@next-core/brick-kit 2.146.2 → 2.147.0

package/dist/index.esm.js

@@ -4,9 +4,9 @@ import _objectWithoutProperties from '@babel/runtime/helpers/objectWithoutProper
 import _asyncToGenerator$3 from '@babel/runtime/helpers/asyncToGenerator';
 import _defineProperty$1 from '@babel/runtime/helpers/defineProperty';
 import React, { useState, useEffect, useRef, forwardRef, useImperativeHandle, useMemo, useContext, createContext, useReducer, useCallback } from 'react';
-import { JsonStorage, toPath, computeRealRoutePath, hasOwnProperty, isObject, isEvaluable, transformAndInject, transform, trackContext, trackState, scanPermissionActionsInStoryboard, precookFunction, cook, resolveContextConcurrently, syncResolveContextConcurrently, trackUsedState, trackUsedContext, shouldAllowRecursiveEvaluations, preevaluate, inject, deepFreeze, createProviderClass, getTemplateDepsOfStoryboard, getDllAndDepsOfStoryboard, asyncProcessStoryboard, getDllAndDepsByResource, scanRouteAliasInStoryboard, prefetchScript, scanBricksInBrickConf, scanProcessorsInAny, loadScript, matchPath, scanAppGetMenuInAny, asyncProcessBrick, scanInstalledAppsInStoryboard, restoreDynamicTemplates, scanStoryboard, mapCustomApisToNameAndNamespace } from '@next-core/brick-utils';
-import _, { set, get, difference, identity, uniqueId, cloneDeep, clamp, isNil, isEmpty, sortBy, merge, isObject as isObject$1, pick, orderBy, omit, findLastIndex, noop, isString } from 'lodash';
-import { http, HttpResponseError, HttpFetchError } from '@next-core/brick-http';
+import { JsonStorage, toPath, computeRealRoutePath, hasOwnProperty, isObject, isEvaluable, transformAndInject, transform, trackContext, trackState, scanPermissionActionsInStoryboard, precookFunction, cook, resolveContextConcurrently, syncResolveContextConcurrently, trackUsedState, trackUsedContext, shouldAllowRecursiveEvaluations, preevaluate, inject, matchPath, deepFreeze, createProviderClass, getTemplateDepsOfStoryboard, getDllAndDepsOfStoryboard, asyncProcessStoryboard, getDllAndDepsByResource, scanRouteAliasInStoryboard, prefetchScript, scanBricksInBrickConf, scanProcessorsInAny, loadScript, scanAppGetMenuInAny, asyncProcessBrick, scanInstalledAppsInStoryboard, restoreDynamicTemplates, scanStoryboard, mapCustomApisToNameAndNamespace } from '@next-core/brick-utils';
+import _, { set, get, difference, identity, uniqueId, cloneDeep, clamp, isNil, isEmpty, sortBy, orderBy, merge, isObject as isObject$1, pick, omit, findLastIndex, noop, isString } from 'lodash';
+import { http, HttpResponseError, HttpAbortError, HttpFetchError } from '@next-core/brick-http';
 import moment from 'moment';
 import { pipes } from '@next-core/pipes';
 import i18next, { getFixedT } from 'i18next';
@@ -3520,6 +3520,43 @@ function loadAllLazyBricks() {
   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 (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 */
 
@@ -3891,16 +3928,10 @@ function _internalApiGetCurrentContext() {
 
   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 */
 
@@ -4017,13 +4048,11 @@ function historyExtended(browserHistory) {
     reload,
     setBlockMessage,
     getBlockMessage,
-    unblock,
-    push,
-    replace
-  }, window.STANDALONE_MICRO_APPS ? standaloneHistoryOverridden(_objectSpread(_objectSpread({}, browserHistory), {}, {
+    unblock
+  }, historyOverridden(_objectSpread(_objectSpread({}, browserHistory), {}, {
     push,
     replace
-  })) : {});
+  })));
 }
 /**
  * Override history for standalone micro apps.
@@ -4031,7 +4060,7 @@ function historyExtended(browserHistory) {
  * when `push` or `replace` to other apps, force page refresh.
  */
 
