Merge pull request #1028 from securityscorecard/ajkl2533@upgraade-nod…

…e-22 build: use Node@22 as build version
securityscorecard · Jul 17, 2024 · 8d3c1a8 · 8d3c1a8
2 parents 1c17619 + 1560d71
commit 8d3c1a8
Show file tree

Hide file tree

Showing 11 changed files with 1,380 additions and 1,389 deletions.
diff --git a/.github/workflows/CD.yaml b/.github/workflows/CD.yaml
@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ['18','20']
+        node: ['18','20','22']
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -50,7 +50,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
 
       - name: Cache yarn files
         uses: actions/cache@v4
@@ -59,9 +59,9 @@ jobs:
           path: |
             .yarn/install-state.gz
             node_modules
-          key: ${{ runner.os }}-node-${{ matrix.node }}-${{ hashFiles('**/yarn.lock', '**/package.json') }}
+          key: ${{ runner.os }}-node-22-${{ hashFiles('**/yarn.lock', '**/package.json') }}
           restore-keys: |
-            ${{ runner.os }}-node-${{ matrix.node }}-${{ env.cache-name }}-
+            ${{ runner.os }}-node-22-${{ env.cache-name }}-
             ${{ runner.os }}-node-${{ env.cache-name }}-
             ${{ runner.os }}-node-
             ${{ runner.os }}-
@@ -92,9 +92,9 @@ jobs:
           path: |
             .yarn/install-state.gz
             node_modules
-          key: ${{ runner.os }}-node-${{ matrix.node }}-${{ hashFiles('**/yarn.lock', '**/package.json') }}
+          key: ${{ runner.os }}-node-16-${{ hashFiles('**/yarn.lock', '**/package.json') }}
           restore-keys: |
-            ${{ runner.os }}-node-${{ matrix.node }}-${{ env.cache-name }}-
+            ${{ runner.os }}-node-16-${{ env.cache-name }}-
             ${{ runner.os }}-node-${{ env.cache-name }}-
             ${{ runner.os }}-node-
             ${{ runner.os }}-
@@ -138,7 +138,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
 
       - name: Cache yarn files
         uses: actions/cache@v4
@@ -147,9 +147,9 @@ jobs:
           path: |
             .yarn/install-state.gz
             node_modules
-          key: ${{ runner.os }}-node-${{ matrix.node }}-${{ hashFiles('**/yarn.lock', '**/package.json') }}
+          key: ${{ runner.os }}-node-22-${{ hashFiles('**/yarn.lock', '**/package.json') }}
           restore-keys: |
-            ${{ runner.os }}-node-${{ matrix.node }}-${{ env.cache-name }}-
+            ${{ runner.os }}-node-22-${{ env.cache-name }}-
             ${{ runner.os }}-node-${{ env.cache-name }}-
             ${{ runner.os }}-node-
             ${{ runner.os }}-
@@ -174,7 +174,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
 
       - name: Cache yarn files
         uses: actions/cache@v4
@@ -183,9 +183,9 @@ jobs:
           path: |
             .yarn/install-state.gz
             node_modules
-          key: ${{ runner.os }}-node-${{ matrix.node }}-${{ hashFiles('**/yarn.lock', '**/package.json') }}
+          key: ${{ runner.os }}-node-22-${{ hashFiles('**/yarn.lock', '**/package.json') }}
           restore-keys: |
-            ${{ runner.os }}-node-${{ matrix.node }}-${{ env.cache-name }}-
+            ${{ runner.os }}-node-22-${{ env.cache-name }}-
             ${{ runner.os }}-node-${{ env.cache-name }}-
             ${{ runner.os }}-node-
             ${{ runner.os }}-
@@ -202,7 +202,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        node: ['18','20']
+        node: ['18','20','22']
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -258,7 +258,7 @@ jobs:
       - name: Setup Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
 
       - name: Cache yarn files
         uses: actions/cache@v4
@@ -267,9 +267,9 @@ jobs:
           path: |
             .yarn/install-state.gz
             node_modules
-          key: ${{ runner.os }}-node-${{ matrix.node }}-${{ hashFiles('**/yarn.lock', '**/package.json') }}
+          key: ${{ runner.os }}-node-22-${{ hashFiles('**/yarn.lock', '**/package.json') }}
           restore-keys: |
-            ${{ runner.os }}-node-${{ matrix.node }}-${{ env.cache-name }}-
+            ${{ runner.os }}-node-22-${{ env.cache-name }}-
             ${{ runner.os }}-node-${{ env.cache-name }}-
             ${{ runner.os }}-node-
             ${{ runner.os }}-
@@ -309,7 +309,7 @@ jobs:
       - name: Use Node.js
         uses: actions/setup-node@v4
         with:
-          node-version: 18
+          node-version: 22
           registry-url: 'https://registry.npmjs.org'
           scope: '@securityscorecard'
 
@@ -320,9 +320,9 @@ jobs:
           path: |
             .yarn/install-state.gz
             node_modules
-          key: ${{ runner.os }}-node-${{ matrix.node }}-${{ hashFiles('**/yarn.lock', '**/package.json') }}
+          key: ${{ runner.os }}-node-22-${{ hashFiles('**/yarn.lock', '**/package.json') }}
           restore-keys: |
-            ${{ runner.os }}-node-${{ matrix.node }}-${{ env.cache-name }}-
+            ${{ runner.os }}-node-22-${{ env.cache-name }}-
             ${{ runner.os }}-node-${{ env.cache-name }}-
             ${{ runner.os }}-node-
             ${{ runner.os }}-
