From 3d3ce3057907e3ba72eb9456e94fa36b2f867eda Mon Sep 17 00:00:00 2001 From: Aashish John Date: Sun, 9 Nov 2025 21:21:29 -0400 Subject: [PATCH 1/7] build!: upgrade to v24 LTS --- .github/workflows/ci-cd.yml | 2 +- .nvmrc | 2 +- Dockerfile | 4 ++-- README.md | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 7afce5f35..118b4df79 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: node-version: - - 20.16.0-bullseye + - 24.11.0-bullseye container: image: node:${{ matrix.node-version }} diff --git a/.nvmrc b/.nvmrc index 1bdd901e6..f88da62e2 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -20.16 +24.11 diff --git a/Dockerfile b/Dockerfile index bdad31c4c..1c5ac1ba2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN jq '{ dependencies, devDependencies, resolutions }' < /tmp/package.json > /t ### Fat Build ### ------------------------- -FROM node:20.16.0 AS builder +FROM node:24.11.0 AS builder WORKDIR /usr/Spoke @@ -36,7 +36,7 @@ RUN yarn run build ### Slim Deploy ### ------------------------- -FROM node:20.16.0 +FROM node:24.11.0 WORKDIR /usr/Spoke diff --git a/README.md b/README.md index cb7cc7370..63baa0f5f 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ that goal. See [`HOWTO_migrate-from-moveon-main.md`](./docs/HOWTO_migrate-from-m Runtimes and package managers: -- Node (^20.16) +- Node (^24.11) - Yarn (>= 1.19.1) External services: diff --git a/package.json b/package.json index 811d9a6b2..ae702cad8 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "engines": { "npm": "please-use-yarn", "yarn": ">= 1.19.1", - "node": "^20.16.0" + "node": "^24.11.0" }, "scripts": { "preinstall": "node -e \"if(process.env.npm_execpath.indexOf('yarn') === -1) throw new Error('spoke must be installed with Yarn: https://yarnpkg.com/')\"", From b47adcb06791254ca87a9874ba7a7b2d298fd69d Mon Sep 17 00:00:00 2001 From: Aashish John Date: Sun, 9 Nov 2025 21:59:58 -0400 Subject: [PATCH 2/7] fix: use ivs with encryption functions --- src/server/api/lib/crypto.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/server/api/lib/crypto.js b/src/server/api/lib/crypto.js index e54cbd623..09e4037e2 100644 --- a/src/server/api/lib/crypto.js +++ b/src/server/api/lib/crypto.js @@ -13,6 +13,8 @@ if (!key) { } const symmetricEncrypt = (value) => { + const iv = crypto.randomBytes(16); + const cipher = crypto.createCipheriv(algorithm, key, iv); const iv = crypto.randomBytes(16); const cipher = crypto.createCipheriv(algorithm, key, iv); let encrypted = cipher.update(value, inputEncoding, outputEncoding); From 46e265ff4ffe5139d2aa3fdc9f294143e95693be Mon Sep 17 00:00:00 2001 From: Aashish John Date: Mon, 23 Mar 2026 21:56:08 -0400 Subject: [PATCH 3/7] fix: remove merge artifacts Removed duplicate IV and cipher initialization in symmetricEncrypt function. --- src/server/api/lib/crypto.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/server/api/lib/crypto.js b/src/server/api/lib/crypto.js index 09e4037e2..e54cbd623 100644 --- a/src/server/api/lib/crypto.js +++ b/src/server/api/lib/crypto.js @@ -13,8 +13,6 @@ if (!key) { } const symmetricEncrypt = (value) => { - const iv = crypto.randomBytes(16); - const cipher = crypto.createCipheriv(algorithm, key, iv); const iv = crypto.randomBytes(16); const cipher = crypto.createCipheriv(algorithm, key, iv); let encrypted = cipher.update(value, inputEncoding, outputEncoding); From 92ec5b300294f9aa540e918f0050ef4ed603c9b7 Mon Sep 17 00:00:00 2001 From: Aashish John Date: Fri, 10 Apr 2026 21:08:01 -0400 Subject: [PATCH 4/7] chore(node): update types --- package.json | 2 +- yarn.lock | 15 +++++++++++---- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index ae702cad8..f51e42157 100644 --- a/package.json +++ b/package.json @@ -234,7 +234,7 @@ "@types/lodash": "^4.14.168", "@types/luxon": "^1.25.2", "@types/material-ui": "^0.21.7", - "@types/node": "^16.11.26", + "@types/node": "^24.12.2", "@types/node-cron": "^2.0.3", "@types/nodemailer": "^6.4.0", "@types/papaparse": "^5.3.5", diff --git a/yarn.lock b/yarn.lock index a239a9fe1..cd0308755 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6430,10 +6430,12 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-14.0.13.tgz#ee1128e881b874c371374c1f72201893616417c9" integrity sha512-rouEWBImiRaSJsVA+ITTFM6ZxibuAlTuNOCyxVbwreu6k6+ujs7DfnU9o+PShFhET78pMBl3eH+AGSI5eOTkPA== -"@types/node@^16.11.26": - version "16.11.26" - resolved "https://registry.yarnpkg.com/@types/node/-/node-16.11.26.tgz#63d204d136c9916fb4dcd1b50f9740fe86884e47" - integrity sha512-GZ7bu5A6+4DtG7q9GsoHXy3ALcgeIHP4NnL0Vv2wu0uUB/yQex26v0tf6/na1mm0+bS9Uw+0DFex7aaKr2qawQ== +"@types/node@^24.12.2": + version "24.12.2" + resolved "https://registry.yarnpkg.com/@types/node/-/node-24.12.2.tgz#353cb161dbf1785ea25e8829ba7ec574c5c629ac" + integrity sha512-A1sre26ke7HDIuY/M23nd9gfB+nrmhtYyMINbjI1zHJxYteKR6qSMX56FsmjMcDb3SMcjJg5BiRRgOCC/yBD0g== + dependencies: + undici-types "~7.16.0" "@types/nodemailer@^6.4.0": version "6.4.0" @@ -27166,6 +27168,11 @@ underscore@1.x: resolved "https://registry.yarnpkg.com/underscore/-/underscore-1.9.2.tgz#0c8d6f536d6f378a5af264a72f7bec50feb7cf2f" integrity sha512-D39qtimx0c1fI3ya1Lnhk3E9nONswSKhnffBI0gME9C99fYOkNi04xs8K6pePLhvl1frbDemkaBQ5ikWllR2HQ== +undici-types@~7.16.0: + version "7.16.0" + resolved "https://registry.yarnpkg.com/undici-types/-/undici-types-7.16.0.tgz#ffccdff36aea4884cbfce9a750a0580224f58a46" + integrity sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw== + undici@^4.9.3: version "4.12.2" resolved "https://registry.yarnpkg.com/undici/-/undici-4.12.2.tgz#f2fc50ca77a774ed8c0e7067c9361ee18a2f422b" From ae186410b1eae6305509e5e8e7b767a287800313 Mon Sep 17 00:00:00 2001 From: Aashish John Date: Tue, 14 Apr 2026 15:59:11 -0400 Subject: [PATCH 5/7] chore: update tool-versions --- .tool-versions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.tool-versions b/.tool-versions index aeca3fd9b..c91198a36 100644 --- a/.tool-versions +++ b/.tool-versions @@ -1,2 +1,2 @@ -nodejs 16.14.0 +nodejs 24.14.1 yarn 1.22.19 From 778630ddc85b4860d46f715f80d9665cb22cc3d4 Mon Sep 17 00:00:00 2001 From: Aashish John Date: Tue, 14 Apr 2026 16:09:39 -0400 Subject: [PATCH 6/7] chore: update to 24.14 --- .github/workflows/ci-cd.yml | 2 +- .nvmrc | 2 +- Dockerfile | 4 ++-- README.md | 2 +- package.json | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 118b4df79..8d92e29f3 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: node-version: - - 24.11.0-bullseye + - 24.14.0-bullseye container: image: node:${{ matrix.node-version }} diff --git a/.nvmrc b/.nvmrc index f88da62e2..fd655f8a3 100644 --- a/.nvmrc +++ b/.nvmrc @@ -1 +1 @@ -24.11 +24.14 diff --git a/Dockerfile b/Dockerfile index 1c5ac1ba2..e808cffc6 100644 --- a/Dockerfile +++ b/Dockerfile @@ -10,7 +10,7 @@ RUN jq '{ dependencies, devDependencies, resolutions }' < /tmp/package.json > /t ### Fat Build ### ------------------------- -FROM node:24.11.0 AS builder +FROM node:24.14.0 AS builder WORKDIR /usr/Spoke @@ -36,7 +36,7 @@ RUN yarn run build ### Slim Deploy ### ------------------------- -FROM node:24.11.0 +FROM node:24.14.0 WORKDIR /usr/Spoke diff --git a/README.md b/README.md index 63baa0f5f..75536f0f7 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,7 @@ that goal. See [`HOWTO_migrate-from-moveon-main.md`](./docs/HOWTO_migrate-from-m Runtimes and package managers: -- Node (^24.11) +- Node (^24.14) - Yarn (>= 1.19.1) External services: diff --git a/package.json b/package.json index f51e42157..2dc45cf13 100644 --- a/package.json +++ b/package.json @@ -6,7 +6,7 @@ "engines": { "npm": "please-use-yarn", "yarn": ">= 1.19.1", - "node": "^24.11.0" + "node": "^24.14.0" }, "scripts": { "preinstall": "node -e \"if(process.env.npm_execpath.indexOf('yarn') === -1) throw new Error('spoke must be installed with Yarn: https://yarnpkg.com/')\"", From 725f7a676862adec9a079f2258a97242e7cc26c8 Mon Sep 17 00:00:00 2001 From: Aashish John Date: Fri, 19 Jun 2026 10:49:32 -0400 Subject: [PATCH 7/7] ci: use bookworm instead of bullseye --- .github/workflows/ci-cd.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-cd.yml b/.github/workflows/ci-cd.yml index 8d92e29f3..5c5eb6c9f 100644 --- a/.github/workflows/ci-cd.yml +++ b/.github/workflows/ci-cd.yml @@ -20,7 +20,7 @@ jobs: strategy: matrix: node-version: - - 24.14.0-bullseye + - 24.14.0-bookworm container: image: node:${{ matrix.node-version }}