@next-core/brick-kit 2.159.3 → 2.159.5

package/dist/index.bundle.js

@@ -8109,6 +8109,9 @@
             yield loadScriptOfDll(Object.values(dllPath));
             yield loadScriptOfBricksOrTemplates(brickPackages.map(item => item.filePath).concat(templatePackages.map(item => item.filePath)));
             yield loadAllLazyBricks();
+            return {
+              pendingTask: Promise.resolve()
+            };
           } else {
             // 先加载模板
             var templateDeps = brickUtils.getTemplateDepsOfStoryboard(storyboard, templatePackages);
@@ -8117,13 +8120,19 @@
             var {
               dll,
               deps,
-              bricks
+              bricks,
+              byProcessors
             } = brickUtils.getDllAndDepsOfStoryboard(yield brickUtils.asyncProcessStoryboard(storyboard, brickTemplateRegistry, templatePackages), brickPackages, {
               ignoreBricksInUnusedCustomTemplates: true
             });
-            yield loadScriptOfDll(dll);
-            yield loadScriptOfBricksOrTemplates(deps);
-            yield loadLazyBricks(bricks);
+            // 需要先阻塞加载 Custom Processors。
+            yield loadScriptOfDll(byProcessors.dll);
+            yield loadScriptOfBricksOrTemplates(byProcessors.deps);
+            // 加载构件资源时，不再阻塞后续业务数据的加载，在挂载构件时再等待该任务完成。
+            // 挂载构件可能包括：Provider 构件实时挂载、路由准备完成后的统一挂载等。
+            return {
+              pendingTask: loadScriptOfDll(dll).then(() => loadScriptOfBricksOrTemplates(deps)).then(() => loadLazyBricks(bricks))
+            };
           }
         });
         return function (_x) {
@@ -8526,14 +8535,14 @@
           args[_key - 1] = _arguments[_key];
         }
         try {
-          yield fn(...args);
+          return yield fn(...args);
         } catch (e) {
           if (e instanceof Event && e.target instanceof HTMLScriptElement) {
             // The scripts maybe stale when a user stays in page while upgrades been applied.
             // So we force reloading again automatically.
             // NOTE: reload only once to avoid a infinite loop.
             yield _this8.reloadMicroApps();
-            yield fn(...args);
+            return yield fn(...args);
           } else {
             throw e;
           }
@@ -9882,6 +9891,7 @@
         if (expandedBrickConf.bg) {
           // A bg brick has no slotId.
           brick.slotId = undefined;
+          yield _this7.kernel.loadDynamicBricks([brick.type]);
           appendBrick(brick, _this7.kernel.mountPoints.bg);
         } else {
           if (expandedBrickConf.portal) {
@@ -10843,6 +10853,9 @@
         var tracePageEnd = (_apiAnalyzer$getInsta = easyopsAnalytics.apiAnalyzer.getInstance()) === null || _apiAnalyzer$getInsta === void 0 ? void 0 : _apiAnalyzer$getInsta.tracePage();
         var locationContext = _this3.locationContext = new LocationContext(_this3.kernel, location);
         var storyboard = locationContext.matchStoryboard(_this3.kernel.bootstrapData.storyboards);
+
+        /** Pending task for loading bricks */
+        var pendingTask;
         if (storyboard) {
           var _storyboard$meta, _storyboard$meta2, _storyboard$meta3;
           yield _this3.kernel.fulfilStoryboard(storyboard);
@@ -10874,7 +10887,9 @@
 
           // 如果找到匹配的 storyboard，那么根据路由匹配得到的 sub-storyboard 加载它的依赖库。
           var subStoryboard = _this3.locationContext.getSubStoryboardByRoute(storyboard);
-          yield _this3.kernel.loadDepsOfStoryboard(subStoryboard);
+          ({
+            pendingTask
+          } = yield _this3.kernel.loadDepsOfStoryboard(subStoryboard));
 
           // 注册 Storyboard 中定义的自定义模板和函数。
           _this3.kernel.registerCustomTemplatesInStoryboard(storyboard);
@@ -11050,14 +11065,21 @@
           }
           _this3.setNavConfig(mountRoutesResult);
           _this3.kernel.toggleLegacyIframe(actualLegacy === "iframe");
-          menuInBg.forEach(brick => {
-            appendBrick(brick, mountPoints.portal);
-          });
+          yield Promise.all(menuInBg.map( /*#__PURE__*/function () {
+            var _ref2 = _asyncToGenerator__default["default"](function* (brick) {
+              yield _this3.kernel.loadDynamicBricks([brick.type]);
+              appendBrick(brick, mountPoints.portal);
+            });
+            return function (_x3) {
+              return _ref2.apply(this, arguments);
+            };
+          }()));
 
           // When we have a matched route other than an abstract route,
           // we say *page found*, otherwise, *page not found*.
           if (route && route.type !== "routes" || failed) {
             var _this3$kernel$bootstr, _this3$kernel$bootstr2, _getAuth$license;
+            yield pendingTask;
             main.length > 0 && mountTree(main, mountPoints.main);
             portal.length > 0 && mountTree(portal, mountPoints.portal);
             afterMountTree(mountPoints.main);