From a892bbcce511fb0dff943ab23090e1d347594c94 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Wed, 29 Oct 2025 09:58:44 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E3=83=86=E3=82=B9=E3=83=88=E3=81=8C?= =?UTF-8?q?=E5=8B=95=E3=81=8B=E3=81=AA=E3=81=84=E3=81=9F=E3=82=81nodejs=20?= =?UTF-8?q?24=E3=82=B5=E3=83=9D=E3=83=BC=E3=83=88=E3=82=92=E5=8F=96?= =?UTF-8?q?=E3=82=8A=E6=B6=88=E3=81=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .devcontainer/devcontainer.json | 2 +- .node-version | 2 +- CHANGELOG.md | 2 -- Dockerfile | 2 +- packages/backend/package.json | 2 +- 5 files changed, 4 insertions(+), 6 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index e800743469..514abdfb20 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,7 +5,7 @@ "workspaceFolder": "/workspace", "features": { "ghcr.io/devcontainers/features/node:1": { - "version": "24.10.0" + "version": "22.15.0" }, "ghcr.io/devcontainers-extra/features/pnpm:2": { "version": "10.10.0" diff --git a/.node-version b/.node-version index 21651351e2..b8ffd70759 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -24.10.0 +22.15.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 4b08a76093..665f42f5b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,6 @@ ## Unreleased ### General -- Enhance: Node.js 24.10.0をサポートするようになりました -- Enhance: DockerのNode.jsが24.10.0に更新されました ### Client - Fix: 紙吹雪エフェクトがアニメーション設定を考慮せず常に表示される問題を修正 diff --git a/Dockerfile b/Dockerfile index 20e24d1dc2..370bed5751 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax = docker/dockerfile:1.4 -ARG NODE_VERSION=24.10.0-bookworm +ARG NODE_VERSION=22.15.0-bookworm # build assets & compile TypeScript diff --git a/packages/backend/package.json b/packages/backend/package.json index dff9fe22cd..afee92fe38 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -4,7 +4,7 @@ "private": true, "type": "module", "engines": { - "node": "^22.15.0 || ^24.10.0" + "node": "^22.15.0" }, "scripts": { "start": "node ./built/boot/entry.js", From a888f2863bb3e7ac14bc63b12810f7a13a98bb70 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Thu, 30 Oct 2025 21:47:04 +0900 Subject: [PATCH 2/2] Node.js 24 support (#16723) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Revert "テストが動かないためnodejs 24サポートを取り消し" This reverts commit a892bbcce511fb0dff943ab23090e1d347594c94. * fix jest.js * ファイルの添付方法を変更 --------- Co-authored-by: samunohito <46447427+samunohito@users.noreply.github.com> --- .devcontainer/devcontainer.json | 2 +- .node-version | 2 +- CHANGELOG.md | 2 ++ Dockerfile | 2 +- packages/backend/jest.js | 2 +- packages/backend/package.json | 2 +- packages/backend/test/utils.ts | 8 ++++++-- 7 files changed, 13 insertions(+), 7 deletions(-) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 514abdfb20..e800743469 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -5,7 +5,7 @@ "workspaceFolder": "/workspace", "features": { "ghcr.io/devcontainers/features/node:1": { - "version": "22.15.0" + "version": "24.10.0" }, "ghcr.io/devcontainers-extra/features/pnpm:2": { "version": "10.10.0" diff --git a/.node-version b/.node-version index b8ffd70759..21651351e2 100644 --- a/.node-version +++ b/.node-version @@ -1 +1 @@ -22.15.0 +24.10.0 diff --git a/CHANGELOG.md b/CHANGELOG.md index 665f42f5b9..4b08a76093 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ ## Unreleased ### General +- Enhance: Node.js 24.10.0をサポートするようになりました +- Enhance: DockerのNode.jsが24.10.0に更新されました ### Client - Fix: 紙吹雪エフェクトがアニメーション設定を考慮せず常に表示される問題を修正 diff --git a/Dockerfile b/Dockerfile index 370bed5751..20e24d1dc2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax = docker/dockerfile:1.4 -ARG NODE_VERSION=22.15.0-bookworm +ARG NODE_VERSION=24.10.0-bookworm # build assets & compile TypeScript diff --git a/packages/backend/jest.js b/packages/backend/jest.js index 0e761d8c92..61f6b00e85 100644 --- a/packages/backend/jest.js +++ b/packages/backend/jest.js @@ -10,7 +10,7 @@ const __dirname = path.dirname(__filename); const args = []; args.push(...[ - ...semver.satisfies(process.version, '^20.17.0 || ^22.0.0') ? ['--no-experimental-require-module'] : [], + ...semver.satisfies(process.version, '^20.17.0 || ^22.0.0 || ^24.10.0') ? ['--no-experimental-require-module'] : [], '--experimental-vm-modules', '--experimental-import-meta-resolve', path.join(__dirname, 'node_modules/jest/bin/jest.js'), diff --git a/packages/backend/package.json b/packages/backend/package.json index afee92fe38..dff9fe22cd 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -4,7 +4,7 @@ "private": true, "type": "module", "engines": { - "node": "^22.15.0" + "node": "^22.15.0 || ^24.10.0" }, "scripts": { "start": "node ./built/boot/entry.js", diff --git a/packages/backend/test/utils.ts b/packages/backend/test/utils.ts index ace614115c..daae7b9643 100644 --- a/packages/backend/test/utils.ts +++ b/packages/backend/test/utils.ts @@ -316,8 +316,12 @@ export const uploadFile = async (user?: UserToken, { path, name, blob }: UploadO : new URL(path, new URL('resources/', import.meta.url)); const formData = new FormData(); - formData.append('file', blob ?? - new File([new Uint8Array(await readFile(absPath))], basename(absPath.toString()))); + formData.append( + 'file', + blob ?? new Blob([new Uint8Array(await readFile(absPath))]), + basename(absPath.toString()), + ); + formData.append('force', 'true'); if (name) { formData.append('name', name);