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

package/dist/index.js

@@ -1669,77 +1669,52 @@ 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];
+          for (const fileName in bundle) {
+            const chunk = bundle[fileName];
+            if (chunk.type !== "chunk") continue;
             const chunkBasename = fileName.split("/").pop();
             const escapedName = chunkBasename.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)) {
-              const base = config.base.endsWith("/") ? config.base : config.base + "/";
-              const absoluteUrl = `new URL("${base}${fileName}", document.baseURI).href`;
+              const bareSpecifier = fileName;
               targetChunk.code = targetChunk.code.replace(importRegex, (_match, named, namespace, defaultImport) => {
-                const fallback = `await import(${absoluteUrl})`;
                 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 "${bareSpecifier}";`;
                 } else if (namespace) {
-                  return `const ${namespace}=await import(window.${globalVar}||${absoluteUrl});`;
+                  return `import * as ${namespace} from "${bareSpecifier}";`;
                 } else if (defaultImport) {
-                  return `const ${defaultImport}=(await import(window.${globalVar}||${absoluteUrl})).default;`;
+                  return `import ${defaultImport} from "${bareSpecifier}";`;
                 } else {
-                  return `await import(window.${globalVar}||${absoluteUrl});`;
+                  return `import "${bareSpecifier}";`;
                 }
               });
             }
           }
         }
-        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 = {};
-        for (const fileName in chunkInfo) {
-          const { chunk, globalVar } = chunkInfo[fileName];
-          const finalHash = crypto.createHash("sha256").update(chunk.code).digest("hex");
-          const hasDefault = /export\s+\{\s*([^}]+\s+as\s+)?default\s*\}/.test(chunk.code) || /export\s+default\s+/.test(chunk.code);
-          const base = config.base.endsWith("/") ? config.base : config.base + "/";
-          manifest[fileName] = {
-            file: `${base}${fileName}`,
-            hash: finalHash,
-            globalVar,
-            hasDefault
-          };
+        const base = config.base.endsWith("/") ? config.base : config.base + "/";
+        for (const fileName in bundle) {
+          const chunk = bundle[fileName];
+          if (chunk.type !== "chunk") continue;
+          if (chunkInfo[fileName]) {
+            const { globalVar } = chunkInfo[fileName];
+            const finalHash = crypto.createHash("sha256").update(chunk.code).digest("hex");
+            const hasDefault = /export\s+\{\s*([^}]+\s+as\s+)?default\s*\}/.test(chunk.code) || /export\s+default\s+/.test(chunk.code);
+            manifest[fileName] = {
+              fileName,
+              file: `${base}${fileName}`,
+              hash: finalHash,
+              globalVar,
+              hasDefault
+            };
+          } else {
+            manifest[fileName] = {
+              fileName,
+              file: `${base}${fileName}`,
+              unmanaged: true
+            };
+          }
         }
         manifest["index"] = {
           file: `${config.base.endsWith("/") ? config.base : config.base + "/"}${mainChunk.fileName}`

package/dist/loader.js

@@ -51,9 +51,17 @@
   }
 
   // Load all managed chunks in parallel
-  if (chunksToLoad.length > 0) {
+  if (Object.keys(manifest).length > 0) {
     const importMap = { imports: {} };
 
+    // Fill unmanaged chunks first
+    for (const fileName in manifest) {
+      const entry = manifest[fileName];
+      if (fileName !== 'index' && !entry.hash) {
+        importMap.imports[fileName] = entry.file;
+      }
+    }
+
     await Promise.all(chunksToLoad.map(async (chunk) => {
       let url = null;
 
@@ -80,15 +88,14 @@
 
       if (url) {
         // Create a Data URL shim that re-exports everything from the Blob URL.
-        // This provides a "stable" alias that works with Import Maps and handles cycles.
-        let shimSource = `export * from "${url}";`;
-        if (chunk.hasDefault) {
-          shimSource += `export { default } from "${url}";`;
-        }
+        const shimSource = chunk.hasDefault
+          ? `export * from "${url}"; export { default } from "${url}";`
+          : `export * from "${url}";`;
         const shimUrl = `data:text/javascript;base64,${btoa(shimSource)}`;
 
-        // Map the absolute path to this shim
-        importMap.imports[chunk.file] = shimUrl;
+        // Map the bare specifier (fileName) and full paths to this shim
+        importMap.imports[chunk.fileName] = shimUrl; // bare specifier
+        importMap.imports[chunk.file] = shimUrl;     // absolute path (legacy/fallback)
 
         // Also set global if anyone still needs it (legacy)
         if (chunk.globalVar) {

package/loader.js

@@ -51,9 +51,17 @@
   }
 
   // Load all managed chunks in parallel
-  if (chunksToLoad.length > 0) {
+  if (Object.keys(manifest).length > 0) {
     const importMap = { imports: {} };
 
+    // Fill unmanaged chunks first
+    for (const fileName in manifest) {
+      const entry = manifest[fileName];
+      if (fileName !== 'index' && !entry.hash) {
+        importMap.imports[fileName] = entry.file;
+      }
+    }
+
     await Promise.all(chunksToLoad.map(async (chunk) => {
       let url = null;
 
@@ -80,15 +88,14 @@
 
       if (url) {
         // Create a Data URL shim that re-exports everything from the Blob URL.
-        // This provides a "stable" alias that works with Import Maps and handles cycles.
-        let shimSource = `export * from "${url}";`;
-        if (chunk.hasDefault) {
-          shimSource += `export { default } from "${url}";`;
-        }
+        const shimSource = chunk.hasDefault
+          ? `export * from "${url}"; export { default } from "${url}";`
+          : `export * from "${url}";`;
         const shimUrl = `data:text/javascript;base64,${btoa(shimSource)}`;
 
-        // Map the absolute path to this shim
-        importMap.imports[chunk.file] = shimUrl;
+        // Map the bare specifier (fileName) and full paths to this shim
+        importMap.imports[chunk.fileName] = shimUrl; // bare specifier
+        importMap.imports[chunk.file] = shimUrl;     // absolute path (legacy/fallback)
 
         // Also set global if anyone still needs it (legacy)
         if (chunk.globalVar) {

package/package.json

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