vite-plugin-cross-origin-storage 2.0.1 → 2.0.3

package/dist/index.d.mts

@@ -1,6 +1,5 @@
 import { CosManifest } from "./loader.mjs";
 import { Plugin } from "vite";
-
 //#region src/index.d.ts
 interface CosPluginOptions {
   /**

package/dist/index.mjs

@@ -4,7 +4,6 @@ import { fileURLToPath } from "node:url";
 import MagicString from "magic-string";
 import { rolldown } from "rolldown";
 import { parseAst } from "rolldown/parseAst";
-
 //#region src/index.ts
 const MANIFEST_PLACEHOLDER = "__COS_MANIFEST__";
 /**
@@ -24,6 +23,14 @@ function defaultLoaderEntry() {
 function contentSpecifier(hash) {
 	return `${RECIPE}:${hash}`;
 }
+/** Recover the npm package name from a resolved module id's `node_modules` segment. */
+function packageNameFromId(id) {
+	const index = id.lastIndexOf("/node_modules/");
+	if (index === -1) return;
+	const [first, second] = id.slice(index + 14).split("/");
+	if (!first) return;
+	return first.startsWith("@") && second ? `${first}/${second}` : first;
+}
 function toMatchers(packages) {
 	return packages.map((p) => typeof p === "string" ? new RegExp(`^${p}$`) : p);
 }
@@ -63,6 +70,11 @@ function collectImportSources(code) {
 				start: source.start,
 				end: source.end
 			});
+			else if (source?.type === "TemplateLiteral" && source.expressions?.length === 0 && source.quasis?.length === 1 && typeof source.quasis[0]?.value?.cooked === "string" && typeof source.start === "number" && typeof source.end === "number") sources.push({
+				value: source.quasis[0].value.cooked,
+				start: source.start,
+				end: source.end
+			});
 		}
 		for (const key in record) if (key !== "type") visit(record[key]);
 	};
@@ -190,18 +202,14 @@ function cosPlugin(options) {
 				hashes.set(id, hash);
 				managed[contentSpecifier(hash)] = {
 					file: `${hash}.js`,
-					hash
+					hash,
+					name: packageNameFromId(id)
 				};
-				bundle[fileName] = {
+				this.emitFile({
 					type: "asset",
 					fileName,
-					name: hash,
-					names: [hash],
-					originalFileName: null,
-					originalFileNames: [],
-					needsCodeReference: false,
 					source: resolved
-				};
+				});
 				return hash;
 			};
 			for (const id of raw.keys()) visit(id, []);
@@ -237,6 +245,5 @@ function cosPlugin(options) {
 		}
 	};
 }
-
 //#endregion
-export { cosPlugin, cosPlugin as default };
+export { cosPlugin, cosPlugin as default };

package/dist/loader.d.mts

