@alicloud/alfa-react 1.4.31 → 1.4.33-alpha.0

package/es/createApplication.js

@@ -34,6 +34,17 @@ var addBasename = function addBasename(path, basename) {
   return resolvePath(basename, path);
 };
 
+var addLeftSlash = function addLeftSlash(path) {
+  return path.charAt(0) === '/' ? path : "/".concat(path);
+};
+/**
+ * 从 path 移除 basename 部分
+ * @param path
+ * @param basename
+ * @returns string
+ */
+
+
 var stripBasename = function stripBasename(path, basename) {
   if (!basename) return path;
 
@@ -92,7 +103,8 @@ export default function createApplication(loader) {
     var $basename = useRef(basename);
     var tagName = normalizeName(props.name);
     $syncHistory.current = syncHistory;
-    $basename.current = basename; // 受控模式锁定一些参数
+    $basename.current = basename;
+    if (customProps.path) customProps.path = addLeftSlash(customProps.path); // 受控模式锁定一些参数
 
     if ($syncHistory.current) {
       // 禁止子应用和 consoleBase 通信
@@ -166,24 +178,25 @@ export default function createApplication(loader) {
         var popstateEvent = new Event('popstate');
         popstateEvent.state = 'mock';
         (_App = App) === null || _App === void 0 ? void 0 : (_App$context$baseFram = _App.context.baseFrame) === null || _App$context$baseFram === void 0 ? void 0 : (_App$context$baseFram2 = _App$context$baseFram.contentWindow) === null || _App$context$baseFram2 === void 0 ? void 0 : _App$context$baseFram2.dispatchEvent(popstateEvent);
-      }; // 受控模式下，返回不会触发子应用内的路由更新
-
+      };
 
       var updateAppHistory = function updateAppHistory() {
         if (App) {
-          // 如果子应用路径不同，主动通知子应用 popstate 事件
-          var nextPath = peelPath(App.context.location);
+          var nextPath = peelPath(App.context.location); // 路由同步只应该在相同 basename 下生效
+
+          if (!peelPath(window.location).startsWith($basename.current || '')) return; // 如果主子应用路径不同，主动通知子应用 popstate 事件
 
           if (nextPath !== stripBasename(peelPath(window.location), $basename.current)) {
-            var popstateEvent = new Event('popstate');
-            popstateEvent.state = 'mock';
-            if (originalReplaceState) originalReplaceState(null, '', stripBasename(peelPath(window.location), $basename.current));
-            dispatchFramePopstate();
+            if (originalReplaceState) {
+              originalReplaceState(null, '', stripBasename(peelPath(window.location), $basename.current));
+              dispatchFramePopstate();
+            }
           }
         }
-      };
+      }; // 受控模式下，返回不会触发子应用内的路由更新，需要主动通知
+
 
-      window.addEventListener('popstate', updateAppHistory);
+      if ($syncHistory.current) window.addEventListener('popstate', updateAppHistory);
 
       _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee() {
         var _app$context$updateBo, _app$context, _app$context$baseFram;
@@ -309,7 +322,7 @@ export default function createApplication(loader) {
         var _App$context$baseFram3, _App$context$baseFram4;
 
         isUnmounted = true;
-        window.removeEventListener('popstate', updateAppHistory);
+        if ($syncHistory.current) window.removeEventListener('popstate', updateAppHistory);
         if (!App) return;
         var frameHistory = (_App$context$baseFram3 = App.context.baseFrame) === null || _App$context$baseFram3 === void 0 ? void 0 : (_App$context$baseFram4 = _App$context$baseFram3.contentWindow) === null || _App$context$baseFram4 === void 0 ? void 0 : _App$context$baseFram4.history;
 
@@ -319,7 +332,8 @@ export default function createApplication(loader) {
           if (originalGo !== frameHistory.go) frameHistory.go = originalGo;
         }
 
-        App.unmount();
+        App.unmount(); // TODO: 在沙箱中嵌套时，unmount 必须销毁沙箱实例，避免在其它微应用中复用该沙箱，导致环境变量污染
+        // if (isOsContext()) App.destroy();
       };
     }, [memoOptions]);
 

package/es/version.js

@@ -1 +1 @@
-export var version = '1.4.31';
+export var version = '1.4.33-alpha.0';

package/lib/createApplication.js

@@ -56,6 +56,17 @@ var addBasename = function addBasename(path, basename) {
   return resolvePath(basename, path);
 };
 
