@next-core/brick-kit 2.188.0 → 2.188.2

package/dist/index.bundle.js

@@ -701,7 +701,7 @@
     return {
       get(name) {
         var getSuffix = () => {
-          var suffix = window.APP_ROOT ? "".concat(window.APP_ROOT).concat(window.PUBLIC_DEPS ? "" : "-/") : "";
+          var suffix = window.APP_ROOT ? "".concat(window.APP_ROOT).concat(window.BOOTSTRAP_UNION_FILE && window.PUBLIC_DEPS ? "" : "-/") : "";
           if (!suffix.startsWith("/")) {
             suffix = getBasePath() + suffix;
           }
@@ -9026,9 +9026,22 @@
         });
       })();
     }
+    processPublicDepsPackages() {
+      var brickPackages = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+      var pubDeps = arguments.length > 1 ? arguments[1] : undefined;
+      if (!(pubDeps !== null && pubDeps !== void 0 && pubDeps.length)) return brickPackages;
+      var bricksMap = new Map();
+
+      // bootstrapData 数据和 pubDeps 中可能同时存在同一个包名，需要过滤去重， 以 pubDeps 中的包为准
+      [...brickPackages, ...pubDeps].forEach(pkg => {
+        var pkgName = pkg.filePath.split("/")[1];
+        bricksMap.set(pkgName, pkg);
+      });
+      return Array.from(bricksMap.values());
+    }
     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 : []);
+      var _this$bootstrapData;
+      return this.processPublicDepsPackages((_this$bootstrapData = this.bootstrapData) === null || _this$bootstrapData === void 0 ? void 0 : _this$bootstrapData.brickPackages, window.PUBLIC_DEPS);
     }
     reloadMicroApps(params, interceptorParams) {
       // There is no need to reload standalone micro-apps.
@@ -9057,7 +9070,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);
@@ -9077,7 +9090,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