-function standaloneHistoryOverridden(browserHistory) {
+function historyOverridden(browserHistory) {
   var {
     push: originalPush,
     replace: originalReplace
@@ -4046,14 +4075,16 @@ function standaloneHistoryOverridden(browserHistory) {
         pathname = 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);
     };
   }
 
@@ -4089,6 +4120,12 @@ function isUnauthenticatedError(error) {
   return error instanceof HttpResponseError && error.response.status === 401 && !!error.responseJson && error.responseJson.code === 100003;
 }
 
+/** @internal */
+
+function isHttpAbortError(error) {
+  return error instanceof HttpAbortError;
+}
+
 /**
  * 将 http 请求错误转换为可读的字符串。
  *
@@ -4130,7 +4167,12 @@ var unauthenticatedConfirmModal;
  */
 
 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) {
@@ -10616,30 +10658,8 @@ class LocationContext {
     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 (matchPath((location || this.location).pathname, {
-          path: homepage,
-          exact: homepage === "/"
-        })) {
-          return storyboard;
-        }
-      }
-    }
+  matchStoryboard(storyboards) {
+    return matchStoryboard(storyboards, this.location.pathname);
   }
 
   getSubStoryboardByRoute(storyboard) {
@@ -11898,6 +11918,39 @@ function mergePreviewRoutes(routes) {
   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$1(this, "defaultCollapsed", false);
@@ -12013,6 +12066,8 @@ class Router {
             return;
           }
 
+          abortController.abortPendingRequest();
+
           _this.locationChangeNotify(_this.prevLocation.pathname, location.pathname);
 
           _this.prevLocation = location;
@@ -12021,16 +12076,11 @@ class Router {
 
           _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();
             }
           }
@@ -12207,6 +12257,8 @@ class Router {
 
           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;
@@ -14958,5 +15010,5 @@ function useProvider() {
   }));
 }
 
-export { BrickAsComponent, BrickWrapper, DisplayByFeatureFlags, EasyopsEmpty, ErrorBoundary, FeatureFlagsProvider, ForwardRefSingleBrickAsComponent, ModalElement, SingleBrickAsComponent, StoryboardFunctionRegistryFactory, UpdatingElement, authenticate, batchSetAppsLocalTheme, checkIf, checkIfByTransform, createHistory, createRuntime, developHelper, doTransform, event, getAuth, getCssPropertyValue, getCurrentTheme, getHistory, getMockInfo, getRuntime, getRuntimeMisc, handleHttpError, httpErrorToString, i18nText, initI18n, isLoggedIn, logout, looseCheckIf, looseCheckIfByTransform, looseCheckIfOfComputed, method, preprocessTransformProperties, property, reTransformForDevtools, renderEasyopsEmpty, transformElementProperties, transformIntermediateData, transformProperties, useApplyPageTitle, useCurrentApp, useCurrentMode, useCurrentTheme, useFeatureFlags, useLocation, useProvider, useRecentApps };
+export { BrickAsComponent, BrickWrapper, DisplayByFeatureFlags, EasyopsEmpty, ErrorBoundary, FeatureFlagsProvider, ForwardRefSingleBrickAsComponent, ModalElement, SingleBrickAsComponent, StoryboardFunctionRegistryFactory, UpdatingElement, abortController, authenticate, batchSetAppsLocalTheme, checkIf, checkIfByTransform, createHistory, createRuntime, developHelper, doTransform, event, getAuth, getCssPropertyValue, getCurrentTheme, getHistory, getMockInfo, getRuntime, getRuntimeMisc, handleHttpError, httpErrorToString, i18nText, initI18n, isLoggedIn, logout, looseCheckIf, looseCheckIfByTransform, looseCheckIfOfComputed, method, preprocessTransformProperties, property, reTransformForDevtools, renderEasyopsEmpty, transformElementProperties, transformIntermediateData, transformProperties, useApplyPageTitle, useCurrentApp, useCurrentMode, useCurrentTheme, useFeatureFlags, useLocation, useProvider, useRecentApps };
 //# sourceMappingURL=index.esm.js.map