Initial plan

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

.github/workflows/lint.yml

@@ -111,5 +111,10 @@ jobs:
         node-version-file: '.node-version'
         cache: 'pnpm'
     - run: pnpm i --frozen-lockfile
-    - run: pnpm --filter "${{ matrix.workspace }}^..." run build
+    - run: pnpm --filter misskey-js run build
+      if: ${{ matrix.workspace == 'backend' || matrix.workspace == 'frontend' || matrix.workspace == 'sw' }}
+    - run: pnpm --filter misskey-reversi run build
+      if: ${{ matrix.workspace == 'backend' || matrix.workspace == 'frontend' }}
+    - run: pnpm --filter misskey-bubble-game run build
+      if: ${{ matrix.workspace == 'frontend' }}
     - run: pnpm --filter ${{ matrix.workspace }} run typecheck

.github/workflows/locale.yml

@@ -3,12 +3,10 @@ name: Lint
 on:
   push:
     paths:
-      - packages/i18n/**
       - locales/**
       - .github/workflows/locale.yml
   pull_request:
     paths:
-      - packages/i18n/**
       - locales/**
       - .github/workflows/locale.yml
 jobs:
@@ -16,18 +14,15 @@ jobs:
     runs-on: ubuntu-latest
     continue-on-error: true
     steps:
-      - uses: actions/checkout@v4.3.0
-        with:
-          fetch-depth: 0
-          submodules: true
-      - name: Setup pnpm
-        uses: pnpm/action-setup@v4.2.0
-      - uses: actions/setup-node@v4.4.0
-        with:
-          node-version-file: ".node-version"
-          cache: "pnpm"
-      - run: pnpm i --frozen-lockfile
-      - run: pnpm --filter i18n build
-      - name: Verify Locales
-        working-directory: ./packages/i18n
-        run: pnpm run verify
+    - uses: actions/checkout@v4.3.0
+      with:
+        fetch-depth: 0
+        submodules: true
+    - name: Setup pnpm
+      uses: pnpm/action-setup@v4.2.0
+    - uses: actions/setup-node@v4.4.0
+      with:
+        node-version-file: '.node-version'
+        cache: 'pnpm'
+    - run: pnpm i --frozen-lockfile
+    - run: cd locales && node verify.js

CHANGELOG.md

@@ -1,4 +1,4 @@
-## 2025.11.2
+## Unreleased
 
 ### General
 -
@@ -8,8 +8,6 @@
 
 ### Server
 - Enhance: メモリ使用量を削減しました
-- Enhance: ActivityPubアクティビティを送信する際のパフォーマンス向上
-- Enhance: 依存関係の更新
 
 
 ## 2025.11.1

Dockerfile

@@ -24,7 +24,6 @@ COPY --link ["packages/frontend-shared/package.json", "./packages/frontend-share
 COPY --link ["packages/frontend/package.json", "./packages/frontend/"]
 COPY --link ["packages/frontend-embed/package.json", "./packages/frontend-embed/"]
 COPY --link ["packages/frontend-builder/package.json", "./packages/frontend-builder/"]
-COPY --link ["packages/i18n/package.json", "./packages/i18n/"]
 COPY --link ["packages/icons-subsetter/package.json", "./packages/icons-subsetter/"]
 COPY --link ["packages/sw/package.json", "./packages/sw/"]
 COPY --link ["packages/misskey-js/package.json", "./packages/misskey-js/"]
@@ -102,7 +101,6 @@ COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-js/
 COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-reversi/built ./packages/misskey-reversi/built
 COPY --chown=misskey:misskey --from=native-builder /misskey/packages/misskey-bubble-game/built ./packages/misskey-bubble-game/built
 COPY --chown=misskey:misskey --from=native-builder /misskey/packages/backend/built ./packages/backend/built
-COPY --chown=misskey:misskey --from=native-builder /misskey/packages/i18n/built ./packages/i18n/built
 COPY --chown=misskey:misskey --from=native-builder /misskey/fluent-emojis /misskey/fluent-emojis
 COPY --chown=misskey:misskey . ./
 

locales/es-ES.yml

@@ -128,7 +128,7 @@ pinnedNote: "Nota fijada"
 pinned: "Fijar al perfil"
 you: "Tú"
 clickToShow: "Haz clic para verlo"
-sensitive: "Marcado como sensible (NSFW)"
+sensitive: "Marcado como sensible"
 add: "Agregar"
 reaction: "Reacción"
 reactions: "Reacciones"
@@ -143,7 +143,7 @@ rememberNoteVisibility: "Recordar visibilidad"
 attachCancel: "Quitar adjunto"
 deleteFile: "Eliminar archivo"
 markAsSensitive: "Marcar como sensible"
-unmarkAsSensitive: "No marcar como sensible"
+unmarkAsSensitive: "Desmarcar como sensible"
 enterFileName: "Introduce el nombre del archivo"
 mute: "Silenciar"
 unmute: "Dejar de silenciar"
@@ -353,7 +353,7 @@ emptyFolder: "La carpeta está vacía"
 dropHereToUpload: "Arrastra los archivos aquí para subirlos."
 unableToDelete: "No se puede borrar"
 inputNewFileName: "Ingrese un nuevo nombre de archivo"
-inputNewDescription: "Introducir un nuevo texto alternativo"
+inputNewDescription: "Ingrese nueva descripción"
 inputNewFolderName: "Ingrese un nuevo nombre de la carpeta"
 circularReferenceFolder: "La carpeta de destino es una sub-carpeta de la carpeta que quieres mover."
 hasChildFilesOrFolders: "No se puede borrar esta carpeta. No está vacía."
@@ -706,7 +706,7 @@ userSaysSomethingAbout: "{name} dijo algo sobre {word}"
 makeActive: "Activar"
 display: "Apariencia"
 copy: "Copiar"
-copiedToClipboard: "Copiado al portapapeles"
+copiedToClipboard: "Texto copiado al portapapeles"
 metrics: "Métricas"
 overview: "Resumen"
 logs: "Registros"
@@ -715,7 +715,7 @@ database: "Base de datos"
 channel: "Canal"
 create: "Crear"
 notificationSetting: "Ajustes de Notificaciones"
-notificationSettingDesc: "Por favor elige el tipo de notificación a mostrar"
+notificationSettingDesc: "Por favor elija el tipo de notificación a mostrar"
 useGlobalSetting: "Usar ajustes globales"
 useGlobalSettingDesc: "Al activarse, se usará la configuración de notificaciones de la cuenta, al desactivarse se pueden hacer configuraciones particulares."
 other: "Otro"
@@ -747,7 +747,7 @@ system: "Sistema"
 switchUi: "Cambiar interfaz de usuario"
 desktop: "Escritorio"
 clip: "Clip"
-createNew: "Crear Nuevo"
+createNew: "Crear"
 optional: "Opcional"
 createNewClip: "Crear clip nuevo"
 unclip: "Quitar clip"
@@ -1203,8 +1203,8 @@ iHaveReadXCarefullyAndAgree: "He leído el texto {x} y estoy de acuerdo"
 dialog: "Diálogo"
 icon: "Avatar"
 forYou: "Para ti"
-currentAnnouncements: "Avisos actuales"
-pastAnnouncements: "Avisos anteriores"
+currentAnnouncements: "Anuncios actuales"
+pastAnnouncements: "Anuncios anteriores"
 youHaveUnreadAnnouncements: "Hay anuncios sin leer"
 useSecurityKey: "Por favor, sigue las instrucciones de tu dispositivo o navegador para usar tu clave de seguridad o tu clave de paso."
 replies: "Responder"
@@ -1412,8 +1412,8 @@ _imageEditing:
     filename: "Nombre de archivo"
     filename_without_ext: "Nombre del archivo sin la extensión"
     year: "Año de rodaje"
-    month: "Mes de la fotografía"
-    day: "Día de la fotografía"
+    month: "Mes de rodaje"
+    day: "Día de rodaje"
     hour: "Hora"
     minute: "Minuto"
     second: "Segundo"
@@ -1427,9 +1427,9 @@ _imageEditing:
     gps_lat: "Latitud"
     gps_long: "Longitud"
 _imageFrameEditor:
-  title: "Edición de Fotos"
+  title: "Edición de Fotograma"
   tip: "Decora tus imágenes con marcos y etiquetas que contengan metadatos."
-  header: "Título"
+  header: "Cabezal"
   footer: "Pie de página"
   borderThickness: "Ancho del borde"
   labelThickness: "Ancho de la etiqueta"
@@ -1456,8 +1456,8 @@ _compression:
     medium: "Tamaño mediano"
     small: "Tamaño pequeño"
 _order:
-  newest: "Más reciente primero"
-  oldest: "Más antiguos primero"
+  newest: "Los más recientes primero"
+  oldest: "Los más antiguos primero"
 _chat:
   messages: "Mensajes"
   noMessagesYet: "Aún no hay mensajes"
@@ -1685,7 +1685,7 @@ _initialTutorial:
       followers: "Visible solo para seguidores. Sólo tus seguidores podrán ver la nota, y no podrá ser renotada por otras personas."
       direct: "Visible sólo para usuarios específicos, y el destinatario será notificado. Puede usarse como alternativa a la mensajería directa."
       doNotSendConfidencialOnDirect1: "¡Ten cuidado cuando vayas a enviar información sensible!"
-      doNotSendConfidencialOnDirect2: "Los administradores del servidor, también llamado instancia, pueden leer lo que escribes. Ten cuidado cuando envíes información sensible en notas directas en servidores o instancias no confiables."
+      doNotSendConfidencialOnDirect2: "Los administradores del servidor pueden leer lo que escribes. Ten cuidado cuando envíes información sensible en notas directas en servidores no confiables."
       localOnly: "Publicando con esta opción seleccionada, la nota no se federará hacia otros servidores. Los usuarios de otros servidores no podrán ver estas notas directamente, sin importar los ajustes seleccionados más arriba."
     _cw:
       title: "Alerta de contenido (CW)"
@@ -2299,7 +2299,7 @@ _theme:
     indicator: "Indicador"
     panel: "Panel"
     shadow: "Sombra"
-    header: "Título"
+    header: "Cabezal"
     navBg: "Fondo de la barra lateral"
     navFg: "Texto de la barra lateral"
     navActive: "Texto de la barra lateral (activo)"
@@ -2771,7 +2771,7 @@ _notification:
     follow: "Siguiendo"
     mention: "Menciones"
     reply: "Respuestas"
-    renote: "Renotas"
+    renote: "Renotar"
     quote: "Citar"
     reaction: "Reacción"
     pollEnded: "La encuesta terminó"

locales/generateDTS.js

@@ -0,0 +1,232 @@
+import * as fs from 'node:fs';
+import { fileURLToPath } from 'node:url';
+import { dirname } from 'node:path';
+import * as yaml from 'js-yaml';
+import ts from 'typescript';
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = dirname(__filename);
+const parameterRegExp = /\{(\w+)\}/g;
+
+function createMemberType(item) {
+	if (typeof item !== 'string') {
+		return ts.factory.createTypeLiteralNode(createMembers(item));
+	}
+	const parameters = Array.from(
+		item.matchAll(parameterRegExp),
+		([, parameter]) => parameter,
+	);
+	return parameters.length
+		? ts.factory.createTypeReferenceNode(
+				ts.factory.createIdentifier('ParameterizedString'),
+				[
+					ts.factory.createUnionTypeNode(
+						parameters.map((parameter) =>
+							ts.factory.createStringLiteral(parameter),
+						),
+					),
+				],
+			)
+		: ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
+}
+
+function createMembers(record) {
+	return Object.entries(record).map(([k, v]) => {
+		const node = ts.factory.createPropertySignature(
+			undefined,
+			ts.factory.createStringLiteral(k),
+			undefined,
+			createMemberType(v),
+		);
+		if (typeof v === 'string') {
+			ts.addSyntheticLeadingComment(
+				node,
+				ts.SyntaxKind.MultiLineCommentTrivia,
+				`*
+ * ${v.replace(/\n/g, '\n * ')}
+ `,
+				true,
+			);
+		}
+		return node;
+	});
+}
+
+export default function generateDTS() {
+	const locale = yaml.load(fs.readFileSync(`${__dirname}/ja-JP.yml`, 'utf-8'));
+	const members = createMembers(locale);
+	const elements = [
+		ts.factory.createVariableStatement(
+			[ts.factory.createToken(ts.SyntaxKind.DeclareKeyword)],
+			ts.factory.createVariableDeclarationList(
+				[
+					ts.factory.createVariableDeclaration(
+						ts.factory.createIdentifier('kParameters'),
+						undefined,
+						ts.factory.createTypeOperatorNode(
+							ts.SyntaxKind.UniqueKeyword,
+							ts.factory.createKeywordTypeNode(ts.SyntaxKind.SymbolKeyword),
+						),
+						undefined,
+					),
+				],
+				ts.NodeFlags.Const,
+			),
+		),
+		ts.factory.createTypeAliasDeclaration(
+			[ts.factory.createToken(ts.SyntaxKind.ExportKeyword)],
+			ts.factory.createIdentifier('ParameterizedString'),
+			[
+				ts.factory.createTypeParameterDeclaration(
+					undefined,
+					ts.factory.createIdentifier('T'),
+					ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+					ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+				),
+			],
+			ts.factory.createIntersectionTypeNode([
+				ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+				ts.factory.createTypeLiteralNode([
+					ts.factory.createPropertySignature(
+						undefined,
+						ts.factory.createComputedPropertyName(
+							ts.factory.createIdentifier('kParameters'),
+						),
+						undefined,
+						ts.factory.createTypeReferenceNode(
+							ts.factory.createIdentifier('T'),
+							undefined,
+						),
+					),
+				])
+			]),
+		),
+		ts.factory.createInterfaceDeclaration(
+			[ts.factory.createToken(ts.SyntaxKind.ExportKeyword)],
+			ts.factory.createIdentifier('ILocale'),
+			undefined,
+			undefined,
+			[
+				ts.factory.createIndexSignature(
+					undefined,
+					[
+						ts.factory.createParameterDeclaration(
+							undefined,
+							undefined,
+							ts.factory.createIdentifier('_'),
+							undefined,
+							ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+							undefined,
+						),
+					],
+					ts.factory.createUnionTypeNode([
+						ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword),
+						ts.factory.createTypeReferenceNode(
+							ts.factory.createIdentifier('ParameterizedString'),
+						),
+						ts.factory.createTypeReferenceNode(
+							ts.factory.createIdentifier('ILocale'),
+							undefined,
+						),
+					]),
+				),
+			],
+		),
+		ts.factory.createInterfaceDeclaration(
+			[ts.factory.createToken(ts.SyntaxKind.ExportKeyword)],
+			ts.factory.createIdentifier('Locale'),
+			undefined,
+			[
+				ts.factory.createHeritageClause(ts.SyntaxKind.ExtendsKeyword, [
+					ts.factory.createExpressionWithTypeArguments(
+						ts.factory.createIdentifier('ILocale'),
+						undefined,
+					),
+				]),
+			],
+			members,
+		),
+		ts.factory.createVariableStatement(
+			[ts.factory.createToken(ts.SyntaxKind.DeclareKeyword)],
+			ts.factory.createVariableDeclarationList(
+				[
+					ts.factory.createVariableDeclaration(
+						ts.factory.createIdentifier('locales'),
+						undefined,
+						ts.factory.createTypeLiteralNode([
+							ts.factory.createIndexSignature(
+								undefined,
+								[
+									ts.factory.createParameterDeclaration(
+										undefined,
+										undefined,
+										ts.factory.createIdentifier('lang'),
+										undefined,
+										ts.factory.createKeywordTypeNode(
+											ts.SyntaxKind.StringKeyword,
+										),
+										undefined,
+									),
+								],
+								ts.factory.createTypeReferenceNode(
+									ts.factory.createIdentifier('Locale'),
+									undefined,
+								),
+							),
+						]),
+						undefined,
+					),
+				],
+				ts.NodeFlags.Const,
+			),
+		),
+		ts.factory.createFunctionDeclaration(
+			[ts.factory.createModifier(ts.SyntaxKind.ExportKeyword)],
+			undefined,
+			ts.factory.createIdentifier('build'),
+			undefined,
+			[],
+			ts.factory.createTypeReferenceNode(
+				ts.factory.createIdentifier('Locale'),
+				undefined,
+			),
+			undefined,
+		),
+		ts.factory.createExportDefault(ts.factory.createIdentifier('locales')),
+	];
+	ts.addSyntheticLeadingComment(
+		elements[0],
+		ts.SyntaxKind.MultiLineCommentTrivia,
+		' eslint-disable ',
+		true,
+	);
+	ts.addSyntheticLeadingComment(
+		elements[0],
+		ts.SyntaxKind.SingleLineCommentTrivia,
+		' This file is generated by locales/generateDTS.js',
+		true,
+	);
+	ts.addSyntheticLeadingComment(
+		elements[0],
+		ts.SyntaxKind.SingleLineCommentTrivia,
+		' Do not edit this file directly.',
+		true,
+	);
+	const printed = ts
+		.createPrinter({
+			newLine: ts.NewLineKind.LineFeed,
+		})
+		.printList(
+			ts.ListFormat.MultiLine,
+			ts.factory.createNodeArray(elements),
+			ts.createSourceFile(
+				'index.d.ts',
+				'',
+				ts.ScriptTarget.ESNext,
+				true,
+				ts.ScriptKind.TS,
+			),
+		);
+
+	fs.writeFileSync(`${__dirname}/index.d.ts`, printed, 'utf-8');
+}

locales/index.d.ts

@@ -1,7 +1,13 @@
 /* eslint-disable */
-// This file is generated by scripts/generateLocaleInterface.ts
+// This file is generated by locales/generateDTS.js
 // Do not edit this file directly.
