From eeea6365a4c94440bd7ee9ead6aca46ecd8c5b4d Mon Sep 17 00:00:00 2001 From: Daniel Emery Date: Wed, 25 Mar 2026 19:30:27 +0100 Subject: [PATCH 1/2] Update to latest lts node version (v24.13.1 -> v24.14.1) --- .github/workflows/ci.yml | 2 +- .nvmrc | 2 +- Dockerfile | 2 +- package-lock.json | 14 +++++++------- package.json | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d927639..c95bac5 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -10,7 +10,7 @@ on: env: REGISTRY: demery IMAGE_NAME: docker-react - NODE_VERSION: 24.13.1 + NODE_VERSION: 24.14.1 jobs: build: diff --git a/.nvmrc b/.nvmrc index 11c309c..a3b7a31 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -v24.13.1 +v24.14.1 diff --git a/Dockerfile b/Dockerfile index 5337eef..40bc4f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM node:24.13.1 AS node +FROM node:24.14.1 AS node FROM nginx:1.29.5 ARG DOCKER_REACT_VERSION diff --git a/package-lock.json b/package-lock.json index 7c37fe6..511b7df 100644 --- a/package-lock.json +++ b/package-lock.json @@ -15,7 +15,7 @@ }, "devDependencies": { "@danielemeryau/prettier-config": "^0.0.6", - "@types/node": "^24.10.13", + "@types/node": "^24.12.0", "typescript": "^5.9.3" }, "peerDependencies": { @@ -29,9 +29,9 @@ "dev": true }, "node_modules/@types/node": { - "version": "24.10.13", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.13.tgz", - "integrity": "sha512-oH72nZRfDv9lADUBSo104Aq7gPHpQZc4BTx38r9xf9pg5LfP6EzSyH2n7qFmmxRQXh7YlUXODcYsg6PuTDSxGg==", + "version": "24.12.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.12.0.tgz", + "integrity": "sha512-GYDxsZi3ChgmckRT9HPU0WEhKLP08ev/Yfcq2AstjrDASOYCSXeyjDsHg4v5t4jOj7cyDX3vmprafKlWIG9MXQ==", "dev": true, "license": "MIT", "dependencies": { @@ -86,9 +86,9 @@ "dev": true }, "@types/node": { - "version": "24.10.13", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.13.tgz", - "integrity": "sha512-oH72nZRfDv9lADUBSo104Aq7gPHpQZc4BTx38r9xf9pg5LfP6EzSyH2n7qFmmxRQXh7YlUXODcYsg6PuTDSxGg==", + "version": "24.12.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-24.12.0.tgz", + "integrity": "sha512-GYDxsZi3ChgmckRT9HPU0WEhKLP08ev/Yfcq2AstjrDASOYCSXeyjDsHg4v5t4jOj7cyDX3vmprafKlWIG9MXQ==", "dev": true, "requires": { "undici-types": "~7.16.0" diff --git a/package.json b/package.json index 6050a8b..a66e013 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "homepage": "https://github.com/danielemery/docker-react#readme", "devDependencies": { "@danielemeryau/prettier-config": "^0.0.6", - "@types/node": "^24.10.13", + "@types/node": "^24.12.0", "typescript": "^5.9.3" }, "dependencies": { From 0e75f097893cc5e94e31ae2fabefc00110d941da Mon Sep 17 00:00:00 2001 From: Daniel Emery Date: Wed, 25 Mar 2026 19:39:44 +0100 Subject: [PATCH 2/2] Bump typescript version and fix "breaking changes" --- package-lock.json | 14 +++++++------- package.json | 2 +- tsconfig.json | 7 +++++-- 3 files changed, 13 insertions(+), 10 deletions(-) diff --git a/package-lock.json b/package-lock.json index 511b7df..faa2e9e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -16,7 +16,7 @@ "devDependencies": { "@danielemeryau/prettier-config": "^0.0.6", "@types/node": "^24.12.0", - "typescript": "^5.9.3" + "typescript": "^6.0.2" }, "peerDependencies": { "zod": "4.3.6" @@ -48,9 +48,9 @@ } }, "node_modules/typescript": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", - "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.2.tgz", + "integrity": "sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==", "dev": true, "license": "Apache-2.0", "bin": { @@ -100,9 +100,9 @@ "integrity": "sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw==" }, "typescript": { - "version": "5.9.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", - "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.2.tgz", + "integrity": "sha512-bGdAIrZ0wiGDo5l8c++HWtbaNCWTS4UTv7RaTH/ThVIgjkveJt83m74bBHMJkuCbslY8ixgLBVZJIOiQlQTjfQ==", "dev": true }, "undici-types": { diff --git a/package.json b/package.json index a66e013..199f5c5 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "devDependencies": { "@danielemeryau/prettier-config": "^0.0.6", "@types/node": "^24.12.0", - "typescript": "^5.9.3" + "typescript": "^6.0.2" }, "dependencies": { "commander": "^14.0.2", diff --git a/tsconfig.json b/tsconfig.json index 3423d96..ade5416 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -5,10 +5,13 @@ "moduleResolution": "NodeNext", "target": "ES2024", "outDir": "./dist", + "rootDir": "./cli", "declaration": true, "strict": true, "skipLibCheck": true, "isolatedModules": true, - "verbatimModuleSyntax": true - } + "verbatimModuleSyntax": true, + "types": ["node"] + }, + "include": ["./cli"] }