@next-core/brick-kit 2.146.1 → 2.147.0

package/CHANGELOG.md

@@ -3,6 +3,30 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.147.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.146.2...@next-core/brick-kit@2.147.0) (2022-10-08)
+
+
+### Bug Fixes
+
+* fix jumping to outside apps ([b27b129](https://github.com/easyops-cn/next-core/commit/b27b129fd276fc02f26c95a29b1e1ab418b9a4bd))
+
+
+### Features
+
+*  support cancel pending requests on route changed ([aa37eed](https://github.com/easyops-cn/next-core/commit/aa37eed0ab03f558fea693d7763da60d0807189b))
+
+
+
+
+
+## [2.146.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.146.1...@next-core/brick-kit@2.146.2) (2022-09-29)
+
+**Note:** Version bump only for package @next-core/brick-kit
+
+
+
+
+
 ## [2.146.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.146.0...@next-core/brick-kit@2.146.1) (2022-09-28)
 
 

package/dist/index.bundle.js

@@ -3519,6 +3519,43 @@
     return loadLazyBricks(lazyBrickRegistry.keys());
   }
 
+  function matchStoryboard(storyboards, pathname) {
+    // 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;
+
+      return (_storyboard$app$homep = (_storyboard$app = storyboard.app) === null || _storyboard$app === void 0 ? void 0 : (_storyboard$app$homep2 = _storyboard$app.homepage) === null || _storyboard$app$homep2 === void 0 ? void 0 : _storyboard$app$homep2.length) !== null && _storyboard$app$homep !== void 0 ? _storyboard$app$homep : 0;
+    }, "desc");
+
+    for (var storyboard of sortedStoryboards) {
+      var _storyboard$app2;
+
+      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(pathname, {
+          path: homepage,
+          exact: homepage === "/"
+        })) {
+          return storyboard;
+        }
+      }
+    }
+  }
+  /**
+   * We say it's an outside app when at least one of the below conditions are true:
+   *   - target app is not found.
+   *   - current app is non-standalone mode and target app is standalone mode.
+   *
+   * Note: when current app is standalone mode, other apps will not be found.
+   */
+
+  function isOutsideApp(storyboard) {
+    return !storyboard || !window.STANDALONE_MICRO_APPS && storyboard.app.standaloneMode;
+  }
+
   var kernel;
   /* istanbul ignore next */
 
@@ -3890,16 +3927,10 @@
 
     return kernel.router.getCurrentContext();
   }
-  function _internalApiHasMatchedApp(pathname) {
-    for (var {
-      homepage
-    } of kernel.bootstrapData.microApps) {
-      if (pathname === homepage || pathname.startsWith("".concat(homepage, "/"))) {
-        return true;
-      }
-    }
+  /* istanbul ignore next */
 
-    return false;
+  function _internalApiMatchStoryboard(pathname) {
+    return matchStoryboard(kernel.bootstrapData.storyboards, pathname);
   }
   /* istanbul ignore next */
 
@@ -4016,13 +4047,11 @@
       reload,
       setBlockMessage,
       getBlockMessage,
-      unblock,
-      push,
-      replace
-    }, window.STANDALONE_MICRO_APPS ? standaloneHistoryOverridden(_objectSpread__default["default"](_objectSpread__default["default"]({}, browserHistory), {}, {
+      unblock
+    }, historyOverridden(_objectSpread__default["default"](_objectSpread__default["default"]({}, browserHistory), {}, {
       push,
       replace
-    })) : {});
+    })));
   }
   /**
    * Override history for standalone micro apps.
@@ -4030,7 +4059,7 @@
    * when `push` or `replace` to other apps, force page refresh.
    */
 
