vite-plugin-cross-origin-storage 1.4.1 → 1.4.3

package/dist/index.js

@@ -1619,7 +1619,9 @@ var hasStringIsWellFormed = "isWellFormed" in String.prototype;
 
 // index.ts
 function cosPlugin(options = {}) {
-  const filter = options.include || options.exclude ? createFilter(options.include || ["**/*"], options.exclude, { resolve: false }) : () => true;
+  const filter = options.include || options.exclude ? createFilter(options.include || ["**/*"], options.exclude, {
+    resolve: false
+  }) : () => true;
   const __dirname = path.dirname(fileURLToPath(import.meta.url));
   const loaderPath = path.resolve(__dirname, "./loader.js");
   let config;
@@ -1649,14 +1651,13 @@ function cosPlugin(options = {}) {
           if (chunk.isEntry) {
             console.log(`COS Plugin: [ENTRY] ${fileName}`);
             mainChunk = chunk;
-          } else {
-            const res = filter(fileName) || filter(chunk.name);
-            console.log(
-              `COS Plugin: [FILTER] ${fileName} (name: ${chunk.name}) -> ${res ? "INCLUDE" : "SKIP"}`
-            );
-            if (res) {
-              managedChunks[fileName] = chunk;
-            }
+          }
+          const res = filter(fileName) || filter(chunk.name);
+          console.log(
+            `COS Plugin: [FILTER] ${fileName} (name: ${chunk.name}) -> ${res ? "INCLUDE" : "SKIP"}`
+          );
+          if (res) {
+            managedChunks[fileName] = chunk;
           }
         }
         if (fileName === "index.html" && chunk.type === "asset") {
@@ -1671,35 +1672,35 @@ function cosPlugin(options = {}) {
         const unmanagedDependencies = /* @__PURE__ */ new Set();
         const base = config.base.endsWith("/") ? config.base : config.base + "/";
         for (const targetChunk of allChunks) {
-          const isTargetManaged = managedChunkNames.has(targetChunk.fileName);
           const importerDir = path.dirname(targetChunk.fileName);
           const deps = [...targetChunk.imports, ...targetChunk.dynamicImports];
           for (const depFileName of deps) {
             const depChunk = bundle[depFileName];
             if (!depChunk || depChunk.type !== "chunk") continue;
             const isDepManaged = managedChunkNames.has(depFileName);
-            if (isTargetManaged || isDepManaged) {
-              let relPath = path.relative(importerDir, depFileName);
-              if (!relPath.startsWith(".")) relPath = "./" + relPath;
-              const escapedRelPath = relPath.replace(
-                /[.*+?^${}()|[\]\\]/g,
-                "\\$&"
-              );
-              const bareSpecifier = `coschunk-${depFileName.replace(/\//g, "-")}`;
-              const staticPattern = `(import|export)\\b\\s*((?:(?!\\bimport\\b|\\bexport\\b)[\\s\\S])*?\\bfrom\\b\\s*)?['"]${escapedRelPath}['"]\\s*;?`;
-              const staticRegex = new RegExp(staticPattern, "g");
-              targetChunk.code = targetChunk.code.replace(staticRegex, (match, keyword, fromPart) => {
+            let relPath = path.relative(importerDir, depFileName);
+            if (!relPath.startsWith(".")) relPath = "./" + relPath;
+            const escapedRelPath = relPath.replace(
+              /[.*+?^${}()|[\]\\]/g,
+              "\\$&"
+            );
+            const bareSpecifier = `coschunk-${depFileName.replace(/\//g, "-")}`;
+            const staticPattern = `(import|export)\\b\\s*((?:(?!\\bimport\\b|\\bexport\\b)[\\s\\S])*?\\bfrom\\b\\s*)?['"]${escapedRelPath}['"]\\s*;?`;
+            const staticRegex = new RegExp(staticPattern, "g");
+            targetChunk.code = targetChunk.code.replace(
+              staticRegex,
+              (match, keyword, fromPart) => {
                 return `${keyword}${fromPart ? " " + fromPart : " "}"${bareSpecifier}";`;
-              });
-              const dynamicPattern = `import\\s*\\(\\s*['"]${escapedRelPath}['"]\\s*\\)`;
-              const dynamicRegex = new RegExp(dynamicPattern, "g");
-              targetChunk.code = targetChunk.code.replace(
-                dynamicRegex,
-                () => `import("${bareSpecifier}")`
-              );
-              if (!isDepManaged) {
-                unmanagedDependencies.add(depFileName);
               }
+            );
+            const dynamicPattern = `import\\s*\\(\\s*['"]${escapedRelPath}['"]\\s*\\)`;
+            const dynamicRegex = new RegExp(dynamicPattern, "g");
+            targetChunk.code = targetChunk.code.replace(
+              dynamicRegex,
+              () => `import("${bareSpecifier}")`
+            );
+            if (!isDepManaged) {
+              unmanagedDependencies.add(depFileName);
             }
           }
         }
@@ -1713,6 +1714,9 @@ function cosPlugin(options = {}) {
           const finalHash = crypto.createHash("sha256").update(chunk.code).digest("hex");
           manifest.chunks[fileName] = finalHash;
         }
+        if (mainChunk && !managedChunkNames.has(mainChunk.fileName)) {
+          unmanagedDependencies.add(mainChunk.fileName);
+        }
         manifest.unmanaged = Array.from(unmanagedDependencies);
         if (htmlAsset) {
           try {

package/dist/loader.js

@@ -55,7 +55,7 @@
     }
   }
 
-  async function getChunkDataUrl(chunk) {
+  async function getChunkBlobUrl(chunk) {
     let blob = await getBlobFromCOS(chunk.hash);
     if (blob) {
       console.log(`COS Loader: ${chunk.fileName} found in COS`);
@@ -85,23 +85,24 @@
   try {
     console.log('COS Loader: Starting app...');
 
-    // Resolve all chunks to Data URLs
+    // Resolve all chunks to Blob URLs
     const importMap = { imports: {} };
 
-    // Set up unmanaged dependencies correctly so Data URLs can resolve them.
+    // Set up unmanaged dependencies correctly so Blob URLs can resolve them.
     for (const fileName of manifest.unmanaged || []) {
       const bareSpecifier = `coschunk-${fileName.replace(/\//g, '-')}`;
-      importMap.imports[bareSpecifier] = window.location.origin + base + fileName;
+      importMap.imports[bareSpecifier] =
+        window.location.origin + base + fileName;
     }
 
     console.log(`COS Loader: Loading ${chunksToLoad.length} chunks...`);
     const loadPromises = chunksToLoad.map(async (chunk) => {
-      const dataUrl = await getChunkDataUrl(chunk);
-      if (dataUrl) {
+      const blobUrl = await getChunkBlobUrl(chunk);
+      if (blobUrl) {
         // Use a hyphenated prefix and replace all slashes to ensure it's treated
         // as a truly bare specifier, bypassing hierarchical/protocol checks.
         const bareSpecifier = `coschunk-${chunk.fileName.replace(/\//g, '-')}`;
-        importMap.imports[bareSpecifier] = dataUrl;
+        importMap.imports[bareSpecifier] = blobUrl;
       }
     });
 
@@ -115,13 +116,14 @@
 
     console.log('COS Loader: Import Map injected');
 
-    // Import the main entry.
-    const entryUrl = `${base}${mainEntry}`;
+    // Import the main entry via its bare specifier to ensure it resolves
+    // through the import map and can find other managed chunks.
+    const entrySpecifier = `coschunk-${mainEntry.replace(/\//g, '-')}`;
 
-    // Small delay to ensure the browser has fully registered the 
+    // Small delay to ensure the browser has fully registered the
     // import map before resolving the first module.
     setTimeout(() => {
-      import(entryUrl).catch((err) => {
+      import(entrySpecifier).catch((err) => {
         console.error('COS Loader: Failed to start app', err);
       });
     }, 0);

package/loader.js

@@ -55,7 +55,7 @@
     }
   }
 
-  async function getChunkDataUrl(chunk) {
+  async function getChunkBlobUrl(chunk) {
     let blob = await getBlobFromCOS(chunk.hash);
     if (blob) {
       console.log(`COS Loader: ${chunk.fileName} found in COS`);
@@ -85,23 +85,24 @@
   try {
     console.log('COS Loader: Starting app...');
 
-    // Resolve all chunks to Data URLs
+    // Resolve all chunks to Blob URLs
     const importMap = { imports: {} };
 
-    // Set up unmanaged dependencies correctly so Data URLs can resolve them.
+    // Set up unmanaged dependencies correctly so Blob URLs can resolve them.
     for (const fileName of manifest.unmanaged || []) {
       const bareSpecifier = `coschunk-${fileName.replace(/\//g, '-')}`;
-      importMap.imports[bareSpecifier] = window.location.origin + base + fileName;
+      importMap.imports[bareSpecifier] =
+        window.location.origin + base + fileName;
     }
 
     console.log(`COS Loader: Loading ${chunksToLoad.length} chunks...`);
     const loadPromises = chunksToLoad.map(async (chunk) => {
-      const dataUrl = await getChunkDataUrl(chunk);
-      if (dataUrl) {
+      const blobUrl = await getChunkBlobUrl(chunk);
+      if (blobUrl) {
         // Use a hyphenated prefix and replace all slashes to ensure it's treated
         // as a truly bare specifier, bypassing hierarchical/protocol checks.
         const bareSpecifier = `coschunk-${chunk.fileName.replace(/\//g, '-')}`;
-        importMap.imports[bareSpecifier] = dataUrl;
+        importMap.imports[bareSpecifier] = blobUrl;
       }
     });
 
@@ -115,13 +116,14 @@
 
     console.log('COS Loader: Import Map injected');
 
-    // Import the main entry.
-    const entryUrl = `${base}${mainEntry}`;
+    // Import the main entry via its bare specifier to ensure it resolves
+    // through the import map and can find other managed chunks.
+    const entrySpecifier = `coschunk-${mainEntry.replace(/\//g, '-')}`;
 
-    // Small delay to ensure the browser has fully registered the 
+    // Small delay to ensure the browser has fully registered the
     // import map before resolving the first module.
     setTimeout(() => {
-      import(entryUrl).catch((err) => {
+      import(entrySpecifier).catch((err) => {
         console.error('COS Loader: Failed to start app', err);
       });
     }, 0);

package/package.json

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