@cloudflare/vite-plugin 2.0.0-beta.v.1 → 2.0.0-beta.v.10

package/dist/{package-DNE1Ou5k.mjs → package-DkG_FTc0.mjs}

@@ -1,7 +1,7 @@
 //#region package.json
 var package_default = {
 	name: "@cloudflare/vite-plugin",
-	version: "2.0.0-beta.v.1",
+	version: "2.0.0-beta.v.10",
 	description: "Cloudflare plugin for Vite",
 	keywords: [
 		"cloudflare",
@@ -57,12 +57,11 @@ var package_default = {
 		"@cloudflare/workers-tsconfig": "workspace:*",
 		"@cloudflare/workers-types": "catalog:default",
 		"@cloudflare/workers-utils": "workspace:*",
-		"@remix-run/node-fetch-server": "^0.8.0",
+		"@remix-run/node-fetch-server": "^1.0.0",
 		"@types/node": "catalog:default",
 		"@types/semver": "^7.5.1",
 		"@types/ws": "^8.5.13",
 		"am-i-vibing": "^0.5.0",
-		"defu": "^6.1.4",
 		"get-port": "^7.1.0",
 		"magic-string": "^0.30.12",
 		"mlly": "^1.7.4",

package/dist/workers/runner-worker/module-runner.js

@@ -1,4 +1,4 @@
-//#region ../../node_modules/.pnpm/vite@8.1.5_patch_hash=6ff029cd40c16544867ce7328a4a4830d20f15b04843483e3452e50844a840e3__085b8cc73d70093003c13768074fdb2d/node_modules/vite/dist/node/module-runner.js
+//#region ../../node_modules/.pnpm/vite@8.3.4_@types+node@22.15.17_esbuild@0.28.2_jiti@2.6.1_tsx@4.21.0_yaml@2.9.0/node_modules/vite/dist/node/module-runner.js
 let SOURCEMAPPING_URL = "sourceMa";
 SOURCEMAPPING_URL += "ppingURL";
 const isWindows = typeof process < "u" && process.platform === "win32";
@@ -38,80 +38,33 @@ function promiseWithResolvers() {
 		reject
 	};
 }
-const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
-function normalizeWindowsPath(input = "") {
-	return input && input.replace(/\\/g, "/").replace(_DRIVE_LETTER_START_RE, (r) => r.toUpperCase());
-}
-const _IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/, _DRIVE_LETTER_RE = /^[A-Za-z]:$/;
-function cwd() {
-	return typeof process < "u" && typeof process.cwd == "function" ? process.cwd().replace(/\\/g, "/") : "/";
-}
-const resolve = function(...arguments_) {
-	arguments_ = arguments_.map((argument) => normalizeWindowsPath(argument));
-	let resolvedPath = "", resolvedAbsolute = !1;
-	for (let index = arguments_.length - 1; index >= -1 && !resolvedAbsolute; index--) {
-		let path = index >= 0 ? arguments_[index] : cwd();
-		!path || path.length === 0 || (resolvedPath = `${path}/${resolvedPath}`, resolvedAbsolute = isAbsolute(path));
-	}
-	return resolvedPath = normalizeString(resolvedPath, !resolvedAbsolute), resolvedAbsolute && !isAbsolute(resolvedPath) ? `/${resolvedPath}` : resolvedPath.length > 0 ? resolvedPath : ".";
-};
-function normalizeString(path, allowAboveRoot) {
-	let res = "", lastSegmentLength = 0, lastSlash = -1, dots = 0, char = null;
-	for (let index = 0; index <= path.length; ++index) {
-		if (index < path.length) char = path[index];
-		else if (char === "/") break;
-		else char = "/";
-		if (char === "/") {
-			if (!(lastSlash === index - 1 || dots === 1)) if (dots === 2) {
-				if (res.length < 2 || lastSegmentLength !== 2 || res[res.length - 1] !== "." || res[res.length - 2] !== ".") {
-					if (res.length > 2) {
-						let lastSlashIndex = res.lastIndexOf("/");
-						lastSlashIndex === -1 ? (res = "", lastSegmentLength = 0) : (res = res.slice(0, lastSlashIndex), lastSegmentLength = res.length - 1 - res.lastIndexOf("/")), lastSlash = index, dots = 0;
-						continue;
-					} else if (res.length > 0) {
-						res = "", lastSegmentLength = 0, lastSlash = index, dots = 0;
-						continue;
-					}
-				}
-				allowAboveRoot && (res += res.length > 0 ? "/.." : "..", lastSegmentLength = 2);
-			} else res.length > 0 ? res += `/${path.slice(lastSlash + 1, index)}` : res = path.slice(lastSlash + 1, index), lastSegmentLength = index - lastSlash - 1;
-			lastSlash = index, dots = 0;
-		} else char === "." && dots !== -1 ? ++dots : dots = -1;
-	}
-	return res;
-}
-const isAbsolute = function(p) {
-	return _IS_ABSOLUTE_RE.test(p);
-}, dirname = function(p) {
-	let segments = normalizeWindowsPath(p).replace(/\/$/, "").split("/").slice(0, -1);
-	return segments.length === 1 && _DRIVE_LETTER_RE.test(segments[0]) && (segments[0] += "/"), segments.join("/") || (isAbsolute(p) ? "/" : ".");
-}, textDecoder = new TextDecoder(), decodeBase64 = (() => {
-	let capturedBuffer = typeof Buffer == "function" ? Buffer : void 0;
-	return capturedBuffer && typeof capturedBuffer.from == "function" ? (base64) => capturedBuffer.from(base64, "base64").toString("utf-8") : (base64) => textDecoder.decode(Uint8Array.from(atob(base64), (c) => c.charCodeAt(0)));
-})(), percentRegEx = /%/g, backslashRegEx = /\\/g, newlineRegEx = /\n/g, carriageReturnRegEx = /\r/g, tabRegEx = /\t/g, questionRegex = /\?/g, hashRegex = /#/g;
-function encodePathChars(filepath) {
-	return filepath.includes("%") && (filepath = filepath.replace(percentRegEx, "%25")), !isWindows && filepath.includes("\\") && (filepath = filepath.replace(backslashRegEx, "%5C")), filepath.includes("\n") && (filepath = filepath.replace(newlineRegEx, "%0A")), filepath.includes("\r") && (filepath = filepath.replace(carriageReturnRegEx, "%0D")), filepath.includes("	") && (filepath = filepath.replace(tabRegEx, "%09")), filepath;
-}
-const posixDirname = dirname, posixResolve = resolve;
-function posixPathToFileHref(posixPath) {
-	let resolved = posixResolve(posixPath), filePathLast = posixPath.charCodeAt(posixPath.length - 1);
-	return (filePathLast === 47 || isWindows && filePathLast === 92) && resolved[resolved.length - 1] !== "/" && (resolved += "/"), resolved = encodePathChars(resolved), resolved.includes("?") && (resolved = resolved.replace(questionRegex, "%3F")), resolved.includes("#") && (resolved = resolved.replace(hashRegex, "%23")), new URL(`file://${resolved}`).href;
-}
-function toWindowsPath(path) {
-	return path.replace(/\//g, "\\");
+const percentEncodedRE = /(?:%[0-9a-f]{2})+/gi, whitespaceOnlyRE = /^\s+$/;
+/** Reverses {@link encodeSourceURL}. */
+function decodeSourceURL(url) {
+	return url.replace(percentEncodedRE, (match) => {
+		let decoded;
+		try {
+			decoded = decodeURIComponent(match);
+		} catch {
+			return match;
+		}
+		return whitespaceOnlyRE.test(decoded) ? decoded : match;
+	});
 }
 var comma = 44, chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/", intToChar = /* @__PURE__ */ new Uint8Array(64), charToInt = /* @__PURE__ */ new Uint8Array(128);
 for (let i = 0; i < chars.length; i++) {
 	let c = chars.charCodeAt(i);
 	intToChar[i] = c, charToInt[c] = i;
 }
-function decodeInteger(reader, relative) {
+function decodeInteger(reader) {
 	let value = 0, shift = 0, integer = 0;
 	do
 		integer = charToInt[reader.next()], value |= (integer & 31) << shift, shift += 5;
 	while (integer & 32);
-	let shouldNegate = value & 1;
-	return value >>>= 1, shouldNegate && (value = -2147483648 | -value), relative + value;
+	return value;
+}
+function decodeSign(num) {
+	return num & 1 ? -2147483648 | -(num >>> 1) : num >>> 1;
 }
 function hasMoreVlq(reader, max) {
 	return reader.pos >= max ? !1 : reader.peek() !== comma;
@@ -137,7 +90,7 @@ function decode(mappings) {
 		let semi = reader.indexOf(";"), line = [], sorted = !0, lastCol = 0;
 		for (genColumn = 0; reader.pos < semi;) {
 			let seg;
-			genColumn = decodeInteger(reader, genColumn), genColumn < lastCol && (sorted = !1), lastCol = genColumn, hasMoreVlq(reader, semi) ? (sourcesIndex = decodeInteger(reader, sourcesIndex), sourceLine = decodeInteger(reader, sourceLine), sourceColumn = decodeInteger(reader, sourceColumn), hasMoreVlq(reader, semi) ? (namesIndex = decodeInteger(reader, namesIndex), seg = [
+			genColumn += decodeSign(decodeInteger(reader)), genColumn < lastCol && (sorted = !1), lastCol = genColumn, hasMoreVlq(reader, semi) ? (sourcesIndex += decodeSign(decodeInteger(reader)), sourceLine += decodeSign(decodeInteger(reader)), sourceColumn += decodeSign(decodeInteger(reader)), hasMoreVlq(reader, semi) ? (namesIndex += decodeSign(decodeInteger(reader)), seg = [
 				genColumn,
 				sourcesIndex,
 				sourceLine,
@@ -218,6 +171,69 @@ function traceSegmentInternal(segments, memo, line, column, bias) {
 	let index = memoizedBinarySearch(segments, column, memo, line);
 	return found ? index = (bias === -1 ? upperBound : lowerBound)(segments, column, index) : bias === -1 && index++, index === -1 || index === segments.length ? -1 : index;
 }
+const _DRIVE_LETTER_START_RE = /^[A-Za-z]:\//;
+function normalizeWindowsPath(input = "") {
+	return input && input.replace(/\\/g, "/").replace(_DRIVE_LETTER_START_RE, (r) => r.toUpperCase());
+}
+const _IS_ABSOLUTE_RE = /^[/\\](?![/\\])|^[/\\]{2}(?!\.)|^[A-Za-z]:[/\\]/, _DRIVE_LETTER_RE = /^[A-Za-z]:$/;
+function cwd() {
+	return typeof process < "u" && typeof process.cwd == "function" ? process.cwd().replace(/\\/g, "/") : "/";
+}
+const resolve = function(...arguments_) {
+	arguments_ = arguments_.map((argument) => normalizeWindowsPath(argument));
+	let resolvedPath = "", resolvedAbsolute = !1;
+	for (let index = arguments_.length - 1; index >= -1 && !resolvedAbsolute; index--) {
+		let path = index >= 0 ? arguments_[index] : cwd();
+		path && path.length !== 0 && (resolvedPath = `${path}/${resolvedPath}`, resolvedAbsolute = isAbsolute(path));
+	}
+	return resolvedPath = normalizeString(resolvedPath, !resolvedAbsolute), resolvedAbsolute && !isAbsolute(resolvedPath) ? `/${resolvedPath}` : resolvedPath.length > 0 ? resolvedPath : ".";
+};
+function normalizeString(path, allowAboveRoot) {
+	let res = "", lastSegmentLength = 0, lastSlash = -1, dots = 0, char = null;
+	for (let index = 0; index <= path.length; ++index) {
+		if (index < path.length) char = path[index];
+		else if (char === "/") break;
+		else char = "/";
+		if (char === "/") {
+			if (lastSlash !== index - 1 && dots !== 1) if (dots === 2) {
+				if (res.length < 2 || lastSegmentLength !== 2 || res[res.length - 1] !== "." || res[res.length - 2] !== ".") {
+					if (res.length > 2) {
+						let lastSlashIndex = res.lastIndexOf("/");
+						lastSlashIndex === -1 ? (res = "", lastSegmentLength = 0) : (res = res.slice(0, lastSlashIndex), lastSegmentLength = res.length - 1 - res.lastIndexOf("/")), lastSlash = index, dots = 0;
+						continue;
+					}
+					if (res.length > 0) {
+						res = "", lastSegmentLength = 0, lastSlash = index, dots = 0;
+						continue;
+					}
+				}
+				allowAboveRoot && (res += res.length > 0 ? "/.." : "..", lastSegmentLength = 2);
+			} else res.length > 0 ? res += `/${path.slice(lastSlash + 1, index)}` : res = path.slice(lastSlash + 1, index), lastSegmentLength = index - lastSlash - 1;
+			lastSlash = index, dots = 0;
+		} else char === "." && dots !== -1 ? ++dots : dots = -1;
+	}
+	return res;
+}
+const isAbsolute = function(p) {
+	return _IS_ABSOLUTE_RE.test(p);
+}, dirname = function(p) {
+	let segments = normalizeWindowsPath(p).replace(/\/$/, "").split("/").slice(0, -1);
+	return segments.length === 1 && _DRIVE_LETTER_RE.test(segments[0]) && (segments[0] += "/"), segments.join("/") || (isAbsolute(p) ? "/" : ".");
+}, textDecoder = new TextDecoder(), decodeBase64 = (() => {
+	let capturedBuffer = typeof Buffer == "function" ? Buffer : void 0;
+	return capturedBuffer && typeof capturedBuffer.from == "function" ? (base64) => capturedBuffer.from(base64, "base64").toString("utf-8") : (base64) => textDecoder.decode(Uint8Array.from(atob(base64), (c) => c.charCodeAt(0)));
+})(), percentRegEx = /%/g, backslashRegEx = /\\/g, newlineRegEx = /\n/g, carriageReturnRegEx = /\r/g, tabRegEx = /\t/g, questionRegex = /\?/g, hashRegex = /#/g;
+function encodePathChars(filepath) {
+	return filepath.includes("%") && (filepath = filepath.replace(percentRegEx, "%25")), !isWindows && filepath.includes("\\") && (filepath = filepath.replace(backslashRegEx, "%5C")), filepath.includes("\n") && (filepath = filepath.replace(newlineRegEx, "%0A")), filepath.includes("\r") && (filepath = filepath.replace(carriageReturnRegEx, "%0D")), filepath.includes("	") && (filepath = filepath.replace(tabRegEx, "%09")), filepath;
+}
+const posixDirname = dirname, posixResolve = resolve;
+function posixPathToFileHref(posixPath) {
+	let resolved = posixResolve(posixPath), filePathLast = posixPath.charCodeAt(posixPath.length - 1);
+	return (filePathLast === 47 || isWindows && filePathLast === 92) && resolved.at(-1) !== "/" && (resolved += "/"), resolved = encodePathChars(resolved), resolved.includes("?") && (resolved = resolved.replace(questionRegex, "%3F")), resolved.includes("#") && (resolved = resolved.replace(hashRegex, "%23")), new URL(`file://${resolved}`).href;
+}
+function toWindowsPath(path) {
+	return path.replace(/\//g, "\\");
+}
 var DecodedMap = class {
 	map;
 	_encoded;
@@ -341,6 +357,10 @@ const prefixedBuiltins = /* @__PURE__ */ new Set([
 function normalizeModuleId(file) {
 	return prefixedBuiltins.has(file) ? file : slash(file).replace(/^\/@fs\//, isWindows ? "" : "/").replace(/^node:/, "").replace(/^\/+/, "/").replace(/^file:\/+/, isWindows ? "" : "/");
 }
+function createIsBuiltin(builtins) {
+	let plainBuiltinsSet = new Set(builtins.filter((builtin) => typeof builtin == "string")), regexBuiltins = builtins.filter((builtin) => typeof builtin != "string");
+	return (id) => plainBuiltinsSet.has(id) || regexBuiltins.some((regexp) => regexp.test(id));
+}
 var HMRContext = class {
 	hmrClient;
 	ownerPath;
@@ -365,8 +385,8 @@ var HMRContext = class {
 		else if (Array.isArray(deps)) this.acceptDeps(deps, callback);
 		else throw Error("invalid hot.accept() usage.");
 	}
-	acceptExports(_, callback) {
-		this.acceptDeps([this.ownerPath], ([mod]) => callback?.(mod));
+	acceptExports(exportNames, callback) {
+		this.acceptDeps([this.ownerPath], ([mod]) => callback?.(mod), typeof exportNames == "string" ? [exportNames] : exportNames);
 	}
 	dispose(cb) {
 		this.hmrClient.disposeMap.set(this.ownerPath, cb);
@@ -414,14 +434,15 @@ var HMRContext = class {
 			data
 		});
 	}
-	acceptDeps(deps, callback = () => {}) {
+	acceptDeps(deps, callback = () => {}, exports) {
 		let mod = this.hmrClient.hotModulesMap.get(this.ownerPath) || {
 			id: this.ownerPath,
 			callbacks: []
 		};
 		mod.callbacks.push({
 			deps,
-			fn: callback
+			fn: callback,
+			exports
 		}), this.hmrClient.hotModulesMap.set(this.ownerPath, mod);
 	}
 }, HMRClient = class {
@@ -451,13 +472,17 @@ var HMRContext = class {
 		this.hotModulesMap.clear(), this.disposeMap.clear(), this.pruneMap.clear(), this.dataMap.clear(), this.customListenersMap.clear(), this.ctxToListenersMap.clear();
 	}
 	async prunePaths(paths) {
-		await Promise.all(paths.map((path) => {
-			let disposer = this.disposeMap.get(path);
-			if (disposer) return disposer(this.dataMap.get(path));
-		})), await Promise.all(paths.map((path) => {
-			let fn = this.pruneMap.get(path);
-			if (fn) return fn(this.dataMap.get(path));
-		}));
+		try {
+			await Promise.all(paths.map((path) => {
+				let disposer = this.disposeMap.get(path);
+				if (disposer) return disposer(this.dataMap.get(path));
+			})), await Promise.all(paths.map((path) => {
+				let fn = this.pruneMap.get(path);
+				if (fn) return fn(this.dataMap.get(path));
+			}));
+		} finally {
+			paths.forEach((path) => this.dataMap.delete(path));
+		}
 	}
 	warnFailedUpdate(err, path) {
 		(!(err instanceof Error) || !err.message.includes("fetch")) && this.logger.error(err), this.logger.error(`Failed to reload ${path}. This could be due to syntax errors or importing non-existent modules. (see errors above)`);
@@ -501,26 +526,6 @@ var HMRContext = class {
 		};
 	}
 };
-/**
-* Vite converts `import { } from 'foo'` to `const _ = __vite_ssr_import__('foo')`.
-* Top-level imports and dynamic imports work slightly differently in Node.js.
-* This function normalizes the differences so it matches prod behaviour.
-*/
-function analyzeImportedModDifference(mod, rawId, moduleType, metadata) {
-	if (!metadata?.isDynamicImport && metadata?.importedNames?.length) {
-		let missingBindings = metadata.importedNames.filter((s) => !(s in mod));
-		if (missingBindings.length) {
-			let lastBinding = missingBindings[missingBindings.length - 1];
-			throw SyntaxError(moduleType === "module" ? `[vite] The requested module '${rawId}' does not provide an export named '${lastBinding}'` : `\
-[vite] Named export '${lastBinding}' not found. The requested module '${rawId}' is a CommonJS module, which may not support all module.exports as named exports.
-CommonJS modules can always be imported via the default export, for example using:
-
-import pkg from '${rawId}';
-const {${missingBindings.join(", ")}} = pkg;
-`);
-		}
-	}
-}
 let nanoid = (size = 21) => {
 	let id = "", i = size | 0;
 	for (; i-- > 0;) id += "useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict"[Math.random() * 64 | 0];
@@ -684,16 +689,111 @@ const createWebSocketModuleRunnerTransport = (options) => {
 		}
 	};
 };
-function createIsBuiltin(builtins) {
-	let plainBuiltinsSet = new Set(builtins.filter((builtin) => typeof builtin == "string")), regexBuiltins = builtins.filter((builtin) => typeof builtin != "string");
-	return (id) => plainBuiltinsSet.has(id) || regexBuiltins.some((regexp) => regexp.test(id));
+/**
+* Vite converts `import { } from 'foo'` to `const _ = __vite_ssr_import__('foo')`.
+* Top-level imports and dynamic imports work slightly differently in Node.js.
+* This function normalizes the differences so it matches prod behaviour.
+*/
+function analyzeImportedModDifference(mod, rawId, moduleType, metadata) {
+	if (!metadata?.isDynamicImport && metadata?.importedNames?.length) {
+		let missingBindings = metadata.importedNames.filter((s) => !(s in mod));
+		if (missingBindings.length) {
+			let lastBinding = missingBindings.at(-1);
+			throw SyntaxError(moduleType === "module" ? `[vite] The requested module '${rawId}' does not provide an export named '${lastBinding}'` : `\
+[vite] Named export '${lastBinding}' not found. The requested module '${rawId}' is a CommonJS module, which may not support all module.exports as named exports.
+CommonJS modules can always be imported via the default export, for example using:
+
+import pkg from '${rawId}';
+const {${missingBindings.join(", ")}} = pkg;
+`);
+		}
+	}
 }
-const ssrModuleExportsKey = "__vite_ssr_exports__", ssrImportKey = "__vite_ssr_import__", ssrDynamicImportKey = "__vite_ssr_dynamic_import__", ssrExportAllKey = "__vite_ssr_exportAll__", ssrExportNameKey = "__vite_ssr_exportName__", ssrImportMetaKey = "__vite_ssr_import_meta__", noop = () => {}, silentConsole = {
-	debug: noop,
-	error: noop
-}, hmrLogger = {
-	debug: (...msg) => console.log("[vite]", ...msg),
-	error: (error) => console.log("[vite]", error)
+const ssrModuleExportsKey = "__vite_ssr_exports__", ssrImportKey = "__vite_ssr_import__", ssrDynamicImportKey = "__vite_ssr_dynamic_import__", ssrExportAllKey = "__vite_ssr_exportAll__", ssrExportNameKey = "__vite_ssr_exportName__", ssrImportMetaKey = "__vite_ssr_import_meta__", customizationHookNamespace = "vite-module-runner:import-meta-resolve/v1/", customizationHooksModule = `
+
+export async function resolve(specifier, context, nextResolve) {
+  if (specifier.startsWith(${JSON.stringify(customizationHookNamespace)})) {
+    const data = specifier.slice(${JSON.stringify(customizationHookNamespace)}.length)
+    const [parsedSpecifier, parsedImporter] = JSON.parse(data)
+    specifier = parsedSpecifier
+    context.parentURL = parsedImporter
+  }
+  return nextResolve(specifier, context)
+}
+
+`;
+function customizationHookResolve(specifier, context, nextResolve) {
+	if (specifier.startsWith(customizationHookNamespace)) {
+		let data = specifier.slice(42), [parsedSpecifier, parsedImporter] = JSON.parse(data);
+		specifier = parsedSpecifier, context.parentURL = parsedImporter;
+	}
+	return nextResolve(specifier, context);
+}
+let isHookRegistered = !1;
+function createImportMetaResolver() {
+	if (isHookRegistered) return importMetaResolveWithCustomHook;
+	let module;
+	try {
+		module = typeof process < "u" ? process.getBuiltinModule("node:module").Module : void 0;
+	} catch {
+		return;
+	}
+	if (module) {
+		if (module.registerHooks) return module.registerHooks({ resolve: customizationHookResolve }), isHookRegistered = !0, importMetaResolveWithCustomHook;
+		if (module.register) {
+			try {
+				let hookModuleContent = `data:text/javascript,${encodeURI(customizationHooksModule)}`;
+				module.register(hookModuleContent);
+			} catch (e) {
+				if ("code" in e && e.code === "ERR_NETWORK_IMPORT_DISALLOWED") return;
+				throw e;
+			}
+			return isHookRegistered = !0, importMetaResolveWithCustomHook;
+		}
+	}
+}
+function importMetaResolveWithCustomHook(specifier, importer) {
+	return import.meta.resolve(`${customizationHookNamespace}${JSON.stringify([specifier, importer])}`);
+}
+const envProxy = new Proxy({}, { get(_, p) {
+	throw Error(`[module runner] Dynamic access of "import.meta.env" is not supported. Please, use "import.meta.env.${String(p)}" instead.`);
+} });
+function createDefaultImportMeta(modulePath) {
+	let href = posixPathToFileHref(modulePath), filename = modulePath, dirname$1 = posixDirname(modulePath);
+	return {
+		filename: isWindows ? toWindowsPath(filename) : filename,
+		dirname: isWindows ? toWindowsPath(dirname$1) : dirname$1,
+		url: href,
+		env: envProxy,
+		resolve(_id, _parent) {
+			throw Error("[module runner] \"import.meta.resolve\" is not supported.");
+		},
+		glob() {
+			throw Error("[module runner] \"import.meta.glob\" is statically replaced during file transformation. Make sure to reference it by the full name.");
+		}
+	};
+}
+/**
+* Create import.meta object for Node.js.
+*/
+function createNodeImportMeta(modulePath) {
+	let defaultMeta = createDefaultImportMeta(modulePath), href = defaultMeta.url, importMetaResolver = createImportMetaResolver();
+	return {
+		...defaultMeta,
+		main: !1,
+		resolve(id, parent) {
+			return (importMetaResolver ?? defaultMeta.resolve)(id, parent ?? href);
+		}
+	};
+}
+var ESModulesEvaluator = class {
+	startOffset = getAsyncFunctionDeclarationPaddingLineCount() + 1;
+	async runInlinedModule(context, code) {
+		await new AsyncFunction(ssrModuleExportsKey, ssrImportMetaKey, ssrImportKey, ssrDynamicImportKey, ssrExportAllKey, ssrExportNameKey, "\"use strict\";\n" + code)(context[ssrModuleExportsKey], context[ssrImportMetaKey], context[ssrImportKey], context[ssrDynamicImportKey], context[ssrExportAllKey], context[ssrExportNameKey]), Object.seal(context[ssrModuleExportsKey]);
+	}
+	runExternalModule(filepath) {
+		return import(filepath);
+	}
 };
 function createHMRHandler(handler) {
 	let queue = new Queue();
@@ -722,13 +822,13 @@ var Queue = class {
 function createHMRHandlerForRunner(runner) {
 	return createHMRHandler(async (payload) => {
 		let hmrClient = runner.hmrClient;
-		if (!(!hmrClient || runner.isClosed())) switch (payload.type) {
+		if (hmrClient && !runner.isClosed()) switch (payload.type) {
 			case "connected":
 				hmrClient.logger.debug("connected.");
 				break;
 			case "update":
 				await hmrClient.notifyListeners("vite:beforeUpdate", payload), await Promise.all(payload.updates.map(async (update) => {
-					if (update.type === "js-update") return update.acceptedPath = unwrapId(update.acceptedPath), update.path = unwrapId(update.path), hmrClient.queueUpdate(update);
+					if (update.type === "js-update") return hmrClient.queueUpdate(update);
 					hmrClient.logger.error("css hmr is not supported in runner mode.");
 				})), await hmrClient.notifyListeners("vite:afterUpdate", payload);
 				break;
@@ -760,6 +860,7 @@ function createHMRHandlerForRunner(runner) {
 				break;
 			}
 			case "ping": break;
+			case "bundled-dev-update": break;
 			default: return payload;
 		}
 	});
@@ -787,7 +888,13 @@ function findAllEntrypoints(runner, entrypoints = /* @__PURE__ */ new Set()) {
 	for (let mod of runner.evaluatedModules.idToModuleMap.values()) mod.importers.size || entrypoints.add(mod.url);
 	return entrypoints;
 }
-const sourceMapCache = {}, fileContentsCache = {}, evaluatedModulesCache = /* @__PURE__ */ new Set(), retrieveFileHandlers = /* @__PURE__ */ new Set(), retrieveSourceMapHandlers = /* @__PURE__ */ new Set(), createExecHandlers = (handlers) => ((...args) => {
+const noop = () => {}, silentConsole = {
+	debug: noop,
+	error: noop
+}, hmrLogger = {
+	debug: (...msg) => console.log("[vite]", ...msg),
+	error: (error) => console.log("[vite]", error)
+}, sourceMapCache = {}, fileContentsCache = {}, evaluatedModulesCache = /* @__PURE__ */ new Set(), retrieveFileHandlers = /* @__PURE__ */ new Set(), retrieveSourceMapHandlers = /* @__PURE__ */ new Set(), createExecHandlers = (handlers) => ((...args) => {
 	for (let handler of handlers) {
 		let result = handler(...args);
 		if (result) return result;
@@ -808,10 +915,11 @@ function supportRelativeURL(file, url) {
 	return protocol && /^\/\w:/.test(startPath) ? (protocol += "/", protocol + slash(posixResolve(startPath, url))) : protocol + posixResolve(startPath, url);
 }
 function getRunnerSourceMap(position) {
+	let id = decodeSourceURL(position.source);
 	for (let moduleGraph of evaluatedModulesCache) {
-		let sourceMap = moduleGraph.getModuleSourceMapById(position.source);
+		let sourceMap = moduleGraph.getModuleSourceMapById(id);
 		if (sourceMap) return {
-			url: position.source,
+			url: id,
 			map: sourceMap,
 			vite: !0
 		};
@@ -837,7 +945,9 @@ function retrieveSourceMap(source) {
 	let sourceMappingURL = retrieveSourceMapURL(source);
 	if (!sourceMappingURL) return null;
 	let sourceMapData;
-	return reSourceMap.test(sourceMappingURL) ? (sourceMapData = decodeBase64(sourceMappingURL.slice(sourceMappingURL.indexOf(",") + 1)), sourceMappingURL = source) : (sourceMappingURL = supportRelativeURL(source, sourceMappingURL), sourceMapData = retrieveFile(sourceMappingURL)), sourceMapData ? {
+	if (reSourceMap.test(sourceMappingURL)) sourceMapData = decodeBase64(sourceMappingURL.slice(sourceMappingURL.indexOf(",") + 1)), sourceMappingURL = source;
+	else sourceMappingURL = supportRelativeURL(source, sourceMappingURL), sourceMapData = retrieveFile(sourceMappingURL);
+	return sourceMapData ? {
 		url: sourceMappingURL,
 		map: sourceMapData
 	} : null;
@@ -889,7 +999,7 @@ function CallSiteToString() {
 	let fileName, fileLocation = "";
 	if (this.isNative()) fileLocation = "native";
 	else {
-		fileName = this.getScriptNameOrSourceURL(), !fileName && this.isEval() && (fileLocation = this.getEvalOrigin(), fileLocation += ", "), fileName ? fileLocation += fileName : fileLocation += "<anonymous>";
+		fileName = this.getScriptNameOrSourceURL(), !fileName && this.isEval() && (fileLocation = this.getEvalOrigin(), fileLocation += ", "), fileLocation += fileName || "<anonymous>";
 		let lineNumber = this.getLineNumber();
 		if (lineNumber != null) {
 			fileLocation += `:${lineNumber}`;
@@ -908,7 +1018,7 @@ function CallSiteToString() {
 	return addSuffix && (line += ` (${fileLocation})`), line;
 }
 function cloneCallSite(frame) {
-	let object = {};
+	let object = Object.create(null);
 	return Object.getOwnPropertyNames(Object.getPrototypeOf(frame)).forEach((name) => {
 		let key = name;
 		object[key] = /^(?:is|get)/.test(name) ? function() {
@@ -923,13 +1033,14 @@ function wrapCallSite(frame, state) {
 	}), frame.isNative()) return state.curPosition = null, frame;
 	let source = frame.getFileName() || frame.getScriptNameOrSourceURL();
 	if (source) {
-		let position = mapSourcePosition({
+		let unmapped = {
 			name: null,
 			source,
 			line: frame.getLineNumber() ?? 0,
 			column: (frame.getColumnNumber() ?? 1) - 1
-		});
-		state.curPosition = position, frame = cloneCallSite(frame);
+		}, position = mapSourcePosition(unmapped);
+		if (state.curPosition = position, position === unmapped && !state.nextPosition?.name && frame.getColumnNumber() != null && frame.getScriptNameOrSourceURL() === source) return frame;
+		frame = cloneCallSite(frame);
 		let originalFunctionName = frame.getFunctionName;
 		return frame.getFunctionName = function() {
 			let name = state.nextPosition == null ? originalFunctionName() : state.nextPosition.name || originalFunctionName();
@@ -966,92 +1077,6 @@ function enableSourceMapSupport(runner) {
 	}
 	return interceptStackTrace(runner, typeof runner.options.sourcemapInterceptor == "object" ? runner.options.sourcemapInterceptor : void 0);
 }
-var ESModulesEvaluator = class {
-	startOffset = getAsyncFunctionDeclarationPaddingLineCount() + 1;
-	async runInlinedModule(context, code) {
-		await new AsyncFunction(ssrModuleExportsKey, ssrImportMetaKey, ssrImportKey, ssrDynamicImportKey, ssrExportAllKey, ssrExportNameKey, "\"use strict\";\n" + code)(context[ssrModuleExportsKey], context[ssrImportMetaKey], context[ssrImportKey], context[ssrDynamicImportKey], context[ssrExportAllKey], context[ssrExportNameKey]), Object.seal(context[ssrModuleExportsKey]);
-	}
-	runExternalModule(filepath) {
-		return import(filepath);
-	}
-};
-const customizationHookNamespace = "vite-module-runner:import-meta-resolve/v1/", customizationHooksModule = `
-
-export async function resolve(specifier, context, nextResolve) {
-  if (specifier.startsWith(${JSON.stringify(customizationHookNamespace)})) {
-    const data = specifier.slice(${JSON.stringify(customizationHookNamespace)}.length)
-    const [parsedSpecifier, parsedImporter] = JSON.parse(data)
-    specifier = parsedSpecifier
-    context.parentURL = parsedImporter
-  }
-  return nextResolve(specifier, context)
-}
-
-`;
-function customizationHookResolve(specifier, context, nextResolve) {
-	if (specifier.startsWith(customizationHookNamespace)) {
-		let data = specifier.slice(42), [parsedSpecifier, parsedImporter] = JSON.parse(data);
-		specifier = parsedSpecifier, context.parentURL = parsedImporter;
-	}
-	return nextResolve(specifier, context);
-}
-let isHookRegistered = !1;
-function createImportMetaResolver() {
-	if (isHookRegistered) return importMetaResolveWithCustomHook;
-	let module;
-	try {
-		module = typeof process < "u" ? process.getBuiltinModule("node:module").Module : void 0;
-	} catch {
-		return;
-	}
-	if (module) {
-		if (module.registerHooks) return module.registerHooks({ resolve: customizationHookResolve }), isHookRegistered = !0, importMetaResolveWithCustomHook;
-		if (module.register) {
-			try {
-				let hookModuleContent = `data:text/javascript,${encodeURI(customizationHooksModule)}`;
-				module.register(hookModuleContent);
-			} catch (e) {
-				if ("code" in e && e.code === "ERR_NETWORK_IMPORT_DISALLOWED") return;
-				throw e;
-			}
-			return isHookRegistered = !0, importMetaResolveWithCustomHook;
-		}
-	}
-}
-function importMetaResolveWithCustomHook(specifier, importer) {
-	return import.meta.resolve(`${customizationHookNamespace}${JSON.stringify([specifier, importer])}`);
-}
-const envProxy = new Proxy({}, { get(_, p) {
-	throw Error(`[module runner] Dynamic access of "import.meta.env" is not supported. Please, use "import.meta.env.${String(p)}" instead.`);
-} });
-function createDefaultImportMeta(modulePath) {
-	let href = posixPathToFileHref(modulePath), filename = modulePath, dirname$1 = posixDirname(modulePath);
-	return {
-		filename: isWindows ? toWindowsPath(filename) : filename,
-		dirname: isWindows ? toWindowsPath(dirname$1) : dirname$1,
-		url: href,
-		env: envProxy,
-		resolve(_id, _parent) {
-			throw Error("[module runner] \"import.meta.resolve\" is not supported.");
-		},
-		glob() {
-			throw Error("[module runner] \"import.meta.glob\" is statically replaced during file transformation. Make sure to reference it by the full name.");
-		}
-	};
-}
-/**
-* Create import.meta object for Node.js.
-*/
-function createNodeImportMeta(modulePath) {
-	let defaultMeta = createDefaultImportMeta(modulePath), href = defaultMeta.url, importMetaResolver = createImportMetaResolver();
-	return {
-		...defaultMeta,
-		main: !1,
-		resolve(id, parent) {
-			return (importMetaResolver ?? defaultMeta.resolve)(id, parent ?? href);
-		}
-	};
-}
 var ModuleRunner = class {
 	options;
 	evaluator;
@@ -1107,14 +1132,13 @@ var ModuleRunner = class {
 		if (visited.has(mod.id)) return !1;
 		visited.add(mod.id);
 		for (let importedModuleId of mod.imports) {
-			if (callstack.includes(importedModuleId)) return !0;
 			let importedModule = this.evaluatedModules.getModuleById(importedModuleId);
-			if (importedModule?.promise && !importedModule.evaluated && this.isCircularRequest(importedModule, callstack, visited)) return !0;
+			if (importedModule?.promise && !importedModule.evaluated && (callstack.includes(importedModuleId) || this.isCircularRequest(importedModule, callstack, visited))) return !0;
 		}
 		return !1;
 	}
 	async cachedRequest(url, mod, callstack = [], metadata) {
-		let meta = mod.meta, moduleId = meta.id, importee = callstack[callstack.length - 1];
+		let meta = mod.meta, moduleId = meta.id, importee = callstack.at(-1);
 		if (importee && mod.importers.add(importee), mod.evaluated && mod.promise) return this.processImport(await mod.promise, meta, metadata);
 		if (mod.promise) return mod.exports && (callstack.includes(moduleId) || this.isCircularRequest(mod, callstack)) ? this.processImport(mod.exports, meta, metadata) : this.processImport(await mod.promise, meta, metadata);
 		let debugTimer;