vite-plugin-cross-origin-storage 1.5.0 → 1.6.0

package/dist/index.js

@@ -1654,14 +1654,12 @@ function cosPlugin(options = {}) {
         if (pkgName) {
           try {
             require2.resolve(pkgName);
-            const externalPatterns = [pkgName, `${pkgName}/*`];
-            for (const pattern of externalPatterns) {
-              if (!externalArray.includes(pattern)) {
-                console.log(
-                  `COS Plugin: [MAGIC] Externalizing pattern "${pattern}" (matched from ${item})`
-                );
-                externalArray.push(pattern);
-              }
+            const pkgRegex = new RegExp(`^${pkgName}(?:/.*)?$`);
+            if (!externalArray.some((e) => e instanceof RegExp && e.source === pkgRegex.source)) {
+              console.log(
+                `COS Plugin: [MAGIC] Externalizing package and subpaths: ${pkgRegex} (matched from ${item})`
+              );
+              externalArray.push(pkgRegex);
             }
           } catch (e) {
           }
@@ -1719,40 +1717,40 @@ function cosPlugin(options = {}) {
         }
         return null;
       }
+      const magicPackages = /* @__PURE__ */ new Set();
       for (const item of includeArray) {
         const pkgName = getPackageName(item);
-        if (!pkgName) continue;
-        try {
-          let pkgPath = "";
+        if (pkgName) {
           try {
-            const mainPath = require2.resolve(pkgName);
-            let currentDir = path.dirname(mainPath);
-            let pkgJsonPath = "";
-            while (currentDir !== path.parse(currentDir).root) {
-              const candidate = path.join(currentDir, "package.json");
-              if (fs.existsSync(candidate)) {
-                pkgJsonPath = candidate;
-                break;
-              }
-              currentDir = path.dirname(currentDir);
-            }
-            if (pkgJsonPath) {
-              const pkgJson = JSON.parse(fs.readFileSync(pkgJsonPath, "utf-8"));
-              const pkgDir = path.dirname(pkgJsonPath);
-              if (pkgJson.module) {
-                pkgPath = path.resolve(pkgDir, pkgJson.module);
-              } else if (pkgJson.exports?.["."]?.import) {
-                pkgPath = path.resolve(pkgDir, pkgJson.exports["."].import);
-              } else if (pkgJson.exports?.import) {
-                pkgPath = path.resolve(pkgDir, pkgJson.exports.import);
-              }
-            }
-            if (!pkgPath) {
-              pkgPath = mainPath;
-            }
+            require2.resolve(pkgName);
+            magicPackages.add(pkgName);
           } catch (e) {
-            pkgPath = require2.resolve(pkgName);
           }
+        }
+      }
+      const discoveredSpecifiers = /* @__PURE__ */ new Set();
+      const allChunks = Object.values(bundle).filter(
+        (c) => c.type === "chunk"
+      );
+      for (const chunk of allChunks) {
+        const allImports = [...chunk.imports, ...chunk.dynamicImports];
+        for (const specifier of allImports) {
+          for (const pkgName of magicPackages) {
+            if (specifier === pkgName || specifier.startsWith(`${pkgName}/`)) {
+              discoveredSpecifiers.add(specifier);
+              break;
+            }
+          }
+        }
+      }
+      const specifierToCode = {};
+      for (const specifier of discoveredSpecifiers) {
+        try {
+          const pkgPath = require2.resolve(specifier);
+          const pkgName = Array.from(magicPackages).find((p) => specifier === p || specifier.startsWith(`${p}/`));
+          const otherSpecifiersFromSamePkg = Array.from(discoveredSpecifiers).filter(
+            (s) => s !== specifier && (s === pkgName || s.startsWith(`${pkgName}/`))
+          );
           const esbuildRequire = createRequire(import.meta.url);
           const esbuild = esbuildRequire("esbuild");
           const buildResult = await esbuild.build({
@@ -1762,19 +1760,32 @@ function cosPlugin(options = {}) {
             minify: true,
             platform: "browser",
             write: false,
-            // Don't write to disk
             target: "esnext",
-            // Neutralize environment
+            // Mark other components of the same library as external to avoid duplication
+            external: otherSpecifiersFromSamePkg,
             define: {
               "process.env.NODE_ENV": '"production"'
             }
           });
-          const content = buildResult.outputFiles[0].contents;
+          let code = buildResult.outputFiles[0].text;
+          for (const otherSpec of otherSpecifiersFromSamePkg) {
+            const escapedOtherSpec = otherSpec.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+            const bareSpecifier = `coschunk-${otherSpec.replace(/[/@]/g, "-")}`;
+            const staticRegex = new RegExp(`(import|export)\\b\\s*((?:(?!\\bimport\\b|\\bexport\\b)[\\s\\S])*?\\bfrom\\b\\s*)?['"]${escapedOtherSpec}['"]\\s*;?`, "g");
+            code = code.replace(staticRegex, (match, keyword, fromPart) => {
+              return `${keyword}${fromPart ? " " + fromPart : " "}"${bareSpecifier}";`;
+            });
+            const dynamicRegex = new RegExp(`import\\s*\\(\\s*['"]${escapedOtherSpec}['"]\\s*\\)`, "g");
+            code = code.replace(dynamicRegex, () => `import("${bareSpecifier}")`);
+          }
+          specifierToCode[specifier] = code;
+          const content = Buffer.from(code);
           const hash = crypto.createHash("sha256").update(content).digest("hex");
-          const ext = path.extname(pkgPath);
+          const ext = ".js";
+          const safeSpecifier = specifier.replace(/[/@]/g, "-").replace(/\.js$/, "");
           const fileName = path.join(
             config.build.assetsDir,
-            `${pkgName}-${hash.slice(0, 8)}${ext}`
+            `${safeSpecifier}-${hash.slice(0, 8)}${ext}`
           );
           this.emitFile({
             type: "asset",
@@ -1784,21 +1795,27 @@ function cosPlugin(options = {}) {
           managedChunks[fileName] = {
             type: "chunk",
             fileName,
-            code: content.toString(),
-            name: item
+            code,
+            name: specifier
           };
-          externalToFileName[pkgName] = fileName;
+          externalToFileName[specifier] = fileName;
         } catch (e) {
+          console.error(`COS Plugin: Failed to bundle magic specifier "${specifier}"`, e);
         }
       }
       if (mainChunk) {
-        const allChunks = Object.values(bundle).filter(
+        const magicMapping = {};
+        for (const specifier in externalToFileName) {
+          const bareSpecifier = `coschunk-${specifier.replace(/[/@]/g, "-")}`;
+          magicMapping[bareSpecifier] = externalToFileName[specifier];
+        }
+        const allChunks2 = Object.values(bundle).filter(
           (c) => c.type === "chunk"
         );
         const managedChunkNames = new Set(Object.keys(managedChunks));
         const unmanagedDependencies = /* @__PURE__ */ new Set();
         const base = config.base.endsWith("/") ? config.base : config.base + "/";
-        for (const targetChunk of allChunks) {
+        for (const targetChunk of allChunks2) {
           const importerDir = path.dirname(targetChunk.fileName);
           const deps = [...targetChunk.imports, ...targetChunk.dynamicImports];
           for (const depFileName of deps) {
@@ -1831,8 +1848,7 @@ function cosPlugin(options = {}) {
             }
           }
           for (const pkgName in externalToFileName) {
-            const fileName = externalToFileName[pkgName];
-            const bareSpecifier = `coschunk-${fileName.replace(/\//g, "-")}`;
+            const bareSpecifier = `coschunk-${pkgName.replace(/[/@]/g, "-")}`;
             const staticPattern = `(import|export)\\b\\s*((?:(?!\\bimport\\b|\\bexport\\b)[\\s\\S])*?\\bfrom\\b\\s*)?['"]${pkgName}['"]\\s*;?`;
             const staticRegex = new RegExp(staticPattern, "g");
             targetChunk.code = targetChunk.code.replace(
@@ -1852,7 +1868,8 @@ function cosPlugin(options = {}) {
         const manifest = {
           base,
           entry: mainChunk.fileName,
-          chunks: {}
+          chunks: {},
+          magic: magicMapping
         };
         for (const fileName in managedChunks) {
           const chunk = managedChunks[fileName];

package/dist/loader.js

@@ -111,6 +111,18 @@
     // Inject Import Map
     const script = document.createElement('script');
     script.type = 'importmap';
+
+    // Add magic specifier mappings (e.g. coschunk-three -> assets/three-*.js)
+    if (manifest.magic) {
+      for (const [specifier, fileName] of Object.entries(manifest.magic)) {
+        const targetSpecifier = `coschunk-${fileName.replace(/\//g, '-')}`;
+        const targetUrl = importMap.imports[targetSpecifier];
+        if (targetUrl) {
+          importMap.imports[specifier] = targetUrl;
+        }
+      }
+    }
+
     script.textContent = JSON.stringify(importMap, null, 2);
     document.head.appendChild(script);
 

package/loader.js

@@ -111,6 +111,18 @@
     // Inject Import Map
     const script = document.createElement('script');
     script.type = 'importmap';
+
+    // Add magic specifier mappings (e.g. coschunk-three -> assets/three-*.js)
+    if (manifest.magic) {
+      for (const [specifier, fileName] of Object.entries(manifest.magic)) {
+        const targetSpecifier = `coschunk-${fileName.replace(/\//g, '-')}`;
+        const targetUrl = importMap.imports[targetSpecifier];
+        if (targetUrl) {
+          importMap.imports[specifier] = targetUrl;
+        }
+      }
+    }
+
     script.textContent = JSON.stringify(importMap, null, 2);
     document.head.appendChild(script);
 

package/package.json

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