@micro-zoe/micro-app 1.0.0-rc.10 → 1.0.0-rc.12

package/lib/index.d.ts

@@ -155,8 +155,10 @@ declare module '@micro-zoe/micro-app/libs/utils' {
     export function isImageElement(target: unknown): target is HTMLImageElement;
     export function isBaseElement(target: unknown): target is HTMLBaseElement;
     export function isDocumentFragment(target: unknown): target is DocumentFragment;
+    export function isDocumentShadowRoot(target: unknown): target is DocumentFragment;
     export function isMicroAppBody(target: unknown): target is HTMLElement;
     export function isMicroAppHead(target: unknown): target is HTMLElement;
+    export function isWebComponentElement(target: unknown): boolean;
     export function isProxyDocument(target: unknown): target is Document;
     export function isTargetExtension(path: string, suffix: string): boolean;
     export function includes(target: unknown[], searchElement: unknown, fromIndex?: number): boolean;

package/lib/index.esm.js

@@ -1,4 +1,4 @@
-const version = '1.0.0-rc.10';
+const version = '1.0.0-rc.12';
 // do not use isUndefined
 const isBrowser = typeof window !== 'undefined';
 // do not use isUndefined
@@ -122,12 +122,23 @@ function isBaseElement(target) {
 function isDocumentFragment(target) {
     return toTypeString(target) === '[object DocumentFragment]';
 }
+function isDocumentShadowRoot(target) {
+    return toTypeString(target) === '[object ShadowRoot]';
+}
 function isMicroAppBody(target) {
     return isElement(target) && target.tagName.toUpperCase() === 'MICRO-APP-BODY';
 }
 function isMicroAppHead(target) {
     return isElement(target) && target.tagName.toUpperCase() === 'MICRO-APP-HEAD';
 }
+function isWebComponentElement(target) {
+    let result = toTypeString(target) === '[object HTMLElement]';
+    if (result) {
+        const tagName = target.tagName.toUpperCase();
+        result = result && !tagName.startsWith('MICRO-APP');
+    }
+    return result;
+}
 // is ProxyDocument
 function isProxyDocument(target) {
     return toTypeString(target) === '[object ProxyDocument]';
@@ -3004,10 +3015,6 @@ function updateElementInfo(node, appName) {
                 };
             }
         }
-        if (isImageElement(node) || isVideoElement(node) || isAudioElement(node)) {
-            // @ts-ignore
-            node.crossOrigin = 'anonymous';
-        }
         rawDefineProperties(node, props);
         /**
          * In FireFox, iframe Node.prototype will point to native Node.prototype after insert to document
@@ -5480,6 +5487,7 @@ function patchRouter(appName, url, microAppWindow, browserHost) {
 }
 
 const escape2RawWindowKeys = [
+    'Array',
     'getComputedStyle',
     // FIX ISSUE: https://github.com/micro-zoe/micro-app/issues/1292
     'DOMParser',
@@ -5605,8 +5613,15 @@ function urlFromScript(script) {
 // @ts-ignore
 const WorkerProxy = new Proxy(originalWorker, {
     construct(Target, args) {
-        const [scriptURL, options] = args;
-        if (!isSameOrigin(scriptURL)) {
+        let [scriptURL, options] = args;
+        options = options || {};
+        const appName = getCurrentAppName();
+        let url = scriptURL;
+        if (appName) {
+            const app = appInstanceMap.get(appName);
+            url = CompletionPath(scriptURL, app.url);
+        }
+        if (url && !isSameOrigin(url)) {
             // 如果 scriptURL 是跨域的，使用 Blob URL 加载并执行 worker
             const script = `import "${scriptURL}";`;
             const workerPath = urlFromScript(script);
@@ -5619,8 +5634,6 @@ const WorkerProxy = new Proxy(originalWorker, {
         }
     },
 });
-// @ts-ignore
-window.Worker = WorkerProxy;
 
 /**
  * patch window of child app
@@ -5918,7 +5931,10 @@ function patchDocumentPrototype(appName, microAppWindow) {
         return range;
     };
     microRootDocument.prototype.createElement = function createElement(tagName, options) {
-        const element = rawMicroCreateElement.call(this, tagName, options);
+        let element = rawMicroCreateElement.call(this, tagName, options);
+        if (isWebComponentElement(element)) {
+            element = rawMicroCreateElement.call(rawDocument, tagName, options);
+        }
         return updateElementInfo(element, appName);
     };
     microRootDocument.prototype.createElementNS = function createElementNS(namespaceURI, name, options) {
@@ -7766,10 +7782,14 @@ function patchElementAndDocument() {
     };
     rawDocumentFragment.prototype.prepend = rawRootElement.prototype.prepend = function prepend(...nodes) {
         let i = nodes.length;
+        let target = globalEnv.rawPrepend;
+        if (isDocumentFragment(this) || isDocumentShadowRoot(this)) {
+            target = globalEnv.rawFragmentPrepend;
+        }
         while (i > 0) {
             let node = nodes[i - 1];
             node = isNode(node) ? node : globalEnv.rawCreateTextNode.call(globalEnv.rawDocument, node);
-            commonElementHandler(this, markElement(node), null, isDocumentFragment(this) ? globalEnv.rawFragmentPrepend : globalEnv.rawPrepend);
+            commonElementHandler(this, markElement(node), null, target);
             i--;
         }
     };
@@ -7851,6 +7871,7 @@ function patchElementAndDocument() {
     };
     // rewrite setAttribute, complete resource address
     rawRootElement.prototype.setAttribute = function setAttribute(key, value) {
+        var _a;
         if (/^micro-app(-\S+)?/i.test(this.tagName) &&
             key === 'data' &&
             this.setAttribute !== rawRootElement.prototype.setAttribute) {
@@ -7866,6 +7887,14 @@ function patchElementAndDocument() {
                 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)) {
+                    includeCrossOrigin = microApp.options.includeCrossOrigin(value);
+                }
+                // @ts-ignore
+                includeCrossOrigin && (node.crossOrigin = 'anonymous');
+            }
         }
     };
     /**