@@ -1,20 +1,8 @@
 //#region src/loader.d.ts
 declare global {
-  interface Navigator {
-    crossOriginStorage?: {
-      requestFileHandles: (descriptors: Array<{
-        algorithm: string;
-        value: string;
-      }>, options?: {
-        create?: boolean;
-      }) => Promise<Array<{
-        getFile: () => Promise<File>;
-        createWritable: () => Promise<{
-          write: (data: Blob) => Promise<void>;
-          close: () => Promise<void>;
-        }>;
-      }>>;
-    };
+  interface Window {
+    /** The manifest the loader ran with, exposed for introspection (e.g. devtools, demo UIs). */
+    __cosManifest?: CosManifest;
   }
 }
 interface CosManifest {
@@ -28,10 +16,15 @@ interface CosManifest {
     specifier: string;
     file: string;
   };
-  /** Map of content-addressed specifier to `{ file, hash }` for every COS-managed chunk. */
+  /**
+   * Map of content-addressed specifier to `{ file, hash, name }` for every COS-managed chunk.
+   * `name` is the npm package the chunk was bundled from (e.g. `vue`, `@vue/reactivity`), when
+   * it could be derived from the resolved module path; absent for chunks it couldn't be.
+   */
   chunks: Record<string, {
     file: string;
     hash: string;
+    name?: string;
   }>;
 }
 //#endregion

package/dist/loader.entry.mjs

@@ -1,7 +1,5 @@
 import { runCosLoader } from "./loader.mjs";
-
 //#region src/loader.entry.ts
 runCosLoader(__COS_MANIFEST__);
-
 //#endregion
-export {  };
+export {};

package/dist/loader.mjs

@@ -1,32 +1,41 @@
 //#region src/loader.ts
 async function runCosLoader(manifest) {
+	window.__cosManifest = manifest;
 	const cos = navigator.crossOriginStorage;
 	const imports = {};
+	let cosQueue = Promise.resolve();
+	const enqueue = (task) => {
+		const result = cosQueue.then(task, task);
+		cosQueue = result.catch(() => {});
+		return result;
+	};
 	async function resolveChunk(hash, file) {
 		if (cos) try {
-			const [handle] = await cos.requestFileHandles([{
+			const blob = await (await enqueue(() => cos.requestFileHandle({
 				algorithm: "SHA-256",
 				value: hash
-			}]);
-			if (handle) {
-				const blob = await handle.getFile();
-				return URL.createObjectURL(new Blob([blob], { type: "text/javascript" }));
-			}
+			}))).getFile();
+			return URL.createObjectURL(new Blob([blob], { type: "text/javascript" }));
 		} catch (error) {
 			if (error?.name !== "NotFoundError") console.error("[cos] lookup failed", error);
 		}
 		const response = await fetch(file);
+		if (!response.ok) throw new Error(`[cos] failed to fetch chunk ${file}: ${response.status} ${response.statusText}`);
+		const contentType = response.headers.get("content-type") ?? "";
+		if (contentType && !/javascript|ecmascript/i.test(contentType)) throw new Error(`[cos] chunk ${file} served as ${contentType}, expected JavaScript`);
 		const blob = new Blob([await response.blob()], { type: "text/javascript" });
 		if (cos) try {
-			const [handle] = await cos.requestFileHandles([{
-				algorithm: "SHA-256",
-				value: hash
-			}], { create: true });
-			if (handle) {
-				const writable = await handle.createWritable();
+			await enqueue(async () => {
+				const writable = await (await cos.requestFileHandle({
+					algorithm: "SHA-256",
+					value: hash
+				}, {
+					create: true,
+					origins: "*"
+				})).createWritable();
 				await writable.write(blob);
 				await writable.close();
-			}
+			});
 		} catch (error) {
 			console.error("[cos] store failed", error);
 		}
@@ -46,6 +55,5 @@ async function runCosLoader(manifest) {
 		manifest.entry.specifier
 );
 }
-
 //#endregion
-export { runCosLoader };
+export { runCosLoader };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-plugin-cross-origin-storage",
   "type": "module",
-  "version": "2.0.1",
+  "version": "2.0.3",
   "description": "Vite plugin to extract shared dependencies into content-addressed chunks loaded from Cross-Origin Storage",
   "author": {
     "name": "Daniel Roe",
@@ -43,23 +43,25 @@
     "node": ">=20.19.0"
   },
   "peerDependencies": {
-    "vite": "^5.0.0 || ^6.0.0 || ^7.0.0"
+    "vite": "^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
   },
   "dependencies": {
     "magic-string": "^0.30.21",
-    "rolldown": "1.1.0"
+    "rolldown": "1.2.0"
   },
   "devDependencies": {
     "@types/node": "latest",
-    "eslint": "^10.4.1",
-    "hookable": "^5.5.3",
-    "playwright-core": "^1.61.1",
-    "tsdown": "^0.20.3",
-    "typescript": "~6.0.3",
-    "unhead": "^2.1.0",
-    "vite": "^7.3.5",
-    "vitest": "^4.1.8",
-    "vue": "3.5.39"
+    "@types/wicg-cross-origin-storage": "2026.7.0",
+    "eslint": "10.7.0",
+    "hookable": "6.1.1",
+    "playwright-core": "1.61.1",
+    "tsdown": "0.22.9",
+    "typescript": "6.0.3",
+    "unhead": "3.1.8",
+    "vite": "8.1.4",
+    "vite8": "npm:vite@8.1.4",
+    "vitest": "4.1.10",
+    "vue": "3.5.40"
   },
   "scripts": {
     "build": "tsdown",