Compare commits

...

4 Commits

Author SHA1 Message Date
zyoshoka
a492f2c7e1 chore(deps): manually update node.js to v22.14.0 2025-03-05 23:12:18 +09:00
renovate[bot]
c7cbe60a2d chore(deps): update node.js to v22.14.0 2025-03-05 14:01:55 +00:00
renovate[bot]
f3be426383 fix(deps): update [frontend] update dependencies (#15595)
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
2025-03-05 21:01:44 +09:00
かっこかり
e8a6629cb5 fix(backend): システムアカウント系のマイグレーション不足を修正 (#15586)
* fix(backend): プロキシアカウントのロールバック用マイグレーションを追加

* fix

* separate newly-added `up` command

* drop backwards-compatibility

* docs
2025-03-05 16:49:49 +09:00
23 changed files with 352 additions and 209 deletions

View File

@@ -5,7 +5,7 @@
"workspaceFolder": "/workspace",
"features": {
"ghcr.io/devcontainers/features/node:1": {
"version": "22.11.0"
"version": "22.14.0"
},
"ghcr.io/devcontainers-extra/features/corepack:1": {
"version": "0.31.0"

View File

@@ -21,7 +21,7 @@ jobs:
strategy:
matrix:
node-version: [22.11.0]
node-version: [22.14.0]
api-json-name: [api-base.json, api-head.json]
include:
- api-json-name: api-base.json

View File

@@ -20,7 +20,7 @@ jobs:
strategy:
matrix:
node-version: [22.11.0]
node-version: [22.14.0]
steps:
- uses: actions/checkout@v4.2.2

View File

@@ -29,7 +29,7 @@ jobs:
strategy:
matrix:
node-version: [22.11.0]
node-version: [22.14.0]
services:
postgres:
@@ -92,7 +92,7 @@ jobs:
strategy:
matrix:
node-version: [22.11.0]
node-version: [22.14.0]
services:
postgres:

View File

@@ -24,7 +24,7 @@ jobs:
runs-on: ubuntu-latest
strategy:
matrix:
node-version: [22.11.0]
node-version: [22.14.0]
steps:
- uses: actions/checkout@v4
with:

View File

@@ -33,7 +33,7 @@ jobs:
strategy:
matrix:
node-version: [22.11.0]
node-version: [22.14.0]
steps:
- uses: actions/checkout@v4.2.2
@@ -69,7 +69,7 @@ jobs:
strategy:
fail-fast: false
matrix:
node-version: [22.11.0]
node-version: [22.14.0]
browser: [chrome]
services:

View File

@@ -26,7 +26,7 @@ jobs:
strategy:
matrix:
node-version: [22.11.0]
node-version: [22.14.0]
# See supported Node.js release schedule at https://nodejs.org/en/about/releases/
steps:

View File

@@ -18,7 +18,7 @@ jobs:
strategy:
matrix:
node-version: [22.11.0]
node-version: [22.14.0]
steps:
- uses: actions/checkout@v4.2.2

View File

@@ -22,7 +22,7 @@ jobs:
strategy:
matrix:
node-version: [22.11.0]
node-version: [22.14.0]
steps:
- uses: actions/checkout@v4.2.2

View File

@@ -1 +1 @@
22.11.0
22.14.0

View File

@@ -1,6 +1,6 @@
# syntax = docker/dockerfile:1.4
ARG NODE_VERSION=22.11.0-bookworm
ARG NODE_VERSION=22.14.0-bookworm
# build assets & compile TypeScript

View File

@@ -13,6 +13,10 @@ export class SystemAccounts21740129169650 {
async down(queryRunner) {
await queryRunner.query(`ALTER TABLE "meta" ADD "proxyAccountId" character varying(32)`);
const proxyAccountId = await queryRunner.query(`SELECT "userId" FROM "system_account" WHERE "type" = 'proxy' ORDER BY "id" DESC LIMIT 1`);
if (proxyAccountId && proxyAccountId.length >= 1) {
await queryRunner.query(`UPDATE "meta" SET "proxyAccountId" = '${proxyAccountId[0].userId}'`);
}
await queryRunner.query(`ALTER TABLE "meta" ADD CONSTRAINT "FK_ab1bc0c1e209daa77b8e8d212ad" FOREIGN KEY ("proxyAccountId") REFERENCES "user"("id") ON DELETE SET NULL ON UPDATE NO ACTION`);
}
}

View File

@@ -0,0 +1,17 @@
/*
* SPDX-FileCopyrightText: syuilo and misskey-project
* SPDX-License-Identifier: AGPL-3.0-only
*/
export class SystemAccounts41740993126937 {
name = 'SystemAccounts41740993126937'
async up(queryRunner) {
await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "isRoot"`);
}
async down(queryRunner) {
// down 実行時は isRoot = true のユーザーが存在しなくなるため手動で対応する必要あり
await queryRunner.query(`ALTER TABLE "user" ADD "isRoot" boolean NOT NULL DEFAULT false`);
}
}

View File

@@ -12,7 +12,7 @@ services:
retries: 20
misskey:
image: node:20
image: node:22.14.0
env_file:
- ./.config/docker.env
environment:

View File

@@ -16,7 +16,7 @@ services:
"
tester:
image: node:20
image: node:22.14.0
depends_on:
a.test:
condition: service_healthy
@@ -86,7 +86,7 @@ services:
command: pnpm -F backend test:fed
daemon:
image: node:20
image: node:22.14.0
depends_on:
redis.test:
condition: service_healthy

View File

@@ -42,20 +42,20 @@
"@testing-library/vue": "8.1.0",
"@types/estree": "1.0.6",
"@types/micromatch": "4.0.9",
"@types/node": "22.13.8",
"@types/node": "22.13.9",
"@types/punycode.js": "npm:@types/punycode@2.1.4",
"@types/tinycolor2": "1.4.6",
"@types/ws": "8.5.14",
"@typescript-eslint/eslint-plugin": "8.25.0",
"@typescript-eslint/parser": "8.25.0",
"@types/ws": "8.18.0",
"@typescript-eslint/eslint-plugin": "8.26.0",
"@typescript-eslint/parser": "8.26.0",
"@vitest/coverage-v8": "3.0.7",
"@vue/runtime-core": "3.5.13",
"acorn": "8.14.0",
"cross-env": "7.0.3",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-vue": "9.32.0",
"eslint-plugin-vue": "9.33.0",
"fast-glob": "3.3.3",
"happy-dom": "17.1.8",
"happy-dom": "17.2.2",
"intersection-observer": "0.12.2",
"micromatch": "4.0.8",
"msw": "2.7.3",

View File

@@ -21,11 +21,11 @@
"lint": "pnpm typecheck && pnpm eslint"
},
"devDependencies": {
"@types/node": "22.13.8",
"@typescript-eslint/eslint-plugin": "8.25.0",
"@typescript-eslint/parser": "8.25.0",
"@types/node": "22.13.9",
"@typescript-eslint/eslint-plugin": "8.26.0",
"@typescript-eslint/parser": "8.26.0",
"esbuild": "0.25.0",
"eslint-plugin-vue": "9.32.0",
"eslint-plugin-vue": "9.33.0",
"nodemon": "3.1.9",
"typescript": "5.8.2",
"vue-eslint-parser": "9.4.3"

View File

@@ -40,7 +40,7 @@
"chartjs-chart-matrix": "2.0.1",
"chartjs-plugin-gradient": "0.6.1",
"chartjs-plugin-zoom": "2.2.0",
"chromatic": "11.26.1",
"chromatic": "11.27.0",
"compare-versions": "6.1.1",
"cropperjs": "2.0.0",
"date-fns": "4.1.0",
@@ -101,24 +101,24 @@
"@types/estree": "1.0.6",
"@types/matter-js": "0.19.8",
"@types/micromatch": "4.0.9",
"@types/node": "22.13.8",
"@types/node": "22.13.9",
"@types/punycode.js": "npm:@types/punycode@2.1.4",
"@types/sanitize-html": "2.13.0",
"@types/seedrandom": "3.0.8",
"@types/throttle-debounce": "5.0.2",
"@types/tinycolor2": "1.4.6",
"@types/ws": "8.5.14",
"@typescript-eslint/eslint-plugin": "8.25.0",
"@typescript-eslint/parser": "8.25.0",
"@types/ws": "8.18.0",
"@typescript-eslint/eslint-plugin": "8.26.0",
"@typescript-eslint/parser": "8.26.0",
"@vitest/coverage-v8": "3.0.7",
"@vue/runtime-core": "3.5.13",
"acorn": "8.14.0",
"cross-env": "7.0.3",
"cypress": "14.1.0",
"eslint-plugin-import": "2.31.0",
"eslint-plugin-vue": "9.32.0",
"eslint-plugin-vue": "9.33.0",
"fast-glob": "3.3.3",
"happy-dom": "17.1.8",
"happy-dom": "17.2.2",
"intersection-observer": "0.12.2",
"micromatch": "4.0.8",
"msw": "2.7.3",
@@ -133,7 +133,7 @@
"storybook-addon-misskey-theme": "github:misskey-dev/storybook-addon-misskey-theme",
"vite-plugin-turbosnap": "1.0.3",
"vitest": "3.0.7",
"vitest-fetch-mock": "0.4.4",
"vitest-fetch-mock": "0.4.5",
"vue-component-type-helpers": "2.2.8",
"vue-eslint-parser": "9.4.3",
"vue-tsc": "2.2.8"

View File

@@ -24,9 +24,9 @@
"devDependencies": {
"@types/matter-js": "0.19.8",
"@types/seedrandom": "3.0.8",
"@types/node": "22.13.8",
"@typescript-eslint/eslint-plugin": "8.25.0",
"@typescript-eslint/parser": "8.25.0",
"@types/node": "22.13.9",
"@typescript-eslint/eslint-plugin": "8.26.0",
"@typescript-eslint/parser": "8.26.0",
"nodemon": "3.1.9",
"execa": "9.5.2",
"typescript": "5.8.2",

View File

@@ -22,9 +22,9 @@
"lint": "pnpm typecheck && pnpm eslint"
},
"devDependencies": {
"@types/node": "22.13.8",
"@typescript-eslint/eslint-plugin": "8.25.0",
"@typescript-eslint/parser": "8.25.0",
"@types/node": "22.13.9",
"@typescript-eslint/eslint-plugin": "8.26.0",
"@typescript-eslint/parser": "8.26.0",
"execa": "9.5.2",
"nodemon": "3.1.9",
"typescript": "5.8.2",

View File

@@ -14,7 +14,7 @@
"misskey-js": "workspace:*"
},
"devDependencies": {
"@typescript-eslint/parser": "8.25.0",
"@typescript-eslint/parser": "8.26.0",
"@typescript/lib-webworker": "npm:@types/serviceworker@0.0.74",
"eslint-plugin-import": "2.31.0",
"nodemon": "3.1.9",

450
pnpm-lock.yaml generated

File diff suppressed because it is too large Load Diff