vite-plugin-cross-origin-storage 1.3.12 → 1.3.14

package/dist/index.js

@@ -1667,6 +1667,7 @@ function cosPlugin(options = {}) {
         const allChunks = Object.values(bundle).filter(
           (c) => c.type === "chunk"
         );
+        const base = config.base.endsWith("/") ? config.base : config.base + "/";
         const managedChunkNames = new Set(Object.keys(managedChunks));
         const managedChunkInfo = {};
         for (const fileName in managedChunks) {
@@ -1690,7 +1691,7 @@ function cosPlugin(options = {}) {
                 /[.*+?^${}()|[\]\\]/g,
                 "\\$&"
               );
-              const bareSpecifier = depFileName;
+              const bareSpecifier = `${base}${depFileName}`;
               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(
@@ -1709,7 +1710,6 @@ function cosPlugin(options = {}) {
           }
         }
         const manifest = {};
-        const base = config.base.endsWith("/") ? config.base : config.base + "/";
         for (const fileName in managedChunkInfo) {
           const { chunk, globalVar } = managedChunkInfo[fileName];
           const finalHash = crypto.createHash("sha256").update(chunk.code).digest("hex");

package/dist/loader.js

@@ -106,10 +106,14 @@
         }
 
         if (url) {
-          // 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;
+          // Use a Data URL shim to decouple the import graph.
+          // This ensures that the circular dependency between React and React-DOM
+          // doesn't cause a lockout/deadlock during the module graph instantiation.
+          const shim = `export * from "${url}";${chunk.hasDefault ? `export { default } from "${url}";` : ''}`;
+          const shimUrl = `data:text/javascript;base64,${btoa(shim)}`;
+
+          importMap.imports[chunk.fileName] = shimUrl;
+          importMap.imports[chunk.file] = shimUrl;
 
           // Also set global if anyone still needs it (legacy)
           if (chunk.globalVar) {

package/loader.js

@@ -106,10 +106,14 @@
         }
 
         if (url) {
-          // 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;
+          // Use a Data URL shim to decouple the import graph.
+          // This ensures that the circular dependency between React and React-DOM
+          // doesn't cause a lockout/deadlock during the module graph instantiation.
+          const shim = `export * from "${url}";${chunk.hasDefault ? `export { default } from "${url}";` : ''}`;
+          const shimUrl = `data:text/javascript;base64,${btoa(shim)}`;
+
+          importMap.imports[chunk.fileName] = shimUrl;
+          importMap.imports[chunk.file] = shimUrl;
 
           // 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.12",
+  "version": "1.3.14",
   "description": "Vite plugin to load chunks from Cross-Origin Storage",
   "keywords": [
     "vite",