Merge branch 'main' into overflow-focus

carbon-design-system · Mar 1, 2022 · c3c87d0 · c3c87d0
2 parents 9af01c3 + 9e3f497
commit c3c87d0
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 21 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 16.x
-        uses: actions/setup-node@v2.5.1
+        uses: actions/setup-node@v3
         with:
           node-version: '16.x'
       - name: Run yarn dedupe
@@ -26,7 +26,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 16.x
-        uses: actions/setup-node@v2.5.1
+        uses: actions/setup-node@v3
         with:
           node-version: '16.x'
       - name: Install dependencies
@@ -39,7 +39,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 16.x
-        uses: actions/setup-node@v2.5.1
+        uses: actions/setup-node@v3
         with:
           node-version: '16.x'
       - name: Install dependencies
@@ -54,7 +54,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 16.x
-        uses: actions/setup-node@v2.5.1
+        uses: actions/setup-node@v3
         with:
           node-version: '16.x'
       - uses: actions/[email protected]
@@ -80,7 +80,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 16.x
-        uses: actions/setup-node@v2.5.1
+        uses: actions/setup-node@v3
         with:
           node-version: '16.x'
       - uses: actions/[email protected]
@@ -116,7 +116,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 16.x
-        uses: actions/setup-node@v2.5.1
+        uses: actions/setup-node@v3
         with:
           node-version: '16.x'
       - uses: actions/[email protected]

diff --git a/.github/workflows/deploy-react-storybook.yml b/.github/workflows/deploy-react-storybook.yml
@@ -18,7 +18,7 @@ jobs:
     steps:
       - uses: actions/checkout@main
       - name: Use Node.js 16.x
-        uses: actions/setup-node@v2.5.1
+        uses: actions/setup-node@v3
         with:
           node-version: '16.x'
       - name: Install dependencies

diff --git a/.github/workflows/deploy-vanilla-devenv.yml b/.github/workflows/deploy-vanilla-devenv.yml
@@ -17,7 +17,7 @@ jobs:
     steps:
       - uses: actions/checkout@main
       - name: Use Node.js 16.x
-        uses: actions/setup-node@v2.5.1
+        uses: actions/setup-node@v3
         with:
           node-version: '16.x'
       - name: Install dependencies

diff --git a/.github/workflows/nightly-release.yml b/.github/workflows/nightly-release.yml
@@ -11,7 +11,7 @@ jobs:
     steps:
       - uses: actions/checkout@main
       - name: Use Node.js 16.x
-        uses: actions/setup-node@v2.5.1
+        uses: actions/setup-node@v3
         with:
           node-version: '16.x'
       - name: Install dependencies

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Use Node.js 16.x
-        uses: actions/setup-node@v2.5.1
+        uses: actions/setup-node@v3
         with:
           node-version: '16.x'
           registry-url: 'https://registry.npmjs.org'

diff --git a/.github/workflows/sync-generated-files.yml b/.github/workflows/sync-generated-files.yml
@@ -9,7 +9,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Use Node.js 16.x
-        uses: actions/setup-node@v2.5.1
+        uses: actions/setup-node@v3
         with:
           node-version: '16.x'
       - name: Install dependencies

diff --git a/.yarn/cache/lolex-npm-3.1.0-fa2f70ad73-7fa8d5b4c0.zip b/.yarn/cache/lolex-npm-3.1.0-fa2f70ad73-7fa8d5b4c0.zip
diff --git a/packages/components/package.json b/packages/components/package.json
@@ -138,7 +138,7 @@
     "karma-sourcemap-loader": "~0.3.7",
     "karma-spec-reporter": "0.0.33",
     "karma-webpack": "^3.0.0",
-    "lolex": "^3.0.0",
+    "lolex": "^5.0.0",
     "markdown-it": "^12.0.4",
     "minimatch": "^3.0.4",
     "mkdirp": "^0.5.0",

diff --git a/yarn.lock b/yarn.lock
@@ -11991,7 +11991,7 @@ __metadata:
     karma-spec-reporter: 0.0.33
     karma-webpack: ^3.0.0
     lodash.debounce: ^4.0.8
-    lolex: ^3.0.0
+    lolex: ^5.0.0
     markdown-it: ^12.0.4
     minimatch: ^3.0.4
     mkdirp: ^0.5.0
@@ -25166,14 +25166,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"lolex@npm:^3.0.0":
-  version: 3.1.0
-  resolution: "lolex@npm:3.1.0"
-  checksum: 7fa8d5b4c0c20adbc8990203af5305ffb9f42bd53fd92fe141ac3ca2e583ee7595a98abe2adb7decf8341f6729f7a8be7097d568e5429a078c121f8ca79de541
-  languageName: node
-  linkType: hard
-
-"lolex@npm:^5.0.1":
+"lolex@npm:^5.0.0, lolex@npm:^5.0.1":
   version: 5.1.2
   resolution: "lolex@npm:5.1.2"
   dependencies: