Skip to content

Commit

Permalink
chore(build): update to nodejs 22 (#2439)
Browse files Browse the repository at this point in the history
* chore(docker): update to nodejs 22

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED

* update .nvmrc and dockerfile comments

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED

* update nodejs-22 to latest tags

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED

* update PR workflows to use node 22

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED

* update @types/nodes version

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED

* update @types/node to 22.13.5 through yarn cli

rh-pre-commit.version: 2.3.2
rh-pre-commit.check-secrets: ENABLED
  • Loading branch information
Omar-AlJaljuli authored Mar 3, 2025
1 parent cd0a3b5 commit cec4863
Show file tree
Hide file tree
Showing 7 changed files with 38 additions and 22 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .nvmrc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
20.18.3
22.14.0
12 changes: 6 additions & 6 deletions .rhdh/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion e2e-tests/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion packages/app/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
30 changes: 23 additions & 7 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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"
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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"
Expand Down

0 comments on commit cec4863

Please # to comment.