@next-core/brick-kit 2.125.0 → 2.126.2

package/CHANGELOG.md

@@ -3,6 +3,45 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.126.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.126.1...@next-core/brick-kit@2.126.2) (2022-08-09)
+
+
+### Bug Fixes
+
+* fix merge preview routes ([ed39097](https://github.com/easyops-cn/next-core/commit/ed390976eb4cb8536465aa30abce5ae51c18e72a))
+
+
+
+
+
+## [2.126.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.126.0...@next-core/brick-kit@2.126.1) (2022-08-09)
+
+
+### Bug Fixes
+
+* do not report 404 when page is empty ([869038e](https://github.com/easyops-cn/next-core/commit/869038e2d5447001aa7e22a1218ce91774ce0905))
+
+
+
+
+
+# [2.126.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.125.0...@next-core/brick-kit@2.126.0) (2022-08-08)
+
+
+### Bug Fixes
+
+* make loose dependency on backend runtime api ([6474f53](https://github.com/easyops-cn/next-core/commit/6474f53687ae514e79c88780810d98e887045c32))
+
+
+### Features
+
+* **runtime:** support runtime FLAGS and MISC on standalone mode ([131cdbc](https://github.com/easyops-cn/next-core/commit/131cdbc46eb609722719091a202c3364053bfc84))
+* support userConfig & injectMenus in standalone mode ([cd890ed](https://github.com/easyops-cn/next-core/commit/cd890edf01b12c18a771d677106de74ca4e837be))
+
+
+
+
+
 # [2.125.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.124.1...@next-core/brick-kit@2.125.0) (2022-08-08)
 
 

package/dist/index.bundle.js

@@ -2923,7 +2923,7 @@
   }
 
   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();
@@ -3107,7 +3107,7 @@
         items,
         app
       } = _yield$fetchMenuById,
-          restMenuData = _objectWithoutProperties__default["default"](_yield$fetchMenuById, _excluded2$1);
+          restMenuData = _objectWithoutProperties__default["default"](_yield$fetchMenuById, _excluded2$2);
 
       var menuData = _objectSpread__default["default"](_objectSpread__default["default"]({}, yield computeRealValueWithOverrideApp(restMenuData, app[0].appId, context, kernel)), {}, {
         items: yield computeMenuItemsWithOverrideApp(items, context, kernel)
@@ -5794,6 +5794,24 @@
     timeoutIdList.clear();
   }
 
+  /**
+   * @description 独立小产品Runtime接口
+   * @endpoint GET /api/v1/runtime_standalone
+   */
+
+
+  var BootstrapStandaloneApi_runtimeStandalone = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator__default["default"](function* (options) {
+      return (
+        /**! @contract easyops.api.api_gateway.bootstrap_standalone.RuntimeStandalone@1.0.1 */
+        (yield brickHttp.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
@@ -6886,6 +6904,43 @@
     };
   }();
 
+  /**
+   * @description 独立小产品Runtime接口
+   * @endpoint GET /api/v1/micro_app_standalone/runtime/:appId
+   */
+
+
+  var RuntimeApi_runtimeMicroAppStandalone = /*#__PURE__*/function () {
+    var _ref = _asyncToGenerator__default["default"](function* (appId, options) {
+      return (
+        /**! @contract easyops.api.micro_app_standalone.runtime.RuntimeMicroAppStandalone@1.0.1 */
+        (yield brickHttp.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__default["default"](function* (data, options) {
+      return (
+        /**! @contract easyops.api.micro_app_standalone.runtime.SearchMicroAppStandalone@1.0.1 */
+        (yield brickHttp.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`.
    *
@@ -7078,15 +7133,21 @@
     }
   }
 
-  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__default["default"](function* () {
-      var [bootstrapResult, confString] = yield Promise.all([brickHttp.http.get(window.BOOTSTRAP_FILE), brickHttp.http.get("".concat(window.APP_ROOT, "conf.yaml"), {
+      var [bootstrapResult, confString, runtimeData] = yield Promise.all([brickHttp.http.get(window.BOOTSTRAP_FILE), brickHttp.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;
 
@@ -7134,6 +7195,24 @@
         }
       }
 
+      if (runtimeData) {
+        var runtimeSetings = runtimeData.settings;
+
+        if (!_.isEmpty(runtimeSetings)) {
+          // Merge Feature Flags
+          if (!settings) {
+            settings = runtimeSetings;
+          } else {
+            // Merge Feature Flags & Misc
+            var rest = _objectWithoutProperties__default["default"](runtimeSetings, _excluded2$1);
+
+            settings.featureFlags = _objectSpread__default["default"](_objectSpread__default["default"]({}, settings.featureFlags), runtimeSetings.featureFlags);
+            settings.misc = _objectSpread__default["default"](_objectSpread__default["default"]({}, settings.misc), runtimeSetings.misc);
+            settings = Object.assign(settings, rest);
+          }
+        }
+      }
+
       return _objectSpread__default["default"](_objectSpread__default["default"]({}, bootstrapResult), {}, {
         settings
       });
@@ -8855,6 +8934,27 @@
           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__default["default"](_objectSpread__default["default"]({}, storyboard.app.userConfig), appRuntimeData.userConfig); // get inject menus (Actually, appRuntimeData contains both main and inject menus)
+
+              storyboard.meta = _objectSpread__default["default"](_objectSpread__default["default"]({}, storyboard.meta), {}, {
+                injectMenus: appRuntimeData.injectMenus
+              });
+            }
+          }
         } else {
           var {
             routes,
@@ -9369,15 +9469,20 @@
     }
 
     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__default["default"](_objectSpread__default["default"]({}, 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__default["default"](_objectSpread__default["default"]({}, menu), (_menu$app = menu.app) !== null && _menu$app !== void 0 && _menu$app.length && menu.app[0].appId ? {} : {
+          app: [{
+            appId: currentAppId
+          }]
+        });
+      });
     }
 
     getProviderBrick(provider) {
@@ -11335,25 +11440,6 @@
     });
   }
 
-  /**
-   * @description 查询独立部署小产品
-   * @endpoint POST /api/v1/micro_app_standalone/search
-   */
-
-
-  var RuntimeApi_searchMicroAppStandalone = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator__default["default"](function* (data, options) {
-      return (
-        /**! @contract easyops.api.micro_app_standalone.runtime.SearchMicroAppStandalone@1.0.1 */
-        (yield brickHttp.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) {
@@ -11417,6 +11503,38 @@
     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__default["default"](this, "defaultCollapsed", false);
@@ -11692,8 +11810,7 @@
           };
 
           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
@@ -11821,9 +11938,10 @@
 
           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);
@@ -11863,9 +11981,9 @@
                 _this3.kernel.prefetchDepsOfStoryboard(storyboard);
               });
             } else {
-              Promise.resolve().then(() => {
+              setTimeout(() => {
                 _this3.kernel.prefetchDepsOfStoryboard(storyboard);
-              });
+              }, 0);
             }
 
             return;
@@ -11903,50 +12021,6 @@
         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 */