Merge branch 'develop' into server-setup-wizard

.devcontainer/devcontainer.json

@@ -5,7 +5,7 @@
 	"workspaceFolder": "/workspace",
 	"features": {
 		"ghcr.io/devcontainers/features/node:1": {
-			"version": "22.11.0"
+			"version": "22.15.0"
 		},
 		"ghcr.io/devcontainers-extra/features/pnpm:2": {
 			"version": "10.10.0"

.node-version

@@ -1 +1 @@
-22.11.0
+22.15.0

CHANGELOG.md

@@ -1,5 +1,8 @@
 ## 2025.5.0
 
+### Note
+- DockerのNode.jsが22.15.0に更新されました
+
 ### General
 -
 

Dockerfile

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

locales/ca-ES.yml

@@ -1425,6 +1425,7 @@ _settings:
   ifOff: "Quan es desactiva"
   enableSyncThemesBetweenDevices: "Sincronitzar els temes instal·lats entre dispositius"
   enablePullToRefresh: "Lliscar i actualitzar "
+  enablePullToRefresh_description: "Amb el ratolí, llisca mentre prems la roda."
   _chat:
     showSenderName: "Mostrar el nom del remitent"
     sendOnEnter: "Introdueix per enviar"

locales/en-US.yml

@@ -1348,6 +1348,7 @@ readonly: "Read only"
 goToDeck: "Return to Deck"
 federationJobs: "Federation Jobs"
 driveAboutTip: "In Drive, a list of files you've uploaded in the past will be displayed. <br>  \nYou can reuse these files when attaching them to notes, or you can upload files in advance to post later. <br>  \n<b>Be careful when deleting a file, as it will not be available in all places where it was used (such as notes, pages, avatars, banners, etc.).</b> <br>  \nYou can also create folders to organize your files."
+scrollToClose: "Scroll to close"
 _chat:
   noMessagesYet: "No messages yet"
   newMessage: "New message"
@@ -1425,6 +1426,7 @@ _settings:
   ifOff: "When turned off"
   enableSyncThemesBetweenDevices: "Synchronize installed themes across devices"
   enablePullToRefresh: "Pull to Refresh"
+  enablePullToRefresh_description: "When using a mouse, drag while pressing in the scrolling wheel."
   _chat:
     showSenderName: "Show sender's name"
     sendOnEnter: "Press Enter to send"

locales/zh-TW.yml

@@ -1348,6 +1348,7 @@ readonly: "唯讀"
 goToDeck: "回去甲板"
 federationJobs: "聯邦通訊作業"
 driveAboutTip: "在「雲端硬碟」中，會顯示過去上傳的檔案列表。<br>\n可以在附加到貼文時重新利用，或者事先上傳之後再用於發布。<br>\n<b>請注意，刪除檔案後，之前使用過該檔案的所有地方（貼文、頁面、大頭貼、橫幅等）也會一併無法顯示。</b><br>\n也可以建立資料夾來整理檔案。"
+scrollToClose: "用滾輪關閉"
 _chat:
   noMessagesYet: "尚無訊息"
   newMessage: "新訊息"
@@ -1425,6 +1426,7 @@ _settings:
   ifOff: "關閉時"
   enableSyncThemesBetweenDevices: "在裝置之間同步已安裝的主題"
   enablePullToRefresh: "下拉更新"
+  enablePullToRefresh_description: "使用滑鼠，按下並拖曳滾輪。"
   _chat:
     showSenderName: "顯示發送者的名稱"
     sendOnEnter: "按下 Enter 發送訊息"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2025.5.0-alpha.0",
+	"version": "2025.5.0-alpha.1",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",

packages/backend/eslint.config.js

@@ -1,4 +1,5 @@
 import tsParser from '@typescript-eslint/parser';
+import globals from 'globals';
 import sharedConfig from '../shared/eslint.config.js';
 
 export default [
@@ -6,6 +7,13 @@ export default [
 	{
 		ignores: ['**/node_modules', 'built', '@types/**/*', 'migration'],
 	},
+	{
+		languageOptions: {
+			globals: {
+				...globals.node,
+			},
+		},
+	},
 	{
 		files: ['**/*.ts', '**/*.tsx'],
 		languageOptions: {

packages/backend/jest.js

@@ -0,0 +1,20 @@
+#!/usr/bin/env node
+import child_process from 'node:child_process';
+import path from 'node:path';
+import url from 'node:url';
+
+import semver from 'semver';
+
+const __filename = url.fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+
+const args = [];
+args.push(...[
+	...semver.satisfies(process.version, '^20.17.0 || ^22.0.0') ? ['--no-experimental-require-module'] : [],
+	'--experimental-vm-modules',
+	'--experimental-import-meta-resolve',
+	path.join(__dirname, 'node_modules/jest/bin/jest.js'),
+	...process.argv.slice(2),
+]);
+
+child_process.spawn(process.execPath, args, { stdio: 'inherit' });

packages/backend/package.json

@@ -22,12 +22,12 @@
 		"typecheck": "tsc --noEmit && tsc -p test --noEmit && tsc -p test-federation --noEmit",
 		"eslint": "eslint --quiet \"{src,test-federation}/**/*.ts\"",
 		"lint": "pnpm typecheck && pnpm eslint",
-		"jest": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --forceExit --config jest.config.unit.cjs",
+		"jest": "cross-env NODE_ENV=test node ./jest.js --forceExit --config jest.config.unit.cjs",
-		"jest:e2e": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --forceExit --config jest.config.e2e.cjs",
+		"jest:e2e": "cross-env NODE_ENV=test node ./jest.js --forceExit --config jest.config.e2e.cjs",
-		"jest:fed": "node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --forceExit --config jest.config.fed.cjs",
+		"jest:fed": "node ./jest.js --forceExit --config jest.config.fed.cjs",
-		"jest-and-coverage": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --coverage --forceExit --config jest.config.unit.cjs",
+		"jest-and-coverage": "cross-env NODE_ENV=test node ./jest.js --coverage --forceExit --config jest.config.unit.cjs",
-		"jest-and-coverage:e2e": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --coverage --forceExit --config jest.config.e2e.cjs",
+		"jest-and-coverage:e2e": "cross-env NODE_ENV=test node ./jest.js --coverage --forceExit --config jest.config.e2e.cjs",
-		"jest-clear": "cross-env NODE_ENV=test node --experimental-vm-modules --experimental-import-meta-resolve node_modules/jest/bin/jest.js --clearCache",
+		"jest-clear": "cross-env NODE_ENV=test node ./jest.js --clearCache",
 		"test": "pnpm jest",
 		"test:e2e": "pnpm build && pnpm build:test && pnpm jest:e2e",
 		"test:fed": "pnpm jest:fed",

packages/backend/test-federation/compose.yml

@@ -50,6 +50,10 @@ services:
         source: ../jest.config.fed.cjs
         target: /misskey/packages/backend/jest.config.fed.cjs
         read_only: true
+      - type: bind
+        source: ../jest.js
+        target: /misskey/packages/backend/jest.js
+        read_only: true
       - type: bind
         source: ../../misskey-js/built
         target: /misskey/packages/misskey-js/built

packages/misskey-js/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "misskey-js",
-	"version": "2025.5.0-alpha.0",
+	"version": "2025.5.0-alpha.1",
 	"description": "Misskey SDK for JavaScript",
 	"license": "MIT",
 	"main": "./built/index.js",