@vrowzer/vite-plugin 0.1.1 → 0.1.3

package/dist/ide/{tsMode-D6r_-_rM.js → tsMode-DW5hjWiU.js}

@@ -1,6 +1,6 @@
-import { a as e, c as t, i as n, n as r, o as i, r as a } from "./toggleHighContrast-DzGcs4Kw.js";
-import { t as o } from "./monaco.contribution-4V6BrQ5P.js";
-import { t as s } from "./workers-DRkYqOHL.js";
+import { a as e, c as t, i as n, n as r, o as i, r as a } from "./toggleHighContrast-BAyJBPWB.js";
+import { t as o } from "./monaco.contribution-Df9Y1epv.js";
+import { t as s } from "./workers-_EnUbIXZ.js";
 //#region ../../node_modules/.pnpm/monaco-editor@0.55.1/node_modules/monaco-editor/esm/vs/language/typescript/workerManager.js
 var c = class {
 	constructor(e, t) {
@@ -22,7 +22,7 @@ var c = class {
 			moduleId: "vs/language/typescript/tsWorker",
 			createWorker: () => new Worker(new URL(
 				/* @vite-ignore */
-				"/assets/ts.worker-CEDDf2SQ.js",
+				"/assets/ts.worker-BMQFrgtp.js",
 				"" + import.meta.url
 			), { type: "module" }),
 			label: this._modeId,

package/dist/ide/{typescript-DM2pFj0X.js → typescript-DdUYzFye.js}

@@ -1,4 +1,4 @@
-import { c as e } from "./toggleHighContrast-DzGcs4Kw.js";
+import { c as e } from "./toggleHighContrast-BAyJBPWB.js";
 //#region ../../node_modules/.pnpm/monaco-editor@0.55.1/node_modules/monaco-editor/esm/vs/basic-languages/typescript/typescript.js
 var t = {
 	wordPattern: /(-?\d*\.\d\w*)|([^\`\~\!\@\#\%\^\&\*\(\)\-\=\+\[\{\]\}\\\|\;\:\'\"\,\.\<\>\/\?\s]+)/g,

package/dist/ide/{workers-DRkYqOHL.js → workers-_EnUbIXZ.js}

@@ -1,4 +1,4 @@
-import { o as e } from "./toggleHighContrast-DzGcs4Kw.js";
+import { o as e } from "./toggleHighContrast-BAyJBPWB.js";
 //#region ../../node_modules/.pnpm/monaco-editor@0.55.1/node_modules/monaco-editor/esm/vs/common/workers.js
 function t(e, t) {
 	let n = globalThis.MonacoEnvironment;

package/dist/ide/{xml-DrNRTdma.js → xml-YkclMbCx.js}

@@ -1,4 +1,4 @@
-import { c as e } from "./toggleHighContrast-DzGcs4Kw.js";
+import { c as e } from "./toggleHighContrast-BAyJBPWB.js";
 //#region ../../node_modules/.pnpm/monaco-editor@0.55.1/node_modules/monaco-editor/esm/vs/basic-languages/xml/xml.js
 var t = {
 	comments: { blockComment: ["<!--", "-->"] },

package/dist/ide/{yaml-ck2FlP6B.js → yaml-nzDq4-PC.js}

@@ -1,4 +1,4 @@
-import { c as e } from "./toggleHighContrast-DzGcs4Kw.js";
+import { c as e } from "./toggleHighContrast-BAyJBPWB.js";
 //#region ../../node_modules/.pnpm/monaco-editor@0.55.1/node_modules/monaco-editor/esm/vs/basic-languages/yaml/yaml.js
 var t = {
 	comments: { lineComment: "#" },

package/dist/index.d.mts

@@ -81,20 +81,25 @@ interface VrowzerOptions {
   manifest?: VrowzerManifestOptions;
   /**
    * The base path for the preview system location, which is used to serve the preview files via service worker of Vrowzer.
+   * This is the source of truth for both the application and Service Worker bundles.
    *
    * @default '/__preview__/'
    */
   basePath?: string;
   /**
-   * The scope for the service worker of Vrowzer, which determines the range of URLs that the service worker will control.
+   * The scope for the service worker of Vrowzer, which determines the range of URLs that
+   * the service worker will control and the `Service-Worker-Allowed` response header.
+   * The value is injected into the Vrowzer runtime, so its corresponding option can be
+   * omitted. This registration scope is independent of the preview `basePath`.
    *
    * @default '/' (the entire origin)
    */
   serviceWorkerScope?: string;
   /**
    * The version of the service worker for Vrowzer, which can be used to manage updates and cache invalidation for the preview system.
+   * This is the source of truth for both the application and Service Worker bundles.
    *
-   * @default 'SERVICE_WORKER_VERSION'
+   * @default 'vrowzer-v1'
    */
   serviceWorkerVersion?: string;
   /**

package/dist/index.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.mts","names":[],"sources":["../src/options.ts","../src/manifest.ts","../src/index.ts"],"mappings":";;;;;;;;UAaiB;EACf,eAAe;EACf;;UAGe;;;;;;;;;;EAUf;;;;;EAKA;;;;;;EAMA;;UAGe;;;;;EAKf;;UAGe;;;;;;;;;EASf,gBAAgB;;;;;;;;;EAShB;;UAGe;;;;;;;;;;;;;;EAcf;;;;EAIA,WAAW;;;;;;EAMX;;;;;;EAMA;;;;;;EAMA;;;;;;;;;;;;EAYA;;;;;;;;;EASA;IAAY,QAAQ;;;;;EAIpB,eAAe;;;;iBC5FD,mBAAmB;;;iBCJnB,QAAQ,UAAS,iBAAsB"}
+{"version":3,"file":"index.d.mts","names":[],"sources":["../src/options.ts","../src/manifest.ts","../src/index.ts"],"mappings":";;;;;;;;UAgBiB;EACf,eAAe;EACf;;UAGe;;;;;;;;;;EAUf;;;;;EAKA;;;;;;EAMA;;UAGe;;;;;EAKf;;UAGe;;;;;;;;;EASf,gBAAgB;;;;;;;;;EAShB;;UAGe;;;;;;;;;;;;;;EAcf;;;;EAIA,WAAW;;;;;;;EAOX;;;;;;;;;EASA;;;;;;;EAOA;;;;;;;;;;;;EAYA;;;;;;;;;EASA;IAAY,QAAQ;;;;;EAIpB,eAAe;;;;iBCpGD,mBAAmB;;;iBCJnB,QAAQ,UAAS,iBAAsB"}

package/dist/index.mjs

@@ -30,7 +30,7 @@ var __require = /* #__PURE__ */ (() => createRequire(import.meta.url))();
 */
 const debug$8 = createDebug("vite-plugin-vrowzer:auto-manifest");
 const VIRTUAL_MODULE_ID = "virtual:vrowzer-manifest";
-const RESOLVED_VIRTUAL_MODULE_ID = "\0virtual:vrowzer-manifest";
+const RESOLVED_VIRTUAL_MODULE_ID = "\0" + VIRTUAL_MODULE_ID;
 const CACHE_DIR_NAME = ".vrowzer-manifest";
 const MANIFEST_FILENAME = "manifest.json";
 const HASH_FILENAME = "_hash";
@@ -251,8 +251,14 @@ function resolveAliases(extra) {
 * @license MIT
 */
 const debug$7 = createDebug("vite-plugin-vrowzer:env");
+const VROWZER_PREVIEW_BASE_PATH_DEFINE = "__VROWZER_INTERNAL_PREVIEW_BASE_PATH__";
+const VROWZER_SERVICE_WORKER_SCOPE_DEFINE = "__VROWZER_INTERNAL_SERVICE_WORKER_SCOPE__";
+const VROWZER_SERVICE_WORKER_VERSION_DEFINE = "__VROWZER_INTERNAL_SERVICE_WORKER_VERSION__";
 const picocolorsBrowser = resolve(dirname(fileURLToPath(import.meta.resolve("picocolors"))), "picocolors.browser.js");
-function envPlugin(_options) {
+function envPlugin(options) {
+	const serializedBasePath = JSON.stringify(options.basePath);
+	const serializedServiceWorkerScope = JSON.stringify(options.serviceWorkerScope);
+	const serializedServiceWorkerVersion = JSON.stringify(options.serviceWorkerVersion);
 	return {
 		name: "vrowzer:env",
 		options(inputOptions) {
@@ -265,7 +271,12 @@ function envPlugin(_options) {
 		},
 		config(_config, _env) {
 			return {
-				define: { "import.meta.env.DEBUG": JSON.stringify(process.env.DEBUG || "") },
+				define: {
+					"import.meta.env.DEBUG": JSON.stringify(process.env.DEBUG || ""),
+					[VROWZER_PREVIEW_BASE_PATH_DEFINE]: serializedBasePath,
+					[VROWZER_SERVICE_WORKER_SCOPE_DEFINE]: serializedServiceWorkerScope,
+					[VROWZER_SERVICE_WORKER_VERSION_DEFINE]: serializedServiceWorkerVersion
+				},
 				resolve: { alias: resolveAliases({
 					"node:process": "@vrowzer/node-polyfill/process",
 					"process/": "@vrowzer/node-polyfill/process",
@@ -274,16 +285,24 @@ function envPlugin(_options) {
 				}) },
 				worker: { format: "es" },
 				server: { headers: {
-					"Service-Worker-Allowed": "/",
+					"Service-Worker-Allowed": options.serviceWorkerScope,
 					"Cross-Origin-Opener-Policy": "same-origin",
 					"Cross-Origin-Embedder-Policy": "credentialless"
 				} },
 				preview: { headers: {
-					"Service-Worker-Allowed": "/",
+					"Service-Worker-Allowed": options.serviceWorkerScope,
 					"Cross-Origin-Opener-Policy": "same-origin",
 					"Cross-Origin-Embedder-Policy": "credentialless"
 				} }
 			};
+		},
+		configResolved(config) {
+			const resolvedBasePath = config.define?.[VROWZER_PREVIEW_BASE_PATH_DEFINE];
+			if (resolvedBasePath !== serializedBasePath) throw new Error(`Vrowzer reserved define ${VROWZER_PREVIEW_BASE_PATH_DEFINE} must be ${serializedBasePath}, received ${JSON.stringify(resolvedBasePath)}`);
+			const resolvedServiceWorkerScope = config.define?.[VROWZER_SERVICE_WORKER_SCOPE_DEFINE];
+			if (resolvedServiceWorkerScope !== serializedServiceWorkerScope) throw new Error(`Vrowzer reserved define ${VROWZER_SERVICE_WORKER_SCOPE_DEFINE} must be ${serializedServiceWorkerScope}, received ${JSON.stringify(resolvedServiceWorkerScope)}`);
+			const resolvedServiceWorkerVersion = config.define?.[VROWZER_SERVICE_WORKER_VERSION_DEFINE];
+			if (resolvedServiceWorkerVersion !== serializedServiceWorkerVersion) throw new Error(`Vrowzer reserved define ${VROWZER_SERVICE_WORKER_VERSION_DEFINE} must be ${serializedServiceWorkerVersion}, received ${JSON.stringify(resolvedServiceWorkerVersion)}`);
 		}
 	};
 }
@@ -683,8 +702,10 @@ function extractInputProperties(source, configObj, forwardedProps, unsupported)
 	}
 	if (hasUnknownTopLevelInput) return;
 	const inputProp = findObjectProperty(configObj, "input");
-	if (inputProp) if (isStaticInputOption(inputProp.value)) forwardedProps.set("input", source.slice(inputProp.value.start, inputProp.value.end));
-	else unsupported.push(`input is not an inline string, array, or record: ${source.slice(inputProp.value.start, inputProp.value.end)}`);
+	if (inputProp) {
+		if (isStaticInputOption(inputProp.value)) forwardedProps.set("input", source.slice(inputProp.value.start, inputProp.value.end));
+		else unsupported.push(`input is not an inline string, array, or record: ${source.slice(inputProp.value.start, inputProp.value.end)}`);
+	}
 	const environmentsProp = findObjectProperty(configObj, "environments");
 	if (!environmentsProp) return;
 	const environmentsValue = unwrapStaticExpression(environmentsProp.value);
@@ -910,6 +931,8 @@ function generateFallbackCode() {
 * @author kazuya kawaguchi (a.k.a. kazupon)
 * @license MIT
 */
+const DEFAULT_BASE_PATH = "/__preview__/";
+const DEFAULT_SERVICE_WORKER_VERSION = "vrowzer-v1";
 function resolveDefaultServiceWorkerEntry() {
 	try {
 		return fileURLToPath(import.meta.resolve("vrowzer/service-worker"));
@@ -917,6 +940,12 @@ function resolveDefaultServiceWorkerEntry() {
 		return "";
 	}
 }
+function normalizeBasePath(basePath) {
+	if (basePath.length === 0 || !basePath.startsWith("/") || basePath.startsWith("//") || basePath.includes("?") || basePath.includes("#")) throw new TypeError(`Vrowzer basePath must be a non-root absolute pathname without a query or hash, received ${JSON.stringify(basePath)}`);
+	const pathname = basePath.replace(/\/+$/, "");
+	if (pathname.length === 0) throw new TypeError("Vrowzer basePath must not be the origin root \"/\"");
+	return `${pathname}/`;
+}
 function resolveOptions(options) {
 	const ide = options.experimental?.ide;
 	return {
@@ -927,9 +956,9 @@ function resolveOptions(options) {
 			port: typeof ide === "object" ? ide.port : void 0,
 			devtools: options.experimental?.devtools ?? false
 		},
-		basePath: options.basePath ?? "/__preview__/",
+		basePath: normalizeBasePath(options.basePath ?? DEFAULT_BASE_PATH),
 		serviceWorkerScope: options.serviceWorkerScope ?? "/",
-		serviceWorkerVersion: options.serviceWorkerVersion ?? "SERVICE_WORKER_VERSION",
+		serviceWorkerVersion: options.serviceWorkerVersion ?? DEFAULT_SERVICE_WORKER_VERSION,
 		serviceWorkerEntry: options.serviceWorkerEntry ?? resolveDefaultServiceWorkerEntry(),
 		resolve: options.resolve
 	};
@@ -1117,7 +1146,8 @@ function inlineCreateRequirePlugin() {
 			const result = code.replace(RE, (match, specifier) => {
 				if (!specifier.endsWith(".json")) return match;
 				try {
-					const content = readFileSync(createRequire(id).resolve(specifier), "utf-8");
+					const resolvedPath = createRequire(id).resolve(specifier);
+					const content = readFileSync(resolvedPath, "utf-8");
 					modified = true;
 					debug$4("inlineCreateRequire: inlined", specifier, "from", id);
 					return JSON.stringify(JSON.parse(content));
@@ -1145,28 +1175,41 @@ function inlineCreateRequirePlugin() {
 * @license MIT
 */
 const debug$3 = createDebug("vite-plugin-vrowzer:rolldown");
+function rewriteRolldownAssetUrls(code) {
+	return code.replace(/(["'])\.\.\/(rolldown-(?:binding\.wasm32-wasi\.wasm|worker\.js)\?__vrowzer_internal_asset=rolldown)\1/g, "$1./$2$1");
+}
+function renderRolldownAssetChunk(code) {
+	const rewritten = rewriteRolldownAssetUrls(code);
+	return rewritten === code ? null : rewritten;
+}
+function rolldownWorkerAssetPlugin() {
+	return {
+		name: "vrowzer:worker-rolldown-assets",
+		renderChunk: renderRolldownAssetChunk
+	};
+}
 const rolldownDistDir = path.resolve(path.dirname(fileURLToPath(import.meta.resolve("@vrowzer/rolldown/package.json"))), "dist");
 debug$3("rolldownDistDir ", rolldownDistDir);
 function rolldownPlugin(_options) {
-	let resolvedOutDir = "";
+	let resolvedAssetsDir = "";
 	return {
 		name: "vrowzer:rolldown",
 		configResolved(config) {
-			resolvedOutDir = path.resolve(config.root, config.build.outDir);
+			resolvedAssetsDir = path.resolve(config.root, config.build.outDir, config.build.assetsDir);
 		},
+		renderChunk: renderRolldownAssetChunk,
 		/**
 		* Copy rolldown WASM binary and sub-worker for production builds.
-		* Both the chunk and WASM/worker files end up in dist/assets/.
+		* The worker chunks and these files share the configured assets directory.
 		*/
 		writeBundle() {
-			const assetsDir = path.resolve(resolvedOutDir, "assets");
-			debug$3("copy-rolldown-wasm: assetsDir ", assetsDir);
+			debug$3("copy-rolldown-wasm: assetsDir ", resolvedAssetsDir);
 			const wasmSrc = path.resolve(rolldownDistDir, "rolldown-binding.wasm32-wasi.wasm");
 			debug$3("copy-rolldown-wasm: wasmSrc ", wasmSrc);
 			const workerSrc = path.resolve(rolldownDistDir, "worker.js");
 			debug$3("copy-rolldown-wasm: workerSrc ", workerSrc);
-			if (existsSync(wasmSrc)) copyFileSync(wasmSrc, path.resolve(assetsDir, "rolldown-binding.wasm32-wasi.wasm"));
-			if (existsSync(workerSrc)) copyFileSync(workerSrc, path.resolve(assetsDir, "rolldown-worker.js"));
+			if (existsSync(wasmSrc)) copyFileSync(wasmSrc, path.resolve(resolvedAssetsDir, "rolldown-binding.wasm32-wasi.wasm"));
+			if (existsSync(workerSrc)) copyFileSync(workerSrc, path.resolve(resolvedAssetsDir, "rolldown-worker.js"));
 		}
 	};
 }
@@ -1189,10 +1232,12 @@ const debug$2 = createDebug("vite-plugin-vrowzer:server");
 * preview requests bypass service worker and hit Vite directly.
 * Without this guard, Vite returns the main page HTML, causing recursive display.
 */
-function previewGuardMiddleware(previewBase = "/__preview__") {
+function previewGuardMiddleware(previewBase) {
+	const previewRoot = previewBase.slice(0, -1);
 	return (req, res, next) => {
 		debug$2("previewGuardMiddleware: previewBase ", previewBase, " req.url ", req.url);
-		if (req.url?.startsWith(previewBase)) {
+		const pathname = req.url ? new URL(req.url, "http://localhost").pathname : void 0;
+		if (pathname === previewRoot || pathname?.startsWith(previewBase)) {
 			res.writeHead(503, {
 				"Content-Type": "text/html",
 				"Retry-After": "1"
@@ -1206,7 +1251,7 @@ function previewGuardMiddleware(previewBase = "/__preview__") {
 	};
 }
 function serverMiddlewarePlugin(options) {
-	const middleware = previewGuardMiddleware(normalizeBasePath(options.basePath));
+	const middleware = previewGuardMiddleware(options.basePath);
 	return {
 		name: "vrowzer:server-middleware",
 		configureServer(server) {
@@ -1217,11 +1262,6 @@ function serverMiddlewarePlugin(options) {
 		}
 	};
 }
-function normalizeBasePath(basePath) {
-	debug$2("normalizeBasePath: basePath ", basePath);
-	if (basePath.endsWith("/")) return basePath.slice(0, -1);
-	else return basePath;
-}
 //#endregion
 //#region src/virtual.ts
 /**
@@ -1377,9 +1417,11 @@ function Vrowzer(options = {}) {
 				{
 					name: "vrowzer:web-worker-config-inject",
 					transform: workerEntryTransform
-				}
+				},
+				rolldownWorkerAssetPlugin()
 			];
 			return {
+				optimizeDeps: { exclude: ["@vrowzer/vite-dev-server"] },
 				resolve: { alias: [{
 					find: /^vite$/,
 					replacement: "@vrowzer/vite-dev-server/vite"
@@ -1428,7 +1470,7 @@ function Vrowzer(options = {}) {
 		apply: "serve"
 	};
 	const serviceWorkerPlugin = ServiceWorker({
-		serviceWorkerAllowed: "/",
+		serviceWorkerAllowed: resolvedOptions.serviceWorkerScope,
 		format: "esm",
 		...resolvedOptions.serviceWorkerEntry ? { entry: resolvedOptions.serviceWorkerEntry } : {}
 	});