-import { type ILocale, type ParameterizedString } from "../types.js";
+declare const kParameters: unique symbol;
+export type ParameterizedString<T extends string = string> = string & {
+    [kParameters]: T;
+};
+export interface ILocale {
+    [_: string]: string | ParameterizedString | ILocale;
+}
 export interface Locale extends ILocale {
     /**
      * 日本語
@@ -13083,3 +13089,8 @@ export interface Locale extends ILocale {
         "mfm": string;
     };
 }
+declare const locales: {
+    [lang: string]: Locale;
+};
+export function build(): Locale;
+export default locales;

locales/index.js

@@ -0,0 +1,93 @@
+/**
+ * Languages Loader
+ */
+
+import * as fs from 'node:fs';
+import * as yaml from 'js-yaml';
+
+const merge = (...args) => args.reduce((a, c) => ({
+	...a,
+	...c,
+	...Object.entries(a)
+		.filter(([k]) => c && typeof c[k] === 'object')
+		.reduce((a, [k, v]) => (a[k] = merge(v, c[k]), a), {})
+}), {});
+
+const languages = [
+	'ar-SA',
+	'ca-ES',
+	'cs-CZ',
+	'da-DK',
+	'de-DE',
+	'en-US',
+	'es-ES',
+	'fr-FR',
+	'id-ID',
+	'it-IT',
+	'ja-JP',
+	'ja-KS',
+	'kab-KAB',
+	'kn-IN',
+	'ko-KR',
+	'nl-NL',
+	'no-NO',
+	'pl-PL',
+	'pt-PT',
+	'ru-RU',
+	'sk-SK',
+	'th-TH',
+	'tr-TR',
+	'ug-CN',
+	'uk-UA',
+	'vi-VN',
+	'zh-CN',
+	'zh-TW',
+];
+
+const primaries = {
+	'en': 'US',
+	'ja': 'JP',
+	'zh': 'CN',
+};
+
+// 何故か文字列にバックスペース文字が混入することがあり、YAMLが壊れるので取り除く
+const clean = (text) => text.replace(new RegExp(String.fromCodePoint(0x08), 'g'), '');
+
+export function build() {
+	// vitestの挙動を調整するため、一度ローカル変数化する必要がある
+	// https://github.com/vitest-dev/vitest/issues/3988#issuecomment-1686599577
+	// https://github.com/misskey-dev/misskey/pull/14057#issuecomment-2192833785
+	const metaUrl = import.meta.url;
+	const locales = languages.reduce((a, c) => (a[c] = yaml.load(clean(fs.readFileSync(new URL(`${c}.yml`, metaUrl), 'utf-8'))) || {}, a), {});
+
+	// 空文字列が入ることがあり、フォールバックが動作しなくなるのでプロパティごと消す
+	const removeEmpty = (obj) => {
+		for (const [k, v] of Object.entries(obj)) {
+			if (v === '') {
+				delete obj[k];
+			} else if (typeof v === 'object') {
+				removeEmpty(v);
+			}
+		}
+		return obj;
+	};
+	removeEmpty(locales);
+
+	return Object.entries(locales)
+		.reduce((a, [k, v]) => (a[k] = (() => {
+			const [lang] = k.split('-');
+			switch (k) {
+				case 'ja-JP': return v;
+				case 'ja-KS':
+				case 'en-US': return merge(locales['ja-JP'], v);
+				default: return merge(
+					locales['ja-JP'],
+					locales['en-US'],
+					locales[`${lang}-${primaries[lang]}`] ?? {},
+					v
+				);
+			}
+		})(), a), {});
+}
+
+export default build();

locales/package.json

@@ -0,0 +1,3 @@
+{
+	"type": "module"
+}

locales/verify.js

@@ -0,0 +1,53 @@
+import locales from './index.js';
+
+let valid = true;
+
+function writeError(type, lang, tree, data) {
+	process.stderr.write(JSON.stringify({ type, lang, tree, data }));
+	process.stderr.write('\n');
+	valid = false;
+}
+
+function verify(expected, actual, lang, trace) {
+	for (let key in expected) {
+		if (!Object.prototype.hasOwnProperty.call(actual, key)) {
+			continue;
+		}
+		if (typeof expected[key] === 'object') {
+			if (typeof actual[key] !== 'object') {
+				writeError('mismatched_type', lang, trace ? `${trace}.${key}` : key, { expected: 'object', actual: typeof actual[key] });
+				continue;
+			}
+			verify(expected[key], actual[key], lang, trace ? `${trace}.${key}` : key);
+		} else if (typeof expected[key] === 'string') {
+			switch (typeof actual[key]) {
+				case 'object':
+					writeError('mismatched_type', lang, trace ? `${trace}.${key}` : key, { expected: 'string', actual: 'object' });
+					break;
+				case 'undefined':
+					continue;
+				case 'string':
+					const expectedParameters = new Set(expected[key].match(/\{[^}]+\}/g)?.map((s) => s.slice(1, -1)));
+					const actualParameters = new Set(actual[key].match(/\{[^}]+\}/g)?.map((s) => s.slice(1, -1)));
+					for (let parameter of expectedParameters) {
+						if (!actualParameters.has(parameter)) {
+							writeError('missing_parameter', lang, trace ? `${trace}.${key}` : key, { parameter });
+						}
+					}
+			}
+		}
+	}
+}
+
+const { ['ja-JP']: original, ...verifiees } = locales;
+
+for (let lang in verifiees) {
+	if (!Object.prototype.hasOwnProperty.call(locales, lang)) {
+		continue;
+	}
+	verify(original, verifiees[lang], lang);
+}
+
+if (!valid) {
+	process.exit(1);
+}

locales/zh-CN.yml

@@ -877,7 +877,7 @@ noInquiryUrlWarning: "尚未设置联络地址。"
 noBotProtectionWarning: "尚未设置 Bot 防御。"
 configure: "设置"
 postToGallery: "创建新图集"
-postToHashtag: "发布至该话题"
+postToHashtag: "投稿到这个标签"
 gallery: "图集"
 recentPosts: "最新发布"
 popularPosts: "热门投稿"
@@ -3146,7 +3146,7 @@ _selfXssPrevention:
   description3: "详情请看这里。{link}"
 _followRequest:
   recieved: "收到的请求"
-  sent: "发送的请求"
+  sent: "已发送的请求"
 _remoteLookupErrors:
   _federationNotAllowed:
     title: "无法与此服务器通信"

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "misskey",
-	"version": "2025.11.2-alpha.1",
+	"version": "2025.11.1",
 	"codename": "nasubi",
 	"repository": {
 		"type": "git",
@@ -8,24 +8,21 @@
 	},
 	"packageManager": "pnpm@10.22.0",
 	"workspaces": [
-		"packages/misskey-js",
-		"packages/i18n",
-		"packages/misskey-reversi",
-		"packages/misskey-bubble-game",
-		"packages/icons-subsetter",
 		"packages/frontend-shared",
-		"packages/frontend-builder",
-		"packages/sw",
-		"packages/backend",
 		"packages/frontend",
-		"packages/frontend-embed"
+		"packages/frontend-embed",
+		"packages/icons-subsetter",
+		"packages/backend",
+		"packages/sw",
+		"packages/misskey-js",
+		"packages/misskey-reversi",
+		"packages/misskey-bubble-game"
 	],
 	"private": true,
 	"scripts": {
 		"build-pre": "node ./scripts/build-pre.js",
 		"build-assets": "node ./scripts/build-assets.mjs",
 		"build": "pnpm build-pre && pnpm -r build && pnpm build-assets",
-		"minify-node-modules": "node ./scripts/minify-node-modules.mjs",
 		"build-storybook": "pnpm --filter frontend build-storybook",
 		"build-misskey-js-with-types": "pnpm build-pre && pnpm --filter backend... --filter=!misskey-js build && pnpm --filter backend generate-api-json --no-build && ncp packages/backend/built/api.json packages/misskey-js/generator/api.json && pnpm --filter misskey-js update-autogen-code && pnpm --filter misskey-js build && pnpm --filter misskey-js api",
 		"start": "pnpm check:connect && cd packages/backend && node ./built/boot/entry.js",
@@ -71,7 +68,6 @@
 	},
 	"devDependencies": {
 		"@eslint/js": "9.39.1",
-		"i18n": "workspace:*",
 		"@misskey-dev/eslint-plugin": "2.2.0",
 		"@types/js-yaml": "4.0.9",
 		"@types/node": "24.10.1",

packages/backend/package.json

@@ -40,17 +40,17 @@
 	},
 	"optionalDependencies": {
 		"@swc/core-android-arm64": "1.3.11",
-		"@swc/core-darwin-arm64": "1.15.3",
-		"@swc/core-darwin-x64": "1.15.3",
+		"@swc/core-darwin-arm64": "1.15.2",
+		"@swc/core-darwin-x64": "1.15.2",
 		"@swc/core-freebsd-x64": "1.3.11",
-		"@swc/core-linux-arm-gnueabihf": "1.15.3",
-		"@swc/core-linux-arm64-gnu": "1.15.3",
-		"@swc/core-linux-arm64-musl": "1.15.3",
-		"@swc/core-linux-x64-gnu": "1.15.3",
-		"@swc/core-linux-x64-musl": "1.15.3",
-		"@swc/core-win32-arm64-msvc": "1.15.3",
-		"@swc/core-win32-ia32-msvc": "1.15.3",
-		"@swc/core-win32-x64-msvc": "1.15.3",
+		"@swc/core-linux-arm-gnueabihf": "1.15.2",
+		"@swc/core-linux-arm64-gnu": "1.15.2",
+		"@swc/core-linux-arm64-musl": "1.15.2",
+		"@swc/core-linux-x64-gnu": "1.15.2",
+		"@swc/core-linux-x64-musl": "1.15.2",
+		"@swc/core-win32-arm64-msvc": "1.15.2",
+		"@swc/core-win32-ia32-msvc": "1.15.2",
+		"@swc/core-win32-x64-msvc": "1.15.2",
 		"@tensorflow/tfjs": "4.22.0",
 		"@tensorflow/tfjs-node": "4.22.0",
 		"bufferutil": "4.0.9",
@@ -70,17 +70,17 @@
 		"utf-8-validate": "6.0.5"
 	},
 	"dependencies": {
-		"@aws-sdk/client-s3": "3.937.0",
-		"@aws-sdk/lib-storage": "3.937.0",
+		"@aws-sdk/client-s3": "3.936.0",
+		"@aws-sdk/lib-storage": "3.936.0",
 		"@discordapp/twemoji": "16.0.1",
 		"@fastify/accepts": "5.0.3",
 		"@fastify/cookie": "11.0.2",
-		"@fastify/cors": "11.1.0",
+		"@fastify/cors": "10.1.0",
 		"@fastify/express": "4.0.2",
-		"@fastify/http-proxy": "11.3.0",
+		"@fastify/http-proxy": "10.0.2",
 		"@fastify/multipart": "9.3.0",
 		"@fastify/static": "8.3.0",
-		"@fastify/view": "11.1.1",
+		"@fastify/view": "10.0.2",
 		"@misskey-dev/sharp-read-bmp": "1.2.0",
 		"@misskey-dev/summaly": "5.2.5",
 		"@napi-rs/canvas": "0.1.82",
@@ -90,33 +90,33 @@
 		"@peertube/http-signature": "1.7.0",
 		"@sentry/node": "10.26.0",
 		"@sentry/profiling-node": "10.26.0",
-		"@simplewebauthn/server": "13.2.2",
-		"@sinonjs/fake-timers": "15.0.0",
-		"@smithy/node-http-handler": "4.4.5",
+		"@simplewebauthn/server": "12.0.0",
+		"@sinonjs/fake-timers": "11.3.1",
+		"@smithy/node-http-handler": "2.5.0",
 		"@swc/cli": "0.7.9",
-		"@swc/core": "1.15.3",
+		"@swc/core": "1.15.2",
 		"@twemoji/parser": "16.0.0",
 		"@types/redis-info": "3.0.3",
 		"accepts": "1.3.8",
 		"ajv": "8.17.1",
 		"archiver": "7.0.1",
 		"async-mutex": "0.5.0",
-		"bcryptjs": "3.0.3",
+		"bcryptjs": "2.4.3",
 		"blurhash": "2.0.5",
-		"body-parser": "2.2.0",
-		"bullmq": "5.64.1",
+		"body-parser": "1.20.3",
+		"bullmq": "5.63.2",
 		"cacheable-lookup": "7.0.0",
-		"cbor": "10.0.11",
+		"cbor": "9.0.2",
 		"chalk": "5.6.2",
 		"chalk-template": "1.1.2",
 		"chokidar": "4.0.3",
-		"color-convert": "3.1.3",
-		"content-disposition": "1.0.1",
-		"date-fns": "4.1.0",
+		"color-convert": "2.0.1",
+		"content-disposition": "0.5.4",
+		"date-fns": "2.30.0",
 		"deep-email-validator": "0.1.21",
 		"fastify": "5.6.2",
 		"fastify-raw-body": "5.0.0",
-		"feed": "5.1.0",
+		"feed": "4.2.2",
 		"file-type": "21.1.1",
 		"fluent-ffmpeg": "2.1.3",
 		"form-data": "4.0.5",
@@ -126,16 +126,16 @@
 		"ioredis": "5.8.2",
 		"ip-cidr": "4.0.2",
 		"ipaddr.js": "2.2.0",
-		"is-svg": "6.1.0",
+		"is-svg": "5.1.0",
 		"js-yaml": "4.1.1",
 		"json5": "2.2.3",
-		"jsonld": "9.0.0",
+		"jsonld": "8.3.3",
 		"jsrsasign": "11.1.0",
 		"juice": "11.0.3",
 		"meilisearch": "0.54.0",
 		"mfm-js": "0.25.0",
 		"microformats-parser": "2.0.4",
-		"mime-types": "3.0.2",
+		"mime-types": "2.1.35",
 		"misskey-js": "workspace:*",
 		"misskey-reversi": "workspace:*",
 		"ms": "3.0.0-canary.202508261828",
@@ -150,8 +150,9 @@
 		"oauth2orize-pkce": "0.1.2",
 		"os-utils": "0.0.14",
 		"otpauth": "9.4.1",
+		"parse5": "7.3.0",
 		"pg": "8.16.3",
-		"pkce-challenge": "5.0.0",
+		"pkce-challenge": "4.1.0",
 		"probe-image-size": "7.2.3",
 		"promise-limit": "2.7.0",
 		"pug": "3.0.3",
@@ -160,12 +161,13 @@
 		"ratelimiter": "3.4.1",
 		"re2": "1.22.3",
 		"redis-info": "3.1.0",
+		"redis-lock": "0.1.4",
 		"reflect-metadata": "0.2.2",
 		"rename": "1.0.4",
 		"rss-parser": "3.13.0",
 		"rxjs": "7.8.2",
 		"sanitize-html": "2.17.0",
-		"secure-json-parse": "4.1.0",
+		"secure-json-parse": "3.0.2",
 		"semver": "7.7.3",
 		"sharp": "0.33.5",
 		"slacc": "0.0.10",
@@ -178,7 +180,7 @@
 		"tsconfig-paths": "4.2.0",
 		"typeorm": "0.3.27",
 		"typescript": "5.9.3",
-		"ulid": "3.0.1",
+		"ulid": "2.4.0",
 		"vary": "1.1.2",
 		"web-push": "3.6.7",
 		"ws": "8.18.3",
@@ -186,12 +188,13 @@
 	},
 	"devDependencies": {
 		"@jest/globals": "29.7.0",
-		"@nestjs/platform-express": "11.1.9",
+		"@nestjs/platform-express": "10.4.20",
 		"@sentry/vue": "10.26.0",
 		"@simplewebauthn/types": "12.0.0",
 		"@swc/jest": "0.2.39",
 		"@types/accepts": "1.3.7",
-		"@types/archiver": "7.0.0",
+		"@types/archiver": "6.0.4",
+		"@types/bcryptjs": "2.4.6",
 		"@types/body-parser": "1.19.6",
 		"@types/color-convert": "2.0.4",
 		"@types/content-disposition": "0.5.9",
@@ -199,12 +202,13 @@
 		"@types/http-link-header": "1.0.7",
 		"@types/jest": "29.5.14",
 		"@types/js-yaml": "4.0.9",
+		"@types/jsdom": "21.1.7",
 		"@types/jsonld": "1.5.15",
 		"@types/jsrsasign": "10.5.15",
-		"@types/mime-types": "3.0.1",
-		"@types/ms": "2.1.0",
+		"@types/mime-types": "2.1.4",
+		"@types/ms": "0.7.34",
 		"@types/node": "24.10.1",
-		"@types/nodemailer": "7.0.4",
+		"@types/nodemailer": "6.4.21",
 		"@types/oauth": "0.9.6",
 		"@types/oauth2orize": "1.11.5",
 		"@types/oauth2orize-pkce": "0.1.2",
@@ -217,7 +221,7 @@
 		"@types/sanitize-html": "2.16.0",
 		"@types/semver": "7.7.1",
 		"@types/simple-oauth2": "5.0.7",
-		"@types/sinonjs__fake-timers": "15.0.1",
+		"@types/sinonjs__fake-timers": "8.1.5",
 		"@types/supertest": "6.0.3",
 		"@types/tinycolor2": "1.4.6",
 		"@types/tmp": "0.2.6",
@@ -227,15 +231,15 @@
 		"@typescript-eslint/eslint-plugin": "8.47.0",
 		"@typescript-eslint/parser": "8.47.0",
 		"aws-sdk-client-mock": "4.1.0",
-		"cross-env": "10.1.0",
+		"cross-env": "7.0.3",
 		"eslint-plugin-import": "2.32.0",
-		"execa": "9.6.0",
-		"fkill": "10.0.1",
+		"execa": "8.0.1",
+		"fkill": "9.0.0",
 		"jest": "29.7.0",
 		"jest-mock": "29.7.0",
-		"jest-util": "29.7.0",
+		"jsdom": "26.1.0",
 		"nodemon": "3.1.11",
-		"pid-port": "2.0.0",
+		"pid-port": "1.0.2",
 		"simple-oauth2": "5.1.0",
 		"supertest": "7.1.4"
 	}

packages/backend/src/@types/redis-lock.d.ts

@@ -0,0 +1,13 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+declare module 'redis-lock' {
+	import type Redis from 'ioredis';
+
+	type Lock = (lockName: string, timeout?: number, taskToPerform?: () => Promise<void>) => void;
+	function redisLock(client: Redis.Redis, retryDelay: number): Lock;
+
+	export = redisLock;
+}

packages/backend/src/boot/master.ts

@@ -10,6 +10,8 @@ import * as os from 'node:os';
 import cluster from 'node:cluster';
 import chalk from 'chalk';
 import chalkTemplate from 'chalk-template';
+import * as Sentry from '@sentry/node';
+import { nodeProfilingIntegration } from '@sentry/profiling-node';
 import Logger from '@/logger.js';
 import { loadConfig } from '@/config.js';
 import type { Config } from '@/config.js';
