Merge pull request #4446 from easyops-cn/steve/v3-config-merge-method

Steve/v3-config-merge-method
easyops-cn · Sep 2, 2024 · eaf8e5b · eaf8e5b
2 parents e9da7c6 + a238d37
commit eaf8e5b
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 1 deletion.
diff --git a/packages/brick-container/src/loadBootstrapData.spec.ts b/packages/brick-container/src/loadBootstrapData.spec.ts
@@ -84,9 +84,12 @@ jest.spyOn(http, "get").mockImplementation(async (url) => {
               },
               defaultConfig: {
                 defaultConf: 7,
+                array: [1, 2],
               },
               userConfig: {
+                __merge_method: "override",
                 userConf: 8,
+                array: [3],
               },
               menuIcon: {
                 imgSrc:
@@ -325,9 +328,12 @@ describe("loadBootstrapData", () => {
             },
             defaultConfig: {
               defaultConf: 7,
+              array: [1, 2],
             },
             userConfig: {
+              __merge_method: "override",
               userConf: 8,
+              array: [3],
             },
             menuIcon: {
               imgSrc:
@@ -365,15 +371,20 @@ describe("loadBootstrapData", () => {
         },
         defaultConfig: {
           defaultConf: 7,
+          array: [1, 2],
         },
         userConfig: {
+          __merge_method: "override",
           userConf: 8,
+          array: [3],
           runtimeUserConf: 9,
         },
         config: {
+          __merge_method: "override",
           defaultConf: 7,
           userConf: 8,
           runtimeUserConf: 9,
+          array: [3],
         },
         menuIcon: {
           imgSrc:

diff --git a/packages/brick-container/src/loadBootstrapData.ts b/packages/brick-container/src/loadBootstrapData.ts
@@ -279,7 +279,16 @@ export async function fulfilStoryboard(storyboard: RuntimeStoryboard) {
 }
 
 function initializeAppConfig(app: MicroApp) {
-  app.config = deepFreeze(merge({}, app.defaultConfig, app.userConfig));
+  // Manually add `__merge_method: override` to avoid being deep merged.
+  const mergedConfig =
+    (app.userConfig?.__merge_method ?? app.defaultConfig?.__merge_method) ===
+    "override"
+      ? {
+          ...app.defaultConfig,
+          ...app.userConfig,
+        }
+      : merge({}, app.defaultConfig, app.userConfig);
+  app.config = deepFreeze(mergedConfig);
 }
 
 function initializeAppLocales(app: MicroApp) {

diff --git a/packages/types/src/manifest.ts b/packages/types/src/manifest.ts
@@ -249,6 +249,7 @@ export interface RuntimeStoryboard extends Storyboard {
   $$registerCustomTemplateProcessed?: boolean;
   $$fulfilled?: boolean;
   $$fulfilling?: Promise<void>;
+  $$fullMerged?: boolean;
   $$i18nFulfilled?: boolean;
   $$deadConditionsRemoved?: boolean;
 }