diff --git a/package.json b/package.json index 7c0d229fad..a7bc356929 100644 --- a/package.json +++ b/package.json @@ -22,31 +22,32 @@ ], "private": true, "scripts": { - "build-pre": "node ./scripts/build-pre.js", + "compile-config": "node ./scripts/compile_config.js", + "build-pre": "pnpm compile-config && node ./scripts/build-pre.js", "build-assets": "node ./scripts/build-assets.mjs", "build": "pnpm build-pre && pnpm -r build && pnpm build-assets", "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 && pnpm start", + "start": "pnpm compile-config && pnpm check:connect && cd packages/backend && pnpm start", "start:inspect": "cd packages/backend && pnpm start:inspect", - "start:test": "ncp ./.github/misskey/test.yml ./.config/test.yml && cd packages/backend && pnpm start:test", + "start:test": "ncp ./.github/misskey/test.yml ./.config/test.yml && cross-env NODE_ENV=test pnpm compile-config && cd packages/backend && pnpm start:test", "cli": "cd packages/backend && pnpm cli", "init": "pnpm migrate", - "migrate": "cd packages/backend && pnpm migrate", - "revert": "cd packages/backend && pnpm revert", - "check:connect": "cd packages/backend && pnpm check:connect", + "migrate": "pnpm compile-config && cd packages/backend && pnpm migrate", + "revert": "pnpm compile-config && cd packages/backend && pnpm revert", + "check:connect": "pnpm compile-config && cd packages/backend && pnpm check:connect", "migrateandstart": "pnpm migrate && pnpm start", "watch": "pnpm dev", "dev": "node scripts/dev.mjs", "lint": "pnpm -r lint", "cy:open": "pnpm cypress open --config-file=cypress.config.ts", "cy:run": "pnpm cypress run", - "e2e": "pnpm start-server-and-test start:test http://localhost:61812 cy:run", - "e2e-dev-container": "ncp ./.config/cypress-devcontainer.yml ./.config/test.yml && pnpm start-server-and-test start:test http://localhost:61812 cy:run", - "jest": "cd packages/backend && pnpm jest", - "jest-and-coverage": "cd packages/backend && pnpm jest-and-coverage", - "test": "pnpm -r test", - "test-and-coverage": "pnpm -r test-and-coverage", + "e2e": "cross-env NODE_ENV=test pnpm compile-config && pnpm start-server-and-test start:test http://localhost:61812 cy:run", + "e2e-dev-container": "ncp ./.config/cypress-devcontainer.yml ./.config/test.yml && cross-env NODE_ENV=test pnpm compile-config && pnpm start-server-and-test start:test http://localhost:61812 cy:run", + "jest": "cross-env NODE_ENV=test pnpm compile-config && cd packages/backend && pnpm jest", + "jest-and-coverage": "cross-env NODE_ENV=test pnpm compile-config && cd packages/backend && pnpm jest-and-coverage", + "test": "cross-env NODE_ENV=test pnpm compile-config && pnpm -r test", + "test-and-coverage": "cross-env NODE_ENV=test pnpm compile-config && pnpm -r test-and-coverage", "clean": "node ./scripts/clean.js", "clean-all": "node ./scripts/clean-all.js", "cleanall": "pnpm clean-all" diff --git a/packages/backend/package.json b/packages/backend/package.json index 8d537259f7..013f564594 100644 --- a/packages/backend/package.json +++ b/packages/backend/package.json @@ -7,14 +7,13 @@ "node": "^22.15.0 || ^24.10.0" }, "scripts": { - "compile-config": "node ./scripts/compile_config.js", - "start": "pnpm compile-config && node ./built/boot/entry.js", - "start:inspect": "pnpm compile-config && node --inspect ./built/boot/entry.js", - "start:test": "cross-env NODE_ENV=test pnpm compile-config && cross-env NODE_ENV=test node ./built/boot/entry.js", - "migrate": "pnpm compile-config && pnpm typeorm migration:run -d ormconfig.js", - "revert": "pnpm compile-config && pnpm typeorm migration:revert -d ormconfig.js", - "cli": "pnpm compile-config && node ./built/boot/cli.js", - "check:connect": "pnpm compile-config && node ./scripts/check_connect.js", + "start": "node ./built/boot/entry.js", + "start:inspect": "node --inspect ./built/boot/entry.js", + "start:test": "cross-env NODE_ENV=test node ./built/boot/entry.js", + "migrate": "pnpm typeorm migration:run -d ormconfig.js", + "revert": "pnpm typeorm migration:revert -d ormconfig.js", + "cli": "node ./built/boot/cli.js", + "check:connect": "node ./scripts/check_connect.js", "build": "swc src -d built -D --strip-leading-paths", "build:test": "swc test-server -d built-test -D --config-file test-server/.swcrc --strip-leading-paths", "watch:swc": "swc src -d built -D -w --strip-leading-paths", @@ -25,11 +24,11 @@ "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 pnpm compile-config && cross-env NODE_ENV=test node ./jest.js --forceExit --config jest.config.unit.cjs", - "jest:e2e": "cross-env NODE_ENV=test pnpm compile-config && cross-env NODE_ENV=test node ./jest.js --forceExit --config jest.config.e2e.cjs", - "jest:fed": "pnpm compile-config && node ./jest.js --forceExit --config jest.config.fed.cjs", - "jest-and-coverage": "cross-env NODE_ENV=test pnpm compile-config && cross-env NODE_ENV=test node ./jest.js --coverage --forceExit --config jest.config.unit.cjs", - "jest-and-coverage:e2e": "cross-env NODE_ENV=test pnpm compile-config && cross-env NODE_ENV=test node ./jest.js --coverage --forceExit --config jest.config.e2e.cjs", + "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", @@ -37,7 +36,7 @@ "test-and-coverage": "pnpm jest-and-coverage", "test-and-coverage:e2e": "pnpm build && pnpm build:test && pnpm jest-and-coverage:e2e", "check-migrations": "node scripts/check_migrations_clean.js", - "generate-api-json": "pnpm compile-config && node ./scripts/generate_api_json.js" + "generate-api-json": "node ./scripts/generate_api_json.js" }, "optionalDependencies": { "@swc/core-android-arm64": "1.3.11", @@ -198,7 +197,6 @@ "@types/fluent-ffmpeg": "2.1.28", "@types/http-link-header": "1.0.7", "@types/jest": "29.5.14", - "@types/js-yaml": "4.0.9", "@types/jsonld": "1.5.15", "@types/jsrsasign": "10.5.15", "@types/mime-types": "3.0.1", @@ -233,7 +231,6 @@ "jest": "29.7.0", "jest-mock": "29.7.0", "jest-util": "29.7.0", - "js-yaml": "4.1.1", "nodemon": "3.1.11", "pid-port": "2.0.0", "simple-oauth2": "5.1.0", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index d34df9659b..3ec0466bb5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -469,9 +469,6 @@ importers: '@types/jest': specifier: 29.5.14 version: 29.5.14 - '@types/js-yaml': - specifier: 4.0.9 - version: 4.0.9 '@types/jsonld': specifier: 1.5.15 version: 1.5.15 @@ -574,9 +571,6 @@ importers: jest-util: specifier: 29.7.0 version: 29.7.0 - js-yaml: - specifier: 4.1.1 - version: 4.1.1 nodemon: specifier: 3.1.11 version: 3.1.11 diff --git a/packages/backend/scripts/compile_config.js b/scripts/compile_config.js similarity index 95% rename from packages/backend/scripts/compile_config.js rename to scripts/compile_config.js index 6a67850441..1198603f2a 100644 --- a/packages/backend/scripts/compile_config.js +++ b/scripts/compile_config.js @@ -11,7 +11,7 @@ import * as yaml from 'js-yaml'; const _filename = fileURLToPath(import.meta.url); const _dirname = dirname(_filename); -const dir = `${_dirname}/../../../.config`; +const dir = `${_dirname}/../.config`; const configYmlPath = process.env.MISSKEY_CONFIG_YML ? resolve(dir, process.env.MISSKEY_CONFIG_YML)