From 661bd25c67f06e2233718f264e374c763f2c7f63 Mon Sep 17 00:00:00 2001 From: Tedd Mason Date: Tue, 19 May 2026 08:22:18 +0100 Subject: [PATCH 1/3] Update to node 24, including dependency review github action and .npmrc file --- .github/workflows/ci.yml | 9 ++++++++- .npmrc | 3 +++ .nvmrc | 2 +- docker/.env | 4 ++-- package-lock.json | 2 +- package.json | 2 +- readme.md | 2 +- 7 files changed, 17 insertions(+), 7 deletions(-) create mode 100644 .npmrc diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 43d34f3..7c95b60 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -17,7 +17,7 @@ jobs: - name: Install nodejs uses: actions/setup-node@v4 with: - node-version: "22.x" + node-version: "24.x" - name: Install node dependencies run: npm ci --ignore-scripts @@ -48,3 +48,10 @@ jobs: -Dsonar.issue.ignore.multicriteria.e2.resourceKey=**/docker/scripts/load-dummy-data.sh -Dsonar.issue.ignore.multicriteria.e3.ruleKey=secrets:S2068 -Dsonar.issue.ignore.multicriteria.e3.resourceKey=**/docker/.env + - name: Dependency Review + if: github.event_name == 'pull_request' + uses: actions/dependency-review-action@v4 + with: + fail-on-severity: moderate + comment-summary-in-pr: always + \ No newline at end of file diff --git a/.npmrc b/.npmrc new file mode 100644 index 0000000..97de5ae --- /dev/null +++ b/.npmrc @@ -0,0 +1,3 @@ +save-exact=true +ignore-scripts=true +min-release-age=7 diff --git a/.nvmrc b/.nvmrc index c6a66a6..8db4761 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v22.21.1 +v24.x diff --git a/docker/.env b/docker/.env index cf59ab0..20d2ee1 100644 --- a/docker/.env +++ b/docker/.env @@ -19,7 +19,7 @@ LAMBDA_TIMEOUT=9999999 # IMPORTANT - If cloning the remote repository into a container volume, the change must be pushed to a pull request # branch from which a new containerised development environment is created. If a new containerised development environment # is not created, running multiple Lambda functions without remote debug limitations will not be possible. -LAMBDA_DOCKER_FLAGS="-e NODE_OPTIONS=--inspect-brk=0.0.0.0:9229 -p 9229:9229" +#LAMBDA_DOCKER_FLAGS="-e NODE_OPTIONS=--inspect-brk=0.0.0.0:9229 -p 9229:9229" # Let Docker select a matching image based on the host operating system and architecture. LAMBDA_IGNORE_ARCHITECTURE=1 @@ -43,7 +43,7 @@ LAMBDA_IGNORE_ARCHITECTURE=1 # debugging when cloning the remote repository into a container volume. DEBUG_HOST_ADDRESS=192.168.0.5 CPX_DB_HOST=capxmldb -NODEJS_VERSION=22 +NODEJS_VERSION=24 PGADMIN_DEFAULT_EMAIL=ubuntu@localhost.localdomain # Database associated values including well known secrets for local development diff --git a/package-lock.json b/package-lock.json index c33e4b9..ecabd03 100644 --- a/package-lock.json +++ b/package-lock.json @@ -31,7 +31,7 @@ "standard": "17.1.2" }, "engines": { - "node": "22.x" + "node": "24.x" } }, "node_modules/@ampproject/remapping": { diff --git a/package.json b/package.json index a6f6289..5243d6e 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "version": "4.0.1", "description": "CAP XML service", "engines": { - "node": "22.x" + "node": "24.x" }, "main": "handler.js", "scripts": { diff --git a/readme.md b/readme.md index 2d94eb0..870c7ec 100644 --- a/readme.md +++ b/readme.md @@ -27,7 +27,7 @@ This project provides CAP XML services through the use of AWS Lambda. ## Prerequisites -- **Node.js 22** or higher +- **Node.js 24.x** ## Installing From 5f0d0941cd629d9803ed017e6b142e0074762314 Mon Sep 17 00:00:00 2001 From: Tedd Mason Date: Tue, 19 May 2026 08:24:34 +0100 Subject: [PATCH 2/3] undoing commented env value --- docker/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker/.env b/docker/.env index 20d2ee1..3ce413f 100644 --- a/docker/.env +++ b/docker/.env @@ -19,7 +19,7 @@ LAMBDA_TIMEOUT=9999999 # IMPORTANT - If cloning the remote repository into a container volume, the change must be pushed to a pull request # branch from which a new containerised development environment is created. If a new containerised development environment # is not created, running multiple Lambda functions without remote debug limitations will not be possible. -#LAMBDA_DOCKER_FLAGS="-e NODE_OPTIONS=--inspect-brk=0.0.0.0:9229 -p 9229:9229" +LAMBDA_DOCKER_FLAGS="-e NODE_OPTIONS=--inspect-brk=0.0.0.0:9229 -p 9229:9229" # Let Docker select a matching image based on the host operating system and architecture. LAMBDA_IGNORE_ARCHITECTURE=1 From febb89982c5ebd94dc6faec379a234b4d1fe1f63 Mon Sep 17 00:00:00 2001 From: Tedd Mason Date: Wed, 20 May 2026 08:56:58 +0100 Subject: [PATCH 3/3] Updating nvm rc to 24.15.0 as 24.x not valid --- .nvmrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.nvmrc b/.nvmrc index 8db4761..f3c8820 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v24.x +v24.15.0