@next-core/brick-kit 2.125.0 → 2.126.2

package/dist/index.esm.js

@@ -2924,7 +2924,7 @@ function getNextInternalOptions(internalOptions, isArray, key) {
 }
 
 var _excluded$6 = ["children"],
-    _excluded2$1 = ["items", "app"];
+    _excluded2$2 = ["items", "app"];
 var symbolAppId = Symbol("appId");
 // Caching menu requests to avoid flicker.
 var menuCache = new Map();
@@ -3108,7 +3108,7 @@ function _processMenu() {
       items,
       app
     } = _yield$fetchMenuById,
-        restMenuData = _objectWithoutProperties(_yield$fetchMenuById, _excluded2$1);
+        restMenuData = _objectWithoutProperties(_yield$fetchMenuById, _excluded2$2);
 
     var menuData = _objectSpread(_objectSpread({}, yield computeRealValueWithOverrideApp(restMenuData, app[0].appId, context, kernel)), {}, {
       items: yield computeMenuItemsWithOverrideApp(items, context, kernel)
@@ -5795,6 +5795,24 @@ function clearPollTimeout() {
   timeoutIdList.clear();
 }
 
+/**
+ * @description 独立小产品Runtime接口
+ * @endpoint GET /api/v1/runtime_standalone
+ */
+
+
+var BootstrapStandaloneApi_runtimeStandalone = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator$4(function* (options) {
+    return (
+      /**! @contract easyops.api.api_gateway.bootstrap_standalone.RuntimeStandalone@1.0.1 */
+      (yield http.get("api/v1/runtime_standalone", options)).data
+    );
+  });
+
+  return function BootstrapStandaloneApi_runtimeStandalone(_x) {
+    return _ref.apply(this, arguments);
+  };
+}();
 /**
  * @description 获取系统初始化信息
  * @endpoint GET /api/auth/v2/bootstrap
@@ -6887,6 +6905,43 @@ var UserAdminApi_searchAllUsersInfo = /*#__PURE__*/function () {
   };
 }();
 