-  function standaloneHistoryOverridden(browserHistory) {
+  function historyOverridden(browserHistory) {
     var {
       push: originalPush,
       replace: originalReplace
@@ -4045,14 +4074,16 @@
           pathname = history$1.parsePath(path).pathname;
         } else {
           pathname = path.pathname;
-        }
+        } // When history.push or history.replace is performing with a non-empty pathname,
+        // force load the target page when it is a page of an outside app.
 
-        if (pathname === "" || _internalApiHasMatchedApp(pathname)) {
-          return (method === "push" ? originalPush : originalReplace)(path, state, callback);
-        } // Going to outside apps.
 
+        if (pathname !== "" && isOutsideApp(_internalApiMatchStoryboard(pathname))) {
+          // Going to outside apps.
+          return location[method === "push" ? "assign" : "replace"](pathIsString ? getBasePath() + path.replace(/^\//, "") : browserHistory.createHref(path));
+        }
 
-        return location[method === "push" ? "assign" : "replace"](pathIsString ? getBasePath() + path.replace(/^\//, "") : browserHistory.createHref(path));
+        return (method === "push" ? originalPush : originalReplace)(path, state, callback);
       };
     }
 
@@ -4088,6 +4119,12 @@
     return error instanceof brickHttp.HttpResponseError && error.response.status === 401 && !!error.responseJson && error.responseJson.code === 100003;
   }
 
+  /** @internal */
+
+  function isHttpAbortError(error) {
+    return error instanceof brickHttp.HttpAbortError;
+  }
+
   /**
    * 将 http 请求错误转换为可读的字符串。
    *
@@ -4129,7 +4166,12 @@
    */
 
   function handleHttpError(error) {
-    // Redirect to login page if not logged in.
+    // Do nothing if aborted http requests
+    if (isHttpAbortError(error)) {
+      return;
+    } // Redirect to login page if not logged in.
+
+
     if (isUnauthenticatedError(error) && !window.NO_AUTH_GUARD) {
       // Do not show multiple confirm modals.
       if (unauthenticatedConfirmModal) {
@@ -10615,30 +10657,8 @@
       return "missed";
     }
 
-    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;
-
-        return (_storyboard$app$homep = (_storyboard$app = storyboard.app) === null || _storyboard$app === void 0 ? void 0 : (_storyboard$app$homep2 = _storyboard$app.homepage) === null || _storyboard$app$homep2 === void 0 ? void 0 : _storyboard$app$homep2.length) !== null && _storyboard$app$homep !== void 0 ? _storyboard$app$homep : 0;
-      }, "desc");
-
-      for (var storyboard of sortedStoryboards) {
-        var _storyboard$app2;
-
-        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((location || this.location).pathname, {
-            path: homepage,
-            exact: homepage === "/"
-          })) {
-            return storyboard;
-          }
-        }
-      }
+    matchStoryboard(storyboards) {
+      return matchStoryboard(storyboards, this.location.pathname);
     }
 
     getSubStoryboardByRoute(storyboard) {
@@ -11897,6 +11917,39 @@
     return mergedRoutes;
   }
 
+  /** @internal */
+  var abortController = (() => {
+    var supported = ("AbortController" in window);
+
+    if (!supported) {
+      return {
+        abortPendingRequest() {// Do nothing
+        },
+
+        getSignalToken() {
+          return null;
+        }
+
+      };
+    }
+
+    var controller = new AbortController();
+    var signal = controller.signal;
+
+    var abortPendingRequest = () => {
+      controller.abort();
+      controller = new AbortController();
+      signal = controller.signal;
+    };
+
+    var getSignalToken = () => signal;
+
+    return {
+      abortPendingRequest,
+      getSignalToken
+    };
+  })();
+
   class Router {
     constructor(kernel) {
       _defineProperty__default["default"](this, "defaultCollapsed", false);
@@ -12012,6 +12065,8 @@
               return;
             }
 
+            abortController.abortPendingRequest();
+
             _this.locationChangeNotify(_this.prevLocation.pathname, location.pathname);
 
             _this.prevLocation = location;
@@ -12020,16 +12075,11 @@
 
             _this.locationContext.messageDispatcher.reset();
 
-            var storyboard = _this.locationContext.matchStoryboard(_this.kernel.bootstrapData.storyboards, location); // Whether non-standalone app to standalone app, or standlone app to non-standalone app
-            // window should reload to refresh the resource
+            if (action === "POP") {
+              var storyboard = matchStoryboard(_this.kernel.bootstrapData.storyboards, location.pathname); // When a browser action of goBack or goForward is performing,
+              // force reload when the target page is a page of an outside app.
 
-
-            if (!window.STANDALONE_MICRO_APPS) {
-              if (storyboard && storyboard.app.standaloneMode) {
-                window.location.reload();
-              }
-            } else {
-              if (!storyboard) {
+              if (isOutsideApp(storyboard)) {
                 window.location.reload();
               }
             }
@@ -12206,6 +12256,8 @@
 
             if (isUnauthenticatedError(error) && !window.NO_AUTH_GUARD) {
               mountRoutesResult.flags.unauthenticated = true;
+            } else if (isHttpAbortError(error)) {
+              return;
             } else {
               yield _this3.kernel.layoutBootstrap(layoutType);
               var brickPageError = _this3.kernel.presetBricks.pageError;
@@ -14968,6 +15020,7 @@
   exports.SingleBrickAsComponent = SingleBrickAsComponent;
   exports.StoryboardFunctionRegistryFactory = StoryboardFunctionRegistryFactory;
   exports.UpdatingElement = UpdatingElement;
+  exports.abortController = abortController;
   exports.authenticate = authenticate;
   exports.batchSetAppsLocalTheme = batchSetAppsLocalTheme;
   exports.checkIf = checkIf;