From fd78e097c65f747962e7a411938a0e67538ed347 Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Thu, 4 Dec 2025 15:57:05 +0900 Subject: [PATCH] wip --- packages/backend/scripts/compile_config.js | 6 +++--- packages/backend/src/config.ts | 4 ++-- packages/backend/test-federation/compose.a.yml | 2 +- packages/backend/test-federation/compose.b.yml | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/backend/scripts/compile_config.js b/packages/backend/scripts/compile_config.js index b5eea9c784..889aeddef2 100644 --- a/packages/backend/scripts/compile_config.js +++ b/packages/backend/scripts/compile_config.js @@ -17,7 +17,7 @@ const _filename = fileURLToPath(import.meta.url); const _dirname = dirname(_filename); const configDir = resolve(_dirname, '../../../.config'); -const OUTPUT_PATH = resolve(_dirname, '../../../built/.config.json'); +const OUTPUT_PATH = resolve(_dirname, '../../../.config/.config.json'); // TODO: yamlのパースに失敗したときのエラーハンドリング @@ -27,8 +27,8 @@ const OUTPUT_PATH = resolve(_dirname, '../../../built/.config.json'); */ function yamlToJson(ymlPath) { if (!fs.existsSync(ymlPath)) { - console.error(`YAML file not found: ${ymlPath}`); - process.exit(1); + console.log(`YAML file not found: ${ymlPath}`); + return; } console.log(`${ymlPath} → ${OUTPUT_PATH}`); diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts index f9852d3578..ac5e227dab 100644 --- a/packages/backend/src/config.ts +++ b/packages/backend/src/config.ts @@ -217,9 +217,9 @@ export type FulltextSearchProvider = 'sqlLike' | 'sqlPgroonga' | 'meilisearch'; const _filename = fileURLToPath(import.meta.url); const _dirname = dirname(_filename); -const compiledConfigFilePathForTest = resolve(_dirname, '../../../built/._config_.json'); +const compiledConfigFilePathForTest = resolve(_dirname, '../../../.config/._config_.json'); -export const compiledConfigFilePath = fs.existsSync(compiledConfigFilePathForTest) ? compiledConfigFilePathForTest : resolve(_dirname, '../../../built/.config.json'); +export const compiledConfigFilePath = fs.existsSync(compiledConfigFilePathForTest) ? compiledConfigFilePathForTest : resolve(_dirname, '../../../.config/.config.json'); export function loadConfig(): Config { if (!fs.existsSync(compiledConfigFilePath)) { diff --git a/packages/backend/test-federation/compose.a.yml b/packages/backend/test-federation/compose.a.yml index 4fd4eb3851..5fad6199b1 100644 --- a/packages/backend/test-federation/compose.a.yml +++ b/packages/backend/test-federation/compose.a.yml @@ -38,7 +38,7 @@ services: volumes: - type: bind source: ./.config/a.test.config.json - target: /misskey/built/._config_.json + target: /misskey/.config/._config_.json read_only: true db.a.test: diff --git a/packages/backend/test-federation/compose.b.yml b/packages/backend/test-federation/compose.b.yml index 753da22822..93ff33eba8 100644 --- a/packages/backend/test-federation/compose.b.yml +++ b/packages/backend/test-federation/compose.b.yml @@ -38,7 +38,7 @@ services: volumes: - type: bind source: ./.config/b.test.config.json - target: /misskey/built/._config_.json + target: /misskey/.config/._config_.json read_only: true db.b.test: