Skip to content

Commit

Permalink
fix(server): fail to load custom config (#9485)
Browse files Browse the repository at this point in the history
closed #9237 #9417
  • Loading branch information
forehalo authored and EYHN committed Jan 4, 2025
1 parent f64d62d commit 28f0dad
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions packages/backend/server/src/prelude.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,17 +73,17 @@ async function load() {
// Modules may contribute to ENV_MAP, figure out a good way to involve them instead of hardcoding in `./config/affine.env`
// 3. load env => config map to `globalThis.AFFiNE.ENV_MAP
// load local env map as well in case there are new env added
await loadConfig(PROJECT_CONFIG_PATH, 'affine.env');
await loadConfig(PROJECT_CONFIG_PATH, 'affine.env.js');

// 4. load `config/affine` to patch custom configs
// load local config as well in case there are new default configurations added
await loadConfig(PROJECT_CONFIG_PATH, 'affine');
await loadConfig(CUSTOM_CONFIG_PATH, 'affine');
await loadConfig(PROJECT_CONFIG_PATH, 'affine.js');
await loadConfig(CUSTOM_CONFIG_PATH, 'affine.js');

// 5. load `config/affine.self` to patch custom configs
// This is the file only take effect in [AFFiNE Cloud]
if (!AFFiNE.isSelfhosted) {
await loadConfig(PROJECT_CONFIG_PATH, 'affine.self');
await loadConfig(PROJECT_CONFIG_PATH, 'affine.self.js');
}

// 6. load `config/private.key` to patch app configs
Expand Down

0 comments on commit 28f0dad

Please sign in to comment.