summaryrefslogtreecommitdiff
path: root/packages/backend/src
diff options
context:
space:
mode:
authorsyuilo <4439005+syuilo@users.noreply.github.com>2025-12-04 16:49:25 +0900
committerGitHub <noreply@github.com>2025-12-04 16:49:25 +0900
commit24bd1509677023ddd8a749bb7fbfe876c7627b48 (patch)
treec3c65a5cf9091e434ad3ba83b087ffd952728caf /packages/backend/src
parentfix(frontend): stacking router viewで連続して戻る操作を行うと何... (diff)
downloadmisskey-24bd1509677023ddd8a749bb7fbfe876c7627b48.tar.gz
misskey-24bd1509677023ddd8a749bb7fbfe876c7627b48.tar.bz2
misskey-24bd1509677023ddd8a749bb7fbfe876c7627b48.zip
refactor(backend): 変換後.config.jsonに統一するように+修正など (#16929)
* wip * Update config.ts * wip * convertは元ファイルを変更するようなニュアンスを若干感じるのでcompileに改名 * wip * Update package.json * Revert "Update package.json" This reverts commit e5c28023168f4631dc6b36a14b35cfddbad1fac0. * wip * wip * 謎 * clean up * wip * wip * Revert "wip" This reverts commit 3aa25ac7cf337d57412308e63d8f54e2536b0f7f. * wip * wip * Update dummy.yml * wip * Update compile_config.js * Update compile_config.js * wip * Revert "wip" This reverts commit fd78e097c65f747962e7a411938a0e67538ed347. * Update dummy.yml * Update compile_config.js
Diffstat (limited to 'packages/backend/src')
-rw-r--r--packages/backend/src/config.ts20
1 files changed, 7 insertions, 13 deletions
diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
index 53946a0bdc..f9852d3578 100644
--- a/packages/backend/src/config.ts
+++ b/packages/backend/src/config.ts
@@ -217,21 +217,15 @@ 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 compiledConfigFilePathForTest = resolve(_dirname, '../../../built/._config_.json');
-/**
- * Path of configuration file
- */
-export const path = process.env.MISSKEY_CONFIG_YML
- ? resolve(dir, process.env.MISSKEY_CONFIG_YML).replace(/\.ya?ml$/i, '.json')
- : process.env.NODE_ENV === 'test'
- ? resolve(dir, 'test.json')
- : resolve(dir, 'default.json');
+export const compiledConfigFilePath = fs.existsSync(compiledConfigFilePathForTest) ? compiledConfigFilePathForTest : resolve(_dirname, '../../../built/.config.json');
export function loadConfig(): Config {
+ if (!fs.existsSync(compiledConfigFilePath)) {
+ throw new Error('Compiled configuration file not found. Try running \'pnpm compile-config\'.');
+ }
+
const meta = JSON.parse(fs.readFileSync(`${_dirname}/../../../built/meta.json`, 'utf-8'));
const frontendManifestExists = fs.existsSync(_dirname + '/../../../built/_frontend_vite_/manifest.json');
@@ -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;