@alicloud/alfa-react 1.6.1 → 1.6.2-alpha.0

package/es/createApplication.js

@@ -10,7 +10,7 @@ import { createEventBus } from '@alicloud/alfa-core';
 import { ConsoleRegion, ConsoleResourceGroup, ConsoleContext } from '@alicloud/xconsole-context';
 import { forApp } from '@alicloud/console-base-messenger';
 import Loading from './components/Loading';
-import { normalizeName } from './utils';
+import { normalizeName, setNativeProperty } from './utils';
 import { countRegister } from './utils/counter';
 import { version as loaderVersion } from './version';
 var eventBus = createEventBus();
@@ -330,33 +330,31 @@ export default function createApplication(loader) {
                 originalGo = frameWindow === null || frameWindow === void 0 ? void 0 : frameWindow.history.go;
                 // update context history according to path
                 if (path) originalReplaceState(getHistoryState(), '', path.replace(/\/+/g, '/'));
-                if (frameWindow) {
-                  frameWindow.history.pushState = function (data, unused, _url) {
-                    if ($syncHistory.current) {
-                      var nextPath = addBasename((_url === null || _url === void 0 ? void 0 : _url.toString()) || '', $basename.current);
-                      if ("".concat(nextPath) !== peelPath(window.location)) {
-                        window.history.pushState(data, unused, nextPath);
-                        onSyncHistory && onSyncHistory('push', nextPath, data);
-                      }
-                      originalReplaceState(data, unused, _url);
-                    } else {
-                      originalPushState(data, unused, _url);
-                    }
-                  };
-                  frameWindow.history.replaceState = function (data, unused, _url) {
+                frameWindow.history.pushState = function (data, unused, _url) {
+                  if ($syncHistory.current) {
                     var nextPath = addBasename((_url === null || _url === void 0 ? void 0 : _url.toString()) || '', $basename.current);
-                    if ($syncHistory.current) {
-                      window.history.replaceState(data, unused, nextPath);
-                      onSyncHistory && onSyncHistory('replace', nextPath, data);
+                    if ("".concat(nextPath) !== peelPath(window.location)) {
+                      window.history.pushState(data, unused, nextPath);
+                      onSyncHistory && onSyncHistory('push', nextPath, data);
                     }
                     originalReplaceState(data, unused, _url);
-                  };
+                  } else {
+                    originalPushState(data, unused, _url);
+                  }
+                };
+                frameWindow.history.replaceState = function (data, unused, _url) {
+                  var nextPath = addBasename((_url === null || _url === void 0 ? void 0 : _url.toString()) || '', $basename.current);
+                  if ($syncHistory.current) {
+                    window.history.replaceState(data, unused, nextPath);
+                    onSyncHistory && onSyncHistory('replace', nextPath, data);
+                  }
+                  originalReplaceState(data, unused, _url);
+                };
 
-                  // 劫持微应用的返回
-                  frameWindow.history.go = function (n) {
-                    window.history.go(n);
-                  };
-                }
+                // 劫持微应用的返回
+                setNativeProperty(frameWindow.history, 'go', function (n) {
+                  window.history.go(n);
+                });
               }
               _context.next = 25;
               return app.mount(fakeBody, {
@@ -390,10 +388,14 @@ export default function createApplication(loader) {
         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;
+
+        // reset method of frame history
         if (frameHistory) {
           if (originalPushState !== frameHistory.pushState) frameHistory.pushState = originalPushState;
           if (originalReplaceState !== frameHistory.replaceState) frameHistory.replaceState = originalReplaceState;
-          if (originalGo !== frameHistory.go) frameHistory.go = originalGo;
+          if (originalGo !== frameHistory.go) {
+            setNativeProperty(frameHistory, 'go', originalGo);
+          }
         }
         App.unmount();
 

package/es/utils/index.js

@@ -17,4 +17,19 @@ export var isOsContext = function isOsContext() {
     // 降级
     return !!window.__IS_CONSOLE_OS_CONTEXT__;
   }
+};
+
+/**
+ * set native object property
+ * @param obj
+ * @param propertyName
+ * @param value
+ * @returns
+ */
+export var setNativeProperty = function setNativeProperty(obj, propertyName, value) {
+  var desc = Object.getOwnPropertyDescriptor(obj, propertyName);
+
+  // in strict mode, Cannot set property go of [xx] which has only a getter
+  if (desc && typeof desc.set === 'undefined') return;
+  obj[propertyName] = value;
 };

package/es/version.js

@@ -1 +1 @@
-export var version = '1.6.1';
+export var version = '1.6.2-alpha.0';

package/lib/createApplication.js

@@ -340,33 +340,31 @@ function createApplication(loader) {
                 originalGo = frameWindow === null || frameWindow === void 0 ? void 0 : frameWindow.history.go;
                 // update context history according to path
                 if (path) originalReplaceState(getHistoryState(), '', path.replace(/\/+/g, '/'));
-                if (frameWindow) {
-                  frameWindow.history.pushState = function (data, unused, _url) {
-                    if ($syncHistory.current) {
-                      var nextPath = addBasename((_url === null || _url === void 0 ? void 0 : _url.toString()) || '', $basename.current);
-                      if ("".concat(nextPath) !== peelPath(window.location)) {
-                        window.history.pushState(data, unused, nextPath);
-                        onSyncHistory && onSyncHistory('push', nextPath, data);
-                      }
-                      originalReplaceState(data, unused, _url);
-                    } else {
-                      originalPushState(data, unused, _url);
-                    }
-                  };
-                  frameWindow.history.replaceState = function (data, unused, _url) {
+                frameWindow.history.pushState = function (data, unused, _url) {
+                  if ($syncHistory.current) {
                     var nextPath = addBasename((_url === null || _url === void 0 ? void 0 : _url.toString()) || '', $basename.current);
-                    if ($syncHistory.current) {
-                      window.history.replaceState(data, unused, nextPath);
-                      onSyncHistory && onSyncHistory('replace', nextPath, data);
+                    if ("".concat(nextPath) !== peelPath(window.location)) {
+                      window.history.pushState(data, unused, nextPath);
+                      onSyncHistory && onSyncHistory('push', nextPath, data);
                     }
                     originalReplaceState(data, unused, _url);
-                  };
+                  } else {
+                    originalPushState(data, unused, _url);
+                  }
+                };
+                frameWindow.history.replaceState = function (data, unused, _url) {
+                  var nextPath = addBasename((_url === null || _url === void 0 ? void 0 : _url.toString()) || '', $basename.current);
+                  if ($syncHistory.current) {
+                    window.history.replaceState(data, unused, nextPath);
+                    onSyncHistory && onSyncHistory('replace', nextPath, data);
+                  }
+                  originalReplaceState(data, unused, _url);
+                };
 
-                  // 劫持微应用的返回
-                  frameWindow.history.go = function (n) {
-                    window.history.go(n);
-                  };
-                }
+                // 劫持微应用的返回
+                (0, _utils.setNativeProperty)(frameWindow.history, 'go', function (n) {
+                  window.history.go(n);
+                });
               }
               _context.next = 25;
               return app.mount(fakeBody, {
@@ -400,10 +398,14 @@ function createApplication(loader) {
         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;
+
+        // reset method of frame history
         if (frameHistory) {
           if (originalPushState !== frameHistory.pushState) frameHistory.pushState = originalPushState;
           if (originalReplaceState !== frameHistory.replaceState) frameHistory.replaceState = originalReplaceState;
-          if (originalGo !== frameHistory.go) frameHistory.go = originalGo;
+          if (originalGo !== frameHistory.go) {
+            (0, _utils.setNativeProperty)(frameHistory, 'go', originalGo);
+          }
         }
         App.unmount();
 

package/lib/utils/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.normalizeName = exports.isOsContext = void 0;
+exports.setNativeProperty = exports.normalizeName = exports.isOsContext = void 0;
 /**
  * kernel 会为沙箱 context 注入 __IS_CONSOLE_OS_CONTEXT__
  */
@@ -25,4 +25,20 @@ var isOsContext = function isOsContext() {
     return !!window.__IS_CONSOLE_OS_CONTEXT__;
   }
 };
-exports.isOsContext = isOsContext;
+
+/**
+ * set native object property
+ * @param obj
+ * @param propertyName
+ * @param value
+ * @returns
+ */
+exports.isOsContext = isOsContext;
+var setNativeProperty = function setNativeProperty(obj, propertyName, value) {
+  var desc = Object.getOwnPropertyDescriptor(obj, propertyName);
+
+  // in strict mode, Cannot set property go of [xx] which has only a getter
+  if (desc && typeof desc.set === 'undefined') return;
+  obj[propertyName] = value;
+};
+exports.setNativeProperty = setNativeProperty;

package/lib/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alicloud/alfa-react",
-  "version": "1.6.1",
+  "version": "1.6.2-alpha.0",
   "description": "Alfa Framework (React Version)",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -38,15 +38,15 @@
     "classnames": "^2.2.6",
     "crypto-js": "^4.1.1",
     "prop-types": "^15.8.1",
-    "@alicloud/alfa-core": "^1.4.37",
-    "@alicloud/console-os-loader": "^1.4.36"
+    "@alicloud/console-os-loader": "^1.4.42",
+    "@alicloud/alfa-core": "^1.4.37"
   },
   "peerDependencies": {
     "react": ">=16.0.0"
   },
   "gitHead": "ff9294b1d5e08b14691c8aa2bef098da2857f3df",
   "scripts": {
-    "prepublish": "npm run version && npm run build && npm run babel && npm run babel:esm && npm run types",
+    "prepublish": "npm run version && npm run babel && npm run babel:esm && npm run types",
     "pub": "pnpm publish",
     "build": "breezr build --engine webpack",
     "babel": "breezr build --engine babel",

package/types/utils/index.d.ts

@@ -3,3 +3,11 @@ export declare const normalizeName: (name: string) => string;
  * 判断是否在沙箱环境中运行
  */
 export declare const isOsContext: () => boolean;
+/**
+ * set native object property
+ * @param obj
+ * @param propertyName
+ * @param value
+ * @returns
+ */
+export declare const setNativeProperty: (obj: any, propertyName: string, value: any) => void;

package/types/version.d.ts

@@ -1 +1 @@
-export declare const version = "1.6.1";
+export declare const version = "1.6.2-alpha.0";