@micro-zoe/micro-app 1.0.0-rc.19 → 1.0.0-rc.20

package/lib/index.esm.js

@@ -1,4 +1,4 @@
-const version = '1.0.0-rc.19';
+const version = '1.0.0-rc.20';
 // do not use isUndefined
 const isBrowser = typeof window !== 'undefined';
 // do not use isUndefined
@@ -636,6 +636,10 @@ function instanceOf(instance, constructor) {
     else if (!isFunction(constructor)) {
         throw new TypeError("Right-hand side of 'instanceof' is not callable");
     }
+    else if (typeof instance === 'number' || typeof instance === 'string' || typeof instance === 'boolean') {
+        // 检查 obj 是否是基本类型的包装器实例
+        return false;
+    }
     let proto = Object.getPrototypeOf(instance);
     while (proto) {
         if (proto === constructor.prototype) {
@@ -1233,7 +1237,8 @@ function scopedCSS(styleElement, app, linkPath) {
         if (styleElement.textContent) {
             commonAction(styleElement, app.name, prefix, app.url, linkPath);
             const observer = new MutationObserver(() => {
-                const isPrefixed = styleElement.textContent && new RegExp(prefix).test(styleElement.textContent);
+                const escapedPrefix = prefix.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+                const isPrefixed = styleElement.textContent && new RegExp(escapedPrefix).test(styleElement.textContent);
                 observer.disconnect();
                 if (!isPrefixed) {
                     styleElement.__MICRO_APP_HAS_SCOPED__ = false;
@@ -2926,6 +2931,7 @@ class BaseSandbox {
             // TODO: 是否可以和constants/SCOPE_WINDOW_ON_EVENT合并
             'onpopstate',
             'onhashchange',
+            'event',
         ];
         // Properties that can only get and set in microAppWindow, will not escape to rawWindow
         this.scopeProperties = Array.from(this.staticScopeProperties);
@@ -3577,8 +3583,13 @@ function patchWindowEffect(microAppWindow, appName) {
         return intervalId;
     };
     microAppWindow.setTimeout = function (handler, timeout, ...args) {
-        const timeoutId = rawSetTimeout.call(rawWindow, handler, timeout, ...args);
-        timeoutIdMap.set(timeoutId, { handler, timeout, args });
+        const setTimeoutHander = function (...args) {
+            timeoutIdMap.delete(timeoutId);
+            typeof handler === 'function' && handler(...args);
+        };
+        const handlerWithCleanup = typeof handler === 'string' ? handler : setTimeoutHander;
+        const timeoutId = rawSetTimeout.call(rawWindow, handlerWithCleanup, timeout, ...args);
+        timeoutIdMap.set(timeoutId, { handler: handlerWithCleanup, timeout, args });
         return timeoutId;
     };
     microAppWindow.clearInterval = function (intervalId) {
@@ -5996,6 +6007,9 @@ function patchDocumentPrototype(appName, microAppWindow) {
     function querySelector(selectors) {
         var _a;
         const _this = getBindTarget(this);
+        if (selectors === 'body') {
+            return this.body;
+        }
         if (!selectors ||
             isUniqueElement(selectors) ||
             rawDocument !== _this) {
@@ -6137,7 +6151,11 @@ function patchDocumentProperty(appName, microAppWindow, sandbox) {
             enumerable: true,
             configurable: true,
             get: () => {
+                var _a;
                 throttleDeferForIframeAppName(appName);
+                if (tagName === 'body') {
+                    return (_a = sandbox.options.container) === null || _a === void 0 ? void 0 : _a.querySelector('micro-app-body');
+                }
                 return rawDocument[tagName];
             },
             set: (value) => { rawDocument[tagName] = value; },
@@ -6296,7 +6314,7 @@ function patchDocumentEffect(appName, microAppWindow) {
  */
 function patchElement(appName, url, microAppWindow, sandbox) {
     patchIframeNode(appName, microAppWindow, sandbox);
-    patchIframeAttribute(url, microAppWindow);
+    patchIframeAttribute(url, microAppWindow, appName);
 }
 /**
  * patch iframe Node/Element
@@ -6471,17 +6489,27 @@ function patchIframeNode(appName, microAppWindow, sandbox) {
         value: ImageProxy,
     });
 }
-function patchIframeAttribute(url, microAppWindow) {
+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;
         if (/^micro-app(-\S+)?/i.test(this.tagName) &&
             key === 'data' &&
             this.setAttribute !== microRootElement.prototype.setAttribute) {
             this.setAttribute(key, value);
         }
         else {
-            if (((key === 'src' || key === 'srcset') && /^(img|script|video|audio|source|embed)$/i.test(this.tagName)) ||
+            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;
+            if (key === 'href' && /^a$/i.test(this.tagName) && typeof aHrefResolver === 'function') {
+                // 试验性质：a 标签开放自定义补齐功能
+                value = aHrefResolver(value, appName, url);
+            }
+            else if (((key === 'src' || key === 'srcset') && /^(img|script|video|audio|source|embed)$/i.test(this.tagName)) ||
                 (key === 'href' && /^(link|image)$/i.test(this.tagName)) ||
                 // 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))) {
@@ -6922,6 +6950,7 @@ class CreateApp {
         // TODO: 类型优化，加上iframe沙箱
         this.sandBox = null;
         this.fiber = false;
+        this.isReloading = false;
         appInstanceMap.set(name, this);
         // init actions
         this.name = name;
@@ -6932,6 +6961,7 @@ class CreateApp {
         // exec before getInlineModeState
         this.iframe = iframe !== null && iframe !== void 0 ? iframe : false;
         this.inline = this.getInlineModeState(inline);
+        this.isReloading = false;
         /**
          * NOTE:
          *  1. Navigate after micro-app created, before mount
@@ -7297,6 +7327,7 @@ class CreateApp {
         if (this.umdMode && this.container && !destroy) {
             this.cloneContainer(this.source.html, this.container, false);
         }
+        const shouldClearData = this.isReloading ? false : (clearData || destroy);
         /**
          * this.container maybe contains micro-app element, stop sandbox should exec after cloneContainer
          * NOTE:
@@ -7307,7 +7338,7 @@ class CreateApp {
             umdMode: this.umdMode,
             keepRouteState: keepRouteState && !destroy,
             destroy,
-            clearData: clearData || destroy,
+            clearData: shouldClearData,
         });
         // dispatch unmount event to base app
         dispatchLifecyclesEvent(this.container, this.name, lifeCycles.UNMOUNT);
@@ -7465,7 +7496,11 @@ class CreateApp {
      */
     createSandbox() {
         if (this.useSandbox && !this.sandBox) {
-            this.sandBox = this.iframe ? new IframeSandbox(this.name, this.url, { attrs: this.attrs }) : new WithSandBox(this.name, this.url);
+            const iframeOption = {
+                attrs: this.attrs,
+                container: this.container
+            };
+            this.sandBox = this.iframe ? new IframeSandbox(this.name, this.url, iframeOption) : new WithSandBox(this.name, this.url);
         }
     }
     // set app state
@@ -9160,7 +9195,15 @@ function reload(appName, destroy) {
         if (app) {
             const rootContainer = app.container && getRootContainer(app.container);
             if (rootContainer) {
-                resolve(rootContainer.reload(destroy));
+                const currentData = microApp.getData(appName);
+                app.isReloading = true;
+                rootContainer.reload(destroy).then(() => {
+                    if (currentData) {
+                        microApp.setData(appName, currentData);
+                    }
+                    app.isReloading = false;
+                    resolve(true);
+                });
             }
             else {
                 logWarn(`app ${appName} is not rendered, cannot use reload`);