@next-core/brick-kit 2.145.2 → 2.146.0

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.146.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.145.3...@next-core/brick-kit@2.146.0) (2022-09-28)
+
+
+### Features
+
+* **StoryboardContext:** move logic of track into resolveFreeVariableValue to support tracking state in useBrick ([62b8445](https://github.com/easyops-cn/next-core/commit/62b8445b28e20c6b12e0eda7b3711d83a2be365c))
+
+
+
+
+
+## [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)
 
 

package/dist/index.bundle.js

@@ -2180,26 +2180,6 @@
           // Or if the resolve is ignored or lazy, use its `value` as a fallback.
           value = computeRealValue(contextConf.value, mergedContext, true);
         }
-
-        if (contextConf.track) {
-          // Track its dependencies and auto update when each of them changed.
-          var deps = (isTemplateState ? brickUtils.trackUsedState : brickUtils.trackUsedContext)(load ? contextConf.resolve : contextConf.value);
-
-          for (var dep of deps) {
-            var _eventTarget;
-
-            var ctx = storyboardContextWrapper.get().get(dep);
-            ctx === null || ctx === void 0 ? void 0 : (_eventTarget = ctx.eventTarget) === null || _eventTarget === void 0 ? void 0 : _eventTarget.addEventListener(isTemplateState ? "state.change" : "context.change", () => {
-              if (load) {
-                storyboardContextWrapper.updateValue(contextConf.name, {
-                  cache: "default"
-                }, "refresh");
-              } else {
-                storyboardContextWrapper.updateValue(contextConf.name, computeRealValue(contextConf.value, mergedContext, true), "replace");
-              }
-            });
-          }
-        }
       }
 
       resolveFreeVariableValue(value, contextConf, mergedContext, storyboardContextWrapper, brick, load, !isLazyResolve);
@@ -2249,6 +2229,27 @@
       }
     }
 
+    if (contextConf.track) {
+      var isTemplateState = !!storyboardContextWrapper.tplContextId; // Track its dependencies and auto update when each of them changed.
+
+      var deps = (isTemplateState ? brickUtils.trackUsedState : brickUtils.trackUsedContext)(load ? contextConf.resolve : contextConf.value);
+
+      for (var dep of deps) {
+        var _eventTarget;
+
+        var ctx = storyboardContextWrapper.get().get(dep);
+        ctx === null || ctx === void 0 ? void 0 : (_eventTarget = ctx.eventTarget) === null || _eventTarget === void 0 ? void 0 : _eventTarget.addEventListener(isTemplateState ? "state.change" : "context.change", () => {
+          if (load) {
+            storyboardContextWrapper.updateValue(contextConf.name, {
+              cache: "default"
+            }, "refresh");
+          } else {
+            storyboardContextWrapper.updateValue(contextConf.name, computeRealValue(contextConf.value, mergedContext, true), "replace");
+          }
+        });
+      }
+    }
+
     storyboardContextWrapper.set(contextConf.name, newContext);
   }
 
@@ -10614,14 +10615,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;
 
@@ -10634,7 +10631,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 === "/"
           })) {
@@ -12023,6 +12020,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 {
@@ -12092,16 +12103,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); // 预加载权限信息