From d004c928d59aba4b3fa4b59535a9274ae377f039 Mon Sep 17 00:00:00 2001
From: zyoshoka <107108195+zyoshoka@users.noreply.github.com>
Date: Sun, 4 May 2025 16:26:23 +0900
Subject: [PATCH] fix

---
 packages/backend/eslint.config.js            |  6 ++++--
 packages/backend/{jest.mjs => jest.js}       |  3 ++-
 packages/backend/package.json                | 12 ++++++------
 packages/backend/test-federation/compose.yml |  4 ++++
 4 files changed, 16 insertions(+), 9 deletions(-)
 rename packages/backend/{jest.mjs => jest.js} (93%)

diff --git a/packages/backend/eslint.config.js b/packages/backend/eslint.config.js
index db42cf88d1..d15a703ba2 100644
--- a/packages/backend/eslint.config.js
+++ b/packages/backend/eslint.config.js
@@ -8,8 +8,10 @@ export default [
 		ignores: ['**/node_modules', 'built', '@types/**/*', 'migration'],
 	},
 	{
-		globals: {
-			...globals.node,
+		languageOptions: {
+			globals: {
+				...globals.node,
+			},
 		},
 	},
 	{
diff --git a/packages/backend/jest.mjs b/packages/backend/jest.js
similarity index 93%
rename from packages/backend/jest.mjs
rename to packages/backend/jest.js
index 6feec5da5f..4f5bbd2608 100644
--- a/packages/backend/jest.mjs
+++ b/packages/backend/jest.js
@@ -10,6 +10,7 @@ args.push(...[
 	'--experimental-vm-modules',
 	'--experimental-import-meta-resolve',
 	path.join(import.meta.dirname, 'node_modules/jest/bin/jest.js'),
-])
+	...process.argv.slice(2),
+]);
 
 child_process.spawn(process.execPath, args, { stdio: 'inherit' });
diff --git a/packages/backend/package.json b/packages/backend/package.json
index b3da258894..71f301d430 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -22,12 +22,12 @@
 		"typecheck": "tsc --noEmit && tsc -p test --noEmit && tsc -p test-federation --noEmit",
 		"eslint": "eslint --quiet \"{src,test-federation}/**/*.ts\"",
 		"lint": "pnpm typecheck && pnpm eslint",
-		"jest": "cross-env NODE_ENV=test node ./jest.mjs --forceExit --config jest.config.unit.cjs",
-		"jest:e2e": "cross-env NODE_ENV=test node ./jest.mjs --forceExit --config jest.config.e2e.cjs",
-		"jest:fed": "node ./jest.mjs --forceExit --config jest.config.fed.cjs",
-		"jest-and-coverage": "cross-env NODE_ENV=test node ./jest.mjs --coverage --forceExit --config jest.config.unit.cjs",
-		"jest-and-coverage:e2e": "cross-env NODE_ENV=test node ./jest.mjs --coverage --forceExit --config jest.config.e2e.cjs",
-		"jest-clear": "cross-env NODE_ENV=test node ./jest.mjs --clearCache",
+		"jest": "cross-env NODE_ENV=test node ./jest.js --forceExit --config jest.config.unit.cjs",
+		"jest:e2e": "cross-env NODE_ENV=test node ./jest.js --forceExit --config jest.config.e2e.cjs",
+		"jest:fed": "node ./jest.js --forceExit --config jest.config.fed.cjs",
+		"jest-and-coverage": "cross-env NODE_ENV=test node ./jest.js --coverage --forceExit --config jest.config.unit.cjs",
+		"jest-and-coverage:e2e": "cross-env NODE_ENV=test node ./jest.js --coverage --forceExit --config jest.config.e2e.cjs",
+		"jest-clear": "cross-env NODE_ENV=test node ./jest.js --clearCache",
 		"test": "pnpm jest",
 		"test:e2e": "pnpm build && pnpm build:test && pnpm jest:e2e",
 		"test:fed": "pnpm jest:fed",
diff --git a/packages/backend/test-federation/compose.yml b/packages/backend/test-federation/compose.yml
index 6c010e0089..bd0ac15a31 100644
--- a/packages/backend/test-federation/compose.yml
+++ b/packages/backend/test-federation/compose.yml
@@ -50,6 +50,10 @@ services:
         source: ../jest.config.fed.cjs
         target: /misskey/packages/backend/jest.config.fed.cjs
         read_only: true
+      - type: bind
+        source: ../jest.js
+        target: /misskey/packages/backend/jest.js
+        read_only: true
       - type: bind
         source: ../../misskey-js/built
         target: /misskey/packages/misskey-js/built