@next-core/brick-kit 2.153.2 → 2.153.4

package/dist/index.bundle.js

@@ -8924,7 +8924,7 @@
     }
   }
 
-  function registerCustomTemplate(tplName, tplConstructor, appId) {
+  function registerCustomTemplate(tplName, tplConstructor, appId, deadCOnditionsRemoved) {
     var tagName = tplName; // When a template is registered by an app, its namespace maybe missed.
 
     if (appId && !tplName.includes(".")) {
@@ -8948,6 +8948,13 @@
         // eslint-disable-next-line no-console
         console.warn("Custom template of \"".concat(tagName, "\" already defined by customElements."));
       }
+    }
+
+    if (!deadCOnditionsRemoved && process.env.NODE_ENV !== "test") {
+      brickUtils.removeDeadConditionsInTpl(tplConstructor, {
+        constantFeatureFlags: true,
+        featureFlags: getRuntime().getFeatureFlags()
+      });
     } // Now we allow re-register custom template
 
 
@@ -9625,7 +9632,7 @@
               bricks: tpl.bricks,
               proxy: tpl.proxy,
               state: tpl.state
-            }, (_storyboard$app = storyboard.app) === null || _storyboard$app === void 0 ? void 0 : _storyboard$app.id);
+            }, (_storyboard$app = storyboard.app) === null || _storyboard$app === void 0 ? void 0 : _storyboard$app.id, true);
           }
         } // 每个 storyboard 仅注册一次custom-template
 
@@ -12204,21 +12211,29 @@
         if (storyboard) {
           var _storyboard$meta, _storyboard$meta2, _storyboard$meta3;
 
-          yield _this3.kernel.fulfilStoryboard(storyboard); // 将动态解析后的模板还原，以便重新动态解析。
+          yield _this3.kernel.fulfilStoryboard(storyboard);
+          brickUtils.removeDeadConditions(storyboard, {
+            constantFeatureFlags: true,
+            featureFlags: _this3.featureFlags
+          }); // 将动态解析后的模板还原，以便重新动态解析。
 
-          brickUtils.restoreDynamicTemplates(storyboard); // 预加载权限信息
+          brickUtils.restoreDynamicTemplates(storyboard);
+          var parallelRequests = []; // 预加载权限信息
 
           if (isLoggedIn() && !getAuth().isAdmin) {
-            yield preCheckPermissions(storyboard);
+            parallelRequests.push(preCheckPermissions(storyboard));
           } // Standalone App 需要额外读取 Installed App 信息
 
 
           if (window.STANDALONE_MICRO_APPS && !window.NO_AUTH_GUARD) {
             // TODO: get standalone apps when NO_AUTH_GUARD, maybe from conf.yaml
-            yield preFetchStandaloneInstalledApps(storyboard);
-            _this3.kernel.bootstrapData.offSiteStandaloneApps = getStandaloneInstalledApps();
-          } // 如果找到匹配的 storyboard，那么根据路由匹配得到的 sub-storyboard 加载它的依赖库。
+            parallelRequests.push(preFetchStandaloneInstalledApps(storyboard).then(() => {
+              _this3.kernel.bootstrapData.offSiteStandaloneApps = getStandaloneInstalledApps();
+            }));
+          } // `loadDepsOfStoryboard()` may requires these data.
+
 
+          yield Promise.all(parallelRequests); // 如果找到匹配的 storyboard，那么根据路由匹配得到的 sub-storyboard 加载它的依赖库。
 
           var subStoryboard = _this3.locationContext.getSubStoryboardByRoute(storyboard);
 
@@ -14949,13 +14964,21 @@
     return typeof v === "object" && v !== null && !Array.isArray(v);
   }
 
-  function buildSortedCacheKey(provider, args) {
+  function isString(v) {
+    return typeof v === "string";
+  }
+
+  function buildSortedCacheKey(provider) {
     var sortObj = obj => Object.keys(obj).sort().map(k => ({
       [k]: obj[k]
     }));
 
+    for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+      args[_key - 1] = arguments[_key];
+    }
+
     try {
-      var sortedArgs = isObj(args) ? sortObj(args) : args.map(arg => sortObj(arg));
+      var sortedArgs = isObj(args) ? sortObj(args) : args.map(arg => isString(arg) ? arg : sortObj(arg));
       return JSON.stringify({
         provider,
         args: sortedArgs
@@ -14974,8 +14997,8 @@
 
   function _fetch() {
     _fetch = _asyncToGenerator__default["default"](function* (provider, cache) {
-      for (var _len = arguments.length, args = new Array(_len > 2 ? _len - 2 : 0), _key = 2; _key < _len; _key++) {
-        args[_key - 2] = arguments[_key];
+      for (var _len2 = arguments.length, args = new Array(_len2 > 2 ? _len2 - 2 : 0), _key2 = 2; _key2 < _len2; _key2++) {
+        args[_key2 - 2] = arguments[_key2];
       }
 
       var promise; // eslint-disable-next-line @typescript-eslint/ban-ts-comment