From 04aebbc3bcd933940e5346fe9723bb1f5bc2b95e Mon Sep 17 00:00:00 2001
From: Thomas Rittson <31796059+eliykat@users.noreply.github.com>
Date: Tue, 18 Oct 2022 12:00:40 +1000
Subject: [PATCH] Use settings in base.json and merge config keys (#3804)

---
 apps/browser/config/config.js | 19 +++++++++++++++++--
 apps/desktop/config/config.js | 19 +++++++++++++++++--
 apps/web/config.js            | 26 ++++++++++++++++++++------
 3 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/apps/browser/config/config.js b/apps/browser/config/config.js
index 81e2d619fee..d437f6361f6 100644
--- a/apps/browser/config/config.js
+++ b/apps/browser/config/config.js
@@ -1,7 +1,22 @@
 function load(envName) {
+  const base = loadConfig("base");
+  const env = loadConfig(envName);
+  const local = loadConfig("local");
+
   return {
-    ...loadConfig(envName),
-    ...loadConfig("local"),
+    ...base,
+    ...env,
+    ...local,
+    flags: {
+      ...base.flags,
+      ...env.flags,
+      ...local.flags,
+    },
+    devFlags: {
+      ...base.devFlags,
+      ...env.devFlags,
+      ...local.devFlags,
+    },
   };
 }
 
diff --git a/apps/desktop/config/config.js b/apps/desktop/config/config.js
index 2e3347321d7..404295dd0db 100644
--- a/apps/desktop/config/config.js
+++ b/apps/desktop/config/config.js
@@ -1,7 +1,22 @@
 function load(envName) {
+  const base = loadConfig("base");
+  const env = loadConfig(envName);
+  const local = loadConfig("local");
+
   return {
-    ...loadConfig(envName),
-    ...loadConfig("local"),
+    ...base,
+    ...env,
+    ...local,
+    flags: {
+      ...base.flags,
+      ...env.flags,
+      ...local.flags,
+    },
+    devFlags: {
+      ...base.devFlags,
+      ...env.devFlags,
+      ...local.devFlags,
+    },
   };
 }
 
diff --git a/apps/web/config.js b/apps/web/config.js
index 2bfc929d354..72ccf4b90ad 100644
--- a/apps/web/config.js
+++ b/apps/web/config.js
@@ -1,12 +1,26 @@
 function load(envName) {
+  const base = require("./config/base.json");
+  const env = loadConfig(envName);
+  const local = loadConfig("local");
+
   return {
-    ...require("./config/base.json"),
-    ...loadConfig(envName),
-    ...loadConfig("local"),
+    ...base,
+    ...env,
+    ...local,
     dev: {
-      ...require("./config/base.json").dev,
-      ...loadConfig(envName).dev,
-      ...loadConfig("local").dev,
+      ...base.dev,
+      ...env.dev,
+      ...local.dev,
+    },
+    flags: {
+      ...base.flags,
+      ...env.flags,
+      ...local.flags,
+    },
+    devFlags: {
+      ...base.devFlags,
+      ...env.devFlags,
+      ...local.devFlags,
     },
   };
 }