@next-core/brick-kit 2.187.1 → 2.188.1

package/dist/index.bundle.js

@@ -701,7 +701,7 @@
     return {
       get(name) {
         var getSuffix = () => {
-          var suffix = window.APP_ROOT ? "".concat(window.APP_ROOT, "-/") : "";
+          var suffix = window.APP_ROOT ? "".concat(window.APP_ROOT).concat(window.PUBLIC_DEPS ? "" : "-/") : "";
           if (!suffix.startsWith("/")) {
             suffix = getBasePath() + suffix;
           }
@@ -715,7 +715,7 @@
           }
           return suffix;
         };
-        return isBuildPush ? "".concat(getBasePath(), "api/gateway/object_store.object_store.GetObject/api/v1/objectStore/bucket/next-builder/object/").concat(name) : "".concat(getSuffix(), "micro-apps/").concat(appId, "/images/").concat(name);
+        return isBuildPush ? "".concat(getBasePath(), "api/gateway/object_store.object_store.GetObject/api/v1/objectStore/bucket/next-builder/object/").concat(name) : window.PUBLIC_DEPS ? "".concat(getSuffix(), "images/").concat(name) : "".concat(getSuffix(), "micro-apps/").concat(appId, "/images/").concat(name);
       }
     };
   }
@@ -3867,27 +3867,26 @@
       return (_kernel$bootstrapData = (_kernel$bootstrapData2 = kernel.bootstrapData.settings) === null || _kernel$bootstrapData2 === void 0 ? void 0 : _kernel$bootstrapData2.homepage) !== null && _kernel$bootstrapData !== void 0 ? _kernel$bootstrapData : "/";
     }
     getBrickPackages() {
-      var _kernel$bootstrapData3;
-      return (_kernel$bootstrapData3 = kernel.bootstrapData) === null || _kernel$bootstrapData3 === void 0 ? void 0 : _kernel$bootstrapData3.brickPackages;
+      return kernel.getBrickPackages();
     }
     getBrandSettings() {
-      var _kernel$bootstrapData4;
+      var _kernel$bootstrapData3;
       return Object.assign({
         base_title: "DevOps 管理专家"
-      }, (_kernel$bootstrapData4 = kernel.bootstrapData.settings) === null || _kernel$bootstrapData4 === void 0 ? void 0 : _kernel$bootstrapData4.brand, kernel.getOriginFaviconHref() ? {
+      }, (_kernel$bootstrapData3 = kernel.bootstrapData.settings) === null || _kernel$bootstrapData3 === void 0 ? void 0 : _kernel$bootstrapData3.brand, kernel.getOriginFaviconHref() ? {
         favicon: kernel.getOriginFaviconHref()
       } : {});
     }
     getLaunchpadSettings() {
-      var _kernel$bootstrapData5;
+      var _kernel$bootstrapData4;
       return Object.assign({
         columns: 7,
         rows: 4
-      }, (_kernel$bootstrapData5 = kernel.bootstrapData.settings) === null || _kernel$bootstrapData5 === void 0 ? void 0 : _kernel$bootstrapData5.launchpad);
+      }, (_kernel$bootstrapData4 = kernel.bootstrapData.settings) === null || _kernel$bootstrapData4 === void 0 ? void 0 : _kernel$bootstrapData4.launchpad);
     }
     getMiscSettings() {
-      var _kernel$bootstrapData6, _kernel$nextApp, _kernel$nextApp$confi, _kernel$nextApp$confi2;
-      return Object.assign({}, (_kernel$bootstrapData6 = kernel.bootstrapData.settings) === null || _kernel$bootstrapData6 === void 0 ? void 0 : _kernel$bootstrapData6.misc, (_kernel$nextApp = kernel.nextApp) === null || _kernel$nextApp === void 0 ? void 0 : (_kernel$nextApp$confi = _kernel$nextApp.config) === null || _kernel$nextApp$confi === void 0 ? void 0 : (_kernel$nextApp$confi2 = _kernel$nextApp$confi.settings) === null || _kernel$nextApp$confi2 === void 0 ? void 0 : _kernel$nextApp$confi2.misc);
+      var _kernel$bootstrapData5, _kernel$nextApp, _kernel$nextApp$confi, _kernel$nextApp$confi2;
+      return Object.assign({}, (_kernel$bootstrapData5 = kernel.bootstrapData.settings) === null || _kernel$bootstrapData5 === void 0 ? void 0 : _kernel$bootstrapData5.misc, (_kernel$nextApp = kernel.nextApp) === null || _kernel$nextApp === void 0 ? void 0 : (_kernel$nextApp$confi = _kernel$nextApp.config) === null || _kernel$nextApp$confi === void 0 ? void 0 : (_kernel$nextApp$confi2 = _kernel$nextApp$confi.settings) === null || _kernel$nextApp$confi2 === void 0 ? void 0 : _kernel$nextApp$confi2.misc);
     }
     /* istanbul ignore next */
     getRelatedApps(appId) {
@@ -7263,7 +7262,7 @@
         return;
       }), window.BOOTSTRAP_UNION_FILE ? brickHttp.http.get(window.BOOTSTRAP_FILE) : Promise.resolve(undefined)];
       if (!window.NO_AUTH_GUARD) {
-        var matches = window.APP_ROOT ? window.APP_ROOT.match(/^(?:(?:\/next)?\/)?sa-static\/([^/]+)\/versions\/([^/]+)\//) : null;
+        var matches = window.APP_ROOT ? window.APP_ROOT.match(/^(?:(?:\/next)?\/)?sa-static\/([^/]+)\/versions\/([^/]+)\//) || window.APP_ROOT.match(/^(?:(?:\/next)?\/)?sa-static\/micro-apps\/(?:v2|v3)\/([^/]+)\/([^/]+)\//) : null;
         if (matches) {
           // No need to wait.
           safeGetRuntimeMicroAppStandalone(matches[1], matches[2]);
@@ -8819,9 +8818,9 @@
       _defineProperty__default["default"](this, "_loadDepsOfStoryboard", /*#__PURE__*/function () {
         var _ref = _asyncToGenerator__default["default"](function* (storyboard) {
           var {
-            brickPackages,
             templatePackages
           } = _this.bootstrapData;
+          var brickPackages = _this.getBrickPackages();
           if (storyboard.dependsAll) {
             var dllPath = window.DLL_PATH || {};
             yield loadScriptOfDll(Object.values(dllPath));
@@ -8871,9 +8870,7 @@
           var filteredBricks = bricks.filter(
           // Only try to load undefined custom elements.
           item => !customElements.get(item));
-          var {
-            brickPackages
-          } = _this.bootstrapData;
+          var brickPackages = _this.getBrickPackages();
           // Try to load deps for dynamic added bricks.
           var {
             dll,
@@ -8883,7 +8880,7 @@
           } = brickUtils.getDllAndDepsByResource({
             bricks: filteredBricks,
             processors
-          }, _this.bootstrapData.brickPackages);
+          }, brickPackages);
           var loadV3Bricks = /*#__PURE__*/function () {
             var _ref4 = _asyncToGenerator__default["default"](function* () {
               if (v3Bricks !== null && v3Bricks !== void 0 && v3Bricks.some(brick => brick.includes(".tpl-"))) {
@@ -8905,6 +8902,7 @@
       }());
       _defineProperty__default["default"](this, "_loadEditorBricks", /*#__PURE__*/function () {
         var _ref5 = _asyncToGenerator__default["default"](function* (editorBricks) {
+          var brickPackages = _this.getBrickPackages();
           var {
             dll,
             deps
@@ -8912,7 +8910,7 @@
             editorBricks: editorBricks.filter(
             // Only try to load undefined custom elements.
             item => !customElements.get(item))
-          }, _this.bootstrapData.brickPackages);
+          }, brickPackages);
           yield loadScriptOfDll(dll);
           yield loadScriptOfBricksOrTemplates(deps);
         });
@@ -9028,6 +9026,10 @@
         });
       })();
     }
+    getBrickPackages() {
+      var _this$bootstrapData, _this$bootstrapData$b, _window$PUBLIC_DEPS;
+      return (_this$bootstrapData = this.bootstrapData) === null || _this$bootstrapData === void 0 ? void 0 : (_this$bootstrapData$b = _this$bootstrapData.brickPackages) === null || _this$bootstrapData$b === void 0 ? void 0 : _this$bootstrapData$b.concat((_window$PUBLIC_DEPS = window.PUBLIC_DEPS) !== null && _window$PUBLIC_DEPS !== void 0 ? _window$PUBLIC_DEPS : []);
+    }
     reloadMicroApps(params, interceptorParams) {
       // There is no need to reload standalone micro-apps.
       if (!window.STANDALONE_MICRO_APPS) {
@@ -9055,7 +9057,7 @@
             $$fulfilling: null
           });
           if (window.BOOTSTRAP_UNION_FILE && !storyboard.$$fullMerged) {
-            var fullBootstrapPath = "".concat(window.APP_ROOT, "-/").concat(storyboard.bootstrapFile);
+            var fullBootstrapPath = "".concat(window.APP_ROOT).concat(window.PUBLIC_DEPS ? "" : "-/").concat(storyboard.bootstrapFile);
             var {
               storyboards
             } = yield brickHttp.http.get(fullBootstrapPath);
@@ -9075,7 +9077,7 @@
             var appRuntimeData;
             try {
               // Note: the request maybe have fired already during bootstrap.
-              appRuntimeData = yield safeGetRuntimeMicroAppStandalone(storyboard.app.id);
+              appRuntimeData = yield safeGetRuntimeMicroAppStandalone(storyboard.app.id, storyboard.app.currentVersion);
             } catch (error) {
               // make it not crash when the backend service is not updated.
               // eslint-disable-next-line no-console
@@ -9401,9 +9403,9 @@
         return;
       }
       var {
-        brickPackages,
         templatePackages
       } = this.bootstrapData;
+      var brickPackages = this.getBrickPackages();
       var templateDeps = brickUtils.getTemplateDepsOfStoryboard(storyboard, templatePackages);
       brickUtils.prefetchScript(templateDeps, window.PUBLIC_ROOT);
       var result = brickUtils.getDllAndDepsOfStoryboard(storyboard, brickPackages);
@@ -9603,8 +9605,8 @@
       };
     }
     getFeatureFlags() {
-      var _this$bootstrapData, _this$bootstrapData$s, _this$nextApp, _this$nextApp$config, _this$nextApp$config$;
-      var flags = _objectSpread__default["default"](_objectSpread__default["default"]({}, (_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), (_this$nextApp = this.nextApp) === null || _this$nextApp === void 0 ? void 0 : (_this$nextApp$config = _this$nextApp.config) === null || _this$nextApp$config === void 0 ? void 0 : (_this$nextApp$config$ = _this$nextApp$config.settings) === null || _this$nextApp$config$ === void 0 ? void 0 : _this$nextApp$config$.featureFlags);
+      var _this$bootstrapData2, _this$bootstrapData2$, _this$nextApp, _this$nextApp$config, _this$nextApp$config$;
+      var flags = _objectSpread__default["default"](_objectSpread__default["default"]({}, (_this$bootstrapData2 = this.bootstrapData) === null || _this$bootstrapData2 === void 0 ? void 0 : (_this$bootstrapData2$ = _this$bootstrapData2.settings) === null || _this$bootstrapData2$ === void 0 ? void 0 : _this$bootstrapData2$.featureFlags), (_this$nextApp = this.nextApp) === null || _this$nextApp === void 0 ? void 0 : (_this$nextApp$config = _this$nextApp.config) === null || _this$nextApp$config === void 0 ? void 0 : (_this$nextApp$config$ = _this$nextApp$config.settings) === null || _this$nextApp$config$ === void 0 ? void 0 : _this$nextApp$config$.featureFlags);
       delete flags["migrate-to-brick-next-v3"];
       return flags;
     }
@@ -11706,7 +11708,7 @@
   var brick;
   var WATEMARK_BRICKNAME = "basic.show-watermark";
   function setWatermark() {
-    var _settings$watermarkCo, _window$APP_ROOT, _window$APP_ROOT$matc, _getAuth$username, _getAuth, _watermarkConfig$cont, _watermarkConfig$flag, _watermarkConfig$flag2;
+    var _settings$watermarkCo, _window$APP_ROOT, _window$APP_ROOT$matc, _window$APP_ROOT2, _window$APP_ROOT2$mat, _getAuth$username, _getAuth, _watermarkConfig$cont, _watermarkConfig$flag, _watermarkConfig$flag2;
     var flags = getRuntime().getFeatureFlags();
     var settings = getRuntime().getMiscSettings();
     var brickPackages = getRuntime().getBrickPackages();
@@ -11716,7 +11718,7 @@
     var watermarkConfig = (_settings$watermarkCo = settings.watermarkConfig) !== null && _settings$watermarkCo !== void 0 ? _settings$watermarkCo : {
       flags: {}
     };
-    var isDeveloper = ((_window$APP_ROOT = window.APP_ROOT) === null || _window$APP_ROOT === void 0 ? void 0 : (_window$APP_ROOT$matc = _window$APP_ROOT.match(/versions\/([^/]+)\//)) === null || _window$APP_ROOT$matc === void 0 ? void 0 : _window$APP_ROOT$matc[1]) === "0.0.0";
+    var isDeveloper = ((_window$APP_ROOT = window.APP_ROOT) === null || _window$APP_ROOT === void 0 ? void 0 : (_window$APP_ROOT$matc = _window$APP_ROOT.match(/versions\/([^/]+)\//)) === null || _window$APP_ROOT$matc === void 0 ? void 0 : _window$APP_ROOT$matc[1]) === "0.0.0" || ((_window$APP_ROOT2 = window.APP_ROOT) === null || _window$APP_ROOT2 === void 0 ? void 0 : (_window$APP_ROOT2$mat = _window$APP_ROOT2.match(/micro-apps\/(?:v2|v3)\/[^/]+\/([^/]+)/)) === null || _window$APP_ROOT2$mat === void 0 ? void 0 : _window$APP_ROOT2$mat[1]) === "0.0.0";
     var username = (_getAuth$username = (_getAuth = getAuth()) === null || _getAuth === void 0 ? void 0 : _getAuth.username) !== null && _getAuth$username !== void 0 ? _getAuth$username : "";
     var defaultProps = _objectSpread__default["default"]({
       content: [...(typeof watermarkConfig.content === "string" ? [watermarkConfig.content] : (_watermarkConfig$cont = watermarkConfig.content) !== null && _watermarkConfig$cont !== void 0 ? _watermarkConfig$cont : []), (_watermarkConfig$flag = watermarkConfig.flags) !== null && _watermarkConfig$flag !== void 0 && _watermarkConfig$flag["show-development"] && isDeveloper ? "Development" : "", (_watermarkConfig$flag2 = watermarkConfig.flags) !== null && _watermarkConfig$flag2 !== void 0 && _watermarkConfig$flag2["show-user"] ? username : ""].filter(Boolean),
@@ -11733,7 +11735,9 @@
       loader.loadBricksImperatively([WATEMARK_BRICKNAME], brickPackages).then(() => {
         brick = document.createElement(WATEMARK_BRICKNAME);
         brick.resolve(defaultProps);
-      }, error => {
+      },
+      // istanbul ignore next
+      error => {
         // eslint-disable-next-line no-console
         console.error("Load watermark service failed:", error);
       });