vite-plugin-cross-origin-storage 1.3.8 → 1.3.10

package/dist/index.js

@@ -1659,57 +1659,41 @@ function cosPlugin(options = {}) {
         }
       }
       if (mainChunk) {
-        const chunkInfo = {};
+        const allChunks = Object.values(bundle).filter((c) => c.type === "chunk");
+        const managedChunkNames = new Set(Object.keys(managedChunks));
+        const managedChunkInfo = {};
         for (const fileName in managedChunks) {
           const nameHash = crypto.createHash("sha256").update(fileName).digest("hex").substring(0, 8);
-          chunkInfo[fileName] = {
+          managedChunkInfo[fileName] = {
             globalVar: `__COS_CHUNK_${nameHash}__`,
             chunk: managedChunks[fileName]
           };
         }
-        const allChunks = Object.values(bundle).filter((c) => c.type === "chunk");
-        const managedChunkNames = new Set(Object.keys(managedChunks));
-        const chunksNeededInImportMap = new Set(managedChunkNames);
-        const queue = Array.from(managedChunkNames);
-        while (queue.length > 0) {
-          const currentName = queue.shift();
-          const chunk = bundle[currentName];
-          if (!chunk) continue;
-          [...chunk.imports, ...chunk.dynamicImports].forEach((dep) => {
-            if (!chunksNeededInImportMap.has(dep)) {
-              chunksNeededInImportMap.add(dep);
-              const depChunk = bundle[dep];
-              if (depChunk && depChunk.type === "chunk" && !managedChunkNames.has(dep)) {
-                queue.push(dep);
-              }
-            }
-          });
-        }
         for (const targetChunk of allChunks) {
+          const isTargetManaged = managedChunkNames.has(targetChunk.fileName);
           const importerDir = path.dirname(targetChunk.fileName);
           for (const depFileName in bundle) {
             const depChunk = bundle[depFileName];
             if (!depChunk || depChunk.type !== "chunk") continue;
-            let relPath = path.relative(importerDir, depFileName);
-            if (!relPath.startsWith(".")) relPath = "./" + relPath;
-            const escapedRelPath = relPath.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-            const staticPattern = `import\\s*(?:(?:\\{\\s*([^}]+)\\s*\\}|\\*\\s+as\\s+([^\\s]+)|([^\\s\\{\\}]+))\\s*from\\s*)?['"]${escapedRelPath}['"];?`;
-            const staticRegex = new RegExp(staticPattern, "g");
-            const dynamicPattern = `import\\s*\\(\\s*['"]${escapedRelPath}['"]\\s*\\)`;
-            const dynamicRegex = new RegExp(dynamicPattern, "g");
-            const exportPattern = `export\\s*(?:(?:\\{\\s*([^}]+)\\s*\\}|\\*\\s*(?:as\\s+([^\\s]+))?))\\s*from\\s*['"]${escapedRelPath}['"];?`;
-            const exportRegex = new RegExp(exportPattern, "g");
             const isDepManaged = managedChunkNames.has(depFileName);
-            const isTargetManaged = managedChunkNames.has(targetChunk.fileName);
-            if (isDepManaged || isTargetManaged) {
+            if (isTargetManaged || isDepManaged) {
+              let relPath = path.relative(importerDir, depFileName);
+              if (!relPath.startsWith(".")) relPath = "./" + relPath;
+              const escapedRelPath = relPath.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
               const bareSpecifier = depFileName;
+              const staticPattern = `import\\s*(?:(?:\\{\\s*([^}]+)\\s*\\}|\\*\\s+as\\s+([^\\s]+)|([^\\s\\{\\}]+))\\s*from\\s*)?['"]${escapedRelPath}['"];?`;
+              const staticRegex = new RegExp(staticPattern, "g");
               targetChunk.code = targetChunk.code.replace(staticRegex, (_match, named, namespace, defaultImport) => {
                 if (named) return `import {${named}} from "${bareSpecifier}";`;
                 if (namespace) return `import * as ${namespace} from "${bareSpecifier}";`;
                 if (defaultImport) return `import ${defaultImport} from "${bareSpecifier}";`;
                 return `import "${bareSpecifier}";`;
               });
+              const dynamicPattern = `import\\s*\\(\\s*['"]${escapedRelPath}['"]\\s*\\)`;
+              const dynamicRegex = new RegExp(dynamicPattern, "g");
               targetChunk.code = targetChunk.code.replace(dynamicRegex, () => `import("${bareSpecifier}")`);
+              const exportPattern = `export\\s*(?:(?:\\{\\s*([^}]+)\\s*\\}|\\*\\s*(?:as\\s+([^\\s]+))?))\\s*from\\s*['"]${escapedRelPath}['"];?`;
+              const exportRegex = new RegExp(exportPattern, "g");
               targetChunk.code = targetChunk.code.replace(exportRegex, (_match, named, namespace) => {
                 if (named) return `export {${named}} from "${bareSpecifier}";`;
                 if (namespace) return `export * as ${namespace} from "${bareSpecifier}";`;
@@ -1720,29 +1704,17 @@ function cosPlugin(options = {}) {
         }
         const manifest = {};
         const base = config.base.endsWith("/") ? config.base : config.base + "/";
-        for (const fileName in bundle) {
-          const chunk = bundle[fileName];
-          if (chunk.type !== "chunk") continue;
-          if (chunksNeededInImportMap.has(fileName)) {
-            if (managedChunkNames.has(fileName)) {
-              const { globalVar } = chunkInfo[fileName];
-              const finalHash = crypto.createHash("sha256").update(chunk.code).digest("hex");
-              const hasDefault = chunk.exports.includes("default");
-              manifest[fileName] = {
-                fileName,
-                file: `${base}${fileName}`,
-                hash: finalHash,
-                globalVar,
-                hasDefault
-              };
-            } else {
-              manifest[fileName] = {
-                fileName,
-                file: `${base}${fileName}`,
-                unmanaged: true
-              };
-            }
-          }
+        for (const fileName in managedChunkInfo) {
+          const { chunk, globalVar } = managedChunkInfo[fileName];
+          const finalHash = crypto.createHash("sha256").update(chunk.code).digest("hex");
+          const hasDefault = chunk.exports.includes("default");
+          manifest[fileName] = {
+            fileName,
+            file: `${base}${fileName}`,
+            hash: finalHash,
+            globalVar,
+            hasDefault
+          };
         }
         manifest["index"] = {
           file: `${config.base.endsWith("/") ? config.base : config.base + "/"}${mainChunk.fileName}`

package/dist/loader.js

@@ -51,15 +51,17 @@
   }
 
   // Load all managed chunks in parallel
-  if (Object.keys(manifest).length > 0) {
+  if (chunksToLoad.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;
-      }
+    // Prefix mapping: Handles all unmanaged chunks automatically.
+    // Longest prefix wins in Import Maps, so specific managed entries below take precedence.
+    // We assume all chunks are in the same relative directory as the managed ones.
+    const firstChunk = chunksToLoad[0];
+    const assetsDir = firstChunk.fileName.substring(0, firstChunk.fileName.lastIndexOf('/') + 1);
+    const assetsUrl = firstChunk.file.substring(0, firstChunk.file.lastIndexOf('/') + 1);
+    if (assetsDir && assetsUrl) {
+      importMap.imports[assetsDir] = assetsUrl;
     }
 
     await Promise.all(chunksToLoad.map(async (chunk) => {
@@ -87,15 +89,10 @@
       }
 
       if (url) {
-        // Create a Data URL shim that re-exports everything from the Blob 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 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)
+        // Map the bare specifier and absolute path directly to the Blob URL.
+        // This avoids the indirection of a Data URL shim and handles cycles naturally.
+        importMap.imports[chunk.fileName] = url;
+        importMap.imports[chunk.file] = url;
 
         // Also set global if anyone still needs it (legacy)
         if (chunk.globalVar) {

package/loader.js

@@ -51,15 +51,17 @@
   }
 
   // Load all managed chunks in parallel
-  if (Object.keys(manifest).length > 0) {
+  if (chunksToLoad.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;
-      }
+    // Prefix mapping: Handles all unmanaged chunks automatically.
+    // Longest prefix wins in Import Maps, so specific managed entries below take precedence.
+    // We assume all chunks are in the same relative directory as the managed ones.
+    const firstChunk = chunksToLoad[0];
+    const assetsDir = firstChunk.fileName.substring(0, firstChunk.fileName.lastIndexOf('/') + 1);
+    const assetsUrl = firstChunk.file.substring(0, firstChunk.file.lastIndexOf('/') + 1);
+    if (assetsDir && assetsUrl) {
+      importMap.imports[assetsDir] = assetsUrl;
     }
 
     await Promise.all(chunksToLoad.map(async (chunk) => {
@@ -87,15 +89,10 @@
       }
 
       if (url) {
-        // Create a Data URL shim that re-exports everything from the Blob 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 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)
+        // Map the bare specifier and absolute path directly to the Blob URL.
+        // This avoids the indirection of a Data URL shim and handles cycles naturally.
+        importMap.imports[chunk.fileName] = url;
+        importMap.imports[chunk.file] = url;
 
         // 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.8",
+  "version": "1.3.10",
   "description": "Vite plugin to load chunks from Cross-Origin Storage",
   "keywords": [
     "vite",