wip

packages/backend/scripts/compile_config.js

@@ -19,8 +19,7 @@ const configYmlPath = process.env.MISSKEY_CONFIG_YML
 		? resolve(dir, 'test.yml')
 		: resolve(dir, 'default.yml');
 
-// Change extension from .yml to .json
+const configJsonPath = resolve(dir, 'config.json');
-const configJsonPath = configYmlPath.replace(/\.yml$/, '.json');
 
 if (!fs.existsSync(configYmlPath)) {
 	console.error(`Configuration file not found: ${configYmlPath}`);
@@ -29,6 +28,6 @@ if (!fs.existsSync(configYmlPath)) {
 
 const yamlContent = fs.readFileSync(configYmlPath, 'utf-8');
 const config = yaml.load(yamlContent, { schema: yaml.JSON_SCHEMA });
-fs.writeFileSync(configJsonPath, JSON.stringify(config, null, '\t'), 'utf-8');
+fs.writeFileSync(configJsonPath, JSON.stringify(config), 'utf-8');
 
 console.log(`Compiled config: ${configYmlPath} -> ${configJsonPath}`);

packages/backend/src/config.ts

@@ -223,18 +223,9 @@ const _dirname = dirname(_filename);
 const dir = `${_dirname}/../../../.config`;
 
 /**
- * Path of configuration file (YAML)
+ * Path of configuration file
  */
-const configYmlPath = process.env.MISSKEY_CONFIG_YML
+export const path = resolve(dir, 'config.json');
-	? resolve(dir, process.env.MISSKEY_CONFIG_YML)
-	: process.env.NODE_ENV === 'test'
-		? resolve(dir, 'test.yml')
-		: resolve(dir, 'default.yml');
-
-/**
- * Path of configuration file (JSON, pre-compiled from YAML)
- */
-export const path = configYmlPath.replace(/\.yml$/, '.json');
 
 export function loadConfig(): Config {
 	const meta = JSON.parse(fs.readFileSync(`${_dirname}/../../../built/meta.json`, 'utf-8'));

packages/backend/test-federation/compose.a.yml

@@ -40,10 +40,6 @@ services:
         source: ./.config/a.test.default.yml
         target: /misskey/.config/default.yml
         read_only: true
-      - type: bind
-        source: ./.config/a.test.default.json
-        target: /misskey/.config/default.json
-        read_only: false
 
   db.a.test:
     extends:

packages/backend/test-federation/compose.b.yml

@@ -40,10 +40,6 @@ services:
         source: ./.config/b.test.default.yml
         target: /misskey/.config/default.yml
         read_only: true
-      - type: bind
-        source: ./.config/b.test.default.json
-        target: /misskey/.config/default.json
-        read_only: false
 
   db.b.test:
     extends:

packages/backend/test-federation/compose.tpl.yml

@@ -38,10 +38,6 @@ services:
         source: ../ormconfig.js
         target: /misskey/packages/backend/ormconfig.js
         read_only: true
-      - type: bind
-        source: ../scripts
-        target: /misskey/packages/backend/scripts
-        read_only: true
       - type: bind
         source: ../package.json
         target: /misskey/packages/backend/package.json

packages/backend/test-federation/setup.sh

@@ -29,8 +29,6 @@ function generate {
   if [ ! -f .config/docker.env ]; then cp .config/example.docker.env .config/docker.env; fi
   if [ ! -f .config/$1.conf ]; then sed "s/\${HOST}/$1/g" .config/example.conf > .config/$1.conf; fi
   if [ ! -f .config/$1.default.yml ]; then sed "s/\${HOST}/$1/g" .config/example.default.yml > .config/$1.default.yml; fi
-  # Pre-compile YAML config to JSON (for runtime use without js-yaml)
-  if [ -f .config/$1.default.yml ]; then node -e "const fs=require('fs'),yaml=require('js-yaml');fs.writeFileSync('.config/$1.default.json',JSON.stringify(yaml.load(fs.readFileSync('.config/$1.default.yml','utf-8'),{schema:yaml.JSON_SCHEMA}),null,'\t'),'utf-8')"; fi
 }
 
 generate a.test