Merge branch 'master' into autoprefixer

carbon-design-system · Nov 16, 2021 · ebf88dc · ebf88dc
2 parents 35d5299 + c0d5d80
commit ebf88dc
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 10 deletions.
diff --git a/.github/workflows/ci-check.yml b/.github/workflows/ci-check.yml
@@ -1,6 +1,10 @@
 name: ci-check
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
+    branches: [ master ]
 
 concurrency:
   group: ci-check-${{ github.ref }}

diff --git a/.yarn/offline-mirror/mini-css-extract-plugin-0.12.0.tgz b/.yarn/offline-mirror/mini-css-extract-plugin-0.12.0.tgz
diff --git a/.yarn/offline-mirror/mini-css-extract-plugin-0.5.0.tgz b/.yarn/offline-mirror/mini-css-extract-plugin-0.5.0.tgz
diff --git a/package.json b/package.json
@@ -82,8 +82,7 @@
     "wca": "web-component-analyzer analyze src --outFile custom-elements.json"
   },
   "resolutions": {
-    "babel-plugin-transform-vue-jsx": "^4.0.0",
-    "lit-html": "^1.4.0"
+    "babel-plugin-transform-vue-jsx": "^4.0.0"
   },
   "dependencies": {
     "@babel/runtime": "^7.16.0",
@@ -224,7 +223,7 @@
     "karma-webpack": "^4.0.0",
     "lint-staged": "^10.5.4",
     "magic-string": "~0.25.7",
-    "mini-css-extract-plugin": "~0.5.0",
+    "mini-css-extract-plugin": "~0.12.0",
     "mkdirp": "~0.5.5",
     "morgan": "^1.8.0",
     "null-loader": "^2.0.0",

diff --git a/renovate.json b/renovate.json
@@ -3,5 +3,5 @@
     "config:base",
     ":maintainLockFilesWeekly"
   ],
-  "rangeStrategy": "bump"
+  "rangeStrategy": "replace"
 }
diff --git a/yarn.lock b/yarn.lock
@@ -15303,7 +15303,7 @@ lit-element@^2.5.1:
   dependencies:
     lit-html "^1.1.1"
 
-lit-html@^1.1.1, lit-html@^1.4.0, lit-html@^1.4.1:
+lit-html@^1.1.1, lit-html@^1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-1.4.1.tgz#0c6f3ee4ad4eb610a49831787f0478ad8e9ae5e0"
   integrity sha512-B9btcSgPYb1q4oSOb/PrOT6Z/H+r6xuNzfH4lFli/AWhYwdtrgQkQWBbIc6mdnf6E2IL3gDXdkkqNktpU0OZQA==
@@ -16127,12 +16127,13 @@ mini-css-extract-plugin@0.8.0:
     schema-utils "^1.0.0"
     webpack-sources "^1.1.0"
 
-mini-css-extract-plugin@~0.5.0:
-  version "0.5.0"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.5.0.tgz#ac0059b02b9692515a637115b0cc9fed3a35c7b0"
-  integrity sha512-IuaLjruM0vMKhUUT51fQdQzBYTX49dLj8w68ALEAe2A4iYNpIC4eMac67mt3NzycvjOlf07/kYxJDc0RTl1Wqw==
+mini-css-extract-plugin@~0.12.0:
+  version "0.12.0"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-0.12.0.tgz#ddeb74fd6304ca9f99c1db74acc7d5b507705454"
+  integrity sha512-z6PQCe9rd1XUwZ8gMaEVwwRyZlrYy8Ba1gRjFP5HcV51HkXX+XlwZ+a1iAYTjSYwgNBXoNR7mhx79mDpOn5fdw==
   dependencies:
     loader-utils "^1.1.0"
+    normalize-url "1.9.1"
     schema-utils "^1.0.0"
     webpack-sources "^1.1.0"