@micro-zoe/micro-app 1.0.0-rc.15 → 1.0.0-rc.17

package/lib/index.esm.js

@@ -1,4 +1,4 @@
-const version = '1.0.0-rc.15';
+const version = '1.0.0-rc.17';
 // do not use isUndefined
 const isBrowser = typeof window !== 'undefined';
 // do not use isUndefined
@@ -911,8 +911,20 @@ class CSSParser {
          *  6. :where(.a, .b, .c) a {}
          *    should be ==> micro-app[name=xxx] :where(.a, .b, .c) a {}
          */
-        return m[0].replace(/(^|,[\n\s]*)([^,]+)/g, (_, separator, selector) => {
+        const attributeValues = {};
+        const matchRes = m[0].replace(/\[([^\]=]+)(?:=([^\]]+))?\]/g, (match, p1, p2) => {
+            const mock = `__mock_${p1}Value__`;
+            attributeValues[mock] = p2;
+            return match.replace(p2, mock);
+        });
+        return matchRes.replace(/(^|,[\n\s]*)([^,]+)/g, (_, separator, selector) => {
             selector = trim(selector);
+            selector = selector.replace(/\[([^\]=]+)(?:=([^\]]+))?\]/g, (match, p1) => {
+                if (attributeValues[p1]) {
+                    return match.replace(p1, attributeValues[p1]);
+                }
+                return match;
+            });
             if (selector && !(this.scopecssDisableNextLine ||
                 (this.scopecssDisable && (!this.scopecssDisableSelectors.length ||
                     this.scopecssDisableSelectors.includes(selector))) ||
@@ -941,7 +953,7 @@ class CSSParser {
         if (cssValue) {
             if (!this.scopecssDisableNextLine &&
                 (!this.scopecssDisable || this.scopecssDisableSelectors.length)) {
-                cssValue = cssValue.replace(/url\(["']?([^)"']+)["']?\)/gm, (all, $1) => {
+                cssValue = cssValue.replace(/url\((["']?)(.*?)\1\)/gm, (all, _, $1) => {
                     if (/^((data|blob):|#|%23)/.test($1) || /^(https?:)?\/\//.test($1)) {
                         return all;
                     }
@@ -5573,16 +5585,18 @@ const proxy2RawDocumentMethods = [
     'prepend',
 ];
 
+const EXCLUDE_URL_PROTOCOLS = [
+    'blob:'
+];
 // 重写 Worker 构造函数的类型
 const originalWorker = window.Worker;
 function isSameOrigin(url) {
-    if (url instanceof URL && url.protocol === 'blob:') {
-        // 如果 url 是 Blob URL，直接返回 true
-        return true;
-    }
-    // 检查 URL 是否与当前页面在同一个源
     try {
-        const parsedUrl = new URL(url);
+        // 检查 URL 是否与当前页面在同一个源
+        const parsedUrl = url instanceof URL ? url : new URL(url);
+        if (EXCLUDE_URL_PROTOCOLS.includes(parsedUrl.protocol)) {
+            return true;
+        }
         return (parsedUrl.protocol === window.location.protocol &&
             parsedUrl.hostname === window.location.hostname &&
             parsedUrl.port === window.location.port);