vite-plugin-cross-origin-storage 1.3.5 → 1.3.6

package/dist/index.js

@@ -1668,64 +1668,28 @@ function cosPlugin(options = {}) {
           };
         }
         const allChunks = Object.values(bundle).filter((c) => c.type === "chunk");
-        for (const targetChunk of allChunks) {
-          for (const fileName in chunkInfo) {
-            if (targetChunk.fileName === fileName) continue;
-            const { globalVar } = chunkInfo[fileName];
-            const chunkBasename = fileName.split("/").pop();
-            const escapedName = chunkBasename.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+        for (const fileName in managedChunks) {
+          const chunk = managedChunks[fileName];
+          chunk.imports.forEach((importedFile) => {
+            const importedBasename = importedFile.split("/").pop();
+            const escapedName = importedBasename.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
             const pattern = `import\\s*(?:(?:\\{\\s*([^}]+)\\s*\\}|\\*\\s+as\\s+([^\\s]+)|([^\\s\\{\\}]+))\\s*from\\s*)?['"]\\.\\/${escapedName}['"];?`;
             const importRegex = new RegExp(pattern, "g");
-            if (importRegex.test(targetChunk.code)) {
+            if (importRegex.test(chunk.code)) {
               const base = config.base.endsWith("/") ? config.base : config.base + "/";
-              const absoluteUrl = `new URL("${base}${fileName}", document.baseURI).href`;
-              targetChunk.code = targetChunk.code.replace(importRegex, (_match, named, namespace, defaultImport) => {
-                const fallback = `await import(${absoluteUrl})`;
+              const absoluteUrl = `${base}${importedFile}`;
+              chunk.code = chunk.code.replace(importRegex, (_match, named, namespace, defaultImport) => {
                 if (named) {
-                  const destructuringPattern = named.split(",").map((b) => {
-                    const parts = b.trim().split(/\s+as\s+/);
-                    return parts.length === 2 ? `${parts[0]}:${parts[1]}` : parts[0];
-                  }).join(",");
-                  return `const {${destructuringPattern}}=await import(window.${globalVar}||${absoluteUrl});`;
+                  return `import {${named}} from "${absoluteUrl}";`;
                 } else if (namespace) {
-                  return `const ${namespace}=await import(window.${globalVar}||${absoluteUrl});`;
+                  return `import * as ${namespace} from "${absoluteUrl}";`;
                 } else if (defaultImport) {
-                  return `const ${defaultImport}=(await import(window.${globalVar}||${absoluteUrl})).default;`;
+                  return `import ${defaultImport} from "${absoluteUrl}";`;
                 } else {
-                  return `await import(window.${globalVar}||${absoluteUrl});`;
+                  return `import "${absoluteUrl}";`;
                 }
               });
             }
-          }
-        }
-        for (const fileName in managedChunks) {
-          const chunk = managedChunks[fileName];
-          chunk.imports.forEach((importedFile) => {
-            if (!chunkInfo[importedFile]) {
-              const importedBasename = importedFile.split("/").pop();
-              const escapedName = importedBasename.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-              const pattern = `import\\s*(?:(?:\\{\\s*([^}]+)\\s*\\}|\\*\\s+as\\s+([^\\s]+)|([^\\s\\{\\}]+))\\s*from\\s*)?['"]\\.\\/${escapedName}['"];?`;
-              const importRegex = new RegExp(pattern, "g");
-              if (importRegex.test(chunk.code)) {
-                const base = config.base.endsWith("/") ? config.base : config.base + "/";
-                const absoluteUrl = `new URL("${base}${importedFile}", document.baseURI).href`;
-                chunk.code = chunk.code.replace(importRegex, (_match, named, namespace, defaultImport) => {
-                  if (named) {
-                    const destructuringPattern = named.split(",").map((b) => {
-                      const parts = b.trim().split(/\s+as\s+/);
-                      return parts.length === 2 ? `${parts[0]}:${parts[1]}` : parts[0];
-                    }).join(",");
-                    return `const {${destructuringPattern}}=await import(${absoluteUrl});`;
-                  } else if (namespace) {
-                    return `const ${namespace}=await import(${absoluteUrl});`;
-                  } else if (defaultImport) {
-                    return `const ${defaultImport}=(await import(${absoluteUrl})).default;`;
-                  } else {
-                    return `await import(${absoluteUrl});`;
-                  }
-                });
-              }
-            }
           });
         }
         const manifest = {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite-plugin-cross-origin-storage",
-  "version": "1.3.5",
+  "version": "1.3.6",
   "description": "Vite plugin to load chunks from Cross-Origin Storage",
   "keywords": [
     "vite",