From 08b14d5cf4e46f63bdfa9ae373d63d477dbfd27a Mon Sep 17 00:00:00 2001 From: Amndeep Singh Mann Date: Tue, 3 Dec 2024 11:29:16 -0600 Subject: [PATCH 1/3] update to node22 Signed-off-by: Amndeep Singh Mann --- .github/workflows/backend-tests.yml | 2 +- .github/workflows/build-prod.yml | 2 +- .github/workflows/e2e-ui-tests.yml | 2 +- .github/workflows/frontend-tests.yml | 2 +- .github/workflows/gh-pages.yml | 2 +- .github/workflows/hdfconverter-tests.yml | 2 +- .github/workflows/inspecjs-tests.yml | 2 +- .github/workflows/linter.yml | 2 +- .github/workflows/push-to-npm.yml | 4 ++-- Dockerfile | 2 +- Dockerfile.lite | 2 +- apps/frontend/package.json | 2 +- docker-compose.yml | 2 +- package.json | 2 +- yarn.lock | 6 +++--- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/backend-tests.yml b/.github/workflows/backend-tests.yml index ee641f0756..432cc9732b 100644 --- a/.github/workflows/backend-tests.yml +++ b/.github/workflows/backend-tests.yml @@ -23,7 +23,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: "18" + node-version: "22" check-latest: true cache: 'yarn' diff --git a/.github/workflows/build-prod.yml b/.github/workflows/build-prod.yml index cd1ff8c283..526a503425 100644 --- a/.github/workflows/build-prod.yml +++ b/.github/workflows/build-prod.yml @@ -24,7 +24,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: "18" + node-version: "22" check-latest: true cache: 'yarn' diff --git a/.github/workflows/e2e-ui-tests.yml b/.github/workflows/e2e-ui-tests.yml index c3e9179549..02155db821 100644 --- a/.github/workflows/e2e-ui-tests.yml +++ b/.github/workflows/e2e-ui-tests.yml @@ -39,7 +39,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: "18" + node-version: "22" check-latest: true cache: 'yarn' diff --git a/.github/workflows/frontend-tests.yml b/.github/workflows/frontend-tests.yml index 176d87055e..41280c24d0 100644 --- a/.github/workflows/frontend-tests.yml +++ b/.github/workflows/frontend-tests.yml @@ -23,7 +23,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: "18" + node-version: "22" check-latest: true cache: 'yarn' diff --git a/.github/workflows/gh-pages.yml b/.github/workflows/gh-pages.yml index 8bb2dc6808..2ac7761020 100644 --- a/.github/workflows/gh-pages.yml +++ b/.github/workflows/gh-pages.yml @@ -14,7 +14,7 @@ jobs: - name: setup node uses: actions/setup-node@v4 with: - node-version: "18" + node-version: "22" check-latest: true cache: 'yarn' diff --git a/.github/workflows/hdfconverter-tests.yml b/.github/workflows/hdfconverter-tests.yml index 711edc1842..ca197f6f3e 100644 --- a/.github/workflows/hdfconverter-tests.yml +++ b/.github/workflows/hdfconverter-tests.yml @@ -29,7 +29,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: "18" + node-version: "22" check-latest: true cache: 'yarn' diff --git a/.github/workflows/inspecjs-tests.yml b/.github/workflows/inspecjs-tests.yml index b7d52dc9e9..ae7a8111e1 100644 --- a/.github/workflows/inspecjs-tests.yml +++ b/.github/workflows/inspecjs-tests.yml @@ -19,7 +19,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: "18" + node-version: "22" check-latest: true cache: 'yarn' diff --git a/.github/workflows/linter.yml b/.github/workflows/linter.yml index 4687365285..fd5c6f618e 100644 --- a/.github/workflows/linter.yml +++ b/.github/workflows/linter.yml @@ -23,7 +23,7 @@ jobs: - name: Setup Node.js uses: actions/setup-node@v4 with: - node-version: "18" + node-version: "22" check-latest: true cache: 'yarn' diff --git a/.github/workflows/push-to-npm.yml b/.github/workflows/push-to-npm.yml index 1020f64185..838a36363d 100644 --- a/.github/workflows/push-to-npm.yml +++ b/.github/workflows/push-to-npm.yml @@ -13,7 +13,7 @@ jobs: - name: setup node uses: actions/setup-node@v4 with: - node-version: "18" + node-version: "22" check-latest: true registry-url: 'https://registry.npmjs.org' cache: 'yarn' @@ -46,7 +46,7 @@ jobs: - uses: actions/setup-node@v4 if: always() with: - node-version: "18" + node-version: "22" check-latest: true registry-url: 'https://npm.pkg.github.com' cache: 'yarn' diff --git a/Dockerfile b/Dockerfile index ee28db4914..b734769078 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -ARG BASE_CONTAINER=registry.access.redhat.com/ubi8/nodejs-18-minimal:1 +ARG BASE_CONTAINER=registry.access.redhat.com/ubi9/nodejs-22-minimal:1 FROM $BASE_CONTAINER AS builder diff --git a/Dockerfile.lite b/Dockerfile.lite index 5a248acbab..3dbe0b1f89 100644 --- a/Dockerfile.lite +++ b/Dockerfile.lite @@ -1,4 +1,4 @@ -ARG BUILD_CONTAINER=registry.access.redhat.com/ubi8/nodejs-18-minimal:1 +ARG BUILD_CONTAINER=registry.access.redhat.com/ubi9/nodejs-22-minimal:1 ARG BASE_CONTAINER=nginx:alpine FROM $BUILD_CONTAINER AS builder diff --git a/apps/frontend/package.json b/apps/frontend/package.json index 41d79baacf..ec0a9fb78e 100644 --- a/apps/frontend/package.json +++ b/apps/frontend/package.json @@ -133,7 +133,7 @@ "prismjs": "1.29.0" }, "engines": { - "node": "^18.19.0" + "node": ">=22" }, "branch": "/blob/master/", "changelog": "/releases", diff --git a/docker-compose.yml b/docker-compose.yml index 2901d6d160..10ee6099cc 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -18,7 +18,7 @@ services: - "5432" certs: - image: registry.access.redhat.com/ubi8/ubi:latest + image: registry.access.redhat.com/ubi9/ubi:latest restart: unless-stopped command: sh -c "sh /etc/pki/ca-trust/source/anchors/dodcerts.sh && update-ca-trust && tail -f /dev/null" volumes: diff --git a/package.json b/package.json index 52604c58cf..0aaf9e7b71 100644 --- a/package.json +++ b/package.json @@ -36,7 +36,7 @@ "dotenv-cli": "^7.0.0" }, "engines": { - "node": "^18.19.0" + "node": ">=22" }, "version": "0.0.0" } diff --git a/yarn.lock b/yarn.lock index cc87657b6e..f0bfa8dac7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8,9 +8,9 @@ integrity sha512-1Yjs2SvM8TflER/OD3cOjhWWOZb58A2t7wpE2S9XfBYTiIl+XFhQG2bjy4Pu1I+EAlCNUzRDYDdFwFYUKvXcIA== "@achrinza/node-ipc@^9.2.5": - version "9.2.8" - resolved "https://registry.npmjs.org/@achrinza/node-ipc/-/node-ipc-9.2.8.tgz#aabfe9fe84406c90bfb7319d5e68b5b517dd8686" - integrity sha512-DSzEEkbMYbAUVlhy7fg+BzccoRuSQzqHbIPGxGv19OJ2WKwS3/9ChAnQcII4g+GujcHhyJ8BUuOVAx/S5uAfQg== + version "9.2.9" + resolved "https://registry.npmjs.org/@achrinza/node-ipc/-/node-ipc-9.2.9.tgz#ab4815d9b16f1c83a479fe8791522a3abebb1c6a" + integrity sha512-7s0VcTwiK/0tNOVdSX9FWMeFdOEcsAOz9HesBldXxFMaGvIak7KC2z9tV9EgsQXn6KUsWsfIkViMNuIo0GoZDQ== dependencies: "@node-ipc/js-queue" "2.0.3" event-pubsub "4.3.0" From 93050dfde0c41432763bcf0a07adfe9cde4de1a2 Mon Sep 17 00:00:00 2001 From: Amndeep Singh Mann Date: Tue, 3 Dec 2024 11:36:56 -0600 Subject: [PATCH 2/3] netlify Signed-off-by: Amndeep Singh Mann --- .nvmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.nvmrc b/.nvmrc index 3c032078a4..2bd5a0a98a 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -18 +22 From b42356c21d63e88321787b54d3ee3994af94b52a Mon Sep 17 00:00:00 2001 From: Amndeep Singh Mann Date: Tue, 3 Dec 2024 11:42:35 -0600 Subject: [PATCH 3/3] different error output msg Signed-off-by: Amndeep Singh Mann --- apps/backend/src/config/config.service.spec.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/backend/src/config/config.service.spec.ts b/apps/backend/src/config/config.service.spec.ts index 7368c9fd78..ddef55c386 100644 --- a/apps/backend/src/config/config.service.spec.ts +++ b/apps/backend/src/config/config.service.spec.ts @@ -122,7 +122,7 @@ describe('Config Service', () => { }) }); expect(() => new ConfigService()).toThrowError( - "EACCES: permission denied, open '.env'" + "EACCES, permission denied '.env'" ); });