Merge branch 'main' into fix/carousel-8247

carbon-design-system · Mar 2, 2022 · 54c87cd · 54c87cd
2 parents 1413ca6 + 2537a02
commit 54c87cd
Show file tree

Hide file tree

Showing 37 changed files with 272 additions and 16 deletions.
diff --git a/.eslintignore b/.eslintignore
@@ -25,6 +25,7 @@ packages/services/es
 packages/services/umd
 packages/services/lib
 packages/services/node_modules
+packages/services/src/internal/vendor
 
 # services-store
 packages/services-store/es

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yaml b/.github/ISSUE_TEMPLATE/bug_report.yaml
@@ -4,7 +4,7 @@ description:
 title: '[YOUR TITLE]: Brief description'
 assignees:
   - jeffchew,ljcarot,oliviaflory,RichKummer,IgnacioBecerra
-labels: ['bug']
+labels: ['bug','dev']
 body:
   - type: markdown
     attributes:

diff --git a/.yarn/offline-mirror/@colors-colors-1.5.0.tgz b/.yarn/offline-mirror/@colors-colors-1.5.0.tgz
diff --git a/.yarn/offline-mirror/@socket.io-base64-arraybuffer-1.0.2.tgz b/.yarn/offline-mirror/@socket.io-base64-arraybuffer-1.0.2.tgz
diff --git a/.yarn/offline-mirror/@types-component-emitter-1.2.11.tgz b/.yarn/offline-mirror/@types-component-emitter-1.2.11.tgz
diff --git a/.yarn/offline-mirror/@types-cookie-0.4.1.tgz b/.yarn/offline-mirror/@types-cookie-0.4.1.tgz
diff --git a/.yarn/offline-mirror/@types-cors-2.8.12.tgz b/.yarn/offline-mirror/@types-cors-2.8.12.tgz
diff --git a/.yarn/offline-mirror/@types-node-17.0.21.tgz b/.yarn/offline-mirror/@types-node-17.0.21.tgz
diff --git a/.yarn/offline-mirror/base64id-2.0.0.tgz b/.yarn/offline-mirror/base64id-2.0.0.tgz
diff --git a/.yarn/offline-mirror/body-parser-1.19.2.tgz b/.yarn/offline-mirror/body-parser-1.19.2.tgz
diff --git a/.yarn/offline-mirror/bytes-3.1.2.tgz b/.yarn/offline-mirror/bytes-3.1.2.tgz
diff --git a/.yarn/offline-mirror/chokidar-3.5.3.tgz b/.yarn/offline-mirror/chokidar-3.5.3.tgz
diff --git a/.yarn/offline-mirror/cookie-0.4.2.tgz b/.yarn/offline-mirror/cookie-0.4.2.tgz
diff --git a/.yarn/offline-mirror/date-format-4.0.3.tgz b/.yarn/offline-mirror/date-format-4.0.3.tgz
diff --git a/.yarn/offline-mirror/debug-4.3.3.tgz b/.yarn/offline-mirror/debug-4.3.3.tgz
diff --git a/.yarn/offline-mirror/engine.io-6.1.3.tgz b/.yarn/offline-mirror/engine.io-6.1.3.tgz
diff --git a/.yarn/offline-mirror/engine.io-parser-5.0.3.tgz b/.yarn/offline-mirror/engine.io-parser-5.0.3.tgz
diff --git a/.yarn/offline-mirror/flatted-3.2.5.tgz b/.yarn/offline-mirror/flatted-3.2.5.tgz
diff --git a/.yarn/offline-mirror/graceful-fs-4.2.9.tgz b/.yarn/offline-mirror/graceful-fs-4.2.9.tgz
diff --git a/.yarn/offline-mirror/http-errors-1.8.1.tgz b/.yarn/offline-mirror/http-errors-1.8.1.tgz
diff --git a/.yarn/offline-mirror/isbinaryfile-4.0.8.tgz b/.yarn/offline-mirror/isbinaryfile-4.0.8.tgz
diff --git a/.yarn/offline-mirror/karma-6.3.17.tgz b/.yarn/offline-mirror/karma-6.3.17.tgz
diff --git a/.yarn/offline-mirror/log4js-6.4.1.tgz b/.yarn/offline-mirror/log4js-6.4.1.tgz
diff --git a/.yarn/offline-mirror/mime-2.6.0.tgz b/.yarn/offline-mirror/mime-2.6.0.tgz
diff --git a/.yarn/offline-mirror/qs-6.9.7.tgz b/.yarn/offline-mirror/qs-6.9.7.tgz
diff --git a/.yarn/offline-mirror/raw-body-2.4.3.tgz b/.yarn/offline-mirror/raw-body-2.4.3.tgz
diff --git a/.yarn/offline-mirror/readdirp-3.6.0.tgz b/.yarn/offline-mirror/readdirp-3.6.0.tgz
diff --git a/.yarn/offline-mirror/setprototypeof-1.2.0.tgz b/.yarn/offline-mirror/setprototypeof-1.2.0.tgz
diff --git a/.yarn/offline-mirror/socket.io-4.4.1.tgz b/.yarn/offline-mirror/socket.io-4.4.1.tgz
diff --git a/.yarn/offline-mirror/socket.io-adapter-2.3.3.tgz b/.yarn/offline-mirror/socket.io-adapter-2.3.3.tgz
diff --git a/.yarn/offline-mirror/socket.io-parser-4.0.4.tgz b/.yarn/offline-mirror/socket.io-parser-4.0.4.tgz
diff --git a/.yarn/offline-mirror/streamroller-3.0.2.tgz b/.yarn/offline-mirror/streamroller-3.0.2.tgz
diff --git a/.yarn/offline-mirror/toidentifier-1.0.1.tgz b/.yarn/offline-mirror/toidentifier-1.0.1.tgz
diff --git a/.yarn/offline-mirror/ws-8.2.3.tgz b/.yarn/offline-mirror/ws-8.2.3.tgz
diff --git a/packages/react/package.json b/packages/react/package.json
@@ -151,7 +151,7 @@
     "jest": "25.5.4",
     "jest-circus": "25.5.4",
     "jest-dev-server": "^4.4.0",
-    "karma": "^4.0.0",
+    "karma": "^6.0.0",
     "karma-accessibility-checker": "^3.0.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-firefox-launcher": "^1.0.0",

diff --git a/packages/web-components/package.json b/packages/web-components/package.json
@@ -217,7 +217,7 @@
     "jasmine-core": "^3.0.0",
     "jest": "25.5.4",
     "jest-diff": "25.5.0",
-    "karma": "^4.0.0",
+    "karma": "^6.0.0",
     "karma-accessibility-checker": "^3.0.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-coverage-istanbul-reporter": "^2.0.0",

diff --git a/yarn.lock b/yarn.lock