@micro-zoe/micro-app 1.0.0-rc.22 → 1.0.0-rc.24

package/lib/index.d.ts

@@ -422,6 +422,7 @@ declare module '@micro-zoe/micro-app/interact' {
                 * @param appName app.name
                 */
             clearDataListener(appName: string): void;
+            changeEventAppName(newAppName: string, oldAppName: string): void;
     }
     export class EventCenterForMicroApp extends EventCenterForGlobal {
             appName: string;

package/lib/index.esm.js

@@ -1,4 +1,4 @@
-const version = '1.0.0-rc.22';
+const version = '1.0.0-rc.24';
 // do not use isUndefined
 const isBrowser = typeof window !== 'undefined';
 // do not use isUndefined
@@ -2713,6 +2713,14 @@ class EventCenterForBaseApp extends EventCenterForGlobal {
     clearDataListener(appName) {
         eventCenter.off(createEventName(formatAppName(appName), false));
     }
+    changeEventAppName(newAppName, oldAppName) {
+        const newEventName = createEventName(formatAppName(newAppName), true);
+        const oldEventName = createEventName(formatAppName(oldAppName), true);
+        if (eventCenter.eventList.has(oldEventName)) {
+            eventCenter.eventList.set(newEventName, eventCenter.eventList.get(oldEventName));
+            eventCenter.eventList.delete(oldEventName);
+        }
+    }
 }
 // Event center for sub app
 class EventCenterForMicroApp extends EventCenterForGlobal {
@@ -6502,18 +6510,14 @@ function patchIframeAttribute(url, microAppWindow, appName) {
     const microRootElement = microAppWindow.Element;
     const rawMicroSetAttribute = microRootElement.prototype.setAttribute;
     microRootElement.prototype.setAttribute = function setAttribute(key, value) {
-        var _a, _b, _c, _d;
+        var _a;
         if (/^micro-app(-\S+)?/i.test(this.tagName) &&
             key === 'data' &&
             this.setAttribute !== microRootElement.prototype.setAttribute) {
             this.setAttribute(key, value);
         }
         else {
-            let appPlugins = (_c = (_b = (_a = microApp === null || microApp === void 0 ? void 0 : microApp.options) === null || _a === void 0 ? void 0 : _a.plugins) === null || _b === void 0 ? void 0 : _b.modules) === null || _c === void 0 ? void 0 : _c[appName];
-            if (!isArray(appPlugins)) {
-                appPlugins = [];
-            }
-            const aHrefResolver = (_d = appPlugins[0]) === null || _d === void 0 ? void 0 : _d.aHrefResolver;
+            const aHrefResolver = (_a = microApp === null || microApp === void 0 ? void 0 : microApp.options) === null || _a === void 0 ? void 0 : _a.aHrefResolver;
             if (key === 'href' && /^a$/i.test(this.tagName) && typeof aHrefResolver === 'function') {
                 // 试验性质：a 标签开放自定义补齐功能
                 value = aHrefResolver(value, appName, url);
@@ -6580,6 +6584,8 @@ class IframeSandbox {
         this.deleteIframeElement = this.createIframeElement(appName, browserHost + rawLocation.pathname, options);
         this.microAppWindow = this.iframe.contentWindow;
         this.patchIframe(this.microAppWindow, (resolve) => {
+            // refresh
+            this.microAppWindow = this.iframe.contentWindow;
             // create new html to iframe
             this.createIframeTemplate(this.microAppWindow);
             // get escapeProperties from plugins
@@ -7081,10 +7087,10 @@ class CreateApp {
             return this.setAppState(appStates.LOADING);
         }
         this.createSandbox();
-        // place outside of nextAction, as nextAction may execute async
-        this.setAppState(appStates.BEFORE_MOUNT);
         const nextAction = () => {
             var _a, _b, _c, _d, _e, _f, _g;
+            // place inside of nextAction, make sure iframe ready
+            this.setAppState(appStates.BEFORE_MOUNT);
             /**
              * Special scenes:
              * 1. mount before prerender exec mount (loading source)
@@ -7773,6 +7779,7 @@ function isPendMethod(method) {
  * @param newChild target node
  */
 function completePathDynamic(app, newChild) {
+    var _a;
     if (isElement(newChild)) {
         if (/^(img|script)$/i.test(newChild.tagName)) {
             if (newChild.hasAttribute('src')) {
@@ -7785,7 +7792,16 @@ function completePathDynamic(app, newChild) {
         else if ((/^(link|image)$/i.test(newChild.tagName) && newChild.hasAttribute('href')) ||
             // If it is the anchor tag,eg. <a href="#xxx"/>, the path will not be completed
             (/^(a)$/i.test(newChild.tagName) && newChild.hasAttribute('href') && !/^#/.test(newChild.getAttribute('href') || ''))) {
-            globalEnv.rawSetAttribute.call(newChild, 'href', CompletionPath(newChild.getAttribute('href'), app.url));
+            const aHrefResolver = (_a = microApp === null || microApp === void 0 ? void 0 : microApp.options) === null || _a === void 0 ? void 0 : _a.aHrefResolver;
+            const hrefValue = newChild.getAttribute('href');
+            let nextHrefValue;
+            if ((/^(a)$/i.test(newChild.tagName) && typeof aHrefResolver === 'function')) {
+                nextHrefValue = aHrefResolver(hrefValue, app.name, app.url);
+            }
+            else {
+                nextHrefValue = CompletionPath(hrefValue, app.url);
+            }
+            globalEnv.rawSetAttribute.call(newChild, 'href', nextHrefValue);
         }
     }
 }
@@ -7948,7 +7964,7 @@ function patchElementAndDocument() {
     };
     // rewrite setAttribute, complete resource address
     rawRootElement.prototype.setAttribute = function setAttribute(key, value) {
-        var _a;
+        var _a, _b;
         if (/^micro-app(-\S+)?/i.test(this.tagName) &&
             key === 'data' &&
             this.setAttribute !== rawRootElement.prototype.setAttribute) {
@@ -7963,12 +7979,18 @@ function patchElementAndDocument() {
                     // If it is the anchor tag,eg. <a href="#xxx"/>, the path will not be completed
                     (key === 'href' && /^(a)$/i.test(this.tagName) && !/^#/.test(value)))) {
                 const app = appInstanceMap.get(appName);
-                value = CompletionPath(value, app.url);
+                const aHrefResolver = (_a = microApp === null || microApp === void 0 ? void 0 : microApp.options) === null || _a === void 0 ? void 0 : _a.aHrefResolver;
+                if (key === 'href' && /^a$/i.test(this.tagName) && typeof aHrefResolver === 'function') {
+                    value = aHrefResolver(value, appName, app.url);
+                }
+                else {
+                    value = CompletionPath(value, app.url);
+                }
             }
             globalEnv.rawSetAttribute.call(this, key, value);
             if (isImageElement(this) || isVideoElement(this) || isAudioElement(this)) {
                 let includeCrossOrigin = false;
-                if (((_a = microApp === null || microApp === void 0 ? void 0 : microApp.options) === null || _a === void 0 ? void 0 : _a.includeCrossOrigin) && isFunction(microApp.options.includeCrossOrigin)) {
+                if (((_b = microApp === null || microApp === void 0 ? void 0 : microApp.options) === null || _b === void 0 ? void 0 : _b.includeCrossOrigin) && isFunction(microApp.options.includeCrossOrigin)) {
                     includeCrossOrigin = microApp.options.includeCrossOrigin(value);
                 }
                 // @ts-ignore
@@ -8361,7 +8383,7 @@ function defineElement(tagName) {
             this.cacheData = null;
             this.connectedCount = 0;
             this.connectStateMap = new Map();
-            this.appName = ''; // app name
+            this._appName = ''; // app name
             this.appUrl = ''; // app url
             this.ssrUrl = ''; // html path in ssr mode
             this.version = version;
@@ -8725,6 +8747,7 @@ function defineElement(tagName) {
                     unmountcb,
                 });
             }
+            delete this.__MICRO_APP_NAME__;
         }
         // hidden app when disconnectedCallback called with keep-alive
         handleHiddenKeepAliveApp(callback) {
@@ -8902,6 +8925,15 @@ function defineElement(tagName) {
             }
             return null;
         }
+        set appName(value) {
+            if (value !== this._appName) {
+                microApp.changeEventAppName(value, this._appName);
+                this._appName = value;
+            }
+        }
+        get appName() {
+            return this._appName;
+        }
         /**
          * get publicPath from a valid address,it can used in micro-app-devtools
          */