@@ -336,7 +336,7 @@ jobs:
         uses: actions/cache@v4
         with:
           path: build
-          key: node-18-${{ hashFiles('**/yarn.lock', '**/package.json', '**/rollup.config.js', 'src/**') }}
+          key: node-22-${{ hashFiles('**/yarn.lock', '**/package.json', '**/rollup.config.js', 'src/**') }}
 
       - name: Build Step
         if: steps.library-build-cache.outputs.cache-hit != 'true'
@@ -374,9 +374,9 @@ jobs:
           path: |
             .yarn/install-state.gz
             node_modules
-          key: ${{ runner.os }}-node-${{ matrix.node }}-${{ hashFiles('**/yarn.lock', '**/package.json') }}
+          key: ${{ runner.os }}-node-16-${{ hashFiles('**/yarn.lock', '**/package.json') }}
           restore-keys: |
-            ${{ runner.os }}-node-${{ matrix.node }}-${{ env.cache-name }}-
+            ${{ runner.os }}-node-16-${{ env.cache-name }}-
             ${{ runner.os }}-node-${{ env.cache-name }}-
             ${{ runner.os }}-node-
             ${{ runner.os }}-

diff --git a/.nvmrc b/.nvmrc
@@ -1 +1 @@
-v18.20.1
+v22.4.1
diff --git a/visual-regressions/.yarn/releases/yarn-3.6.4.cjs b/visual-regressions/.yarn/releases/yarn-3.6.4.cjs
diff --git a/visual-regressions/.yarn/releases/yarn-4.3.1.cjs b/visual-regressions/.yarn/releases/yarn-4.3.1.cjs
diff --git a/visual-regressions/.yarnrc.yml b/visual-regressions/.yarnrc.yml
@@ -1,3 +1,9 @@
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-3.6.4.cjs
+packageExtensions:
+  storycap@*:
+    dependencies:
+      '@storybook/manager-api': '*'
+      '@storybook/preview-api': '*'
+
+yarnPath: .yarn/releases/yarn-4.3.1.cjs
diff --git a/visual-regressions/Dockerfile b/visual-regressions/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:18.20.0
+FROM node:22.4.1
 
 RUN apt-get update -q -y \
   && apt-get install -q -y --no-install-recommends \

diff --git a/visual-regressions/bin/take-and-check-in-docker-ci.sh b/visual-regressions/bin/take-and-check-in-docker-ci.sh
@@ -1,2 +1,2 @@
 #!/usr/bin/env sh
-docker run --rm -v "$PWD/.storybook/image-snapshots/:/usr/src/app/snapshots" -v "$PWD/storybook-static:/usr/src/app/storybook" --platform=linux/amd64 radekpodrazky/visual-regressions:node18.20.0-chrome-123.0.6312.86-002 yarn serve-take-and-check
+docker run --rm -v "$PWD/.storybook/image-snapshots/:/usr/src/app/snapshots" -v "$PWD/storybook-static:/usr/src/app/storybook" --platform=linux/amd64 radekpodrazky/visual-regressions:node22.4.1-chrome-126.0.6478.126-001 yarn serve-take-and-check
diff --git a/visual-regressions/bin/take-and-check-in-docker.sh b/visual-regressions/bin/take-and-check-in-docker.sh
@@ -1,2 +1,2 @@
 #!/usr/bin/env sh
-docker run --rm --network host -v "$PWD/.storybook/image-snapshots/:/usr/src/app/snapshots" -it radekpodrazky/visual-regressions:node18.20.0-chrome-123.0.6312.86-002 yarn take-and-check
+docker run --rm --network host -v "$PWD/.storybook/image-snapshots/:/usr/src/app/snapshots" -it radekpodrazky/visual-regressions:node22.4.1-chrome-126.0.6478.126-001 yarn take-and-check
diff --git a/visual-regressions/bin/take-and-update-in-docker.sh b/visual-regressions/bin/take-and-update-in-docker.sh
@@ -1,2 +1,2 @@
 #!/usr/bin/env sh
-docker run --rm --network host -v "$PWD/.storybook/image-snapshots/:/usr/src/app/snapshots" -it radekpodrazky/visual-regressions:node18.20.0-chrome-123.0.6312.86-002 yarn take-and-update
+docker run --rm --network host -v "$PWD/.storybook/image-snapshots/:/usr/src/app/snapshots" -it radekpodrazky/visual-regressions:node22.4.1-chrome-126.0.6478.126-001 yarn take-and-update
diff --git a/visual-regressions/package.json b/visual-regressions/package.json
@@ -8,10 +8,10 @@
     "serve-take-and-check": "start-server-and-test 'serve storybook' http-get://localhost:3000 'STORYBOOK_URL=http://localhost:3000 ./bin/take.sh && ./bin/check.sh'"
   },
   "devDependencies": {
-    "reg-cli": "^0.18.1",
-    "serve": "^14.2.1",
-    "start-server-and-test": "^2.0.3",
-    "storycap": "^4.3.1"
+    "reg-cli": "0.18.1",
+    "serve": "^14.2.3",
+    "start-server-and-test": "^2.0.4",
+    "storycap": "^5.0.0"
   },
-  "packageManager": "yarn@3.6.4"
+  "packageManager": "yarn@4.3.1"
 }