@@ -72,9 +74,6 @@ export async function masterMain() {
 	bootLogger.succ('Misskey initialized');
 
 	if (config.sentryForBackend) {
-		const Sentry = await import('@sentry/node');
-		const { nodeProfilingIntegration } = await import('@sentry/profiling-node');
-
 		Sentry.init({
 			integrations: [
 				...(config.sentryForBackend.enableNodeProfiling ? [nodeProfilingIntegration()] : []),

packages/backend/src/boot/worker.ts

@@ -4,6 +4,8 @@
  */
 
 import cluster from 'node:cluster';
+import * as Sentry from '@sentry/node';
+import { nodeProfilingIntegration } from '@sentry/profiling-node';
 import { envOption } from '@/env.js';
 import { loadConfig } from '@/config.js';
 import { jobQueue, server } from './common.js';
@@ -15,9 +17,6 @@ export async function workerMain() {
 	const config = loadConfig();
 
 	if (config.sentryForBackend) {
-		const Sentry = await import('@sentry/node');
-		const { nodeProfilingIntegration } = await import('@sentry/profiling-node');
-
 		Sentry.init({
 			integrations: [
 				...(config.sentryForBackend.enableNodeProfiling ? [nodeProfilingIntegration()] : []),

packages/backend/src/core/AppLockService.ts

@@ -0,0 +1,44 @@
+/*
+ * SPDX-FileCopyrightText: syuilo and misskey-project
+ * SPDX-License-Identifier: AGPL-3.0-only
+ */
+
+import { promisify } from 'node:util';
+import { Inject, Injectable } from '@nestjs/common';
+import redisLock from 'redis-lock';
+import * as Redis from 'ioredis';
+import { DI } from '@/di-symbols.js';
+import { bindThis } from '@/decorators.js';
+
+/**
+ * Retry delay (ms) for lock acquisition
+ */
+const retryDelay = 100;
+
+@Injectable()
+export class AppLockService {
+	private lock: (key: string, timeout?: number, _?: (() => Promise<void>) | undefined) => Promise<() => void>;
+
+	constructor(
+		@Inject(DI.redis)
+		private redisClient: Redis.Redis,
+	) {
+		this.lock = promisify(redisLock(this.redisClient, retryDelay));
+	}
+
+	/**
+	 * Get AP Object lock
+	 * @param uri AP object ID
+	 * @param timeout Lock timeout (ms), The timeout releases previous lock.
+	 * @returns Unlock function
+	 */
+	@bindThis
+	public getApLock(uri: string, timeout = 30 * 1000): Promise<() => void> {
+		return this.lock(`ap-object:${uri}`, timeout);
+	}
+
+	@bindThis
+	public getChartInsertLock(lockKey: string, timeout = 30 * 1000): Promise<() => void> {
+		return this.lock(`chart-insert:${lockKey}`, timeout);
+	}
+}

packages/backend/src/core/CoreModule.ts

@@ -21,6 +21,7 @@ import { AccountUpdateService } from './AccountUpdateService.js';
 import { AiService } from './AiService.js';
 import { AnnouncementService } from './AnnouncementService.js';
 import { AntennaService } from './AntennaService.js';
+import { AppLockService } from './AppLockService.js';
 import { AchievementService } from './AchievementService.js';
 import { AvatarDecorationService } from './AvatarDecorationService.js';
 import { CaptchaService } from './CaptchaService.js';
@@ -165,6 +166,7 @@ const $AccountUpdateService: Provider = { provide: 'AccountUpdateService', useEx
 const $AiService: Provider = { provide: 'AiService', useExisting: AiService };
 const $AnnouncementService: Provider = { provide: 'AnnouncementService', useExisting: AnnouncementService };
 const $AntennaService: Provider = { provide: 'AntennaService', useExisting: AntennaService };
+const $AppLockService: Provider = { provide: 'AppLockService', useExisting: AppLockService };
 const $AchievementService: Provider = { provide: 'AchievementService', useExisting: AchievementService };
 const $AvatarDecorationService: Provider = { provide: 'AvatarDecorationService', useExisting: AvatarDecorationService };
 const $CaptchaService: Provider = { provide: 'CaptchaService', useExisting: CaptchaService };
@@ -318,6 +320,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		AiService,
 		AnnouncementService,
 		AntennaService,
+		AppLockService,
 		AchievementService,
 		AvatarDecorationService,
 		CaptchaService,
@@ -467,6 +470,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$AiService,
 		$AnnouncementService,
 		$AntennaService,
+		$AppLockService,
 		$AchievementService,
 		$AvatarDecorationService,
 		$CaptchaService,
@@ -617,6 +621,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		AiService,
 		AnnouncementService,
 		AntennaService,
+		AppLockService,
 		AchievementService,
 		AvatarDecorationService,
 		CaptchaService,
@@ -765,6 +770,7 @@ const $ApQuestionService: Provider = { provide: 'ApQuestionService', useExisting
 		$AiService,
 		$AnnouncementService,
 		$AntennaService,
+		$AppLockService,
 		$AchievementService,
 		$AvatarDecorationService,
 		$CaptchaService,

packages/backend/src/core/MfmService.ts

@@ -5,16 +5,20 @@
 
 import { URL } from 'node:url';
 import { Inject, Injectable } from '@nestjs/common';
-import * as htmlParser from 'node-html-parser';
+import * as parse5 from 'parse5';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import { intersperse } from '@/misc/prelude/array.js';
 import { normalizeForSearch } from '@/misc/normalize-for-search.js';
 import type { IMentionedRemoteUsers } from '@/models/Note.js';
 import { bindThis } from '@/decorators.js';
-import { escapeHtml } from '@/misc/escape-html.js';
+import type { DefaultTreeAdapterMap } from 'parse5';
 import type * as mfm from 'mfm-js';
 
+const treeAdapter = parse5.defaultTreeAdapter;
+type Node = DefaultTreeAdapterMap['node'];
+type ChildNode = DefaultTreeAdapterMap['childNode'];
+
 const urlRegex = /^https?:\/\/[\w\/:%#@$&?!()\[\]~.,=+\-]+/;
 const urlRegexFull = /^https?:\/\/[\w\/:%#@$&?!()\[\]~.,=+\-]+$/;
 
@@ -33,68 +37,68 @@ export class MfmService {
 
 		const normalizedHashtagNames = hashtagNames == null ? undefined : new Set<string>(hashtagNames.map(x => normalizeForSearch(x)));
 
-		const doc = htmlParser.parse(`<div>${html}</div>`);
+		const dom = parse5.parseFragment(html);
 
 		let text = '';
 
-		for (const n of doc.childNodes) {
+		for (const n of dom.childNodes) {
 			analyze(n);
 		}
 
 		return text.trim();
 
-		function getText(node: htmlParser.Node): string {
-			if (node instanceof htmlParser.TextNode) return node.textContent;
-			if (!(node instanceof htmlParser.HTMLElement)) return '';
-			if (node.tagName === 'BR') return '\n';
+		function getText(node: Node): string {
+			if (treeAdapter.isTextNode(node)) return node.value;
+			if (!treeAdapter.isElementNode(node)) return '';
+			if (node.nodeName === 'br') return '\n';
 
-			if (node.childNodes != null) {
+			if (node.childNodes) {
 				return node.childNodes.map(n => getText(n)).join('');
 			}
 
 			return '';
 		}
 
-		function analyzeChildren(childNodes: htmlParser.Node[] | null): void {
-			if (childNodes != null) {
+		function appendChildren(childNodes: ChildNode[]): void {
+			if (childNodes) {
 				for (const n of childNodes) {
 					analyze(n);
 				}
 			}
 		}
 
-		function analyze(node: htmlParser.Node) {
-			if (node instanceof htmlParser.TextNode) {
-				text += node.textContent;
+		function analyze(node: Node) {
+			if (treeAdapter.isTextNode(node)) {
+				text += node.value;
 				return;
 			}
 
 			// Skip comment or document type node
-			if (!(node instanceof htmlParser.HTMLElement)) {
+			if (!treeAdapter.isElementNode(node)) {
 				return;
 			}
 
-			switch (node.tagName) {
-				case 'BR': {
+			switch (node.nodeName) {
+				case 'br': {
 					text += '\n';
 					break;
 				}
 
-				case 'A': {
+				case 'a': {
 					const txt = getText(node);
-					const rel = node.attributes.rel;
-					const href = node.attributes.href;
+					const rel = node.attrs.find(x => x.name === 'rel');
+					const href = node.attrs.find(x => x.name === 'href');
 
 					// ハッシュタグ
-					if (normalizedHashtagNames && href != null && normalizedHashtagNames.has(normalizeForSearch(txt))) {
+					if (normalizedHashtagNames && href && normalizedHashtagNames.has(normalizeForSearch(txt))) {
 						text += txt;
 						// メンション
-					} else if (txt.startsWith('@') && !(rel != null && rel.startsWith('me '))) {
+					} else if (txt.startsWith('@') && !(rel && rel.value.startsWith('me '))) {
 						const part = txt.split('@');
 
 						if (part.length === 2 && href) {
 							//#region ホスト名部分が省略されているので復元する
-							const acct = `${txt}@${(new URL(href)).hostname}`;
+							const acct = `${txt}@${(new URL(href.value)).hostname}`;
 							text += acct;
 							//#endregion
 						} else if (part.length === 3) {
@@ -109,17 +113,17 @@ export class MfmService {
 							if (!href) {
 								return txt;
 							}
-							if (!txt || txt === href) {	// #6383: Missing text node
-								if (href.match(urlRegexFull)) {
-									return href;
+							if (!txt || txt === href.value) {	// #6383: Missing text node
+								if (href.value.match(urlRegexFull)) {
+									return href.value;
 								} else {
-									return `<${href}>`;
+									return `<${href.value}>`;
 								}
 							}
-							if (href.match(urlRegex) && !href.match(urlRegexFull)) {
-								return `[${txt}](<${href}>)`;	// #6846
+							if (href.value.match(urlRegex) && !href.value.match(urlRegexFull)) {
+								return `[${txt}](<${href.value}>)`;	// #6846
 							} else {
-								return `[${txt}](${href})`;
+								return `[${txt}](${href.value})`;
 							}
 						};
 
@@ -128,64 +132,60 @@ export class MfmService {
 					break;
 				}
 
-				case 'H1': {
+				case 'h1': {
 					text += '【';
-					analyzeChildren(node.childNodes);
+					appendChildren(node.childNodes);
 					text += '】\n';
 					break;
 				}
 
-				case 'B':
-				case 'STRONG': {
+				case 'b':
+				case 'strong': {
 					text += '**';
-					analyzeChildren(node.childNodes);
+					appendChildren(node.childNodes);
 					text += '**';
 					break;
 				}
 
-				case 'SMALL': {
+				case 'small': {
 					text += '<small>';
-					analyzeChildren(node.childNodes);
+					appendChildren(node.childNodes);
 					text += '</small>';
 					break;
 				}
 
-				case 'S':
-				case 'DEL': {
+				case 's':
+				case 'del': {
 					text += '~~';
-					analyzeChildren(node.childNodes);
+					appendChildren(node.childNodes);
 					text += '~~';
 					break;
 				}
 
-				case 'I':
-				case 'EM': {
+				case 'i':
+				case 'em': {
 					text += '<i>';
-					analyzeChildren(node.childNodes);
+					appendChildren(node.childNodes);
 					text += '</i>';
 					break;
 				}
 
-				case 'RUBY': {
+				case 'ruby': {
 					let ruby: [string, string][] = [];
 					for (const child of node.childNodes) {
-						if ((child instanceof htmlParser.TextNode) && !/\s|\[|\]/.test(child.textContent)) {
-							ruby.push([child.textContent, '']);
+						if (child.nodeName === 'rp') {
 							continue;
 						}
-
-						if (!(child instanceof htmlParser.HTMLElement)) continue;
-
-						if (child.tagName === 'RP') {
+						if (treeAdapter.isTextNode(child) && !/\s|\[|\]/.test(child.value)) {
+							ruby.push([child.value, '']);
 							continue;
 						}
-
-						if (child.tagName === 'RT' && ruby.length > 0) {
+						if (child.nodeName === 'rt' && ruby.length > 0) {
 							const rt = getText(child);
 							if (/\s|\[|\]/.test(rt)) {
 								// If any space is included in rt, it is treated as a normal text
 								ruby = [];
-								analyzeChildren(node.childNodes);
+								appendChildren(node.childNodes);
 								break;
 							} else {
 								ruby.at(-1)![1] = rt;
@@ -194,7 +194,7 @@ export class MfmService {
 						}
 						// If any other element is included in ruby, it is treated as a normal text
 						ruby = [];
-						analyzeChildren(node.childNodes);
+						appendChildren(node.childNodes);
 						break;
 					}
 					for (const [base, rt] of ruby) {
@@ -204,30 +204,26 @@ export class MfmService {
 				}
 
 				// block code (<pre><code>)
-				case 'PRE': {
-					if (node.childNodes.length === 1 && (node.childNodes[0] instanceof htmlParser.HTMLElement) && node.childNodes[0].tagName === 'CODE') {
+				case 'pre': {
+					if (node.childNodes.length === 1 && node.childNodes[0].nodeName === 'code') {
 						text += '\n```\n';
 						text += getText(node.childNodes[0]);
 						text += '\n```\n';
-					} else if (node.childNodes.length === 1 && (node.childNodes[0] instanceof htmlParser.TextNode) && node.childNodes[0].textContent.startsWith('<code>') && node.childNodes[0].textContent.endsWith('</code>')) {
-						text += '\n```\n';
-						text += node.childNodes[0].textContent.slice(6, -7);
-						text += '\n```\n';
 					} else {
-						analyzeChildren(node.childNodes);
+						appendChildren(node.childNodes);
 					}
 					break;
 				}
 
 				// inline code (<code>)
-				case 'CODE': {
+				case 'code': {
 					text += '`';
-					analyzeChildren(node.childNodes);
+					appendChildren(node.childNodes);
 					text += '`';
 					break;
 				}
 
-				case 'BLOCKQUOTE': {
+				case 'blockquote': {
 					const t = getText(node);
 					if (t) {
 						text += '\n> ';
@@ -236,33 +232,33 @@ export class MfmService {
 					break;
 				}
 
-				case 'P':
-				case 'H2':
-				case 'H3':
-				case 'H4':
-				case 'H5':
-				case 'H6': {
+				case 'p':
+				case 'h2':
+				case 'h3':
+				case 'h4':
+				case 'h5':
+				case 'h6': {
 					text += '\n\n';
-					analyzeChildren(node.childNodes);
+					appendChildren(node.childNodes);
 					break;
 				}
 
 				// other block elements
-				case 'DIV':
-				case 'HEADER':
-				case 'FOOTER':
-				case 'ARTICLE':
-				case 'LI':
-				case 'DT':
-				case 'DD': {
+				case 'div':
+				case 'header':
+				case 'footer':
+				case 'article':
+				case 'li':
+				case 'dt':
+				case 'dd': {
 					text += '\n';
-					analyzeChildren(node.childNodes);
+					appendChildren(node.childNodes);
 					break;
 				}
 
 				default:	// includes inline elements
 				{
-					analyzeChildren(node.childNodes);
+					appendChildren(node.childNodes);
 					break;
 				}
 			}
@@ -275,16 +271,25 @@ export class MfmService {
 			return null;
 		}
 
+		function escapeHtml(text: string): string {
+			return text
+				.replace(/&/g, '&amp;')
+				.replace(/</g, '&lt;')
+				.replace(/>/g, '&gt;')
+				.replace(/"/g, '&quot;')
+				.replace(/'/g, '&#039;');
+		}
+
 		function toHtml(children?: mfm.MfmNode[]): string {
 			if (children == null) return '';
-			return children.map(x => handlers[x.type](x)).join('');
+			return children.map(x => (handlers as any)[x.type](x)).join('');
 		}
 
 		function fnDefault(node: mfm.MfmFn) {
 			return `<i>${toHtml(node.children)}</i>`;
 		}
 
-		const handlers = {
+		const handlers: { [K in mfm.MfmNode['type']]: (node: mfm.NodeType<K>) => any } = {
 			bold: (node) => {
 				return `<b>${toHtml(node.children)}</b>`;
 			},
@@ -307,7 +312,7 @@ export class MfmService {
 						const text = node.children[0].type === 'text' ? node.children[0].props.text : '';
 						try {
 							const date = new Date(parseInt(text, 10) * 1000);
-							return `<time datetime="${escapeHtml(date.toISOString())}">${escapeHtml(date.toISOString())}</time>`;
+							return `<time datetime="${date.toISOString()}">${date.toISOString()}</time>`;
 						} catch (err) {
 							return fnDefault(node);
 						}
@@ -349,7 +354,7 @@ export class MfmService {
 			},
 
 			emojiCode: (node) => {
-				return `\u200B:${escapeHtml(node.props.name)}:\u200B`;
+				return `\u200B:${node.props.name}:\u200B`;
 			},
 
 			unicodeEmoji: (node) => {
@@ -357,7 +362,7 @@ export class MfmService {
 			},
 
 			hashtag: (node) => {
-				return `<a href="${escapeHtml(`${this.config.url}/tags/${encodeURIComponent(node.props.hashtag)}`)}" rel="tag">#${escapeHtml(node.props.hashtag)}</a>`;
+				return `<a href="${this.config.url}/tags/${encodeURIComponent(escapeHtml(node.props.hashtag))}" rel="tag">#${escapeHtml(node.props.hashtag)}</a>`;
 			},
 
 			inlineCode: (node) => {
@@ -373,12 +378,7 @@ export class MfmService {
 			},
 
 			link: (node) => {
-				try {
-					const url = new URL(node.props.url);
-					return `<a href="${escapeHtml(url.href)}">${toHtml(node.children)}</a>`;
-				} catch (err) {
-					return `[${toHtml(node.children)}](${escapeHtml(node.props.url)})`;
-				}
+				return `<a href="${encodeURIComponent(escapeHtml(node.props.url))}">${toHtml(node.children)}</a>`;
 			},
 
 			mention: (node) => {
@@ -387,12 +387,7 @@ export class MfmService {
 				const href = remoteUserInfo
 					? (remoteUserInfo.url ? remoteUserInfo.url : remoteUserInfo.uri)
 					: `${this.config.url}/${acct.endsWith(`@${this.config.url}`) ? acct.substring(0, acct.length - this.config.url.length - 1) : acct}`;
-				try {
-					const url = new URL(href);
-					return `<a href="${escapeHtml(url.href)}" class="u-url mention">${escapeHtml(acct)}</a>`;
-				} catch (err) {
-					return escapeHtml(acct);
-				}
+				return `<a href="${encodeURIComponent(escapeHtml(href))}" class="u-url mention">${escapeHtml(acct)}</a>`;
 			},
 
 			quote: (node) => {
@@ -409,30 +404,25 @@ export class MfmService {
 				const lines = node.props.text.split(/\r\n|\r|\n/).map(x => escapeHtml(x));
 
 				for (const x of intersperse<FIXME | 'br'>('br', lines)) {
-					html += x === 'br' ? '<br />' : x;
+					html += x === 'br' ? '<br>' : x;
 				}
 
-				return html;
+				return `<p>${html}</p>`;
 			},
 
 			url: (node) => {
-				try {
-					const url = new URL(node.props.url);
-					return `<a href="${escapeHtml(url.href)}">${escapeHtml(node.props.url)}</a>`;
-				} catch (err) {
-					return escapeHtml(node.props.url);
-				}
+				return `<a href="${encodeURIComponent(escapeHtml(node.props.url))}">${escapeHtml(node.props.url)}</a>`;
 			},
 
 			search: (node) => {
-				return `<a href="${escapeHtml(`https://www.google.com/search?q=${encodeURIComponent(node.props.query)}`)}">${escapeHtml(node.props.content)}</a>`;
+				return `<a href="https://www.google.com/search?q=${encodeURIComponent(escapeHtml(node.props.query))}">${escapeHtml(node.props.content)}</a>`;
 			},
 
 			plain: (node) => {
 				return `<span>${toHtml(node.children)}</span>`;
 			},
-		} satisfies { [K in mfm.MfmNode['type']]: (node: mfm.NodeType<K>) => string } as { [K in mfm.MfmNode['type']]: (node: mfm.MfmNode) => string };
+		};
 
-		return `${toHtml(nodes)}${extraHtml ?? ''}`;
+		return `<p>${toHtml(nodes)}${extraHtml ?? ''}</p>`;
 	}
 }

packages/backend/src/core/NotificationService.ts

@@ -202,7 +202,7 @@ export class NotificationService implements OnApplicationShutdown {
 	}
 
 	// TODO
-	//const locales = await import('i18n');
+	//const locales = await import('../../../../locales/index.js');
 
 	// TODO: locale ファイルをクライアント用とサーバー用で分けたい
 
@@ -271,7 +271,7 @@ export class NotificationService implements OnApplicationShutdown {
 		let untilTime = untilId ? this.toXListId(untilId) : null;
 
 		let notifications: MiNotification[];
-		for (; ;) {
+		for (;;) {
 			let notificationsRes: [id: string, fields: string[]][];
 
 			// sinceidのみの場合は古い順、そうでない場合は新しい順。 QueryService.makePaginationQueryも参照

packages/backend/src/core/WebAuthnService.ts

@@ -66,6 +66,7 @@ export class WebAuthnService {
 			userID: isoUint8Array.fromUTF8String(userId),
 			userName: userName,
 			userDisplayName: userDisplayName,
+			attestationType: 'indirect',
 			excludeCredentials: keys.map(key => (<{ id: string; transports?: AuthenticatorTransportFuture[]; }>{
 				id: key.id,
 				transports: key.transports ?? undefined,

packages/backend/src/core/activitypub/ApInboxService.ts

@@ -5,7 +5,6 @@
 
 import { Inject, Injectable } from '@nestjs/common';
 import { In } from 'typeorm';
-import * as Redis from 'ioredis';
 import { DI } from '@/di-symbols.js';
 import type { Config } from '@/config.js';
 import { UserFollowingService } from '@/core/UserFollowingService.js';
@@ -15,8 +14,8 @@ import { NotePiningService } from '@/core/NotePiningService.js';
 import { UserBlockingService } from '@/core/UserBlockingService.js';
 import { NoteDeleteService } from '@/core/NoteDeleteService.js';
 import { NoteCreateService } from '@/core/NoteCreateService.js';
-import { acquireApObjectLock } from '@/misc/distributed-lock.js';
 import { concat, toArray, toSingle, unique } from '@/misc/prelude/array.js';
+import { AppLockService } from '@/core/AppLockService.js';
 import type Logger from '@/logger.js';
 import { IdService } from '@/core/IdService.js';
 import { StatusError } from '@/misc/status-error.js';
@@ -49,8 +48,8 @@ export class ApInboxService {
 		@Inject(DI.config)
 		private config: Config,
 
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis,
+		@Inject(DI.meta)
+		private meta: MiMeta,
 
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
@@ -77,6 +76,7 @@ export class ApInboxService {
 		private userBlockingService: UserBlockingService,
 		private noteCreateService: NoteCreateService,
 		private noteDeleteService: NoteDeleteService,
+		private appLockService: AppLockService,
 		private apResolverService: ApResolverService,
 		private apDbResolverService: ApDbResolverService,
 		private apLoggerService: ApLoggerService,
@@ -311,7 +311,7 @@ export class ApInboxService {
 		// アナウンス先が許可されているかチェック
 		if (!this.utilityService.isFederationAllowedUri(uri)) return;
 
-		const unlock = await acquireApObjectLock(this.redisClient, uri);
+		const unlock = await this.appLockService.getApLock(uri);
 
 		try {
 			// 既に同じURIを持つものが登録されていないかチェック
@@ -438,7 +438,7 @@ export class ApInboxService {
 			}
 		}
 
-		const unlock = await acquireApObjectLock(this.redisClient, uri);
+		const unlock = await this.appLockService.getApLock(uri);
 
 		try {
 			const exist = await this.apNoteService.fetchNote(note);
@@ -522,7 +522,7 @@ export class ApInboxService {
 	private async deleteNote(actor: MiRemoteUser, uri: string): Promise<string> {
 		this.logger.info(`Deleting the Note: ${uri}`);
 
-		const unlock = await acquireApObjectLock(this.redisClient, uri);
+		const unlock = await this.appLockService.getApLock(uri);
 
 		try {
 			const note = await this.apDbResolverService.getNoteFromApId(uri);

packages/backend/src/core/activitypub/ApRendererService.ts

@@ -28,7 +28,6 @@ import { bindThis } from '@/decorators.js';
 import { CustomEmojiService } from '@/core/CustomEmojiService.js';
 import { IdService } from '@/core/IdService.js';
 import { UtilityService } from '@/core/UtilityService.js';
-import { escapeHtml } from '@/misc/escape-html.js';
 import { JsonLdService } from './JsonLdService.js';
 import { ApMfmService } from './ApMfmService.js';
 import { CONTEXT } from './misc/contexts.js';
@@ -435,9 +434,9 @@ export class ApRendererService {
 
 		if (quote != null) {
 			// Append quote link as `<br><br><span class="quote-inline">RE: <a href="...">...</a></span>`
-			// the class name `quote-inline` is used in non-misskey clients for styling quote notes.
+			// the claas name `quote-inline` is used in non-misskey clients for styling quote notes.
 			// For compatibility, the span part should be kept as possible.
-			extraHtml = `<br><br><span class="quote-inline">RE: <a href="${escapeHtml(quote)}">${escapeHtml(quote)}</a></span>`;
+			extraHtml = `<br><br><span class="quote-inline">RE: <a href="${quote}">${quote}</a></span>`;
 		}
 
 		const summary = note.cw === '' ? String.fromCharCode(0x200B) : note.cw;

packages/backend/src/core/activitypub/models/ApNoteService.ts

@@ -5,15 +5,14 @@
 
 import { forwardRef, Inject, Injectable } from '@nestjs/common';
 import { In } from 'typeorm';
-import * as Redis from 'ioredis';
 import { DI } from '@/di-symbols.js';
 import type { PollsRepository, EmojisRepository, MiMeta } from '@/models/_.js';
 import type { Config } from '@/config.js';
 import type { MiRemoteUser } from '@/models/User.js';
 import type { MiNote } from '@/models/Note.js';
-import { acquireApObjectLock } from '@/misc/distributed-lock.js';
 import { toArray, toSingle, unique } from '@/misc/prelude/array.js';
 import type { MiEmoji } from '@/models/Emoji.js';
+import { AppLockService } from '@/core/AppLockService.js';
 import type { MiDriveFile } from '@/models/DriveFile.js';
 import { NoteCreateService } from '@/core/NoteCreateService.js';
 import type Logger from '@/logger.js';
@@ -49,9 +48,6 @@ export class ApNoteService {
 		@Inject(DI.meta)
 		private meta: MiMeta,
 
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis,
-
 		@Inject(DI.pollsRepository)
 		private pollsRepository: PollsRepository,
 
@@ -71,6 +67,7 @@ export class ApNoteService {
 		private apMentionService: ApMentionService,
 		private apImageService: ApImageService,
 		private apQuestionService: ApQuestionService,
+		private appLockService: AppLockService,
 		private pollService: PollService,
 		private noteCreateService: NoteCreateService,
 		private apDbResolverService: ApDbResolverService,
@@ -357,7 +354,7 @@ export class ApNoteService {
 			throw new StatusError('blocked host', 451);
 		}
 
-		const unlock = await acquireApObjectLock(this.redisClient, uri);
+		const unlock = await this.appLockService.getApLock(uri);
 
 		try {
 			//#region このサーバーに既に登録されていたらそれを返す

packages/backend/src/core/chart/charts/active-users.ts

@@ -5,12 +5,11 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
-import * as Redis from 'ioredis';
+import { AppLockService } from '@/core/AppLockService.js';
 import type { MiUser } from '@/models/User.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
 import { IdService } from '@/core/IdService.js';
-import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/active-users.js';
@@ -29,13 +28,11 @@ export default class ActiveUsersChart extends Chart<typeof schema> { // eslint-d
 		@Inject(DI.db)
 		private db: DataSource,
 
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis,
-
+		private appLockService: AppLockService,
 		private chartLoggerService: ChartLoggerService,
 		private idService: IdService,
 	) {
-		super(db, (k) => acquireChartInsertLock(redisClient, k), chartLoggerService.logger, name, schema);
+		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema);
 	}
 
 	protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/ap-request.ts

@@ -5,10 +5,9 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
-import * as Redis from 'ioredis';
+import { AppLockService } from '@/core/AppLockService.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
-import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/ap-request.js';
@@ -23,12 +22,10 @@ export default class ApRequestChart extends Chart<typeof schema> { // eslint-dis
 		@Inject(DI.db)
 		private db: DataSource,
 
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis,
-
+		private appLockService: AppLockService,
 		private chartLoggerService: ChartLoggerService,
 	) {
-		super(db, (k) => acquireChartInsertLock(redisClient, k), chartLoggerService.logger, name, schema);
+		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema);
 	}
 
 	protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/drive.ts

@@ -5,11 +5,10 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
-import * as Redis from 'ioredis';
 import type { MiDriveFile } from '@/models/DriveFile.js';
+import { AppLockService } from '@/core/AppLockService.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
-import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/drive.js';
@@ -24,12 +23,10 @@ export default class DriveChart extends Chart<typeof schema> { // eslint-disable
 		@Inject(DI.db)
 		private db: DataSource,
 
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis,
-
+		private appLockService: AppLockService,
 		private chartLoggerService: ChartLoggerService,
 	) {
-		super(db, (k) => acquireChartInsertLock(redisClient, k), chartLoggerService.logger, name, schema);
+		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema);
 	}
 
 	protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/federation.ts

@@ -5,11 +5,10 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
-import * as Redis from 'ioredis';
 import type { FollowingsRepository, InstancesRepository, MiMeta } from '@/models/_.js';
+import { AppLockService } from '@/core/AppLockService.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
-import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/federation.js';
@@ -27,18 +26,16 @@ export default class FederationChart extends Chart<typeof schema> { // eslint-di
 		@Inject(DI.meta)
 		private meta: MiMeta,
 
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis,
-
 		@Inject(DI.followingsRepository)
 		private followingsRepository: FollowingsRepository,
 
 		@Inject(DI.instancesRepository)
 		private instancesRepository: InstancesRepository,
 
+		private appLockService: AppLockService,
 		private chartLoggerService: ChartLoggerService,
 	) {
-		super(db, (k) => acquireChartInsertLock(redisClient, k), chartLoggerService.logger, name, schema);
+		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema);
 	}
 
 	protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/instance.ts

@@ -5,14 +5,13 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
-import * as Redis from 'ioredis';
 import type { DriveFilesRepository, FollowingsRepository, UsersRepository, NotesRepository } from '@/models/_.js';
 import type { MiDriveFile } from '@/models/DriveFile.js';
 import type { MiNote } from '@/models/Note.js';
+import { AppLockService } from '@/core/AppLockService.js';
 import { DI } from '@/di-symbols.js';
 import { UtilityService } from '@/core/UtilityService.js';
 import { bindThis } from '@/decorators.js';
-import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/instance.js';
@@ -27,9 +26,6 @@ export default class InstanceChart extends Chart<typeof schema> { // eslint-disa
 		@Inject(DI.db)
 		private db: DataSource,
 
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis,
-
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
 
@@ -43,9 +39,10 @@ export default class InstanceChart extends Chart<typeof schema> { // eslint-disa
 		private followingsRepository: FollowingsRepository,
 
 		private utilityService: UtilityService,
+		private appLockService: AppLockService,
 		private chartLoggerService: ChartLoggerService,
 	) {
-		super(db, (k) => acquireChartInsertLock(redisClient, k), chartLoggerService.logger, name, schema, true);
+		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema, true);
 	}
 
 	protected async tickMajor(group: string): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/notes.ts

@@ -5,12 +5,11 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { Not, IsNull, DataSource } from 'typeorm';
-import * as Redis from 'ioredis';
 import type { NotesRepository } from '@/models/_.js';
 import type { MiNote } from '@/models/Note.js';
+import { AppLockService } from '@/core/AppLockService.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
-import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/notes.js';
@@ -25,15 +24,13 @@ export default class NotesChart extends Chart<typeof schema> { // eslint-disable
 		@Inject(DI.db)
 		private db: DataSource,
 
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis,
-
 		@Inject(DI.notesRepository)
 		private notesRepository: NotesRepository,
 
+		private appLockService: AppLockService,
 		private chartLoggerService: ChartLoggerService,
 	) {
-		super(db, (k) => acquireChartInsertLock(redisClient, k), chartLoggerService.logger, name, schema);
+		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema);
 	}
 
 	protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/per-user-drive.ts

@@ -5,13 +5,12 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
-import * as Redis from 'ioredis';
 import type { DriveFilesRepository } from '@/models/_.js';
 import type { MiDriveFile } from '@/models/DriveFile.js';
+import { AppLockService } from '@/core/AppLockService.js';
 import { DI } from '@/di-symbols.js';
 import { DriveFileEntityService } from '@/core/entities/DriveFileEntityService.js';
 import { bindThis } from '@/decorators.js';
-import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/per-user-drive.js';
@@ -26,16 +25,14 @@ export default class PerUserDriveChart extends Chart<typeof schema> { // eslint-
 		@Inject(DI.db)
 		private db: DataSource,
 
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis,
-
 		@Inject(DI.driveFilesRepository)
 		private driveFilesRepository: DriveFilesRepository,
 
+		private appLockService: AppLockService,
 		private driveFileEntityService: DriveFileEntityService,
 		private chartLoggerService: ChartLoggerService,
 	) {
-		super(db, (k) => acquireChartInsertLock(redisClient, k), chartLoggerService.logger, name, schema, true);
+		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema, true);
 	}
 
 	protected async tickMajor(group: string): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/per-user-following.ts

@@ -5,13 +5,12 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { Not, IsNull, DataSource } from 'typeorm';
-import * as Redis from 'ioredis';
 import type { MiUser } from '@/models/User.js';
+import { AppLockService } from '@/core/AppLockService.js';
 import { DI } from '@/di-symbols.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import type { FollowingsRepository } from '@/models/_.js';
 import { bindThis } from '@/decorators.js';
-import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/per-user-following.js';
@@ -26,16 +25,14 @@ export default class PerUserFollowingChart extends Chart<typeof schema> { // esl
 		@Inject(DI.db)
 		private db: DataSource,
 
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis,
-
 		@Inject(DI.followingsRepository)
 		private followingsRepository: FollowingsRepository,
 
+		private appLockService: AppLockService,
 		private userEntityService: UserEntityService,
 		private chartLoggerService: ChartLoggerService,
 	) {
-		super(db, (k) => acquireChartInsertLock(redisClient, k), chartLoggerService.logger, name, schema, true);
+		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema, true);
 	}
 
 	protected async tickMajor(group: string): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/per-user-notes.ts

@@ -5,13 +5,12 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
-import * as Redis from 'ioredis';
 import type { MiUser } from '@/models/User.js';
 import type { MiNote } from '@/models/Note.js';
+import { AppLockService } from '@/core/AppLockService.js';
 import { DI } from '@/di-symbols.js';
 import type { NotesRepository } from '@/models/_.js';
 import { bindThis } from '@/decorators.js';
-import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/per-user-notes.js';
@@ -26,15 +25,13 @@ export default class PerUserNotesChart extends Chart<typeof schema> { // eslint-
 		@Inject(DI.db)
 		private db: DataSource,
 
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis,
-
 		@Inject(DI.notesRepository)
 		private notesRepository: NotesRepository,
 
+		private appLockService: AppLockService,
 		private chartLoggerService: ChartLoggerService,
 	) {
-		super(db, (k) => acquireChartInsertLock(redisClient, k), chartLoggerService.logger, name, schema, true);
+		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema, true);
 	}
 
 	protected async tickMajor(group: string): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/per-user-pv.ts

@@ -5,11 +5,10 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
-import * as Redis from 'ioredis';
 import type { MiUser } from '@/models/User.js';
+import { AppLockService } from '@/core/AppLockService.js';
 import { DI } from '@/di-symbols.js';
 import { bindThis } from '@/decorators.js';
-import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/per-user-pv.js';
@@ -24,12 +23,10 @@ export default class PerUserPvChart extends Chart<typeof schema> { // eslint-dis
 		@Inject(DI.db)
 		private db: DataSource,
 
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis,
-
+		private appLockService: AppLockService,
 		private chartLoggerService: ChartLoggerService,
 	) {
-		super(db, (k) => acquireChartInsertLock(redisClient, k), chartLoggerService.logger, name, schema, true);
+		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema, true);
 	}
 
 	protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/per-user-reactions.ts

@@ -5,13 +5,12 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
-import * as Redis from 'ioredis';
 import type { MiUser } from '@/models/User.js';
 import type { MiNote } from '@/models/Note.js';
+import { AppLockService } from '@/core/AppLockService.js';
 import { DI } from '@/di-symbols.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { bindThis } from '@/decorators.js';
-import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/per-user-reactions.js';
@@ -26,13 +25,11 @@ export default class PerUserReactionsChart extends Chart<typeof schema> { // esl
 		@Inject(DI.db)
 		private db: DataSource,
 
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis,
-
+		private appLockService: AppLockService,
 		private userEntityService: UserEntityService,
 		private chartLoggerService: ChartLoggerService,
 	) {
-		super(db, (k) => acquireChartInsertLock(redisClient, k), chartLoggerService.logger, name, schema, true);
+		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema, true);
 	}
 
 	protected async tickMajor(group: string): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/test-grouped.ts

@@ -5,11 +5,10 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
-import * as Redis from 'ioredis';
+import { AppLockService } from '@/core/AppLockService.js';
 import { DI } from '@/di-symbols.js';
 import Logger from '@/logger.js';
 import { bindThis } from '@/decorators.js';
-import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { name, schema } from './entities/test-grouped.js';
 import type { KVs } from '../core.js';
@@ -25,12 +24,10 @@ export default class TestGroupedChart extends Chart<typeof schema> { // eslint-d
 		@Inject(DI.db)
 		private db: DataSource,
 
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis,
-
+		private appLockService: AppLockService,
 		logger: Logger,
 	) {
-		super(db, (k) => acquireChartInsertLock(redisClient, k), logger, name, schema, true);
+		super(db, (k) => appLockService.getChartInsertLock(k), logger, name, schema, true);
 	}
 
 	protected async tickMajor(group: string): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/test-intersection.ts

@@ -5,11 +5,10 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
-import * as Redis from 'ioredis';
+import { AppLockService } from '@/core/AppLockService.js';
 import { DI } from '@/di-symbols.js';
 import Logger from '@/logger.js';
 import { bindThis } from '@/decorators.js';
-import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { name, schema } from './entities/test-intersection.js';
 import type { KVs } from '../core.js';
@@ -23,12 +22,10 @@ export default class TestIntersectionChart extends Chart<typeof schema> { // esl
 		@Inject(DI.db)
 		private db: DataSource,
 
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis,
-
+		private appLockService: AppLockService,
 		logger: Logger,
 	) {
-		super(db, (k) => acquireChartInsertLock(redisClient, k), logger, name, schema);
+		super(db, (k) => appLockService.getChartInsertLock(k), logger, name, schema);
 	}
 
 	protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/test-unique.ts

@@ -5,11 +5,10 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
-import * as Redis from 'ioredis';
+import { AppLockService } from '@/core/AppLockService.js';
 import { DI } from '@/di-symbols.js';
 import Logger from '@/logger.js';
 import { bindThis } from '@/decorators.js';
-import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { name, schema } from './entities/test-unique.js';
 import type { KVs } from '../core.js';
@@ -23,12 +22,10 @@ export default class TestUniqueChart extends Chart<typeof schema> { // eslint-di
 		@Inject(DI.db)
 		private db: DataSource,
 
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis,
-
+		private appLockService: AppLockService,
 		logger: Logger,
 	) {
-		super(db, (k) => acquireChartInsertLock(redisClient, k), logger, name, schema);
+		super(db, (k) => appLockService.getChartInsertLock(k), logger, name, schema);
 	}
 
 	protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/test.ts

@@ -5,11 +5,10 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { DataSource } from 'typeorm';
-import * as Redis from 'ioredis';
+import { AppLockService } from '@/core/AppLockService.js';
 import { DI } from '@/di-symbols.js';
 import Logger from '@/logger.js';
 import { bindThis } from '@/decorators.js';
-import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { name, schema } from './entities/test.js';
 import type { KVs } from '../core.js';
@@ -25,12 +24,10 @@ export default class TestChart extends Chart<typeof schema> { // eslint-disable-
 		@Inject(DI.db)
 		private db: DataSource,
 
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis,
-
+		private appLockService: AppLockService,
 		logger: Logger,
 	) {
-		super(db, (k) => acquireChartInsertLock(redisClient, k), logger, name, schema);
+		super(db, (k) => appLockService.getChartInsertLock(k), logger, name, schema);
 	}
 
 	protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/core/chart/charts/users.ts

@@ -5,13 +5,12 @@
 
 import { Injectable, Inject } from '@nestjs/common';
 import { Not, IsNull, DataSource } from 'typeorm';
-import * as Redis from 'ioredis';
 import type { MiUser } from '@/models/User.js';
+import { AppLockService } from '@/core/AppLockService.js';
 import { DI } from '@/di-symbols.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import type { UsersRepository } from '@/models/_.js';
 import { bindThis } from '@/decorators.js';
-import { acquireChartInsertLock } from '@/misc/distributed-lock.js';
 import Chart from '../core.js';
 import { ChartLoggerService } from '../ChartLoggerService.js';
 import { name, schema } from './entities/users.js';
@@ -26,16 +25,14 @@ export default class UsersChart extends Chart<typeof schema> { // eslint-disable
 		@Inject(DI.db)
 		private db: DataSource,
 
-		@Inject(DI.redis)
-		private redisClient: Redis.Redis,
-
 		@Inject(DI.usersRepository)
 		private usersRepository: UsersRepository,
 
+		private appLockService: AppLockService,
 		private userEntityService: UserEntityService,
 		private chartLoggerService: ChartLoggerService,
 	) {
-		super(db, (k) => acquireChartInsertLock(redisClient, k), chartLoggerService.logger, name, schema);
+		super(db, (k) => appLockService.getChartInsertLock(k), chartLoggerService.logger, name, schema);
 	}
 
 	protected async tickMajor(): Promise<Partial<KVs<typeof schema>>> {

packages/backend/src/misc/distributed-lock.ts

@@ -1,49 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import * as Redis from 'ioredis';
-
-export async function acquireDistributedLock(
-	redis: Redis.Redis,
-	name: string,
-	timeout: number,
-	maxRetries: number,
-	retryInterval: number,
-): Promise<() => Promise<void>> {
-	const lockKey = `lock:${name}`;
-	const identifier = Math.random().toString(36).slice(2);
-
-	let retries = 0;
-	while (retries < maxRetries) {
-		const result = await redis.set(lockKey, identifier, 'PX', timeout, 'NX');
-		if (result === 'OK') {
-			return async () => {
-				const currentIdentifier = await redis.get(lockKey);
-				if (currentIdentifier === identifier) {
-					await redis.del(lockKey);
-				}
-			};
-		}
-
-		await new Promise(resolve => setTimeout(resolve, retryInterval));
-		retries++;
-	}
-
-	throw new Error(`Failed to acquire lock ${name}`);
-}
-
-export function acquireApObjectLock(
-	redis: Redis.Redis,
-	uri: string,
-): Promise<() => Promise<void>> {
-	return acquireDistributedLock(redis, `ap-object:${uri}`, 30 * 1000, 50, 100);
-}
-
-export function acquireChartInsertLock(
-	redis: Redis.Redis,
-	name: string,
-): Promise<() => Promise<void>> {
-	return acquireDistributedLock(redis, `chart-insert:${name}`, 30 * 1000, 50, 500);
-}

packages/backend/src/misc/escape-html.ts

@@ -1,13 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-export function escapeHtml(text: string): string {
-	return text
-		.replace(/&/g, '&')
-		.replace(/</g, '&lt;')
-		.replace(/>/g, '&gt;')
-		.replace(/"/g, '&quot;')
-		.replace(/'/g, '&#039;');
-}

packages/backend/src/queue/QueueProcessorService.ts

@@ -5,6 +5,7 @@
 
 import { Inject, Injectable, OnApplicationShutdown } from '@nestjs/common';
 import * as Bull from 'bullmq';
+import * as Sentry from '@sentry/node';
 import type { Config } from '@/config.js';
 import { DI } from '@/di-symbols.js';
 import type Logger from '@/logger.js';
@@ -156,13 +157,6 @@ export class QueueProcessorService implements OnApplicationShutdown {
 			};
 		}
 
-		let Sentry: typeof import('@sentry/node') | undefined;
-		if (Sentry != null) {
-			import('@sentry/node').then((mod) => {
-				Sentry = mod;
-			});
-		}
-
 		//#region system
 		{
 			const processer = (job: Bull.Job) => {
@@ -181,7 +175,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 			};
 
 			this.systemQueueWorker = new Bull.Worker(QUEUE.SYSTEM, (job) => {
-				if (Sentry != null) {
+				if (this.config.sentryForBackend) {
 					return Sentry.startSpan({ name: 'Queue: System: ' + job.name }, () => processer(job));
 				} else {
 					return processer(job);
@@ -198,7 +192,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 				.on('completed', (job, result) => logger.debug(`completed(${result}) id=${job.id}`))
 				.on('failed', (job, err: Error) => {
 					logger.error(`failed(${err.name}: ${err.message}) id=${job?.id ?? '?'}`, { job: renderJob(job), e: renderError(err) });
-					if (Sentry != null) {
+					if (config.sentryForBackend) {
 						Sentry.captureMessage(`Queue: System: ${job?.name ?? '?'}: ${err.name}: ${err.message}`, {
 							level: 'error',
 							extra: { job, err },
@@ -238,7 +232,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 			};
 
 			this.dbQueueWorker = new Bull.Worker(QUEUE.DB, (job) => {
-				if (Sentry != null) {
+				if (this.config.sentryForBackend) {
 					return Sentry.startSpan({ name: 'Queue: DB: ' + job.name }, () => processer(job));
 				} else {
 					return processer(job);
@@ -255,7 +249,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 				.on('completed', (job, result) => logger.debug(`completed(${result}) id=${job.id}`))
 				.on('failed', (job, err) => {
 					logger.error(`failed(${err.name}: ${err.message}) id=${job?.id ?? '?'}`, { job: renderJob(job), e: renderError(err) });
-					if (Sentry != null) {
+					if (config.sentryForBackend) {
 						Sentry.captureMessage(`Queue: DB: ${job?.name ?? '?'}: ${err.name}: ${err.message}`, {
 							level: 'error',
 							extra: { job, err },
@@ -270,7 +264,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 		//#region deliver
 		{
 			this.deliverQueueWorker = new Bull.Worker(QUEUE.DELIVER, (job) => {
-				if (Sentry != null) {
+				if (this.config.sentryForBackend) {
 					return Sentry.startSpan({ name: 'Queue: Deliver' }, () => this.deliverProcessorService.process(job));
 				} else {
 					return this.deliverProcessorService.process(job);
@@ -295,7 +289,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 				.on('completed', (job, result) => logger.debug(`completed(${result}) ${getJobInfo(job, true)} to=${job.data.to}`))
 				.on('failed', (job, err) => {
 					logger.error(`failed(${err.name}: ${err.message}) ${getJobInfo(job)} to=${job ? job.data.to : '-'}`);
-					if (Sentry != null) {
+					if (config.sentryForBackend) {
 						Sentry.captureMessage(`Queue: Deliver: ${err.name}: ${err.message}`, {
 							level: 'error',
 							extra: { job, err },
@@ -310,7 +304,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 		//#region inbox
 		{
 			this.inboxQueueWorker = new Bull.Worker(QUEUE.INBOX, (job) => {
-				if (Sentry != null) {
+				if (this.config.sentryForBackend) {
 					return Sentry.startSpan({ name: 'Queue: Inbox' }, () => this.inboxProcessorService.process(job));
 				} else {
 					return this.inboxProcessorService.process(job);
@@ -335,7 +329,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 				.on('completed', (job, result) => logger.debug(`completed(${result}) ${getJobInfo(job, true)}`))
 				.on('failed', (job, err) => {
 					logger.error(`failed(${err.name}: ${err.message}) ${getJobInfo(job)} activity=${job ? (job.data.activity ? job.data.activity.id : 'none') : '-'}`, { job: renderJob(job), e: renderError(err) });
-					if (Sentry != null) {
+					if (config.sentryForBackend) {
 						Sentry.captureMessage(`Queue: Inbox: ${err.name}: ${err.message}`, {
 							level: 'error',
 							extra: { job, err },
@@ -350,7 +344,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 		//#region user-webhook deliver
 		{
 			this.userWebhookDeliverQueueWorker = new Bull.Worker(QUEUE.USER_WEBHOOK_DELIVER, (job) => {
-				if (Sentry != null) {
+				if (this.config.sentryForBackend) {
 					return Sentry.startSpan({ name: 'Queue: UserWebhookDeliver' }, () => this.userWebhookDeliverProcessorService.process(job));
 				} else {
 					return this.userWebhookDeliverProcessorService.process(job);
@@ -375,7 +369,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 				.on('completed', (job, result) => logger.debug(`completed(${result}) ${getJobInfo(job, true)} to=${job.data.to}`))
 				.on('failed', (job, err) => {
 					logger.error(`failed(${err.name}: ${err.message}) ${getJobInfo(job)} to=${job ? job.data.to : '-'}`);
-					if (Sentry != null) {
+					if (config.sentryForBackend) {
 						Sentry.captureMessage(`Queue: UserWebhookDeliver: ${err.name}: ${err.message}`, {
 							level: 'error',
 							extra: { job, err },
@@ -390,7 +384,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 		//#region system-webhook deliver
 		{
 			this.systemWebhookDeliverQueueWorker = new Bull.Worker(QUEUE.SYSTEM_WEBHOOK_DELIVER, (job) => {
-				if (Sentry != null) {
+				if (this.config.sentryForBackend) {
 					return Sentry.startSpan({ name: 'Queue: SystemWebhookDeliver' }, () => this.systemWebhookDeliverProcessorService.process(job));
 				} else {
 					return this.systemWebhookDeliverProcessorService.process(job);
@@ -415,7 +409,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 				.on('completed', (job, result) => logger.debug(`completed(${result}) ${getJobInfo(job, true)} to=${job.data.to}`))
 				.on('failed', (job, err) => {
 					logger.error(`failed(${err.name}: ${err.message}) ${getJobInfo(job)} to=${job ? job.data.to : '-'}`);
-					if (Sentry != null) {
+					if (config.sentryForBackend) {
 						Sentry.captureMessage(`Queue: SystemWebhookDeliver: ${err.name}: ${err.message}`, {
 							level: 'error',
 							extra: { job, err },
@@ -440,7 +434,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 			};
 
 			this.relationshipQueueWorker = new Bull.Worker(QUEUE.RELATIONSHIP, (job) => {
-				if (Sentry != null) {
+				if (this.config.sentryForBackend) {
 					return Sentry.startSpan({ name: 'Queue: Relationship: ' + job.name }, () => processer(job));
 				} else {
 					return processer(job);
@@ -462,7 +456,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 				.on('completed', (job, result) => logger.debug(`completed(${result}) id=${job.id}`))
 				.on('failed', (job, err) => {
 					logger.error(`failed(${err.name}: ${err.message}) id=${job?.id ?? '?'}`, { job: renderJob(job), e: renderError(err) });
-					if (Sentry != null) {
+					if (config.sentryForBackend) {
 						Sentry.captureMessage(`Queue: Relationship: ${job?.name ?? '?'}: ${err.name}: ${err.message}`, {
 							level: 'error',
 							extra: { job, err },
@@ -485,7 +479,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 			};
 
 			this.objectStorageQueueWorker = new Bull.Worker(QUEUE.OBJECT_STORAGE, (job) => {
-				if (Sentry != null) {
+				if (this.config.sentryForBackend) {
 					return Sentry.startSpan({ name: 'Queue: ObjectStorage: ' + job.name }, () => processer(job));
 				} else {
 					return processer(job);
@@ -503,7 +497,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 				.on('completed', (job, result) => logger.debug(`completed(${result}) id=${job.id}`))
 				.on('failed', (job, err) => {
 					logger.error(`failed(${err.name}: ${err.message}) id=${job?.id ?? '?'}`, { job: renderJob(job), e: renderError(err) });
-					if (Sentry != null) {
+					if (config.sentryForBackend) {
 						Sentry.captureMessage(`Queue: ObjectStorage: ${job?.name ?? '?'}: ${err.name}: ${err.message}`, {
 							level: 'error',
 							extra: { job, err },
@@ -518,7 +512,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 		//#region ended poll notification
 		{
 			this.endedPollNotificationQueueWorker = new Bull.Worker(QUEUE.ENDED_POLL_NOTIFICATION, (job) => {
-				if (Sentry != null) {
+				if (this.config.sentryForBackend) {
 					return Sentry.startSpan({ name: 'Queue: EndedPollNotification' }, () => this.endedPollNotificationProcessorService.process(job));
 				} else {
 					return this.endedPollNotificationProcessorService.process(job);
@@ -533,7 +527,7 @@ export class QueueProcessorService implements OnApplicationShutdown {
 		//#region post scheduled note
 		{
 			this.postScheduledNoteQueueWorker = new Bull.Worker(QUEUE.POST_SCHEDULED_NOTE, async (job) => {
-				if (Sentry != null) {
+				if (this.config.sentryForBackend) {
 					return Sentry.startSpan({ name: 'Queue: PostScheduledNote' }, () => this.postScheduledNoteProcessorService.process(job));
 				} else {
 					return this.postScheduledNoteProcessorService.process(job);

packages/backend/src/server/api/ApiCallService.ts

@@ -7,6 +7,7 @@ import { randomUUID } from 'node:crypto';
 import * as fs from 'node:fs';
 import * as stream from 'node:stream/promises';
 import { Inject, Injectable } from '@nestjs/common';
+import * as Sentry from '@sentry/node';
 import { DI } from '@/di-symbols.js';
 import { getIpHash } from '@/misc/get-ip-hash.js';
 import type { MiLocalUser, MiUser } from '@/models/User.js';
@@ -36,7 +37,6 @@ export class ApiCallService implements OnApplicationShutdown {
 	private logger: Logger;
 	private userIpHistories: Map<MiUser['id'], Set<string>>;
 	private userIpHistoriesClearIntervalId: NodeJS.Timeout;
-	private Sentry: typeof import('@sentry/node') | null = null;
 
 	constructor(
 		@Inject(DI.meta)
@@ -59,12 +59,6 @@ export class ApiCallService implements OnApplicationShutdown {
 		this.userIpHistoriesClearIntervalId = setInterval(() => {
 			this.userIpHistories.clear();
 		}, 1000 * 60 * 60);
-
-		if (this.config.sentryForBackend) {
-			import('@sentry/node').then((Sentry) => {
-				this.Sentry = Sentry;
-			});
-		}
 	}
 
 	#sendApiError(reply: FastifyReply, err: ApiError): void {
@@ -126,8 +120,8 @@ export class ApiCallService implements OnApplicationShutdown {
 				},
 			});
 
-			if (this.Sentry != null) {
-				this.Sentry.captureMessage(`Internal error occurred in ${ep.name}: ${err.message}`, {
+			if (this.config.sentryForBackend) {
+				Sentry.captureMessage(`Internal error occurred in ${ep.name}: ${err.message}`, {
 					level: 'error',
 					user: {
 						id: userId,
@@ -438,8 +432,8 @@ export class ApiCallService implements OnApplicationShutdown {
 		}
 
 		// API invoking
-		if (this.Sentry != null) {
-			return await this.Sentry.startSpan({
+		if (this.config.sentryForBackend) {
+			return await Sentry.startSpan({
 				name: 'API: ' + ep.name,
 			}, () => ep.exec(data, user, token, file, request.ip, request.headers)
 				.catch((err: Error) => this.#onExecError(ep, data, err, user?.id)));

packages/backend/src/server/oauth/OAuth2ProviderService.ts

@@ -120,7 +120,7 @@ async function discoverClientInformation(logger: Logger, httpRequestService: Htt
 		}
 
 		const text = await res.text();
-		const fragment = htmlParser.parse(`<div>${text}</div>`);
+		const fragment = htmlParser.parse(text);
 
 		redirectUris.push(...[...fragment.querySelectorAll('link[rel=redirect_uri][href]')].map(el => el.attributes.href));
 

packages/backend/test/e2e/exports.ts

@@ -16,7 +16,7 @@ describe('export-clips', () => {
 	let bob: misskey.entities.SignupResponse;
 
 	// XXX: Any better way to get the result?
-	async function pollFirstDriveFile(): Promise<any> {
+	async function pollFirstDriveFile() {
 		while (true) {
 			const files = (await api('drive/files', {}, alice)).body;
 			if (!files.length) {

packages/backend/test/e2e/fetch-resource.ts

@@ -73,7 +73,7 @@ describe('Webリソース', () => {
 	};
 
 	const metaTag = (res: SimpleGetResponse, key: string, superkey = 'name'): string => {
-		return res.body.querySelector('meta[' + superkey + '="' + key + '"]')?.attributes.content;
+		return res.body.window.document.querySelector('meta[' + superkey + '="' + key + '"]')?.content;
 	};
 
 	beforeAll(async () => {

packages/backend/test/e2e/oauth.ts

@@ -19,7 +19,7 @@ import {
 	ResourceOwnerPassword,
 } from 'simple-oauth2';
 import pkceChallenge from 'pkce-challenge';
-import * as htmlParser from 'node-html-parser';
+import { JSDOM } from 'jsdom';
 import Fastify, { type FastifyInstance, type FastifyReply } from 'fastify';
 import { api, port, sendEnvUpdateRequest, signup } from '../utils.js';
 import type * as misskey from 'misskey-js';
@@ -73,11 +73,11 @@ const clientConfig: ModuleOptions<'client_id'> = {
 };
 
 function getMeta(html: string): { transactionId: string | undefined, clientName: string | undefined, clientLogo: string | undefined } {
-	const doc = htmlParser.parse(`<div>${html}</div>`);
+	const fragment = JSDOM.fragment(html);
 	return {
-		transactionId: doc.querySelector('meta[name="misskey:oauth:transaction-id"]')?.attributes.content,
-		clientName: doc.querySelector('meta[name="misskey:oauth:client-name"]')?.attributes.content,
-		clientLogo: doc.querySelector('meta[name="misskey:oauth:client-logo"]')?.attributes.content,
+		transactionId: fragment.querySelector<HTMLMetaElement>('meta[name="misskey:oauth:transaction-id"]')?.content,
+		clientName: fragment.querySelector<HTMLMetaElement>('meta[name="misskey:oauth:client-name"]')?.content,
+		clientLogo: fragment.querySelector<HTMLMetaElement>('meta[name="misskey:oauth:client-logo"]')?.content,
 	};
 }
 
@@ -148,7 +148,7 @@ function assertIndirectError(response: Response, error: string): void {
 async function assertDirectError(response: Response, status: number, error: string): Promise<void> {
 	assert.strictEqual(response.status, status);
 
-	const data = await response.json() as any;
+	const data = await response.json();
 	assert.strictEqual(data.error, error);
 }
 
@@ -704,7 +704,7 @@ describe('OAuth', () => {
 		const response = await fetch(new URL('.well-known/oauth-authorization-server', host));
 		assert.strictEqual(response.status, 200);
 
-		const body = await response.json() as any;
+		const body = await response.json();
 		assert.strictEqual(body.issuer, 'http://misskey.local');
 		assert.ok(body.scopes_supported.includes('write:notes'));
 	});

packages/backend/test/jest.setup.ts

@@ -9,4 +9,3 @@ beforeAll(async () => {
 		await initTestDb(false);
 		await sendEnvResetRequest();
 });
-

packages/backend/test/unit/AnnouncementService.ts

@@ -26,7 +26,7 @@ import { GlobalEventService } from '@/core/GlobalEventService.js';
 import { ModerationLogService } from '@/core/ModerationLogService.js';
 import { secureRndstr } from '@/misc/secure-rndstr.js';
 import type { TestingModule } from '@nestjs/testing';
-import type { MockMetadata } from 'jest-mock';
+import type { MockFunctionMetadata } from 'jest-mock';
 
 const moduleMocker = new ModuleMocker(global);
 
@@ -84,7 +84,7 @@ describe('AnnouncementService', () => {
 						log: jest.fn(),
 					};
 				} else if (typeof token === 'function') {
-					const mockMetadata = moduleMocker.getMetadata(token) as MockMetadata<any, any>;
+					const mockMetadata = moduleMocker.getMetadata(token) as MockFunctionMetadata<any, any>;
 					const Mock = moduleMocker.generateFromMetadata(mockMetadata);
 					return new Mock();
 				}

packages/backend/test/unit/ApMfmService.ts

@@ -9,6 +9,7 @@ import { Test } from '@nestjs/testing';
 import { CoreModule } from '@/core/CoreModule.js';
 import { ApMfmService } from '@/core/activitypub/ApMfmService.js';
 import { GlobalModule } from '@/GlobalModule.js';
+import { MiNote } from '@/models/Note.js';
 
 describe('ApMfmService', () => {
 	let apMfmService: ApMfmService;
@@ -30,7 +31,7 @@ describe('ApMfmService', () => {
 			const { content, noMisskeyContent } = apMfmService.getNoteHtml(note);
 
 			assert.equal(noMisskeyContent, true, 'noMisskeyContent');
-			assert.equal(content, 'テキスト <a href="http://misskey.local/tags/%E3%82%BF%E3%82%B0" rel="tag">#タグ</a> <a href="http://misskey.local/@mention" class="u-url mention">@mention</a> 🍊 ​:emoji:​ <a href="https://example.com/">https://example.com</a>', 'content');
+			assert.equal(content, '<p>テキスト <a href="http://misskey.local/tags/タグ" rel="tag">#タグ</a> <a href="http://misskey.local/@mention" class="u-url mention">@mention</a> 🍊 ​:emoji:​ <a href="https://example.com">https://example.com</a></p>', 'content');
 		});
 
 		test('Provide _misskey_content for MFM', () => {
@@ -42,7 +43,7 @@ describe('ApMfmService', () => {
 			const { content, noMisskeyContent } = apMfmService.getNoteHtml(note);
 
 			assert.equal(noMisskeyContent, false, 'noMisskeyContent');
-			assert.equal(content, '<i>foo</i>', 'content');
+			assert.equal(content, '<p><i>foo</i></p>', 'content');
 		});
 	});
 });

packages/backend/test/unit/CaptchaService.ts

@@ -446,7 +446,7 @@ describe('CaptchaService', () => {
 				if (!res.success) {
 					expect(res.error.code).toBe(code);
 				}
-				expect(metaService.update).not.toHaveBeenCalled();
+				expect(metaService.update).not.toBeCalled();
 			}
 
 			describe('invalidParameters', () => {

packages/backend/test/unit/DriveService.ts

@@ -53,7 +53,7 @@ describe('DriveService', () => {
 			s3Mock.on(DeleteObjectCommand)
 				.rejects(new InvalidObjectState({ $metadata: {}, message: '' }));
 
-			await expect(driveService.deleteObjectStorageFile('unexpected')).rejects.toThrow(Error);
+			await expect(driveService.deleteObjectStorageFile('unexpected')).rejects.toThrowError(Error);
 		});
 
 		test('delete a file with no valid key', async () => {

packages/backend/test/unit/FileInfoService.ts

@@ -17,7 +17,7 @@ import { FileInfo, FileInfoService } from '@/core/FileInfoService.js';
 import { AiService } from '@/core/AiService.js';
 import { LoggerService } from '@/core/LoggerService.js';
 import type { TestingModule } from '@nestjs/testing';
-import type { MockMetadata } from 'jest-mock';
+import type { MockFunctionMetadata } from 'jest-mock';
 
 const _filename = fileURLToPath(import.meta.url);
 const _dirname = dirname(_filename);
@@ -34,7 +34,7 @@ describe('FileInfoService', () => {
 		delete fi.sensitive;
 		delete fi.blurhash;
 		delete fi.porn;
-
+		
 		return fi;
 	}
 
@@ -54,7 +54,7 @@ describe('FileInfoService', () => {
 				//	return {  };
 				//}
 				if (typeof token === 'function') {
-					const mockMetadata = moduleMocker.getMetadata(token) as MockMetadata<any, any>;
+					const mockMetadata = moduleMocker.getMetadata(token) as MockFunctionMetadata<any, any>;
 					const Mock = moduleMocker.generateFromMetadata(mockMetadata);
 					return new Mock();
 				}

packages/backend/test/unit/MfmService.ts

@@ -24,25 +24,25 @@ describe('MfmService', () => {
 	describe('toHtml', () => {
 		test('br', () => {
 			const input = 'foo\nbar\nbaz';
-			const output = 'foo<br />bar<br />baz';
+			const output = '<p><span>foo<br />bar<br />baz</span></p>';
 			assert.equal(mfmService.toHtml(mfm.parse(input)), output);
 		});
 
 		test('br alt', () => {
 			const input = 'foo\r\nbar\rbaz';
-			const output = 'foo<br />bar<br />baz';
+			const output = '<p><span>foo<br />bar<br />baz</span></p>';
 			assert.equal(mfmService.toHtml(mfm.parse(input)), output);
 		});
 
 		test('Do not generate unnecessary span', () => {
 			const input = 'foo $[tada bar]';
-			const output = 'foo <i>bar</i>';
+			const output = '<p>foo <i>bar</i></p>';
 			assert.equal(mfmService.toHtml(mfm.parse(input)), output);
 		});
 
 		test('escape', () => {
 			const input = '```\n<p>Hello, world!</p>\n```';
-			const output = '<pre><code>&lt;p&gt;Hello, world!&lt;/p&gt;</code></pre>';
+			const output = '<p><pre><code>&lt;p&gt;Hello, world!&lt;/p&gt;</code></pre></p>';
 			assert.equal(mfmService.toHtml(mfm.parse(input)), output);
 		});
 	});
@@ -118,7 +118,7 @@ describe('MfmService', () => {
 			assert.deepStrictEqual(mfmService.fromHtml('<p>a <ruby>Misskey<rp>(</rp><rt>ミス キー</rt><rp>)</rp> b</ruby> c</p>'), 'a Misskey(ミス キー) b c');
 			assert.deepStrictEqual(
 				mfmService.fromHtml('<p>a <ruby>Misskey<rp>(</rp><rt>ミスキー</rt><rp>)</rp>Misskey<rp>(</rp><rt>ミス キー</rt><rp>)</rp>Misskey<rp>(</rp><rt>ミスキー</rt><rp>)</rp></ruby> b</p>'),
-				'a Misskey(ミスキー)Misskey(ミス キー)Misskey(ミスキー) b',
+				'a Misskey(ミスキー)Misskey(ミス キー)Misskey(ミスキー) b'
 			);
 		});
 

packages/backend/test/unit/RelayService.ts

@@ -9,7 +9,7 @@ import { jest } from '@jest/globals';
 import { Test } from '@nestjs/testing';
 import { ModuleMocker } from 'jest-mock';
 import type { TestingModule } from '@nestjs/testing';
-import type { MockMetadata } from 'jest-mock';
+import type { MockFunctionMetadata } from 'jest-mock';
 import { ApRendererService } from '@/core/activitypub/ApRendererService.js';
 import { UserEntityService } from '@/core/entities/UserEntityService.js';
 import { IdService } from '@/core/IdService.js';
@@ -45,7 +45,7 @@ describe('RelayService', () => {
 					return { deliver: jest.fn() };
 				}
 				if (typeof token === 'function') {
-					const mockMetadata = moduleMocker.getMetadata(token) as MockMetadata<any, any>;
+					const mockMetadata = moduleMocker.getMetadata(token) as MockFunctionMetadata<any, any>;
 					const Mock = moduleMocker.generateFromMetadata(mockMetadata);
 					return new Mock();
 				}

packages/backend/test/unit/RoleService.ts

@@ -11,7 +11,7 @@ import { ModuleMocker } from 'jest-mock';
 import { Test } from '@nestjs/testing';
 import * as lolex from '@sinonjs/fake-timers';
 import type { TestingModule } from '@nestjs/testing';
-import type { MockMetadata } from 'jest-mock';
+import type { MockFunctionMetadata } from 'jest-mock';
 import { GlobalModule } from '@/GlobalModule.js';
 import { RoleService } from '@/core/RoleService.js';
 import {
@@ -104,8 +104,6 @@ describe('RoleService', () => {
 
 	beforeEach(async () => {
 		clock = lolex.install({
-			// https://github.com/sinonjs/sinon/issues/2620
-			toFake: Object.keys(lolex.timers).filter((key) => !['nextTick', 'queueMicrotask'].includes(key)) as lolex.FakeMethod[],
 			now: new Date(),
 			shouldClearNativeTimers: true,
 		});
@@ -137,7 +135,7 @@ describe('RoleService', () => {
 					return { fetch: jest.fn() };
 				}
 				if (typeof token === 'function') {
-					const mockMetadata = moduleMocker.getMetadata(token) as MockMetadata<any, any>;
+					const mockMetadata = moduleMocker.getMetadata(token) as MockFunctionMetadata<any, any>;
 					const Mock = moduleMocker.generateFromMetadata(mockMetadata);
 					return new Mock();
 				}

packages/backend/test/unit/S3Service.ts

@@ -72,7 +72,7 @@ describe('S3Service', () => {
 				Bucket: 'fake',
 				Key: 'fake',
 				Body: 'x',
-			})).rejects.toThrow(Error);
+			})).rejects.toThrowError(Error);
 		});
 
 		test('upload a large file error', async () => {
@@ -82,7 +82,7 @@ describe('S3Service', () => {
 				Bucket: 'fake',
 				Key: 'fake',
 				Body: 'x'.repeat(8 * 1024 * 1024 + 1), // デフォルトpartSizeにしている 8 * 1024 * 1024 を越えるサイズ
-			})).rejects.toThrow(Error);
+			})).rejects.toThrowError(Error);
 		});
 	});
 });

packages/backend/test/unit/SigninWithPasskeyApiService.ts

@@ -9,7 +9,7 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { FastifyReply, FastifyRequest } from 'fastify';
 import { AuthenticationResponseJSON } from '@simplewebauthn/types';
 import { HttpHeader } from 'fastify/types/utils.js';
-import { MockMetadata, ModuleMocker } from 'jest-mock';
+import { MockFunctionMetadata, ModuleMocker } from 'jest-mock';
 import { MiUser } from '@/models/User.js';
 import { MiUserProfile, UserProfilesRepository, UsersRepository } from '@/models/_.js';
 import { IdService } from '@/core/IdService.js';
@@ -95,7 +95,7 @@ describe('SigninWithPasskeyApiService', () => {
 			],
 		}).useMocker((token) => {
 			if (typeof token === 'function') {
-				const mockMetadata = moduleMocker.getMetadata(token) as MockMetadata<any, any>;
+				const mockMetadata = moduleMocker.getMetadata(token) as MockFunctionMetadata<any, any>;
 				const Mock = moduleMocker.generateFromMetadata(mockMetadata);
 				return new Mock();
 			}

packages/backend/test/unit/chart.ts

@@ -9,7 +9,6 @@ import * as assert from 'assert';
 import { jest } from '@jest/globals';
 import * as lolex from '@sinonjs/fake-timers';
 import { DataSource } from 'typeorm';
-import * as Redis from 'ioredis';
 import TestChart from '@/core/chart/charts/test.js';
 import TestGroupedChart from '@/core/chart/charts/test-grouped.js';
 import TestUniqueChart from '@/core/chart/charts/test-unique.js';
@@ -19,16 +18,16 @@ import { entity as TestGroupedChartEntity } from '@/core/chart/charts/entities/t
 import { entity as TestUniqueChartEntity } from '@/core/chart/charts/entities/test-unique.js';
 import { entity as TestIntersectionChartEntity } from '@/core/chart/charts/entities/test-intersection.js';
 import { loadConfig } from '@/config.js';
+import type { AppLockService } from '@/core/AppLockService.js';
 import Logger from '@/logger.js';
 
 describe('Chart', () => {
 	const config = loadConfig();
+	const appLockService = {
+		getChartInsertLock: () => () => Promise.resolve(() => {}),
+	} as unknown as jest.Mocked<AppLockService>;
 
 	let db: DataSource | undefined;
-	let redisClient = {
-		set: () => Promise.resolve('OK'),
-		get: () => Promise.resolve(null),
-	} as unknown as jest.Mocked<Redis.Redis>;
 
 	let testChart: TestChart;
 	let testGroupedChart: TestGroupedChart;
@@ -65,14 +64,12 @@ describe('Chart', () => {
 		await db.initialize();
 
 		const logger = new Logger('chart'); // TODO: モックにする
-		testChart = new TestChart(db, redisClient, logger);
-		testGroupedChart = new TestGroupedChart(db, redisClient, logger);
-		testUniqueChart = new TestUniqueChart(db, redisClient, logger);
-		testIntersectionChart = new TestIntersectionChart(db, redisClient, logger);
+		testChart = new TestChart(db, appLockService, logger);
+		testGroupedChart = new TestGroupedChart(db, appLockService, logger);
+		testUniqueChart = new TestUniqueChart(db, appLockService, logger);
+		testIntersectionChart = new TestIntersectionChart(db, appLockService, logger);
 
 		clock = lolex.install({
-			// https://github.com/sinonjs/sinon/issues/2620
-			toFake: Object.keys(lolex.timers).filter((key) => !['nextTick', 'queueMicrotask'].includes(key)) as lolex.FakeMethod[],
 			now: new Date(Date.UTC(2000, 0, 1, 0, 0, 0)),
 			shouldClearNativeTimers: true,
 		});

packages/backend/test/unit/queue/processors/CheckModeratorsActivityProcessorService.ts

@@ -141,8 +141,6 @@ describe('CheckModeratorsActivityProcessorService', () => {
 
 	beforeEach(async () => {
 		clock = lolex.install({
-			// https://github.com/sinonjs/sinon/issues/2620
-			toFake: Object.keys(lolex.timers).filter((key) => !['nextTick', 'queueMicrotask'].includes(key)) as lolex.FakeMethod[],
 			now: new Date(baseDate),
 			shouldClearNativeTimers: true,
 		});

packages/backend/test/utils.ts

@@ -10,8 +10,8 @@ import { randomUUID } from 'node:crypto';
 import { inspect } from 'node:util';
 import WebSocket, { ClientOptions } from 'ws';
 import fetch, { File, RequestInit, type Headers } from 'node-fetch';
-import * as htmlParser from 'node-html-parser';
 import { DataSource } from 'typeorm';
+import { JSDOM } from 'jsdom';
 import { type Response } from 'node-fetch';
 import Fastify from 'fastify';
 import { entities } from '../src/postgres.js';
@@ -468,7 +468,7 @@ export function makeStreamCatcher<T>(
 
 export type SimpleGetResponse = {
 	status: number,
-	body: any | null,
+	body: any | JSDOM | null,
 	type: string | null,
 	location: string | null
 };
@@ -499,7 +499,7 @@ export const simpleGet = async (path: string, accept = '*/*', cookie: any = unde
 
 	const body =
 		jsonTypes.includes(res.headers.get('content-type') ?? '') ? await res.json() :
-		htmlTypes.includes(res.headers.get('content-type') ?? '') ? htmlParser.parse(await res.text()) :
+		htmlTypes.includes(res.headers.get('content-type') ?? '') ? new JSDOM(await res.text()) :
 		await bodyExtractor(res);
 
 	return {

packages/frontend-builder/locale-inliner.ts

@@ -10,7 +10,7 @@ import { collectModifications } from './locale-inliner/collect-modifications.js'
 import { applyWithLocale } from './locale-inliner/apply-with-locale.js';
 import { blankLogger } from './logger.js';
 import type { Logger } from './logger.js';
-import type { Locale } from 'i18n';
+import type { Locale } from '../../locales/index.js';
 import type { Manifest as ViteManifest } from 'vite';
 
 export class LocaleInliner {

packages/frontend-builder/locale-inliner/apply-with-locale.ts

@@ -5,7 +5,7 @@
 
 import MagicString from 'magic-string';
 import { assertNever } from '../utils.js';
-import type { ILocale, Locale } from 'i18n';
+import type { Locale, ILocale } from '../../../locales/index.js';
 import type { TextModification } from '../locale-inliner.js';
 import type { Logger } from '../logger.js';
 

packages/frontend-builder/package.json

@@ -18,9 +18,8 @@
 		"typescript": "5.9.3"
 	},
 	"dependencies": {
-		"i18n": "workspace:*",
 		"estree-walker": "3.0.3",
 		"magic-string": "0.30.21",
-		"vite": "7.2.4"
+		"vite": "7.2.2"
 	}
 }

packages/frontend-embed/build.ts

@@ -2,7 +2,7 @@ import * as fs from 'fs/promises';
 import url from 'node:url';
 import path from 'node:path';
 import { execa } from 'execa';
-import locales from 'i18n';
+import locales from '../../locales/index.js';
 import { LocaleInliner } from '../frontend-builder/locale-inliner.js'
 import { createLogger } from '../frontend-builder/logger';
 

packages/frontend-embed/package.json

@@ -11,7 +11,6 @@
 	},
 	"dependencies": {
 		"@discordapp/twemoji": "16.0.1",
-		"i18n": "workspace:*",
 		"@rollup/plugin-json": "6.1.0",
 		"@rollup/plugin-replace": "6.0.3",
 		"@rollup/pluginutils": "5.3.0",
@@ -28,14 +27,14 @@
 		"misskey-js": "workspace:*",
 		"punycode.js": "2.3.1",
 		"rollup": "4.53.3",
-		"sass": "1.94.2",
+		"sass": "1.94.1",
 		"shiki": "3.15.0",
 		"tinycolor2": "1.6.0",
 		"tsc-alias": "1.8.16",
 		"tsconfig-paths": "4.2.0",
 		"typescript": "5.9.3",
 		"uuid": "13.0.0",
-		"vite": "7.2.4",
+		"vite": "7.2.2",
 		"vue": "3.5.24"
 	},
 	"devDependencies": {
@@ -50,12 +49,12 @@
 		"@types/ws": "8.18.1",
 		"@typescript-eslint/eslint-plugin": "8.47.0",
 		"@typescript-eslint/parser": "8.47.0",
-		"@vitest/coverage-v8": "4.0.13",
+		"@vitest/coverage-v8": "3.2.4",
 		"@vue/runtime-core": "3.5.24",
 		"acorn": "8.15.0",
 		"cross-env": "10.1.0",
 		"eslint-plugin-import": "2.32.0",
-		"eslint-plugin-vue": "10.6.0",
+		"eslint-plugin-vue": "10.5.1",
 		"fast-glob": "3.3.3",
 		"happy-dom": "20.0.10",
 		"intersection-observer": "0.12.2",
@@ -63,11 +62,11 @@
 		"msw": "2.12.2",
 		"nodemon": "3.1.11",
 		"prettier": "3.6.2",
-		"start-server-and-test": "2.1.3",
+		"start-server-and-test": "2.1.2",
 		"tsx": "4.20.6",
 		"vite-plugin-turbosnap": "1.0.3",
-		"vue-component-type-helpers": "3.1.5",
+		"vue-component-type-helpers": "3.1.4",
 		"vue-eslint-parser": "10.2.0",
-		"vue-tsc": "3.1.5"
+		"vue-tsc": "3.1.4"
 	}
 }

packages/frontend-embed/src/components/I18n.vue

@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script setup lang="ts" generic="T extends string | ParameterizedString">
 import { computed, h } from 'vue';
-import type { ParameterizedString } from 'i18n';
+import type { ParameterizedString } from '../../../../locales/index.js';
 
 const props = withDefaults(defineProps<{
 	src: T;
@@ -25,7 +25,7 @@ const slots = defineSlots<T extends ParameterizedString<infer R> ? { [K in R]: (
 const parsed = computed(() => {
 	let str = props.src as string;
 	const value: (string | { arg: string; })[] = [];
-	for (; ;) {
+	for (;;) {
 		const nextBracketOpen = str.indexOf('{');
 		const nextBracketClose = str.indexOf('}');
 

packages/frontend-embed/src/i18n.ts

@@ -6,7 +6,7 @@
 import { markRaw } from 'vue';
 import { I18n } from '@@/js/i18n.js';
 import { locale } from '@@/js/locale.js';
-import type { Locale } from 'i18n';
+import type { Locale } from '../../../locales/index.js';
 
 export const i18n = markRaw(new I18n<Locale>(locale, _DEV_));
 

packages/frontend-embed/vite.config.ts

@@ -1,10 +1,10 @@
 import path from 'path';
 import pluginVue from '@vitejs/plugin-vue';
-import { defineConfig, type UserConfig } from 'vite';
+import { type UserConfig, defineConfig } from 'vite';
 import * as yaml from 'js-yaml';
 import { promises as fsp } from 'fs';
 
-import locales from 'i18n';
+import locales from '../../locales/index.js';
 import meta from '../../package.json';
 import packageInfo from './package.json' with { type: 'json' };
 import pluginJson5 from './vite.json5.js';

packages/frontend-shared/js/i18n.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import type { ILocale, ParameterizedString } from 'i18n';
+import type { ILocale, ParameterizedString } from '../../../locales/index.js';
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 type TODO = any;

packages/frontend-shared/js/locale.ts

@@ -4,7 +4,7 @@
  */
 
 import { lang, version } from '@@/js/config.js';
-import type { Locale } from 'i18n';
+import type { Locale } from '../../../locales/index.js';
 
 // ここはビルド時に const locale = JSON.parse("...") みたいな感じで置き換えられるので top-level await は消える
 export let locale: Locale = await window.fetch(`/assets/locales/${lang}.${version}.json`).then(r => r.json(), () => null);

packages/frontend-shared/js/store-boot-errors.ts

@@ -3,7 +3,7 @@
  * SPDX-License-Identifier: AGPL-3.0-only
  */
 
-import type { Locale } from 'i18n';
+import type { Locale } from '../../../locales/index.js';
 
 type BootLoaderLocaleBody = Locale['_bootErrors'] & { reload: Locale['reload'] };
 

packages/frontend-shared/package.json

@@ -25,7 +25,7 @@
 		"@typescript-eslint/eslint-plugin": "8.47.0",
 		"@typescript-eslint/parser": "8.47.0",
 		"esbuild": "0.27.0",
-		"eslint-plugin-vue": "10.6.0",
+		"eslint-plugin-vue": "10.5.1",
 		"nodemon": "3.1.11",
 		"typescript": "5.9.3",
 		"vue-eslint-parser": "10.2.0"
@@ -34,7 +34,6 @@
 		"js-built"
 	],
 	"dependencies": {
-		"i18n": "workspace:*",
 		"misskey-js": "workspace:*",
 		"vue": "3.5.24"
 	}

packages/frontend/.storybook/preload-locale.ts

@@ -4,7 +4,7 @@
  */
 
 import { writeFile } from 'node:fs/promises';
-import locales from 'i18n';
+import locales from '../../../locales/index.js';
 
 await writeFile(
 	new URL('locale.ts', import.meta.url),

packages/frontend/build.ts

@@ -2,7 +2,7 @@ import * as fs from 'fs/promises';
 import url from 'node:url';
 import path from 'node:path';
 import { execa } from 'execa';
-import locales from 'i18n';
+import locales from '../../locales/index.js';
 import { LocaleInliner } from '../frontend-builder/locale-inliner.js'
 import { createLogger } from '../frontend-builder/logger';
 

packages/frontend/lib/vite-plugin-watch-locales.ts

@@ -4,7 +4,7 @@
  */
 
 import path from 'node:path'
-import locales from 'i18n';
+import locales from '../../../locales/index.js';
 
 const localesDir = path.resolve(__dirname, '../../../locales')
 
@@ -13,14 +13,14 @@ const localesDir = path.resolve(__dirname, '../../../locales')
  * @returns {import('vite').Plugin}
  */
 export default function pluginWatchLocales() {
-	return {
-		name: 'watch-locales',
+  return {
+    name: 'watch-locales',
 
-		configureServer(server) {
-			const localeYmlPaths = Object.keys(locales).map(locale => path.join(localesDir, `${locale}.yml`));
+    configureServer(server) {
+      const localeYmlPaths = Object.keys(locales).map(locale => path.join(localesDir, `${locale}.yml`));
 
-			// watcherにパスを追加
-			server.watcher.add(localeYmlPaths);
+      // watcherにパスを追加
+      server.watcher.add(localeYmlPaths);
 
 			server.watcher.on('change', (filePath) => {
 				if (localeYmlPaths.includes(filePath)) {
@@ -31,6 +31,6 @@ export default function pluginWatchLocales() {
 					})
 				}
 			});
-		},
-	};
+    },
+  };
 }

packages/frontend/package.json

@@ -20,7 +20,6 @@
 		"@discordapp/twemoji": "16.0.1",
 		"@github/webauthn-json": "2.1.1",
 		"@mcaptcha/vanilla-glue": "0.1.0-alpha-3",
-		"i18n": "workspace:*",
 		"@misskey-dev/browser-image-resizer": "2024.1.0",
 		"@rollup/plugin-json": "6.1.0",
 		"@rollup/plugin-replace": "6.0.3",
@@ -59,7 +58,7 @@
 		"json5": "2.2.3",
 		"magic-string": "0.30.21",
 		"matter-js": "0.20.0",
-		"mediabunny": "1.25.1",
+		"mediabunny": "1.25.0",
 		"mfm-js": "0.25.0",
 		"misskey-bubble-game": "workspace:*",
 		"misskey-js": "workspace:*",
@@ -70,7 +69,7 @@
 		"qr-scanner": "1.4.2",
 		"rollup": "4.53.3",
 		"sanitize-html": "2.17.0",
-		"sass": "1.94.2",
+		"sass": "1.94.1",
 		"shiki": "3.15.0",
 		"strict-event-emitter-types": "2.0.0",
 		"textarea-caret": "3.1.0",
@@ -81,7 +80,7 @@
 		"tsconfig-paths": "4.2.0",
 		"typescript": "5.9.3",
 		"v-code-diff": "1.13.1",
-		"vite": "7.2.4",
+		"vite": "7.2.2",
 		"vue": "3.5.24",
 		"vuedraggable": "next",
 		"wanakana": "5.3.1"
@@ -90,7 +89,7 @@
 		"@misskey-dev/summaly": "5.2.5",
 		"@storybook/addon-essentials": "8.6.14",
 		"@storybook/addon-interactions": "8.6.14",
-		"@storybook/addon-links": "10.0.8",
+		"@storybook/addon-links": "9.1.16",
 		"@storybook/addon-mdx-gfm": "8.6.14",
 		"@storybook/addon-storysource": "8.6.14",
 		"@storybook/blocks": "8.6.14",
@@ -98,13 +97,13 @@
 		"@storybook/core-events": "8.6.14",
 		"@storybook/manager-api": "8.6.14",
 		"@storybook/preview-api": "8.6.14",
-		"@storybook/react": "10.0.8",
-		"@storybook/react-vite": "10.0.8",
+		"@storybook/react": "9.1.16",
+		"@storybook/react-vite": "9.1.16",
 		"@storybook/test": "8.6.14",
 		"@storybook/theming": "8.6.14",
 		"@storybook/types": "8.6.14",
-		"@storybook/vue3": "10.0.8",
-		"@storybook/vue3-vite": "10.0.8",
+		"@storybook/vue3": "9.1.16",
+		"@storybook/vue3-vite": "9.1.16",
 		"@tabler/icons-webfont": "3.35.0",
 		"@testing-library/vue": "8.1.0",
 		"@types/canvas-confetti": "1.9.0",
@@ -120,14 +119,14 @@
 		"@types/ws": "8.18.1",
 		"@typescript-eslint/eslint-plugin": "8.47.0",
 		"@typescript-eslint/parser": "8.47.0",
-		"@vitest/coverage-v8": "4.0.13",
+		"@vitest/coverage-v8": "3.2.4",
 		"@vue/compiler-core": "3.5.24",
 		"@vue/runtime-core": "3.5.24",
 		"acorn": "8.15.0",
 		"cross-env": "10.1.0",
-		"cypress": "15.7.0",
+		"cypress": "15.6.0",
 		"eslint-plugin-import": "2.32.0",
-		"eslint-plugin-vue": "10.6.0",
+		"eslint-plugin-vue": "10.5.1",
 		"fast-glob": "3.3.3",
 		"happy-dom": "20.0.10",
 		"intersection-observer": "0.12.2",
@@ -140,16 +139,16 @@
 		"react": "19.2.0",
 		"react-dom": "19.2.0",
 		"seedrandom": "3.0.5",
-		"start-server-and-test": "2.1.3",
-		"storybook": "10.0.8",
+		"start-server-and-test": "2.1.2",
+		"storybook": "9.1.16",
 		"storybook-addon-misskey-theme": "github:misskey-dev/storybook-addon-misskey-theme",
 		"tsx": "4.20.6",
 		"vite-plugin-glsl": "1.5.4",
 		"vite-plugin-turbosnap": "1.0.3",
-		"vitest": "4.0.13",
+		"vitest": "3.2.4",
 		"vitest-fetch-mock": "0.4.5",
-		"vue-component-type-helpers": "3.1.5",
+		"vue-component-type-helpers": "3.1.4",
 		"vue-eslint-parser": "10.2.0",
-		"vue-tsc": "3.1.5"
+		"vue-tsc": "3.1.4"
 	}
 }

packages/frontend/src/components/global/I18n.vue

@@ -9,7 +9,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script setup lang="ts" generic="T extends string | ParameterizedString">
 import { computed, h } from 'vue';
-import type { ParameterizedString } from 'i18n';
+import type { ParameterizedString } from '../../../../../locales/index.js';
 
 const props = withDefaults(defineProps<{
 	src: T;
@@ -25,7 +25,7 @@ const slots = defineSlots<T extends ParameterizedString<infer R> ? { [K in R]: (
 const parsed = computed(() => {
 	let str = props.src as string;
 	const value: (string | { arg: string; })[] = [];
-	for (; ;) {
+	for (;;) {
 		const nextBracketOpen = str.indexOf('{');
 		const nextBracketClose = str.indexOf('}');
 

packages/frontend/src/i18n.ts

@@ -6,7 +6,7 @@
 import { markRaw } from 'vue';
 import { I18n } from '@@/js/i18n.js';
 import { locale } from '@@/js/locale.js';
-import type { Locale } from 'i18n';
+import type { Locale } from '../../../locales/index.js';
 
 export const i18n = markRaw(new I18n<Locale>(locale, _DEV_));
 

packages/frontend/test/aiscript/api.test.ts

@@ -8,6 +8,7 @@ import { aiScriptReadline, createAiScriptEnv } from '@/aiscript/api.js';
 import { errors, Interpreter, Parser, values } from '@syuilo/aiscript';
 import {
 	afterAll,
+	afterEach,
 	beforeAll,
 	beforeEach,
 	describe,
@@ -79,9 +80,8 @@ describe('AiScript common API', () => {
 	});
 
 	describe('readline', () => {
-		beforeEach(() => {
+		afterEach(() => {
 			vi.restoreAllMocks();
-			vi.clearAllMocks();
 		});
 
 		test.sequential('ok', async () => {
@@ -176,9 +176,8 @@ describe('AiScript common API', () => {
 	});
 
 	describe('dialog', () => {
-		beforeEach(() => {
+		afterEach(() => {
 			vi.restoreAllMocks();
-			vi.clearAllMocks();
 		});
 
 		test.sequential('ok', async () => {
@@ -216,9 +215,8 @@ describe('AiScript common API', () => {
 	});
 
 	describe('confirm', () => {
-		beforeEach(() => {
+		afterEach(() => {
 			vi.restoreAllMocks();
-			vi.clearAllMocks();
 		});
 
 		test.sequential('ok', async () => {
@@ -274,9 +272,8 @@ describe('AiScript common API', () => {
 	});
 
 	describe('api', () => {
-		beforeEach(() => {
+		afterEach(() => {
 			vi.restoreAllMocks();
-			vi.clearAllMocks();
 		});
 
 		test.sequential('successful', async () => {
@@ -350,7 +347,7 @@ describe('AiScript common API', () => {
 			miLocalStorage.removeItem('aiscript:widget:key');
 		});
 
-		beforeEach(() => {
+		afterEach(() => {
 			miLocalStorage.removeItem('aiscript:widget:key');
 		});
 

packages/frontend/test/i18n.test.ts

@@ -5,7 +5,7 @@
 
 import { describe, expect, it } from 'vitest';
 import { I18n } from '../../frontend-shared/js/i18n.js'; // @@で参照できなかったので
-import type { ParameterizedString } from 'i18n';
+import type { ParameterizedString } from '../../../locales/index.js';
 
 // TODO: このテストはfrontend-sharedに移動する
 

packages/frontend/test/init.ts

@@ -7,13 +7,13 @@ import { vi } from 'vitest';
 import createFetchMock from 'vitest-fetch-mock';
 import type { Ref } from 'vue';
 import { ref } from 'vue';
-// Set i18n
-import locales from 'i18n';
-import { updateI18n } from '@/i18n.js';
 
 const fetchMocker = createFetchMock(vi);
 fetchMocker.enableMocks();
 
+// Set i18n
+import locales from '../../../locales/index.js';
+import { updateI18n } from '@/i18n.js';
 updateI18n(locales['en-US']);
 
 // XXX: misskey-js panics if WebSocket is not defined

packages/frontend/vite.config.ts

@@ -2,18 +2,18 @@ import path from 'path';
 import pluginReplace from '@rollup/plugin-replace';
 import pluginVue from '@vitejs/plugin-vue';
 import pluginGlsl from 'vite-plugin-glsl';
-import type { UserConfig } from 'vite';
 import { defineConfig } from 'vite';
+import type { UserConfig } from 'vite';
 import * as yaml from 'js-yaml';
 import { promises as fsp } from 'fs';
 
-import locales from 'i18n';
+import locales from '../../locales/index.js';
 import meta from '../../package.json';
 import packageInfo from './package.json' with { type: 'json' };
 import pluginUnwindCssModuleClassName from './lib/rollup-plugin-unwind-css-module-class-name.js';
 import pluginJson5 from './vite.json5.js';
-import type { Options as SearchIndexOptions } from './lib/vite-plugin-create-search-index.js';
 import pluginCreateSearchIndex from './lib/vite-plugin-create-search-index.js';
+import type { Options as SearchIndexOptions } from './lib/vite-plugin-create-search-index.js';
 import pluginWatchLocales from './lib/vite-plugin-watch-locales.js';
 import { pluginRemoveUnrefI18n } from '../frontend-builder/rollup-plugin-remove-unref-i18n.js';
 

packages/i18n/README.md

@@ -1,5 +0,0 @@
-# Misskey i18n
-
-Misskey の言語ファイル本体 (ja-JP.yml など) はリポジトリ直下の `/locales` に置かれており、そこから Crowdin 連携やビルド資産が生成されます。
-
-このパッケージは Misskey モノレポ内で、これらの言語ファイルを共通で扱うためのヘルパー群や型情報をまとめる位置づけです。バックエンド / フロントエンド / Service Worker など各パッケージが同じ翻訳データと型定義を利用できるようにすることを目的としており、npm での外部配布は想定していません。

packages/i18n/build.ts

@@ -1,163 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import fs from 'node:fs';
-import { fileURLToPath } from 'node:url';
-import { dirname, resolve } from 'node:path';
-import { watch as chokidarWatch } from 'chokidar';
-import * as esbuild from 'esbuild';
-import { build } from 'esbuild';
-import { execa } from 'execa';
-import { globSync } from 'glob';
-import { generateLocaleInterface } from './scripts/generateLocaleInterface.js';
-import type { BuildOptions, BuildResult, Plugin, PluginBuild } from 'esbuild';
-
-const _filename = fileURLToPath(import.meta.url);
-const _dirname = dirname(_filename);
-const _package = JSON.parse(fs.readFileSync(_dirname + '/package.json', 'utf-8'));
-const _rootPackageDir = resolve(_dirname, '../../');
-const _rootPackage = JSON.parse(fs.readFileSync(resolve(_rootPackageDir, 'package.json'), 'utf-8'));
-const _frontendLocalesDir = resolve(_dirname, '../../built/_frontend_dist_/locales');
-const _localesDir = resolve(_rootPackageDir, 'locales');
-
-const entryPoints = globSync('./src/**/**.{ts,tsx}');
-
-const options: BuildOptions = {
-	entryPoints,
-	minify: process.env.NODE_ENV === 'production',
-	sourceRoot: 'src',
-	outdir: './built',
-	target: 'es2022',
-	platform: 'node',
-	format: 'esm',
-	sourcemap: 'linked',
-};
-
-// コマンドライン引数を取得
-const args = process.argv.slice(2).map(arg => arg.toLowerCase());
-
-// built配下をすべて削除する
-if (!args.includes('--no-clean')) {
-	fs.rmSync('./built', { recursive: true, force: true });
-}
-
-if (args.includes('--watch')) {
-	await watchSrc();
-} else {
-	await buildSrc();
-}
-
-function copyLocales(): void {
-	const srcDir = _localesDir;
-	const destDir = resolve(_dirname, 'built/locales');
-
-	fs.mkdirSync(destDir, { recursive: true });
-
-	const files = fs.readdirSync(srcDir).filter(f => f.endsWith('.yml'));
-	for (const file of files) {
-		fs.copyFileSync(resolve(srcDir, file), resolve(destDir, file));
-	}
-	console.log(`[${_package.name}] locales copied (${files.length} files).`);
-}
-
-/**
- * フロントエンド用の locale JSON を書き出す
- * Service Worker が HTTP 経由で取得するために必要
- */
-async function writeFrontendLocalesJson(): Promise<void> {
-	// 動的 import でビルド済みモジュールから読み込み（循環参照回避）
-	const { writeFrontendLocalesJson: write } = await import('./built/index.js');
-	await write(_frontendLocalesDir, _rootPackage.version);
-	console.log(`[${_package.name}] frontend locales JSON written to ${_frontendLocalesDir}`);
-}
-
-async function buildSrc(): Promise<void> {
-	console.log(`[${_package.name}] start building...`);
-
-	await generateLocaleInterface(_localesDir);
-
-	await build(options)
-		.then(() => {
-			console.log(`[${_package.name}] build succeeded.`);
-		})
-		.catch((err) => {
-			process.stderr.write(err.stderr);
-			process.exit(1);
-		});
-
-	copyLocales();
-	await writeFrontendLocalesJson();
-
-	if (process.env.NODE_ENV === 'production') {
-		console.log(`[${_package.name}] skip building d.ts because NODE_ENV is production.`);
-	} else {
-		await buildDts();
-	}
-
-	console.log(`[${_package.name}] finish building.`);
-}
-
-function buildDts(): Promise<unknown> {
-	return execa(
-		'tsc',
-		[
-			'--project', 'tsconfig.json',
-			'--rootDir', 'src',
-			'--outDir', 'built',
-			'--declaration', 'true',
-			'--emitDeclarationOnly', 'true',
-		],
-		{
-			stdout: process.stdout,
-			stderr: process.stderr,
-		},
-	);
-}
-
-async function watchSrc(): Promise<void> {
-	const localesWatcher = chokidarWatch(_localesDir, {
-		ignoreInitial: true,
-	});
-	localesWatcher.on('all', async (event, path) => {
-		if (!path.endsWith('.yml')) return;
-		console.log(`[${_package.name}] locales changed: ${event} ${path}`);
-		copyLocales();
-		await writeFrontendLocalesJson();
-		await generateLocaleInterface(_localesDir);
-	});
-
-	const plugins: Plugin[] = [{
-		name: 'gen-dts',
-		setup(build: PluginBuild) {
-			build.onStart(() => {
-				console.log(`[${_package.name}] detect changed...`);
-			});
-			build.onEnd(async (result: BuildResult) => {
-				if (result.errors.length > 0) {
-					console.error(`[${_package.name}] watch build failed:`, result);
-					return;
-				}
-				await buildDts();
-			});
-		},
-	}];
-
-	console.log(`[${_package.name}] start watching...`);
-
-	const context = await esbuild.context({ ...options, plugins });
-	await context.watch();
-
-	await new Promise((resolve, reject) => {
-		process.on('SIGHUP', resolve);
-		process.on('SIGINT', resolve);
-		process.on('SIGTERM', resolve);
-		process.on('uncaughtException', reject);
-		process.on('exit', resolve);
-	}).finally(async () => {
-		await context.dispose();
-		await localesWatcher.close();
-		console.log(`[${_package.name}] finish watching.`);
-	});
-}

packages/i18n/eslint.config.js

@@ -1,35 +0,0 @@
-import tsParser from '@typescript-eslint/parser';
-import sharedConfig from '../shared/eslint.config.js';
-
-// eslint-disable-next-line import/no-default-export
-export default [
-	...sharedConfig,
-	{
-		ignores: [
-			'**/node_modules',
-			'built',
-			'coverage',
-			'vitest.config.ts',
-			'test',
-			'test-d',
-			'generator',
-		],
-	},
-	{
-		files: ['**/*.ts', '**/*.tsx'],
-		languageOptions: {
-			parserOptions: {
-				parser: tsParser,
-				project: ['./tsconfig.eslint.json'],
-				sourceType: 'module',
-				tsconfigRootDir: import.meta.dirname,
-			},
-		},
-	},
-	{
-		files: ['src/autogen/**/*.ts', 'src/autogen/**/*.tsx'],
-		rules: {
-			'@stylistic/indent': 'off',
-		},
-	},
-];

packages/i18n/package.json

@@ -1,42 +0,0 @@
-{
-	"name": "i18n",
-	"type": "module",
-	"private": true,
-	"main": "./built/index.js",
-	"types": "./built/index.d.ts",
-	"exports": {
-		".": {
-			"types": "./built/index.d.ts",
-			"import": "./built/index.js"
-		}
-	},
-	"scripts": {
-		"generate": "tsx scripts/generateLocaleInterface.ts",
-		"verify": "tsx scripts/verify.ts",
-		"build": "tsx ./build.ts",
-		"watch": "nodemon -w package.json -e json --exec \"tsx ./build.ts --watch\"",
-		"tsd": "tsd",
-		"typecheck": "tsc --noEmit",
-		"lint": "pnpm typecheck && pnpm eslint",
-		"lint:fix": "pnpm eslint --fix"
-	},
-	"files": [
-		"built"
-	],
-	"devDependencies": {
-		"@types/js-yaml": "4.0.9",
-		"@types/node": "24.10.1",
-		"@typescript-eslint/eslint-plugin": "8.47.0",
-		"@typescript-eslint/parser": "8.47.0",
-		"chokidar": "4.0.3",
-		"esbuild": "0.27.0",
-		"execa": "9.6.0",
-		"glob": "11.1.0",
-		"nodemon": "3.1.11",
-		"tsx": "4.20.6",
-		"typescript": "5.9.3"
-	},
-	"dependencies": {
-		"js-yaml": "4.1.1"
-	}
-}

packages/i18n/scripts/generateLocaleInterface.ts

@@ -1,153 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-import * as fs from 'node:fs';
-import { fileURLToPath } from 'node:url';
-import { dirname, resolve } from 'node:path';
-import * as yaml from 'js-yaml';
-import ts from 'typescript';
-
-const __filename = fileURLToPath(import.meta.url);
-const __dirname = dirname(__filename);
-const parameterRegExp = /\{(\w+)\}/g;
-
-interface LocaleRecord {
-	[key: string]: string | LocaleRecord;
-}
-
-function createMemberType(item: string | LocaleRecord): ts.TypeNode {
-	if (typeof item !== 'string') {
-		return ts.factory.createTypeLiteralNode(createMembers(item));
-	}
-	const parameters = Array.from(
-		item.matchAll(parameterRegExp),
-		([, parameter]) => parameter,
-	);
-	return parameters.length
-		? ts.factory.createTypeReferenceNode(
-			ts.factory.createIdentifier('ParameterizedString'),
-			[
-				ts.factory.createUnionTypeNode(
-					parameters.map((parameter) =>
-						ts.factory.createLiteralTypeNode(ts.factory.createStringLiteral(parameter)),
-					),
-				),
-			],
-		)
-		: ts.factory.createKeywordTypeNode(ts.SyntaxKind.StringKeyword);
-}
-
-function createMembers(record: LocaleRecord): ts.TypeElement[] {
-	return Object.entries(record).map(([k, v]) => {
-		const node = ts.factory.createPropertySignature(
-			undefined,
-			ts.factory.createStringLiteral(k),
-			undefined,
-			createMemberType(v),
-		);
-		if (typeof v === 'string') {
-			ts.addSyntheticLeadingComment(
-				node,
-				ts.SyntaxKind.MultiLineCommentTrivia,
-				`*
- * ${v.replace(/\n/g, '\n * ')}
- `,
-				true,
-			);
-		}
-		return node;
-	});
-}
-
-export async function generateLocaleInterface(localesDir: string): Promise<void> {
-	const locale = yaml.load(fs.readFileSync(`${localesDir}/ja-JP.yml`, 'utf-8').toString()) as LocaleRecord;
-	const members = createMembers(locale);
-
-	const elements: ts.Statement[] = [
-		ts.factory.createImportDeclaration(
-			undefined,
-			ts.factory.createImportClause(
-				false,
-				undefined,
-				ts.factory.createNamedImports([
-					ts.factory.createImportSpecifier(
-						true,
-						undefined,
-						ts.factory.createIdentifier('ILocale'),
-					),
-					ts.factory.createImportSpecifier(
-						true,
-						undefined,
-						ts.factory.createIdentifier('ParameterizedString'),
-					),
-				]),
-			),
-			ts.factory.createStringLiteral('../types.js'),
-			undefined,
-		),
-		ts.factory.createInterfaceDeclaration(
-			[ts.factory.createToken(ts.SyntaxKind.ExportKeyword)],
-			ts.factory.createIdentifier('Locale'),
-			undefined,
-			[
-				ts.factory.createHeritageClause(ts.SyntaxKind.ExtendsKeyword, [
-					ts.factory.createExpressionWithTypeArguments(
-						ts.factory.createIdentifier('ILocale'),
-						undefined,
-					),
-				]),
-			],
-			members,
-		),
-	];
-
-	ts.addSyntheticLeadingComment(
-		elements[0],
-		ts.SyntaxKind.MultiLineCommentTrivia,
-		' eslint-disable ',
-		true,
-	);
-	ts.addSyntheticLeadingComment(
-		elements[0],
-		ts.SyntaxKind.SingleLineCommentTrivia,
-		' This file is generated by scripts/generateLocaleInterface.ts',
-		true,
-	);
-	ts.addSyntheticLeadingComment(
-		elements[0],
-		ts.SyntaxKind.SingleLineCommentTrivia,
-		' Do not edit this file directly.',
-		true,
-	);
-
-	const printed = ts
-		.createPrinter({
-			newLine: ts.NewLineKind.LineFeed,
-		})
-		.printList(
-			ts.ListFormat.MultiLine,
-			ts.factory.createNodeArray(elements),
-			ts.createSourceFile(
-				'locale.ts',
-				'',
-				ts.ScriptTarget.ESNext,
-				true,
-				ts.ScriptKind.TS,
-			),
-		);
-
-	const autogenDir = `${__dirname}/../src/autogen`;
-	fs.mkdirSync(autogenDir, { recursive: true });
-
-	// 一瞬ファイルが存在しなくなって途切れる→不安定になるらしいので、リネームで対処
-	fs.writeFileSync(`${autogenDir}/_locale.ts`, printed, 'utf-8');
-	fs.renameSync(`${autogenDir}/_locale.ts`, `${autogenDir}/locale.ts`);
-}
-
-// スクリプトとして直接実行された場合
-const isMain = import.meta.url === `file://${process.argv[1]}`;
-if (isMain) {
-	await generateLocaleInterface(resolve(__dirname, '../../../locales'));
-}

packages/i18n/scripts/verify.ts

@@ -1,70 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-let valid = true;
-
-interface LocaleRecord {
-	[key: string]: string | LocaleRecord;
-}
-
-interface ErrorData {
-	expected?: string;
-	actual?: string;
-	parameter?: string;
-}
-
-function writeError(type: string, lang: string, tree: string, data: ErrorData): void {
-	process.stderr.write(JSON.stringify({ type, lang, tree, data }));
-	process.stderr.write('\n');
-	valid = false;
-}
-
-function verify(expected: LocaleRecord, actual: LocaleRecord, lang: string, trace?: string): void {
-	for (const key in expected) {
-		if (!Object.prototype.hasOwnProperty.call(actual, key)) {
-			continue;
-		}
-		if (typeof expected[key] === 'object') {
-			if (typeof actual[key] !== 'object') {
-				writeError('mismatched_type', lang, trace ? `${trace}.${key}` : key, { expected: 'object', actual: typeof actual[key] });
-				continue;
-			}
-			verify(expected[key] as LocaleRecord, actual[key] as LocaleRecord, lang, trace ? `${trace}.${key}` : key);
-		} else if (typeof expected[key] === 'string') {
-			switch (typeof actual[key]) {
-				case 'object':
-					writeError('mismatched_type', lang, trace ? `${trace}.${key}` : key, { expected: 'string', actual: 'object' });
-					break;
-				case 'undefined':
-					continue;
-				case 'string': {
-					const expectedParameters = new Set((expected[key] as string).match(/\{[^}]+\}/g)?.map((s) => s.slice(1, -1)));
-					const actualParameters = new Set((actual[key] as string).match(/\{[^}]+\}/g)?.map((s) => s.slice(1, -1)));
-					for (const parameter of expectedParameters) {
-						if (!actualParameters.has(parameter)) {
-							writeError('missing_parameter', lang, trace ? `${trace}.${key}` : key, { parameter });
-						}
-					}
-				}
-			}
-		}
-	}
-}
-
-// index.tsはtsのまま動かすことを想定していない（ビルド成果物を外部に公開する）.
-// よってビルド後のものを検証する
-const locales = await import('../built/index.js');
-const { 'ja-JP': original, ...verifiees } = locales as unknown as Record<string, LocaleRecord>;
-
-for (const lang in verifiees) {
-	if (!Object.prototype.hasOwnProperty.call(locales, lang)) {
-		continue;
-	}
-	verify(original, verifiees[lang], lang);
-}
-
-if (!valid) {
-	process.exit(1);
-}

packages/i18n/src/index.ts

@@ -1,166 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-/**
- * Languages Loader
- */
-
-import * as fs from 'node:fs';
-import * as yaml from 'js-yaml';
-import type { Locale } from './autogen/locale.js';
-import type { ILocale, ParameterizedString } from './types.js';
-
-const languages = [
-	'ar-SA',
-	'ca-ES',
-	'cs-CZ',
-	'da-DK',
-	'de-DE',
-	'en-US',
-	'es-ES',
-	'fr-FR',
-	'id-ID',
-	'it-IT',
-	'ja-JP',
-	'ja-KS',
-	'kab-KAB',
-	'kn-IN',
-	'ko-KR',
-	'nl-NL',
-	'no-NO',
-	'pl-PL',
-	'pt-PT',
-	'ru-RU',
-	'sk-SK',
-	'th-TH',
-	'tr-TR',
-	'ug-CN',
-	'uk-UA',
-	'vi-VN',
-	'zh-CN',
-	'zh-TW',
-] as const;
-
-type Language = typeof languages[number];
-
-const primaries = {
-	'en': 'US',
-	'ja': 'JP',
-	'zh': 'CN',
-} as const satisfies Record<string, string>;
-
-type PrimaryLang = keyof typeof primaries;
-
-type Locales = Record<Language, ILocale>;
-
-/**
- * オブジェクトを再帰的にマージする
- */
-function merge<T extends ILocale>(...args: (T | ILocale | undefined)[]): T {
-	return args.reduce<ILocale>((a, c) => ({
-		...a,
-		...c,
-		...Object.entries(a)
-			.filter(([k]) => c && typeof c[k] === 'object')
-			.reduce<Record<string, ILocale[string]>>((acc, [k, v]) => {
-				acc[k] = merge(v as ILocale, (c as ILocale)[k] as ILocale);
-				return acc;
-			}, {}),
-	}), {} as ILocale) as T;
-}
-
-/**
- * 何故か文字列にバックスペース文字が混入することがあり、YAMLが壊れるので取り除く
- */
-function clean (text: string) {
-	return text.replace(new RegExp(String.fromCodePoint(0x08), 'g'), '');
-}
-
-/**
- * 空文字列が入ることがあり、フォールバックが動作しなくなるのでプロパティごと消す
- */
-function removeEmpty<T extends ILocale>(obj: T): T {
-	for (const [k, v] of Object.entries(obj)) {
-		if (v === '') {
-			delete obj[k];
-		} else if (typeof v === 'object') {
-			removeEmpty(v as ILocale);
-		}
-	}
-	return obj;
-}
-
-function build(): Record<Language, Locale> {
-	// vitestの挙動を調整するため、一度ローカル変数化する必要がある
-	// https://github.com/vitest-dev/vitest/issues/3988#issuecomment-1686599577
-	// https://github.com/misskey-dev/misskey/pull/14057#issuecomment-2192833785
-	const metaUrl = import.meta.url;
-	const locales = languages.reduce<Locales>((a, lang) => {
-		a[lang] = (yaml.load(clean(fs.readFileSync(new URL(`./locales/${lang}.yml`, metaUrl), 'utf-8'))) ?? {}) as ILocale;
-		return a;
-	}, {} as Locales);
-
-	removeEmpty(locales);
-
-	return Object.entries(locales).reduce<Record<Language, Locale>>((a, [k, v]) => {
-		const lang = k.split('-')[0];
-		const key = k as Language;
-
-		switch (key) {
-			case 'ja-JP':
-				a[key] = v as Locale;
-				break;
-			case 'ja-KS':
-			case 'en-US':
-				a[key] = merge<Locale>(locales['ja-JP'] as Locale, v);
-				break;
-			default: {
-				const primaryLang = lang as PrimaryLang;
-				const primaryKey = (lang in primaries ? `${lang}-${primaries[primaryLang]}` : undefined) as Language | undefined;
-				a[key] = merge<Locale>(
-					locales['ja-JP'] as Locale,
-					locales['en-US'],
-					primaryKey ? locales[primaryKey] : {},
-					v,
-				);
-				break;
-			}
-		}
-
-		return a;
-	}, {} as Record<Language, Locale>);
-}
-
-const locales = build() as {
-	[lang: string]: Locale;
-};
-
-/**
- * フロントエンド用の locale JSON を書き出す
- * Service Worker が HTTP 経由で取得するために必要
- * @param destDir 出力先ディレクトリ（例: built/_frontend_dist_/locales）
- * @param version バージョン文字列（ファイル名とJSON内に埋め込まれる）
- */
-async function writeFrontendLocalesJson(destDir: string, version: string): Promise<void> {
-	const { mkdir, writeFile } = await import('node:fs/promises');
-	const { resolve } = await import('node:path');
-
-	await mkdir(destDir, { recursive: true });
-
-	const builtLocales = build();
-	const v = { '_version_': version };
-
-	for (const [lang, locale] of Object.entries(builtLocales)) {
-		await writeFile(
-			resolve(destDir, `${lang}.${version}.json`),
-			JSON.stringify({ ...locale, ...v }),
-			'utf-8',
-		);
-	}
-}
-
-export { locales, build, writeFrontendLocalesJson };
-export type { Language, Locale, ILocale, ParameterizedString };
-export default locales;

packages/i18n/src/types.ts

@@ -1,14 +0,0 @@
-/*
- * SPDX-FileCopyrightText: syuilo and misskey-project
- * SPDX-License-Identifier: AGPL-3.0-only
- */
-
-declare const kParameters: unique symbol;
-
-export type ParameterizedString<T extends string = string> = string & {
-	[kParameters]: T;
-};
-
-export interface ILocale {
-	[_: string]: string | ParameterizedString | ILocale;
-}

packages/i18n/tsconfig.eslint.json

@@ -1,8 +0,0 @@
-{
-    "extends": "./tsconfig.json",
-    "include": [
-        "src/**/*.ts",
-        "scripts/**/*.ts",
-        "build.ts"
-    ]
-}

packages/i18n/tsconfig.json

@@ -1,14 +0,0 @@
-{
-	"compilerOptions": {
-		"target": "ESNext",
-		"module": "NodeNext",
-		"moduleResolution": "NodeNext",
-		"esModuleInterop": true,
-		"forceConsistentCasingInFileNames": true,
-		"strict": true,
-		"skipLibCheck": true
-	},
-	"include": [
-		"src/**/*.ts"
-	]
-}

packages/misskey-js/package.json

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

packages/sw/build.js

@@ -7,9 +7,8 @@
 
 import { fileURLToPath } from 'node:url';
 import * as esbuild from 'esbuild';
-import locales from 'i18n';
+import locales from '../../locales/index.js';
 import meta from '../../package.json' with { type: 'json' };
-
 const watch = process.argv[2]?.includes('watch');
 
 const __dirname = fileURLToPath(new URL('.', import.meta.url));

packages/sw/package.json

@@ -9,7 +9,6 @@
 		"lint": "pnpm typecheck && pnpm eslint"
 	},
 	"dependencies": {
-		"i18n": "workspace:*",
 		"esbuild": "0.27.0",
 		"idb-keyval": "6.2.2",
 		"misskey-js": "workspace:*"

packages/sw/src/scripts/lang.ts

@@ -8,7 +8,7 @@
  */
 import { get, set } from 'idb-keyval';
 import { I18n } from '@@/js/i18n.js';
-import type { Locale } from 'i18n';
+import type { Locale } from '../../../../locales/index.js';
 
 class SwLang {
 	public cacheName = `mk-cache-${_VERSION_}`;

packages/sw/src/sw.ts

@@ -7,7 +7,7 @@ import { get } from 'idb-keyval';
 import * as Misskey from 'misskey-js';
 import type { PushNotificationDataMap } from '@/types.js';
 import type { I18n } from '@@/js/i18n.js';
-import type { Locale } from 'i18n';
+import type { Locale } from '../../../locales/index.js';
 import { createEmptyNotification, createNotification } from '@/scripts/create-notification.js';
 import { swLang } from '@/scripts/lang.js';
 import * as swos from '@/scripts/operations.js';