@next-core/brick-kit 2.117.4 → 2.117.7

package/CHANGELOG.md

@@ -3,6 +3,40 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.117.7](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.117.6...@next-core/brick-kit@2.117.7) (2022-04-12)
+
+
+### Bug Fixes
+
+* **template-preview:** support setting lifeCycle and events ([275cf02](https://github.com/easyops-cn/next-core/commit/275cf02fe2a2ce46241cb55d93b4822768e20459))
+
+
+
+
+
+## [2.117.6](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.117.5...@next-core/brick-kit@2.117.6) (2022-04-11)
+
+
+### Bug Fixes
+
+* handle checking isInIframeOfLegacyConsole when previewing in visual builder by iframe ([8e347b9](https://github.com/easyops-cn/next-core/commit/8e347b969033992412ee349ecd6f633141be95d5))
+* reload bootstrap again when loading bricks failed ([f022593](https://github.com/easyops-cn/next-core/commit/f0225934d5a1694ee06f96f3d1b5cd1c9b92c1b2))
+
+
+
+
+
+## [2.117.5](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.117.4...@next-core/brick-kit@2.117.5) (2022-04-11)
+
+
+### Bug Fixes
+
+* useProvider hook 支持query查询provider ([c8581e8](https://github.com/easyops-cn/next-core/commit/c8581e877f740f4218ac296eaa6448ce54be2803))
+
+
+
+
+
 ## [2.117.4](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.117.3...@next-core/brick-kit@2.117.4) (2022-04-11)
 
 

package/dist/index.bundle.js

@@ -7753,6 +7753,8 @@
 
   class Kernel {
     constructor() {
+      var _this = this;
+
       _defineProperty__default["default"](this, "mountPoints", void 0);
 
       _defineProperty__default["default"](this, "bootstrapData", void 0);
@@ -7794,36 +7796,111 @@
       _defineProperty__default["default"](this, "loadUsersStarted", false);
 
       _defineProperty__default["default"](this, "loadMagicBrickConfigStarted", false);
+
+      _defineProperty__default["default"](this, "_loadDepsOfStoryboard", /*#__PURE__*/function () {
+        var _ref = _asyncToGenerator__default["default"](function* (storyboard) {
+          var {
+            brickPackages,
+            templatePackages
+          } = _this.bootstrapData;
+
+          if (storyboard.dependsAll) {
+            var dllPath = window.DLL_PATH || {};
+            yield loadScriptOfDll(Object.values(dllPath));
+            yield loadScriptOfBricksOrTemplates(brickPackages.map(item => item.filePath).concat(templatePackages.map(item => item.filePath)));
+            yield loadAllLazyBricks();
+          } else {
+            // 先加载模板
+            var templateDeps = brickUtils.getTemplateDepsOfStoryboard(storyboard, templatePackages);
+            yield loadScriptOfBricksOrTemplates(templateDeps); // 加载模板后才能加工得到最终的构件表
+
+            var {
+              dll,
+              deps,
+              bricks
+            } = brickUtils.getDllAndDepsOfStoryboard(yield brickUtils.asyncProcessStoryboard(storyboard, brickTemplateRegistry, templatePackages), brickPackages, {
+              ignoreBricksInUnusedCustomTemplates: true
+            });
+            yield loadScriptOfDll(dll);
+            yield loadScriptOfBricksOrTemplates(deps);
+            yield loadLazyBricks(bricks);
+          }
+        });
+
+        return function (_x) {
+          return _ref.apply(this, arguments);
+        };
+      }());
+
+      _defineProperty__default["default"](this, "_loadDynamicBricks", /*#__PURE__*/function () {
+        var _ref2 = _asyncToGenerator__default["default"](function* (bricks, processors) {
+          var filteredBricks = bricks.filter( // Only try to load undefined custom elements.
+          item => !customElements.get(item)); // Try to load deps for dynamic added bricks.
+
+          var {
+            dll,
+            deps
+          } = brickUtils.getDllAndDepsByResource({
+            bricks: filteredBricks,
+            processors
+          }, _this.bootstrapData.brickPackages);
+          yield loadScriptOfDll(dll);
+          yield loadScriptOfBricksOrTemplates(deps);
+          yield loadLazyBricks(filteredBricks);
+        });
+
+        return function (_x2, _x3) {
+          return _ref2.apply(this, arguments);
+        };
+      }());
+
+      _defineProperty__default["default"](this, "_loadEditorBricks", /*#__PURE__*/function () {
+        var _ref3 = _asyncToGenerator__default["default"](function* (editorBricks) {
+          var {
+            dll,
+            deps
+          } = brickUtils.getDllAndDepsByResource({
+            editorBricks: editorBricks.filter( // Only try to load undefined custom elements.
+            item => !customElements.get(item))
+          }, _this.bootstrapData.brickPackages);
+          yield loadScriptOfDll(dll);
+          yield loadScriptOfBricksOrTemplates(deps);
+        });
+
+        return function (_x4) {
+          return _ref3.apply(this, arguments);
+        };
+      }());
     }
 
     bootstrap(mountPoints) {
-      var _this = this;
+      var _this2 = this;
 
       return _asyncToGenerator__default["default"](function* () {
-        var _this$bootstrapData$s, _this$bootstrapData$s2;
+        var _this2$bootstrapData$, _this2$bootstrapData$2;
 
-        _this.mountPoints = mountPoints;
-        yield Promise.all([_this.loadCheckLogin(), _this.loadMicroApps()]);
+        _this2.mountPoints = mountPoints;
+        yield Promise.all([_this2.loadCheckLogin(), _this2.loadMicroApps()]);
 
-        if (_this.bootstrapData.storyboards.length === 0) {
+        if (_this2.bootstrapData.storyboards.length === 0) {
           throw new Error("No storyboard were found.");
         }
 
-        generateColorTheme((_this$bootstrapData$s = _this.bootstrapData.settings) === null || _this$bootstrapData$s === void 0 ? void 0 : (_this$bootstrapData$s2 = _this$bootstrapData$s.misc) === null || _this$bootstrapData$s2 === void 0 ? void 0 : _this$bootstrapData$s2.theme);
+        generateColorTheme((_this2$bootstrapData$ = _this2.bootstrapData.settings) === null || _this2$bootstrapData$ === void 0 ? void 0 : (_this2$bootstrapData$2 = _this2$bootstrapData$.misc) === null || _this2$bootstrapData$2 === void 0 ? void 0 : _this2$bootstrapData$2.theme);
 
         if (isLoggedIn()) {
-          _this.loadSharedData();
+          _this2.loadSharedData();
         }
 
-        _this.menuBar = new MenuBar(_this, "menuBar");
-        _this.appBar = new AppBar(_this, "appBar");
-        _this.loadingBar = new BaseBar(_this, "loadingBar");
-        _this.router = new Router(_this);
+        _this2.menuBar = new MenuBar(_this2, "menuBar");
+        _this2.appBar = new AppBar(_this2, "appBar");
+        _this2.loadingBar = new BaseBar(_this2, "loadingBar");
+        _this2.router = new Router(_this2);
         initAnalytics();
-        yield _this.router.bootstrap();
+        yield _this2.router.bootstrap();
 
         if (!window.STANDALONE_MICRO_APPS) {
-          _this.legacyAuthGuard();
+          _this2.legacyAuthGuard();
         }
 
         listenDevtools();
@@ -7831,7 +7908,7 @@
     }
 
     layoutBootstrap(layout) {
-      var _this2 = this;
+      var _this3 = this;
 
       return _asyncToGenerator__default["default"](function* () {
         var supportedLayouts = ["console", "business"];
@@ -7840,12 +7917,12 @@
           throw new Error("Unknown layout: ".concat(layout));
         }
 
-        _this2.currentLayout = layout;
-        _this2.presetBricks = layout === "business" ? {
+        _this3.currentLayout = layout;
+        _this3.presetBricks = layout === "business" ? {
           loadingBar: "business-website.loading-bar",
           pageNotFound: "business-website.page-not-found",
           pageError: "business-website.page-error"
-        } : _objectSpread__default["default"](_objectSpread__default["default"]({}, _this2.bootstrapData.navbar), {}, {
+        } : _objectSpread__default["default"](_objectSpread__default["default"]({}, _this3.bootstrapData.navbar), {}, {
           pageNotFound: "basic-bricks.page-not-found",
           pageError: "basic-bricks.page-error"
         });
@@ -7858,9 +7935,9 @@
           }
         }
 
-        yield Promise.all([_this2.menuBar.bootstrap(_this2.presetBricks.menuBar, {
+        yield Promise.all([_this3.menuBar.bootstrap(_this3.presetBricks.menuBar, {
           testid: "brick-next-menu-bar"
-        }), _this2.appBar.bootstrap(_this2.presetBricks.appBar), _this2.loadingBar.bootstrap(_this2.presetBricks.loadingBar)]);
+        }), _this3.appBar.bootstrap(_this3.presetBricks.appBar), _this3.loadingBar.bootstrap(_this3.presetBricks.loadingBar)]);
       })();
     }
 
@@ -7897,7 +7974,7 @@
     }
 
     loadMicroApps(params, interceptorParams) {
-      var _this3 = this;
+      var _this4 = this;
 
       return _asyncToGenerator__default["default"](function* () {
         var data = yield window.STANDALONE_MICRO_APPS ? standaloneBootstrap() : BootstrapV2Api_bootstrapV2(_objectSpread__default["default"]({
@@ -7914,7 +7991,7 @@
 
 
         processBootstrapResponse(bootstrapResponse);
-        _this3.bootstrapData = _objectSpread__default["default"](_objectSpread__default["default"]({}, bootstrapResponse), {}, {
+        _this4.bootstrapData = _objectSpread__default["default"](_objectSpread__default["default"]({}, bootstrapResponse), {}, {
           microApps: bootstrapResponse.storyboards.map(storyboard => storyboard.app).filter(Boolean)
         });
       })();
@@ -7928,7 +8005,7 @@
     }
 
     fulfilStoryboard(storyboard) {
-      var _this4 = this;
+      var _this5 = this;
 
       return _asyncToGenerator__default["default"](function* () {
         if (storyboard.$$fulfilled) {
@@ -7936,7 +8013,7 @@
         }
 
         if (!storyboard.$$fulfilling) {
-          storyboard.$$fulfilling = _this4.doFulfilStoryboard(storyboard);
+          storyboard.$$fulfilling = _this5.doFulfilStoryboard(storyboard);
         }
 
         return storyboard.$$fulfilling;
@@ -7944,7 +8021,7 @@
     }
 
     doFulfilStoryboard(storyboard) {
-      var _this5 = this;
+      var _this6 = this;
 
       return _asyncToGenerator__default["default"](function* () {
         if (window.STANDALONE_MICRO_APPS) {
@@ -7965,7 +8042,7 @@
           });
         }
 
-        _this5.postProcessStoryboard(storyboard);
+        _this6.postProcessStoryboard(storyboard);
       })();
     }
 
@@ -7978,8 +8055,8 @@
         // Prefix to avoid conflict between brick package's i18n namespace.
         var i18nNamespace = getI18nNamespace("app", storyboard.app.id); // Support any language in `meta.i18n`.
 
-        Object.entries(storyboard.meta.i18n).forEach(_ref => {
-          var [lang, resources] = _ref;
+        Object.entries(storyboard.meta.i18n).forEach(_ref4 => {
+          var [lang, resources] = _ref4;
           i18next__default["default"].addResourceBundle(lang, i18nNamespace, resources);
         });
       }
@@ -8006,7 +8083,7 @@
         path: previewPath,
         bricks: [_objectSpread__default["default"]({
           brick: templateId
-        }, lodash.pick(settings, "properties"))],
+        }, lodash.pick(settings, "properties", "events", "lifeCycle"))],
         menu: false,
         exact: true
       };
@@ -8019,34 +8096,30 @@
     }
 
     loadDepsOfStoryboard(storyboard) {
-      var _this6 = this;
+      return this.gracefullyLoadDeps(this._loadDepsOfStoryboard, storyboard);
+    }
+
+    gracefullyLoadDeps(fn) {
+      var _arguments = arguments,
+          _this7 = this;
 
       return _asyncToGenerator__default["default"](function* () {
-        var {
-          brickPackages,
-          templatePackages
-        } = _this6.bootstrapData;
-
-        if (storyboard.dependsAll) {
-          var dllPath = window.DLL_PATH || {};
-          yield loadScriptOfDll(Object.values(dllPath));
-          yield loadScriptOfBricksOrTemplates(brickPackages.map(item => item.filePath).concat(templatePackages.map(item => item.filePath)));
-          yield loadAllLazyBricks();
-        } else {
-          // 先加载模板
-          var templateDeps = brickUtils.getTemplateDepsOfStoryboard(storyboard, templatePackages);
-          yield loadScriptOfBricksOrTemplates(templateDeps); // 加载模板后才能加工得到最终的构件表
+        for (var _len = _arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+          args[_key - 1] = _arguments[_key];
+        }
 
-          var {
-            dll,
-            deps,
-            bricks
-          } = brickUtils.getDllAndDepsOfStoryboard(yield brickUtils.asyncProcessStoryboard(storyboard, brickTemplateRegistry, templatePackages), brickPackages, {
-            ignoreBricksInUnusedCustomTemplates: true
-          });
-          yield loadScriptOfDll(dll);
-          yield loadScriptOfBricksOrTemplates(deps);
-          yield loadLazyBricks(bricks);
+        try {
+          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 _this7.reloadMicroApps();
+            yield fn(...args);
+          } else {
+            throw e;
+          }
         }
       })();
     }
@@ -8091,7 +8164,7 @@
     }
 
     loadDynamicBricksInBrickConf(brickConf) {
-      var _this7 = this;
+      var _this8 = this;
 
       return _asyncToGenerator__default["default"](function* () {
         // Notice: `brickConf` contains runtime data,
@@ -8099,44 +8172,16 @@
         // which could cause stack overflow while traversing.
         var bricks = brickUtils.scanBricksInBrickConf(brickConf);
         var processors = brickUtils.scanProcessorsInAny(brickConf);
-        yield _this7.loadDynamicBricks(bricks, processors);
+        yield _this8.loadDynamicBricks(bricks, processors);
       })();
     }
 
     loadDynamicBricks(bricks, processors) {
-      var _this8 = this;
-
-      return _asyncToGenerator__default["default"](function* () {
-        var filteredBricks = bricks.filter( // Only try to load undefined custom elements.
-        item => !customElements.get(item)); // Try to load deps for dynamic added bricks.
-
-        var {
-          dll,
-          deps
-        } = brickUtils.getDllAndDepsByResource({
-          bricks: filteredBricks,
-          processors
-        }, _this8.bootstrapData.brickPackages);
-        yield loadScriptOfDll(dll);
-        yield loadScriptOfBricksOrTemplates(deps);
-        yield loadLazyBricks(filteredBricks);
-      })();
+      return this.gracefullyLoadDeps(this._loadDynamicBricks, bricks, processors);
     }
 
     loadEditorBricks(editorBricks) {
-      var _this9 = this;
-
-      return _asyncToGenerator__default["default"](function* () {
-        var {
-          dll,
-          deps
-        } = brickUtils.getDllAndDepsByResource({
-          editorBricks: editorBricks.filter( // Only try to load undefined custom elements.
-          item => !customElements.get(item))
-        }, _this9.bootstrapData.brickPackages);
-        yield loadScriptOfDll(dll);
-        yield loadScriptOfBricksOrTemplates(deps);
-      })();
+      return this.gracefullyLoadDeps(this._loadEditorBricks, editorBricks);
     }
 
     firstRendered() {
@@ -8237,10 +8282,10 @@
     }
 
     getMicroAppApiOrchestrationMapAsync() {
-      var _this10 = this;
+      var _this9 = this;
 
       return _asyncToGenerator__default["default"](function* () {
-        return yield _this10.allMicroAppApiOrchestrationPromise;
+        return yield _this9.allMicroAppApiOrchestrationPromise;
       })();
     }
 
@@ -8332,14 +8377,14 @@
     }
 
     getRelatedAppsAsync(appId) {
-      var _this11 = this;
+      var _this10 = this;
 
       return _asyncToGenerator__default["default"](function* () {
         if (!appId) {
           return [];
         }
 
-        var allRelatedApps = yield _this11.allRelatedAppsPromise;
+        var allRelatedApps = yield _this10.allRelatedAppsPromise;
         var thisApp = allRelatedApps.find(item => item.microAppId === appId);
 
         if (!thisApp) {
@@ -8351,38 +8396,38 @@
     }
 
     updateWorkspaceStack() {
-      var _this12 = this;
+      var _this11 = this;
 
       return _asyncToGenerator__default["default"](function* () {
-        if (_this12.currentApp && _this12.currentApp.id) {
+        if (_this11.currentApp && _this11.currentApp.id) {
           var workspace = {
-            appId: _this12.currentApp.id,
-            appName: _this12.currentApp.name,
-            appLocaleName: _this12.currentApp.localeName,
-            url: _this12.currentUrl
+            appId: _this11.currentApp.id,
+            appName: _this11.currentApp.name,
+            appLocaleName: _this11.currentApp.localeName,
+            url: _this11.currentUrl
           };
 
-          if (_this12.workspaceStack.length > 0) {
-            var previousWorkspace = _this12.workspaceStack[_this12.workspaceStack.length - 1];
+          if (_this11.workspaceStack.length > 0) {
+            var previousWorkspace = _this11.workspaceStack[_this11.workspaceStack.length - 1];
 
-            var _relatedApps = yield _this12.getRelatedAppsAsync(previousWorkspace.appId);
+            var _relatedApps = yield _this11.getRelatedAppsAsync(previousWorkspace.appId);
 
-            if (_relatedApps.some(item => item.microAppId === _this12.currentApp.id)) {
+            if (_relatedApps.some(item => item.microAppId === _this11.currentApp.id)) {
               Object.assign(previousWorkspace, workspace);
               return;
             }
           }
 
-          var relatedApps = yield _this12.getRelatedAppsAsync(_this12.currentApp.id);
+          var relatedApps = yield _this11.getRelatedAppsAsync(_this11.currentApp.id);
 
           if (relatedApps.length > 0) {
-            _this12.workspaceStack.push(workspace);
+            _this11.workspaceStack.push(workspace);
 
             return;
           }
         }
 
-        _this12.workspaceStack = [];
+        _this11.workspaceStack = [];
       })();
     }
 
@@ -8405,9 +8450,9 @@
     }
 
     getFeatureFlags() {
-      var _this$bootstrapData, _this$bootstrapData$s3;
+      var _this$bootstrapData, _this$bootstrapData$s;
 
-      return Object.assign({}, (_this$bootstrapData = this.bootstrapData) === null || _this$bootstrapData === void 0 ? void 0 : (_this$bootstrapData$s3 = _this$bootstrapData.settings) === null || _this$bootstrapData$s3 === void 0 ? void 0 : _this$bootstrapData$s3.featureFlags);
+      return Object.assign({}, (_this$bootstrapData = this.bootstrapData) === null || _this$bootstrapData === void 0 ? void 0 : (_this$bootstrapData$s = _this$bootstrapData.settings) === null || _this$bootstrapData$s === void 0 ? void 0 : _this$bootstrapData$s.featureFlags);
     }
 
     getStandaloneMenus(menuId) {
@@ -8423,22 +8468,22 @@
     }
 
     getProviderBrick(provider) {
-      var _this13 = this;
+      var _this12 = this;
 
       return _asyncToGenerator__default["default"](function* () {
         if (isCustomApiProvider(provider)) {
           provider = CUSTOM_API_PROVIDER;
         }
 
-        if (_this13.providerRepository.has(provider)) {
-          return _this13.providerRepository.get(provider);
+        if (_this12.providerRepository.has(provider)) {
+          return _this12.providerRepository.get(provider);
         }
 
         if (provider === CUSTOM_API_PROVIDER && !customElements.get(provider)) {
           registerCustomApi();
         }
 
-        yield _this13.loadDynamicBricks([provider]);
+        yield _this12.loadDynamicBricks([provider]);
 
         if (!customElements.get(provider)) {
           throw new Error("Provider not defined: \"".concat(provider, "\"."));
@@ -8446,7 +8491,7 @@
 
         var brick = document.createElement(provider);
 
-        _this13.providerRepository.set(provider, brick);
+        _this12.providerRepository.set(provider, brick);
 
         return brick;
       })();
@@ -8455,7 +8500,7 @@
   } // Since `@next-dll/editor-bricks-helper` depends on `@next-dll/react-dnd`,
   // always load react-dnd before loading editor-bricks-helper.
 
-  function loadScriptOfDll(_x) {
+  function loadScriptOfDll(_x5) {
     return _loadScriptOfDll.apply(this, arguments);
   }
 
@@ -8630,7 +8675,8 @@
         misc.isInIframe = true;
 
         try {
-          misc.isInIframeOfLegacyConsole = window.origin === window.parent.origin;
+          // Handle when previewing in visual builder by iframe.
+          misc.isInIframeOfLegacyConsole = window.origin === window.parent.origin && getBasePath() === "/next/" && !window.parent.location.pathname.startsWith("/next/");
         } catch (e) {// do nothing
         }
       }
@@ -13625,26 +13671,32 @@
     var response = React.useRef();
     var data = React.useRef(defaults.data);
     var forceUpdate = React.useReducer(() => ({}), [])[1];
-    var doFetch = React.useCallback( /*#__PURE__*/_asyncToGenerator__default["default"](function* () {
-      try {
-        error.current = undefined;
-        if (!suspense) setLoading(true);
+    var doFetch = React.useCallback( /*#__PURE__*/function () {
+      var _ref = _asyncToGenerator__default["default"](function* (provider) {
+        try {
+          error.current = undefined;
+          if (!suspense) setLoading(true);
+
+          for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
+            args[_key - 1] = arguments[_key];
+          }
 
-        for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
-          args[_key] = arguments[_key];
+          var newRes = yield fetch(provider, ...args);
+          response.current = newRes;
+          data.current = transform(data.current, newRes);
+        } catch (e) {
+          error.current = e;
         }
 
-        var newRes = yield fetch(provider, ...args);
-        response.current = newRes;
-        data.current = transform(data.current, newRes);
-      } catch (e) {
-        error.current = e;
-      }
+        if (!suspense) setLoading(false);
+        if (error.current) onError(error.current);
+        return data.current;
+      });
 
-      if (!suspense) setLoading(false);
-      if (error.current) onError(error.current);
-      return data.current;
-    }), [provider, customOptions, dependencies, requestInit, suspense, transform, defaults.data, onError]);
+      return function (_x) {
+        return _ref.apply(this, arguments);
+      };
+    }(), [provider, customOptions, dependencies, requestInit, suspense, transform, defaults.data, onError]);
     var makeFetch = React.useCallback( /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator__default["default"](function* (providerOrBody, args) {
         var providerStr = provider;
@@ -13664,7 +13716,7 @@
 
         if (suspense) {
           return _asyncToGenerator__default["default"](function* () {
-            suspender.current = doFetch(...actualArgs).then(newData => {
+            suspender.current = doFetch(providerStr, ...actualArgs).then(newData => {
               suspenseStatus.current = "success";
               return newData;
             }, error => {
@@ -13677,10 +13729,10 @@
           })();
         }
 
-        return doFetch(...actualArgs);
+        return doFetch(providerStr, ...actualArgs);
       });
 
-      return function (_x, _x2) {
+      return function (_x2, _x3) {
         return _ref2.apply(this, arguments);
       };
     }(), [doFetch]);