@next-core/brick-kit 2.199.10 → 2.200.1

package/dist/index.esm.js

@@ -325,7 +325,7 @@ var shouldOmitInLodash = new Set([
 
 // Omit all mutable methods from moment.
 var shouldOmitInMoment = new Set(["lang", "langData", "locale", "localeData", "defineLocale", "updateLocale", "updateOffset"]);
-var allowedGlobalObjects = new Set(["Array", "Boolean", "Date", "Infinity", "JSON", "Math", "NaN", "Number", "String", "RegExp", "decodeURI", "decodeURIComponent", "encodeURI", "encodeURIComponent", "isFinite", "isNaN", "parseFloat", "parseInt", "Map", "Set", "URLSearchParams", "WeakMap", "WeakSet", "atob", "btoa"]);
+var allowedGlobalObjects = new Set(["Array", "Boolean", "Date", "Infinity", "JSON", "Math", "NaN", "Number", "String", "RegExp", "decodeURI", "decodeURIComponent", "encodeURI", "encodeURIComponent", "isFinite", "isNaN", "parseFloat", "parseInt", "Map", "Set", "URL", "URLSearchParams", "WeakMap", "WeakSet", "atob", "btoa"]);
 function supplyIndividual(variableName, mock) {
   switch (variableName) {
     case "Object":
@@ -7162,7 +7162,7 @@ function processBootstrapResponse(bootstrapResponse) {
   for (var storyboard of bootstrapResponse.storyboards) {
     var app = storyboard.app;
     if (app) {
-      app.config = deepFreeze(merge({}, app.defaultConfig, app.userConfig));
+      initializeAppConfig(app);
       setAppLocales(storyboard.app);
     }
   }
@@ -7172,6 +7172,12 @@ function processBootstrapResponse(bootstrapResponse) {
   bootstrapResponse.brickPackages = deepFreeze(bootstrapResponse.brickPackages);
   bootstrapResponse.templatePackages = deepFreeze(bootstrapResponse.templatePackages);
 }
+function initializeAppConfig(app) {
+  var _app$userConfig$__mer, _app$userConfig, _app$defaultConfig;
+  // Manually add `__merge_method: override` to `app.userConfig` to avoid being deep merged.
+  var mergedConfig = ((_app$userConfig$__mer = (_app$userConfig = app.userConfig) === null || _app$userConfig === void 0 ? void 0 : _app$userConfig.__merge_method) !== null && _app$userConfig$__mer !== void 0 ? _app$userConfig$__mer : (_app$defaultConfig = app.defaultConfig) === null || _app$defaultConfig === void 0 ? void 0 : _app$defaultConfig.__merge_method) === "override" ? _objectSpread(_objectSpread({}, app.defaultConfig), app.userConfig) : merge({}, app.defaultConfig, app.userConfig);
+  app.config = deepFreeze(mergedConfig);
+}
 
 var CUSTOM_API_PROVIDER = "brick-kit.provider-custom-api";
 function hasFields(ext_fields, type) {
@@ -9260,7 +9266,7 @@ class Kernel {
           if (appRuntimeData) {
             // Merge `app.defaultConfig` and `app.userConfig` to `app.config`.
             storyboard.app.userConfig = _objectSpread(_objectSpread({}, storyboard.app.userConfig), appRuntimeData.userConfig);
-            storyboard.app.config = deepFreeze(merge({}, storyboard.app.defaultConfig, storyboard.app.userConfig));
+            initializeAppConfig(storyboard.app);
             // get inject menus (Actually, appRuntimeData contains both main and inject menus)
             storyboard.meta = _objectSpread(_objectSpread({}, storyboard.meta), {}, {
               injectMenus: appRuntimeData.injectMenus