From 4580ae1e30690d17db6950930830e4e16026d0ee Mon Sep 17 00:00:00 2001 From: syuilo <4439005+syuilo@users.noreply.github.com> Date: Wed, 3 Dec 2025 18:37:56 +0900 Subject: [PATCH] wip --- packages/backend/migration/js/migration-config.js | 5 ++--- packages/backend/src/config.ts | 14 ++++---------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/packages/backend/migration/js/migration-config.js b/packages/backend/migration/js/migration-config.js index 853735661b..bc7bb1a140 100644 --- a/packages/backend/migration/js/migration-config.js +++ b/packages/backend/migration/js/migration-config.js @@ -3,8 +3,7 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import { path as configYamlPath } from '../../built/config.js'; -import * as yaml from 'js-yaml'; +import { compiledConfigFilePath } from '../../built/config.js'; import fs from "node:fs"; export function isConcurrentIndexMigrationEnabled() { @@ -14,7 +13,7 @@ export function isConcurrentIndexMigrationEnabled() { let loadedConfigCache = undefined; function loadConfigInternal() { - const config = yaml.load(fs.readFileSync(configYamlPath, 'utf-8')); + const config = JSON.parse(fs.readFileSync(compiledConfigFilePath, 'utf-8')); return { disallowExternalApRedirect: Boolean(config.disallowExternalApRedirect ?? false), diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts index 25d700e395..be138b601b 100644 --- a/packages/backend/src/config.ts +++ b/packages/backend/src/config.ts @@ -217,18 +217,12 @@ export type FulltextSearchProvider = 'sqlLike' | 'sqlPgroonga' | 'meilisearch'; const _filename = fileURLToPath(import.meta.url); const _dirname = dirname(_filename); -/** - * Path of configuration directory - */ -const dir = `${_dirname}/../../../.config`; +const configDir = `${_dirname}/../../../.config`; -/** - * Path of configuration file - */ -export const path = resolve(dir, '.config.json'); +export const compiledConfigFilePath = resolve(configDir, '.config.json'); export function loadConfig(): Config { - if (!fs.existsSync(path)) { + if (!fs.existsSync(compiledConfigFilePath)) { throw new Error('Compiled configuration file not found. Try running \'pnpm convert:config\'.'); } @@ -243,7 +237,7 @@ export function loadConfig(): Config { JSON.parse(fs.readFileSync(`${_dirname}/../../../built/_frontend_embed_vite_/manifest.json`, 'utf-8')) : { 'src/boot.ts': { file: null } }; - const config = JSON.parse(fs.readFileSync(path, 'utf-8')) as Source; + const config = JSON.parse(fs.readFileSync(compiledConfigFilePath, 'utf-8')) as Source; const url = tryCreateUrl(config.url ?? process.env.MISSKEY_URL ?? ''); const version = meta.version;