bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-06 00:13:28 +00:00
Code Issues Releases Wiki Activity

Use settings in base.json and merge config keys (#3804)

Browse Source
This commit is contained in:
Thomas Rittson
2022-10-18 12:00:40 +10:00
committed by GitHub
parent fcd388e888
commit 04aebbc3bc
3 changed files with 54 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
apps/browser/config/config.js
View File

@@ -1,7 +1,22 @@
function load(envName) { function load(envName) {
const base = loadConfig("base");
const env = loadConfig(envName);
const local = loadConfig("local");
return { return {
...loadConfig(envName), ...base,
...loadConfig("local"), ...env,
...local,
flags: {
...base.flags,
...env.flags,
...local.flags,
},
devFlags: {
...base.devFlags,
...env.devFlags,
...local.devFlags,
},
}; };
} }

19
apps/desktop/config/config.js
View File

@@ -1,7 +1,22 @@
function load(envName) { function load(envName) {
const base = loadConfig("base");
const env = loadConfig(envName);
const local = loadConfig("local");
return { return {
...loadConfig(envName), ...base,
...loadConfig("local"), ...env,
...local,
flags: {
...base.flags,
...env.flags,
...local.flags,
},
devFlags: {
...base.devFlags,
...env.devFlags,
...local.devFlags,
},
}; };
} }

26
apps/web/config.js
View File

@@ -1,12 +1,26 @@
function load(envName) { function load(envName) {
const base = require("./config/base.json");
const env = loadConfig(envName);
const local = loadConfig("local");
return { return {
...require("./config/base.json"), ...base,
...loadConfig(envName), ...env,
...loadConfig("local"), ...local,
dev: { dev: {
...require("./config/base.json").dev, ...base.dev,
...loadConfig(envName).dev, ...env.dev,
...loadConfig("local").dev, ...local.dev,
},
flags: {
...base.flags,
...env.flags,
...local.flags,
},
devFlags: {
...base.devFlags,
...env.devFlags,
...local.devFlags,
}, },
}; };
} }