@micro-zoe/micro-app 1.0.0-rc.7 → 1.0.0-rc.8

package/lib/index.esm.js

@@ -1,4 +1,4 @@
-const version = '1.0.0-rc.7';
+const version = '1.0.0-rc.8';
 // do not use isUndefined
 const isBrowser = typeof window !== 'undefined';
 // do not use isUndefined
@@ -4065,32 +4065,34 @@ function createMicroHistory(appName, microLocation) {
             (_c = (_a = appInstanceMap.get(appName)) === null || _a === void 0 ? void 0 : (_b = _a.sandBox).updateIframeBase) === null || _c === void 0 ? void 0 : _c.call(_b);
         };
     }
-    const pushState = getMicroHistoryMethod('pushState');
-    const replaceState = getMicroHistoryMethod('replaceState');
+    const originalHistory = {
+        pushState: getMicroHistoryMethod('pushState'),
+        replaceState: getMicroHistoryMethod('replaceState'),
+    };
     if (isIframeSandbox(appName)) {
-        return {
-            pushState,
-            replaceState,
+        return assign({
             go(delta) {
                 return rawHistory.go(delta);
             }
-        };
+        }, originalHistory);
     }
     return new Proxy(rawHistory, {
         get(target, key) {
-            if (key === 'state') {
-                return getMicroState(appName);
-            }
-            else if (key === 'pushState') {
-                return pushState;
+            if (key === 'pushState' || key === 'replaceState') {
+                return originalHistory[key];
             }
-            else if (key === 'replaceState') {
-                return replaceState;
+            else if (key === 'state') {
+                return getMicroState(appName);
             }
             return bindFunctionToRawTarget(Reflect.get(target, key), target, 'HISTORY');
         },
         set(target, key, value) {
-            Reflect.set(target, key, value);
+            if (key === 'pushState' || key === 'replaceState') {
+                originalHistory[key] = value;
+            }
+            else {
+                Reflect.set(target, key, value);
+            }
             /**
              * If the set() method returns false, and the assignment happened in strict-mode code, a TypeError will be thrown.
              * e.g. history.state = {}
@@ -4186,7 +4188,6 @@ function reWriteHistoryMethod(method) {
             excludeHiddenApp: true,
             excludePreRender: true,
         }).forEach(appName => {
-            // TODO: 大部分情况下，history.pushState 都是先执行，micro-app后卸载，所以会产生一种情况：跳转到新地址后，search模式会在url上添加参数，卸载后再将参数删除，所以会导致浏览器地址闪烁，是否需要去掉这个功能
             if ((isRouterModeSearch(appName) || isRouterModeState(appName)) && !getMicroPathFromURL(appName)) {
                 const app = appInstanceMap.get(appName);
                 attachRouteToBrowserURL(appName, setMicroPathToURL(appName, app.sandBox.proxyWindow.location), setMicroState(appName, getMicroState(appName), app.sandBox.proxyWindow.location));
@@ -8283,8 +8284,7 @@ function defineElement(tagName) {
             if (this.legalAttribute(attr, newVal) &&
                 this[attr === ObservedAttrName.NAME ? 'appName' : 'appUrl'] !== newVal) {
                 if (attr === ObservedAttrName.URL && (!this.appUrl ||
-                    !this.connectStateMap.get(this.connectedCount) // TODO: 这里的逻辑可否再优化一下
-                )) {
+                    !this.connectStateMap.get(this.connectedCount))) {
                     newVal = formatAppURL(newVal, this.appName);
                     if (!newVal) {
                         return logError(`Invalid attribute url ${newVal}`, this.appName);
@@ -8293,13 +8293,11 @@ function defineElement(tagName) {
                     this.handleInitialNameAndUrl();
                 }
                 else if (attr === ObservedAttrName.NAME && (!this.appName ||
-                    !this.connectStateMap.get(this.connectedCount) // TODO: 这里的逻辑可否再优化一下
-                )) {
+                    !this.connectStateMap.get(this.connectedCount))) {
                     const formatNewName = formatAppName(newVal);
                     if (!formatNewName) {
                         return logError(`Invalid attribute name ${newVal}`, this.appName);
                     }
-                    // TODO: 当micro-app还未插入文档中就修改name，逻辑可否再优化一下
                     if (this.cacheData) {
                         microApp.setData(formatNewName, this.cacheData);
                         this.cacheData = null;