diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 684ef408c4..9facdd06dd 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -31,7 +31,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [20] + node-version: [20, 22] steps: - name: Checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 @@ -63,7 +63,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - node-version: [20] + node-version: [20, 22] steps: - name: Checkout uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4 diff --git a/.nvmrc b/.nvmrc index 87bc4c77fe..7d41c735d7 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20.18.3 +22.14.0 diff --git a/.rhdh/docker/Dockerfile b/.rhdh/docker/Dockerfile index 871e150485..01676420fa 100644 --- a/.rhdh/docker/Dockerfile +++ b/.rhdh/docker/Dockerfile @@ -21,9 +21,9 @@ # 4. add Brew metadata # Stage 1 - Build nodejs skeleton -#@follow_tag(registry.access.redhat.com/ubi9/nodejs-20:1) -# https://registry.access.redhat.com/ubi9/nodejs-20 -FROM registry.access.redhat.com/ubi9/nodejs-20:9.5-1741006255 AS build +#@follow_tag(registry.access.redhat.com/ubi9/nodejs-22:1) +# https://registry.access.redhat.com/ubi9/nodejs-222 +FROM registry.access.redhat.com/ubi9/nodejs-22:9.5-1740412185 AS build # hadolint ignore=DL3002 USER 0 @@ -264,9 +264,9 @@ RUN "$YARN" workspaces focus --all --production && \ npm config set cafile /opt/app-root/src/registry-ca.pem # Stage 5 - Build the runner image -#@follow_tag(registry.access.redhat.com/ubi9/nodejs-20-minimal:1) -# https://registry.access.redhat.com/ubi9/nodejs-20-minimal -FROM registry.access.redhat.com/ubi9/nodejs-20-minimal:9.5-1739448741 AS runner +#@follow_tag(registry.access.redhat.com/ubi9/nodejs-22-minimal:1) +# https://registry.access.redhat.com/ubi9/nodejs-22-minimal +FROM registry.access.redhat.com/ubi9/nodejs-22-minimal:9.5-1740651938 AS runner USER 0 # Downstream sources diff --git a/docker/Dockerfile b/docker/Dockerfile index b108887d1b..1f4faf4585 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -23,8 +23,8 @@ # 4. add Brew metadata # Stage 1 - Build nodejs skeleton -# https://registry.access.redhat.com/ubi9/nodejs-20 -FROM registry.access.redhat.com/ubi9/nodejs-20:9.5-1741006255 AS skeleton +# https://registry.access.redhat.com/ubi9/nodejs-22 +FROM registry.access.redhat.com/ubi9/nodejs-22:9.5-1740412185 AS skeleton # hadolint ignore=DL3002 USER 0 @@ -204,8 +204,8 @@ RUN "$YARN" workspaces focus --all --production && \ npm config set cafile /opt/app-root/src/registry-ca.pem # Stage 5 - Build the runner image -# https://registry.access.redhat.com/ubi9/nodejs-20-minimal -FROM registry.access.redhat.com/ubi9/nodejs-20-minimal:9.5-1739448741 AS runner +# https://registry.access.redhat.com/ubi9/nodejs-22-minimal +FROM registry.access.redhat.com/ubi9/nodejs-22-minimal:9.5-1740651938 AS runner USER 0 # Upstream only diff --git a/e2e-tests/package.json b/e2e-tests/package.json index 66d7c903fb..23a1197c51 100644 --- a/e2e-tests/package.json +++ b/e2e-tests/package.json @@ -28,7 +28,7 @@ }, "devDependencies": { "@playwright/test": "1.50.1", - "@types/node": "20.17.19", + "@types/node": "22.13.5", "@typescript-eslint/eslint-plugin": "6.21.0", "@typescript-eslint/parser": "6.21.0", "eslint": "8.57.1", diff --git a/packages/app/package.json b/packages/app/package.json index 5182965e93..44da4892a8 100644 --- a/packages/app/package.json +++ b/packages/app/package.json @@ -65,7 +65,7 @@ "@testing-library/react": "14.3.1", "@testing-library/react-hooks": "8.0.1", "@testing-library/user-event": "14.6.1", - "@types/node": "20.17.19", + "@types/node": "22.13.5", "@types/react": "18.3.18", "@types/react-dom": "18.3.5", "prettier": "3.5.2" diff --git a/yarn.lock b/yarn.lock index 209f287334..f8eceb8a3b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -20352,12 +20352,12 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:20.17.19, @types/node@npm:^20.1.1": - version: 20.17.19 - resolution: "@types/node@npm:20.17.19" +"@types/node@npm:22.13.5": + version: 22.13.5 + resolution: "@types/node@npm:22.13.5" dependencies: - undici-types: ~6.19.2 - checksum: 4eb29628e293d47494c1fe8eaacbaf9f1317cc2ada176a74753d0ea6e3ff6cb5f3e97ba3baa1435d9934950f0fec5693272f2805387f2e70c119038ee7608c20 + undici-types: ~6.20.0 + checksum: 8789d9bc3efd212819fd03f7bbd429901b076703e9852ccf4950c8c7cd300d5d5a05f273d0936cbaf28194485d2bd0c265a1a25390720e353a53359526c28fb3 languageName: node linkType: hard @@ -20384,6 +20384,15 @@ __metadata: languageName: node linkType: hard +"@types/node@npm:^20.1.1": + version: 20.17.19 + resolution: "@types/node@npm:20.17.19" + dependencies: + undici-types: ~6.19.2 + checksum: 4eb29628e293d47494c1fe8eaacbaf9f1317cc2ada176a74753d0ea6e3ff6cb5f3e97ba3baa1435d9934950f0fec5693272f2805387f2e70c119038ee7608c20 + languageName: node + linkType: hard + "@types/oauth@npm:*": version: 0.9.4 resolution: "@types/oauth@npm:0.9.4" @@ -21945,7 +21954,7 @@ __metadata: "@testing-library/react": 14.3.1 "@testing-library/react-hooks": 8.0.1 "@testing-library/user-event": 14.6.1 - "@types/node": 20.17.19 + "@types/node": 22.13.5 "@types/react": 18.3.18 "@types/react-dom": 18.3.5 lodash: 4.17.21 @@ -27065,7 +27074,7 @@ __metadata: "@kubernetes/client-node": 0.22.3 "@microsoft/microsoft-graph-client": 3.0.7 "@playwright/test": 1.50.1 - "@types/node": 20.17.19 + "@types/node": 22.13.5 "@typescript-eslint/eslint-plugin": 6.21.0 "@typescript-eslint/parser": 6.21.0 eslint: 8.57.1 @@ -44722,6 +44731,13 @@ __metadata: languageName: node linkType: hard +"undici-types@npm:~6.20.0": + version: 6.20.0 + resolution: "undici-types@npm:6.20.0" + checksum: b7bc50f012dc6afbcce56c9fd62d7e86b20a62ff21f12b7b5cbf1973b9578d90f22a9c7fe50e638e96905d33893bf2f9f16d98929c4673c2480de05c6c96ea8b + languageName: node + linkType: hard + "undici@npm:6.21.1": version: 6.21.1 resolution: "undici@npm:6.21.1"