+/**
+ * @description 独立小产品Runtime接口
+ * @endpoint GET /api/v1/micro_app_standalone/runtime/:appId
+ */
+
+
+var RuntimeApi_runtimeMicroAppStandalone = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator$4(function* (appId, options) {
+    return (
+      /**! @contract easyops.api.micro_app_standalone.runtime.RuntimeMicroAppStandalone@1.0.1 */
+      (yield http.get("api/gateway/micro_app_standalone.runtime.RuntimeMicroAppStandalone/api/v1/micro_app_standalone/runtime/".concat(appId), options)).data
+    );
+  });
+
+  return function RuntimeApi_runtimeMicroAppStandalone(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();
+/**
+ * @description 查询独立部署小产品
+ * @endpoint POST /api/v1/micro_app_standalone/search
+ */
+
+
+var RuntimeApi_searchMicroAppStandalone = /*#__PURE__*/function () {
+  var _ref = _asyncToGenerator$4(function* (data, options) {
+    return (
+      /**! @contract easyops.api.micro_app_standalone.runtime.SearchMicroAppStandalone@1.0.1 */
+      (yield http.post("api/gateway/micro_app_standalone.runtime.SearchMicroAppStandalone/api/v1/micro_app_standalone/search", data, options)).data
+    );
+  });
+
+  return function RuntimeApi_searchMicroAppStandalone(_x, _x2) {
+    return _ref.apply(this, arguments);
+  };
+}();
+
 /**
  * Merge `app.defaultConfig` and `app.userConfig` to `app.config`.
  *
@@ -7079,15 +7134,21 @@ function initAnalytics() {
   }
 }
 
-var _excluded$4 = ["feature_flags"];
+var _excluded$4 = ["feature_flags"],
+    _excluded2$1 = ["featureFlags", "misc"];
 function standaloneBootstrap() {
   return _standaloneBootstrap.apply(this, arguments);
 }
 
 function _standaloneBootstrap() {
   _standaloneBootstrap = _asyncToGenerator$4(function* () {
-    var [bootstrapResult, confString] = yield Promise.all([http.get(window.BOOTSTRAP_FILE), http.get("".concat(window.APP_ROOT, "conf.yaml"), {
+    var [bootstrapResult, confString, runtimeData] = yield Promise.all([http.get(window.BOOTSTRAP_FILE), http.get("".concat(window.APP_ROOT, "conf.yaml"), {
       responseType: "text"
+    }), yield BootstrapStandaloneApi_runtimeStandalone().catch(function (error) {
+      // make it not crash when the backend service is not updated.
+      // eslint-disable-next-line no-console
+      console.warn("request runtime api from api-gateway failed: ", error, ", something might went wrong running standalone micro app");
+      return undefined;
     })]);
     var conf;
 
@@ -7135,6 +7196,24 @@ function _standaloneBootstrap() {
       }
     }
 
+    if (runtimeData) {
+      var runtimeSetings = runtimeData.settings;
+
+      if (!isEmpty(runtimeSetings)) {
+        // Merge Feature Flags
+        if (!settings) {
+          settings = runtimeSetings;
+        } else {
+          // Merge Feature Flags & Misc
+          var rest = _objectWithoutProperties(runtimeSetings, _excluded2$1);
+
+          settings.featureFlags = _objectSpread(_objectSpread({}, settings.featureFlags), runtimeSetings.featureFlags);
+          settings.misc = _objectSpread(_objectSpread({}, settings.misc), runtimeSetings.misc);
+          settings = Object.assign(settings, rest);
+        }
+      }
+    }
+
     return _objectSpread(_objectSpread({}, bootstrapResult), {}, {
       settings
     });
@@ -8856,6 +8935,27 @@ class Kernel {
         Object.assign(storyboard, {
           $$fulfilled: true
         });
+
+        if (!window.NO_AUTH_GUARD) {
+          var appRuntimeData;
+
+          try {
+            appRuntimeData = yield RuntimeApi_runtimeMicroAppStandalone(storyboard.app.id);
+          } catch (error) {
+            // make it not crash when the backend service is not updated.
+            // eslint-disable-next-line no-console
+            console.warn("request standalone runtime api from micro-app-standalone failed: ", error, ", something might went wrong running standalone micro app");
+          }
+
+          if (appRuntimeData) {
+            // merge user config
+            storyboard.app.userConfig = _objectSpread(_objectSpread({}, storyboard.app.userConfig), appRuntimeData.userConfig); // get inject menus (Actually, appRuntimeData contains both main and inject menus)
+
+            storyboard.meta = _objectSpread(_objectSpread({}, storyboard.meta), {}, {
+              injectMenus: appRuntimeData.injectMenus
+            });
+          }
+        }
       } else {
         var {
           routes,
@@ -9370,15 +9470,20 @@ class Kernel {
   }
 
   getStandaloneMenus(menuId) {
-    var _cloneDeep, _currentStoryboard$me;
+    var _currentStoryboard$me, _currentStoryboard$me2;
 
     var currentAppId = this.currentApp.id;
     var currentStoryboard = this.bootstrapData.storyboards.find(storyboard => storyboard.app.id === currentAppId);
-    return ((_cloneDeep = cloneDeep((_currentStoryboard$me = currentStoryboard.meta) === null || _currentStoryboard$me === void 0 ? void 0 : _currentStoryboard$me.menus)) !== null && _cloneDeep !== void 0 ? _cloneDeep : []).filter(menu => menu.menuId === menuId).map(menu => _objectSpread(_objectSpread({}, menu), {}, {
-      app: [{
-        appId: currentAppId
-      }]
-    }));
+    var menus = (_currentStoryboard$me = currentStoryboard.meta) !== null && _currentStoryboard$me !== void 0 && _currentStoryboard$me.injectMenus ? cloneDeep(currentStoryboard.meta.injectMenus) : (_currentStoryboard$me2 = currentStoryboard.meta) !== null && _currentStoryboard$me2 !== void 0 && _currentStoryboard$me2.menus ? cloneDeep(currentStoryboard.meta.menus) : [];
+    return menus.filter(menu => menu.menuId === menuId).map(menu => {
+      var _menu$app;
+
+      return _objectSpread(_objectSpread({}, menu), (_menu$app = menu.app) !== null && _menu$app !== void 0 && _menu$app.length && menu.app[0].appId ? {} : {
+        app: [{
+          appId: currentAppId
+        }]
+      });
+    });
   }
 
   getProviderBrick(provider) {
@@ -11336,25 +11441,6 @@ function registerFormRenderer() {
   });
 }
 
-/**
- * @description 查询独立部署小产品
- * @endpoint POST /api/v1/micro_app_standalone/search
- */
-
-
-var RuntimeApi_searchMicroAppStandalone = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator$4(function* (data, options) {
-    return (
-      /**! @contract easyops.api.micro_app_standalone.runtime.SearchMicroAppStandalone@1.0.1 */
-      (yield http.post("api/gateway/micro_app_standalone.runtime.SearchMicroAppStandalone/api/v1/micro_app_standalone/search", data, options)).data
-    );
-  });
-
-  return function RuntimeApi_searchMicroAppStandalone(_x, _x2) {
-    return _ref.apply(this, arguments);
-  };
-}();
-
 var standaloneApps = [];
 var appIdSet = new Set();
 function preFetchStandaloneInstalledApps(_x) {
@@ -11418,6 +11504,38 @@ function getStandaloneInstalledApps() {
   return standaloneApps;
 }
 
+function mergePreviewRoutes(routes) {
+  var mergedRoutes = routes;
+  var specificTemplatePreviewIndex = findLastIndex(mergedRoutes, route => route.path.startsWith("${APP.homepage}/_dev_only_/template-preview/"));
+  mergedRoutes = [...mergedRoutes.slice(0, specificTemplatePreviewIndex + 1), {
+    path: "${APP.homepage}/_dev_only_/template-preview/:templateId",
+    bricks: [{
+      brick: "span"
+    }],
+    menu: false,
+    exact: true
+  }, ...mergedRoutes.slice(specificTemplatePreviewIndex + 1)];
+  var specificSnippetPreviewIndex = findLastIndex(mergedRoutes, route => route.path.startsWith("${APP.homepage}/_dev_only_/snippet-preview/"));
+  mergedRoutes = [...mergedRoutes.slice(0, specificSnippetPreviewIndex + 1), {
+    path: "${APP.homepage}/_dev_only_/snippet-preview/:snippetId",
+    bricks: [{
+      brick: "span"
+    }],
+    menu: false,
+    exact: true
+  }, ...mergedRoutes.slice(specificSnippetPreviewIndex + 1)];
+  var specificFormPreviewIndex = findLastIndex(mergedRoutes, route => route.path.startsWith("${APP.homepage}/_dev_only_/form-preview/"));
+  mergedRoutes = [...mergedRoutes.slice(0, specificFormPreviewIndex + 1), {
+    path: "${APP.homepage}/_dev_only_/form-preview/:FormId",
+    bricks: [{
+      brick: "span"
+    }],
+    menu: false,
+    exact: true
+  }, ...mergedRoutes.slice(specificFormPreviewIndex + 1)];
+  return mergedRoutes;
+}
+
 class Router {
   constructor(kernel) {
     _defineProperty$1(this, "defaultCollapsed", false);
@@ -11693,8 +11811,7 @@ class Router {
         };
 
         try {
-          var mergedRoutes = _this3.MergePreviewRouter(storyboard.routes);
-
+          var mergedRoutes = mergePreviewRoutes(storyboard.routes);
           yield locationContext.mountRoutes(mergedRoutes, undefined, mountRoutesResult);
         } catch (error) {
           // eslint-disable-next-line no-console
@@ -11822,9 +11939,10 @@ class Router {
 
         menuInBg.forEach(brick => {
           appendBrick(brick, mountPoints.portal);
-        });
+        }); // When we have a matched route other than an abstract route,
+        // we say *page found*, otherwise, *page not found*.
 
-        if (main.length > 0 || portal.length > 0) {
+        if (route && route.type !== "routes" || failed) {
           main.length > 0 && mountTree(main, mountPoints.main);
           portal.length > 0 && mountTree(portal, mountPoints.portal);
           afterMountTree(mountPoints.main);
@@ -11864,9 +11982,9 @@ class Router {
               _this3.kernel.prefetchDepsOfStoryboard(storyboard);
             });
           } else {
-            Promise.resolve().then(() => {
+            setTimeout(() => {
               _this3.kernel.prefetchDepsOfStoryboard(storyboard);
-            });
+            }, 0);
           }
 
           return;
@@ -11904,50 +12022,6 @@ class Router {
       subMenu: mountResult.menuBar.subMenu
     };
   }
-
-  MergePreviewRouter(router) {
-    var mergedRoutes = router;
-    var specificTemplatePreviewIndex = findLastIndex(mergedRoutes, route => route.path.startsWith("${APP.homepage}/_dev_only_/template-preview/"));
-
-    if (specificTemplatePreviewIndex > -1) {
-      mergedRoutes = [...mergedRoutes.slice(0, specificTemplatePreviewIndex + 1), {
-        path: "${APP.homepage}/_dev_only_/template-preview/:templateId",
-        bricks: [{
-          brick: "span"
-        }],
-        menu: false,
-        exact: true
-      }, ...mergedRoutes.slice(specificTemplatePreviewIndex + 1)];
-    }
-
-    var specificSnippetPreviewIndex = findLastIndex(mergedRoutes, route => route.path.startsWith("${APP.homepage}/_dev_only_/snippet-preview/"));
-
-    if (specificSnippetPreviewIndex > -1) {
-      mergedRoutes = [...mergedRoutes.slice(0, specificSnippetPreviewIndex + 1), {
-        path: "${APP.homepage}/_dev_only_/snippet-preview/:snippetId",
-        bricks: [{
-          brick: "span"
-        }],
-        menu: false,
-        exact: true
-      }, ...mergedRoutes.slice(specificSnippetPreviewIndex + 1)];
-    }
-
-    var specificFormPreviewIndex = findLastIndex(mergedRoutes, route => route.path.startsWith("${APP.homepage}/_dev_only_/form-preview/"));
-
-    if (specificFormPreviewIndex > -1) {
-      mergedRoutes = [...mergedRoutes.slice(0, specificFormPreviewIndex + 1), {
-        path: "${APP.homepage}/_dev_only_/form-preview/:FormId",
-        bricks: [{
-          brick: "span"
-        }],
-        menu: false,
-        exact: true
-      }, ...mergedRoutes.slice(specificFormPreviewIndex + 1)];
-    }
-
-    return mergedRoutes;
-  }
   /* istanbul ignore next */