@next-core/brick-kit 2.145.1 → 2.145.3

package/CHANGELOG.md

@@ -3,6 +3,29 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.145.3](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.145.2...@next-core/brick-kit@2.145.3) (2022-09-27)
+
+
+### Bug Fixes
+
+* app to standalone app, path to homepage ([af5a01d](https://github.com/easyops-cn/next-core/commit/af5a01d0e1f1875430084f9e253d326f0994386a))
+* standalone back and show pageNotFound ([80d1c18](https://github.com/easyops-cn/next-core/commit/80d1c185a4f3bf5039192b7861e710456c416080))
+
+
+
+
+
+## [2.145.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.145.1...@next-core/brick-kit@2.145.2) (2022-09-27)
+
+
+### Bug Fixes
+
+* should merge userConfig and defaultConfig ([623c30b](https://github.com/easyops-cn/next-core/commit/623c30b32df487bbf8850245f0b44d397d17fc7b))
+
+
+
+
+
 ## [2.145.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.145.0...@next-core/brick-kit@2.145.1) (2022-09-26)
 
 **Note:** Version bump only for package @next-core/brick-kit

package/dist/index.bundle.js

@@ -9207,7 +9207,7 @@
 
         var bootstrapResponse = _objectSpread__default["default"]({
           templatePackages: []
-        }, data); // Merge `app.defaultConfig` and `app.userConfig` to `app.config`.
+        }, data); // Merge `app.defaultConfig` and `app.userConfig` to `app.config`. Should merge config again in standalone mode when doFulfilStoryboard because static bootstrap.json do not have userConfig.
 
 
         processBootstrapResponse(bootstrapResponse);
@@ -9262,8 +9262,9 @@
             }
 
             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)
+              // Merge `app.defaultConfig` and `app.userConfig` to `app.config`.
+              storyboard.app.userConfig = _objectSpread__default["default"](_objectSpread__default["default"]({}, storyboard.app.userConfig), appRuntimeData.userConfig);
+              storyboard.app.config = brickUtils.deepFreeze(_.merge({}, storyboard.app.defaultConfig, storyboard.app.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
@@ -10613,14 +10614,10 @@
       return "missed";
     }
 
-    matchStoryboard(storyboards) {
-      if (window.STANDALONE_MICRO_APPS && storyboards.length === 1) {
-        return storyboards[0];
-      } // Put apps with longer homepage before shorter ones.
+    matchStoryboard(storyboards, location) {
+      // Put apps with longer homepage before shorter ones.
       // E.g., `/legacy/tool` will match first before `/legacy`.
       // This enables two apps with relationship of parent-child of homepage.
-
-
       var sortedStoryboards = _.orderBy(storyboards, storyboard => {
         var _storyboard$app$homep, _storyboard$app, _storyboard$app$homep2;
 
@@ -10633,7 +10630,7 @@
         var homepage = (_storyboard$app2 = storyboard.app) === null || _storyboard$app2 === void 0 ? void 0 : _storyboard$app2.homepage;
 
         if (typeof homepage === "string" && homepage[0] === "/") {
-          if (brickUtils.matchPath(this.location.pathname, {
+          if (brickUtils.matchPath((location || this.location).pathname, {
             path: homepage,
             exact: homepage === "/"
           })) {
@@ -12022,6 +12019,20 @@
 
             _this.locationContext.messageDispatcher.reset();
 
+            var storyboard = _this.locationContext.matchStoryboard(_this.kernel.bootstrapData.storyboards, location);
+
+            if (!window.STANDALONE_MICRO_APPS) {
+              if (storyboard && storyboard.app.standaloneMode) {
+                // from non-standalone app to standalone app, should jump out off site
+                window.location.assign(window.location.href);
+              }
+            } else {
+              if (!storyboard) {
+                // from standalone app goback to non-standalone app, should reload
+                window.location.reload();
+              }
+            }
+
             if (_this.rendering) {
               _this.nextLocation = location;
             } else {
@@ -12091,16 +12102,6 @@
         if (storyboard) {
           var _storyboard$meta, _storyboard$meta2, _storyboard$meta3;
 
-          if (!window.STANDALONE_MICRO_APPS) {
-            if (storyboard.app.standaloneMode) {
-              // if nextApp was standalone micro-apps, use location.replace to reload window;
-              var path = history.createHref({
-                pathname: storyboard.app.homepage
-              });
-              window.location.replace(path);
-            }
-          }
-
           yield _this3.kernel.fulfilStoryboard(storyboard); // 将动态解析后的模板还原，以便重新动态解析。
 
           brickUtils.restoreDynamicTemplates(storyboard); // 预加载权限信息