summaryrefslogtreecommitdiff
path: root/packages/backend/src
diff options
context:
space:
mode:
authorおさむのひと <46447427+samunohito@users.noreply.github.com>2025-12-03 09:00:37 +0900
committerGitHub <noreply@github.com>2025-12-03 09:00:37 +0900
commit1facca1ac59af0da21e85f17ded97b39e179dafe (patch)
tree8898b1938d2c7394d83cdd4ae6bdd6331bc45551 /packages/backend/src
parentUpdate CHANGELOG.md (diff)
downloadmisskey-1facca1ac59af0da21e85f17ded97b39e179dafe.tar.gz
misskey-1facca1ac59af0da21e85f17ded97b39e179dafe.tar.bz2
misskey-1facca1ac59af0da21e85f17ded97b39e179dafe.zip
enhance(backend): 起動前にconfigをjson化 (#16923)
* enhance(backend): 起動前にconfigをjson化 * fix * fix * fix * fix * fix * fix CHANGELOG.md * fix * Update CHANGELOG.md * get original
Diffstat (limited to 'packages/backend/src')
-rw-r--r--packages/backend/src/config.ts9
1 files changed, 4 insertions, 5 deletions
diff --git a/packages/backend/src/config.ts b/packages/backend/src/config.ts
index fc83899eb7..53946a0bdc 100644
--- a/packages/backend/src/config.ts
+++ b/packages/backend/src/config.ts
@@ -6,7 +6,6 @@
import * as fs from 'node:fs';
import { fileURLToPath } from 'node:url';
import { dirname, resolve } from 'node:path';
-import * as yaml from 'js-yaml';
import { type FastifyServerOptions } from 'fastify';
import type * as Sentry from '@sentry/node';
import type * as SentryVue from '@sentry/vue';
@@ -227,10 +226,10 @@ const dir = `${_dirname}/../../../.config`;
* Path of configuration file
*/
export const path = process.env.MISSKEY_CONFIG_YML
- ? resolve(dir, 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.yml')
- : resolve(dir, 'default.yml');
+ ? resolve(dir, 'test.json')
+ : resolve(dir, 'default.json');
export function loadConfig(): Config {
const meta = JSON.parse(fs.readFileSync(`${_dirname}/../../../built/meta.json`, 'utf-8'));
@@ -244,7 +243,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 = yaml.load(fs.readFileSync(path, 'utf-8')) as Source;
+ const config = JSON.parse(fs.readFileSync(path, 'utf-8')) as Source;
const url = tryCreateUrl(config.url ?? process.env.MISSKEY_URL ?? '');
const version = meta.version;