+var addLeftSlash = function addLeftSlash(path) {
+  return path.charAt(0) === '/' ? path : "/".concat(path);
+};
+/**
+ * 从 path 移除 basename 部分
+ * @param path
+ * @param basename
+ * @returns string
+ */
+
+
 var stripBasename = function stripBasename(path, basename) {
   if (!basename) return path;
 
@@ -114,7 +125,8 @@ function createApplication(loader) {
     var $basename = (0, _react.useRef)(basename);
     var tagName = (0, _utils.normalizeName)(props.name);
     $syncHistory.current = syncHistory;
-    $basename.current = basename; // 受控模式锁定一些参数
+    $basename.current = basename;
+    if (customProps.path) customProps.path = addLeftSlash(customProps.path); // 受控模式锁定一些参数
 
     if ($syncHistory.current) {
       // 禁止子应用和 consoleBase 通信
@@ -188,24 +200,25 @@ function createApplication(loader) {
         var popstateEvent = new Event('popstate');
         popstateEvent.state = 'mock';
         (_App = App) === null || _App === void 0 ? void 0 : (_App$context$baseFram = _App.context.baseFrame) === null || _App$context$baseFram === void 0 ? void 0 : (_App$context$baseFram2 = _App$context$baseFram.contentWindow) === null || _App$context$baseFram2 === void 0 ? void 0 : _App$context$baseFram2.dispatchEvent(popstateEvent);
-      }; // 受控模式下，返回不会触发子应用内的路由更新
-
+      };
 
       var updateAppHistory = function updateAppHistory() {
         if (App) {
-          // 如果子应用路径不同，主动通知子应用 popstate 事件
-          var nextPath = peelPath(App.context.location);
+          var nextPath = peelPath(App.context.location); // 路由同步只应该在相同 basename 下生效
+
+          if (!peelPath(window.location).startsWith($basename.current || '')) return; // 如果主子应用路径不同，主动通知子应用 popstate 事件
 
           if (nextPath !== stripBasename(peelPath(window.location), $basename.current)) {
-            var popstateEvent = new Event('popstate');
-            popstateEvent.state = 'mock';
-            if (originalReplaceState) originalReplaceState(null, '', stripBasename(peelPath(window.location), $basename.current));
-            dispatchFramePopstate();
+            if (originalReplaceState) {
+              originalReplaceState(null, '', stripBasename(peelPath(window.location), $basename.current));
+              dispatchFramePopstate();
+            }
           }
         }
-      };
+      }; // 受控模式下，返回不会触发子应用内的路由更新，需要主动通知
+
 
-      window.addEventListener('popstate', updateAppHistory);
+      if ($syncHistory.current) window.addEventListener('popstate', updateAppHistory);
       (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee() {
         var _app$context$updateBo, _app$context, _app$context$baseFram;
 
@@ -329,7 +342,7 @@ function createApplication(loader) {
         var _App$context$baseFram3, _App$context$baseFram4;
 
         isUnmounted = true;
-        window.removeEventListener('popstate', updateAppHistory);
+        if ($syncHistory.current) window.removeEventListener('popstate', updateAppHistory);
         if (!App) return;
         var frameHistory = (_App$context$baseFram3 = App.context.baseFrame) === null || _App$context$baseFram3 === void 0 ? void 0 : (_App$context$baseFram4 = _App$context$baseFram3.contentWindow) === null || _App$context$baseFram4 === void 0 ? void 0 : _App$context$baseFram4.history;
 
@@ -339,7 +352,8 @@ function createApplication(loader) {
           if (originalGo !== frameHistory.go) frameHistory.go = originalGo;
         }
 
-        App.unmount();
+        App.unmount(); // TODO: 在沙箱中嵌套时，unmount 必须销毁沙箱实例，避免在其它微应用中复用该沙箱，导致环境变量污染
+        // if (isOsContext()) App.destroy();
       };
     }, [memoOptions]);
 

package/lib/version.js

@@ -4,5 +4,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.version = void 0;
-var version = '1.4.31';
+var version = '1.4.33-alpha.0';
 exports.version = version;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/alfa-react",
-  "version": "1.4.31",
+  "version": "1.4.33-alpha.0",
   "description": "Alfa Framework (React Version)",
   "main": "lib/index.js",
   "module": "es/index.js",

package/types/createApplication.d.ts

@@ -2,7 +2,11 @@
 import { BaseLoader } from '@alicloud/alfa-core';
 import { AlfaFactoryOption } from './types';
 interface IProps<C = any> extends AlfaFactoryOption {
-    customProps: C;
+    customProps: C & {
+        consoleBase?: any;
+        path?: string;
+        __injectHistory?: any;
+    };
     syncHistory?: boolean;
     basename?: string;
 }

package/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "1.4.31";
+export declare const version = "1.4.33-alpha.0";