vite 8.3.2 → 8.3.4

package/dist/node/chunks/node.js

@@ -13,7 +13,6 @@ import { format, formatWithOptions, inspect, isDeepStrictEqual, parseEnv, promis
 import { MessageChannel, Worker } from "node:worker_threads";
 import pm from "picomatch";
 import { VERSION as rolldownVersion, rolldown } from "rolldown";
-import { escapePath, glob, globSync, isDynamicPattern } from "tinyglobby";
 import { dev, oxcRuntimePlugin, resolveTsconfig, scan, viteAliasPlugin, viteBuildImportAnalysisPlugin, viteDynamicImportVarsPlugin, viteImportGlobPlugin, viteJsonPlugin, viteLoadFallbackPlugin, viteManifestPlugin, viteModulePreloadPolyfillPlugin, viteReporterPlugin, viteResolvePlugin, viteTransformPlugin, viteWebWorkerPostPlugin } from "rolldown/experimental";
 import childProcess, { exec, execFile, execSync, spawn } from "node:child_process";
 import { promises } from "node:dns";
@@ -24,6 +23,7 @@ import path$1, { isAbsolute as isAbsolute$1, join as join$1, posix as posix$1, r
 import { exactRegex, makeIdFiltersToMatchWithQuery, prefixRegex, withFilter } from "rolldown/filter";
 import { Buffer as Buffer$1 } from "node:buffer";
 import { readdirSync, statSync as statSync$1 } from "fs";
+import { escapePath, glob, globSync, isDynamicPattern } from "tinyglobby";
 import assert from "node:assert";
 import process$1, { cwd } from "node:process";
 import v8 from "node:v8";
@@ -649,7 +649,7 @@ var BaseEnvironment = class extends PartialEnvironment {
 };
 //#endregion
 //#region package.json
-var version = "8.3.2";
+var version = "8.3.4";
 //#endregion
 //#region src/node/constants.ts
 const ROLLUP_HOOKS = [
@@ -2490,7 +2490,7 @@ function optimizeSafeRealPathSync() {
 	});
 }
 function ensureWatchedFile(watcher, file, root) {
-	if (file && !file.startsWith(withTrailingSlash(root)) && !file.includes("\0") && fs.existsSync(file)) watcher.add(path.resolve(file));
+	if (file && !normalizePath(file).startsWith(withTrailingSlash(root)) && !file.includes("\0") && fs.existsSync(file)) watcher.add(path.resolve(file));
 }
 function joinSrcset(ret) {
 	return ret.map(({ url, descriptor }) => url + (descriptor ? ` ${descriptor}` : "")).join(", ");
@@ -2832,7 +2832,7 @@ function setupHmrWsOptionCompat(serverConfig) {
 		for (const key of wsOptionKeys) if (hmrConfig[key] !== void 0) wsConfig[key] ??= hmrConfig[key];
 	}
 	serverConfig.ws = wsConfig;
-	const hmrProxy = hmrConfig || {};
+	const hmrProxy = { ...hmrConfig };
 	for (const key of wsOptionKeys) Object.defineProperty(hmrProxy, key, {
 		get() {
 			return serverConfig.ws?.[key];
@@ -3483,7 +3483,7 @@ function alias$1(options = {}) {
 	};
 }
 //#endregion
-//#region ../../node_modules/.pnpm/magic-string@1.4.2/node_modules/magic-string/dist/index.mjs
+//#region ../../node_modules/.pnpm/magic-string@1.4.3/node_modules/magic-string/dist/index.mjs
 var BitSet = class BitSet {
 	constructor(arg) {
 		this.bits = arg instanceof BitSet ? arg.bits.slice() : [];
@@ -4492,7 +4492,7 @@ var MagicString = class MagicString {
 			while (chunk !== last) {
 				if (chunk.next !== this.byStart.get(chunk.end)) throw new MagicStringError("cannot overwrite across a split point");
 				chunk = chunk.next;
-				chunk.edit("", false);
+				chunk.edit("", false, !overwrite);
 			}
 			first.edit(content, storeName, !overwrite);
 		} else {
@@ -4846,8 +4846,8 @@ var MagicString = class MagicString {
 			if (this._hasRemovedContent(match.index, match.index + match[0].length)) return false;
 			const replacement = getReplacement(match, this.original);
 			if (replacement === match[0]) return true;
-			if (match[0].length === 0) this.appendRight(match.index, replacement);
-			else this.overwrite(match.index, match.index + match[0].length, replacement);
+			if (match[0].length === 0) this.appendRight(match.index - this.offset, replacement);
+			else this.overwrite(match.index - this.offset, match.index + match[0].length - this.offset, replacement);
 			return true;
 		};
 		if (searchValue.global) {
@@ -4874,8 +4874,8 @@ var MagicString = class MagicString {
 			if (typeof replacement === "function") replacement = replacement(string, index, original);
 			else replacement = expandReplacement(replacement, string, index, original, [], void 0);
 			if (string !== replacement) {
-				if (string.length === 0) this.appendRight(index, replacement);
-				else this.overwrite(index, index + string.length, replacement);
+				if (string.length === 0) this.appendRight(index - this.offset, replacement);
+				else this.overwrite(index - this.offset, index + string.length - this.offset, replacement);
 			}
 			break;
 		}
@@ -4896,7 +4896,7 @@ var MagicString = class MagicString {
 			for (let index = 0; index <= original.length; index += 1) {
 				if (this._hasRemovedContent(index, index)) continue;
 				const _replacement = typeof replacement === "function" ? replacement("", index, original) : expandReplacement(replacement, "", index, original, [], void 0);
-				if (_replacement !== "") this.appendRight(index, _replacement);
+				if (_replacement !== "") this.appendRight(index - this.offset, _replacement);
 			}
 			return this;
 		}
@@ -4904,7 +4904,7 @@ var MagicString = class MagicString {
 			if (this._hasRemovedContent(index, index + stringLength)) continue;
 			const previous = original.slice(index, index + stringLength);
 			const _replacement = typeof replacement === "function" ? replacement(previous, index, original) : expandReplacement(replacement, previous, index, original, [], void 0);
-			if (previous !== _replacement) this.overwrite(index, index + stringLength, _replacement);
+			if (previous !== _replacement) this.overwrite(index - this.offset, index + stringLength - this.offset, _replacement);
 		}
 		return this;
 	}
@@ -6470,7 +6470,7 @@ var WorkerWithFallback = class {
 //#endregion
 //#region ../../node_modules/.pnpm/lilconfig@3.1.3/node_modules/lilconfig/src/index.js
 var require_src$1 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const path$7 = __require("path");
+	const path$8 = __require("path");
 	const fs$7 = __require("fs");
 	const os$3 = __require("os");
 	const url$2 = __require("url");
@@ -6503,7 +6503,7 @@ var require_src$1 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	* And on Windows, this will never happen. ('C:\build' -> 'C:')
 	*/
 	function parentDir(p) {
-		return path$7.dirname(p) || path$7.sep;
+		return path$8.dirname(p) || path$8.sep;
 	}
 	/** @type {import('./index').LoaderSync} */
 	const jsonLoader = (_, content) => JSON.parse(content);
@@ -6563,7 +6563,7 @@ var require_src$1 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			}
 		};
 		conf.searchPlaces.forEach((place) => {
-			const key = path$7.extname(place) || "noExt";
+			const key = path$8.extname(place) || "noExt";
 			const loader = conf.loaders[key];
 			if (!loader) throw new Error(`Missing loader for extension "${place}"`);
 			if (typeof loader !== "function") throw new Error(`Loader for extension "${place}" is not a function: Received ${typeof loader}.`);
@@ -6615,14 +6615,14 @@ var require_src$1 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 						visited.add(dir);
 					}
 					for (const searchPlace of searchPlaces) {
-						const filepath = path$7.join(dir, searchPlace);
+						const filepath = path$8.join(dir, searchPlace);
 						try {
 							await fs$7.promises.access(filepath);
 						} catch {
 							continue;
 						}
 						const content = String(await fsReadFileAsync(filepath));
-						const loaderKey = path$7.extname(searchPlace) || "noExt";
+						const loaderKey = path$8.extname(searchPlace) || "noExt";
 						const loader = loaders[loaderKey];
 						if (searchPlace === "package.json") {
 							const pkg = await loader(filepath, content);
@@ -6655,9 +6655,9 @@ var require_src$1 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			},
 			async load(filepath) {
 				validateFilePath(filepath);
-				const absPath = path$7.resolve(process.cwd(), filepath);
+				const absPath = path$8.resolve(process.cwd(), filepath);
 				if (cache && loadCache.has(absPath)) return loadCache.get(absPath);
-				const { base, ext } = path$7.parse(absPath);
+				const { base, ext } = path$8.parse(absPath);
 				const loaderKey = ext || "noExt";
 				const loader = loaders[loaderKey];
 				validateLoader(loader, loaderKey);
@@ -6727,13 +6727,13 @@ var require_src$1 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 						visited.add(dir);
 					}
 					for (const searchPlace of searchPlaces) {
-						const filepath = path$7.join(dir, searchPlace);
+						const filepath = path$8.join(dir, searchPlace);
 						try {
 							fs$7.accessSync(filepath);
 						} catch {
 							continue;
 						}
-						const loaderKey = path$7.extname(searchPlace) || "noExt";
+						const loaderKey = path$8.extname(searchPlace) || "noExt";
 						const loader = loaders[loaderKey];
 						const content = String(fs$7.readFileSync(filepath));
 						if (searchPlace === "package.json") {
@@ -6767,9 +6767,9 @@ var require_src$1 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			},
 			load(filepath) {
 				validateFilePath(filepath);
-				const absPath = path$7.resolve(process.cwd(), filepath);
+				const absPath = path$8.resolve(process.cwd(), filepath);
 				if (cache && loadCache.has(absPath)) return loadCache.get(absPath);
-				const { base, ext } = path$7.parse(absPath);
+				const { base, ext } = path$8.parse(absPath);
 				const loaderKey = ext || "noExt";
 				const loader = loaders[loaderKey];
 				validateLoader(loader, loaderKey);
@@ -6814,7 +6814,7 @@ var require_src$1 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	};
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.28_tsx@4.23.15_yaml@2.9.0/node_modules/postcss-load-config/src/req.js
+//#region ../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.29_tsx@4.23.15_yaml@2.9.1/node_modules/postcss-load-config/src/req.js
 var require_req = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const { createRequire: createRequire$1 } = __require("node:module");
 	const { fileURLToPath: fileURLToPath$1, pathToFileURL: pathToFileURL$1 } = __require("node:url");
@@ -6856,7 +6856,7 @@ var require_req = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = req;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.28_tsx@4.23.15_yaml@2.9.0/node_modules/postcss-load-config/src/options.js
+//#region ../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.29_tsx@4.23.15_yaml@2.9.1/node_modules/postcss-load-config/src/options.js
 var require_options = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const req = require_req();
 	/**
@@ -6890,7 +6890,7 @@ var require_options = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = options;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.28_tsx@4.23.15_yaml@2.9.0/node_modules/postcss-load-config/src/plugins.js
+//#region ../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.29_tsx@4.23.15_yaml@2.9.1/node_modules/postcss-load-config/src/plugins.js
 var require_plugins = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const req = require_req();
 	/**
@@ -6944,7 +6944,7 @@ var require_plugins = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = plugins;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.28_tsx@4.23.15_yaml@2.9.0/node_modules/postcss-load-config/src/index.js
+//#region ../../node_modules/.pnpm/postcss-load-config@6.0.1_jiti@2.7.0_postcss@8.5.29_tsx@4.23.15_yaml@2.9.1/node_modules/postcss-load-config/src/index.js
 var require_src = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const { resolve: resolve$3 } = __require("node:path");
 	const config = require_src$1();
@@ -7620,7 +7620,7 @@ function oxcPlugin(config) {
 			...jsxOptions,
 			refresh: false
 		};
-		if (jsxRefreshFilter?.(id) && !JS_TYPES_RE.test(cleanUrl(id))) result.lang = "js";
+		if (jsxRefreshFilter?.(id) && !JS_TYPES_RE.test(id) && !JS_TYPES_RE.test(cleanUrl(id))) result.lang = "js";
 		return result;
 	};
 	let server;
@@ -10967,10 +10967,10 @@ var require_binary_extensions = /* @__PURE__ */ __commonJSMin(((exports, module)
 //#endregion
 //#region ../../node_modules/.pnpm/is-binary-path@2.1.0/node_modules/is-binary-path/index.js
 var require_is_binary_path = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const path$6 = __require("path");
+	const path$7 = __require("path");
 	const binaryExtensions = require_binary_extensions();
 	const extensions = new Set(binaryExtensions);
-	module.exports = (filePath) => extensions.has(path$6.extname(filePath).slice(1).toLowerCase());
+	module.exports = (filePath) => extensions.has(path$7.extname(filePath).slice(1).toLowerCase());
 }));
 //#endregion
 //#region ../../node_modules/.pnpm/chokidar@3.6.0_patch_hash=e17269188c54412478078f7ac7877c1d5a475a2f2438328e3a7e725513ccbf1f/node_modules/chokidar/lib/constants.js
@@ -13842,18 +13842,29 @@ var require_lib$1 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	})();
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/shell-quote@1.8.4/node_modules/shell-quote/quote.js
+//#region ../../node_modules/.pnpm/shell-quote@1.12.0/node_modules/shell-quote/quote.js
 var require_quote = /* @__PURE__ */ __commonJSMin(((exports, module) => {
+	/** @import { ControlOperator } from './parse' */
+	/** @type {ControlOperator['op'][]} */
 	var OPS = [
 		"||",
 		"&&",
+		";;&",
 		";;",
+		";&",
 		"|&",
 		"<(",
+		">(",
 		"<<<",
+		"<<-",
+		"<<",
 		">>",
 		">&",
+		">|",
+		"&>>",
+		"&>",
 		"<&",
+		"<>",
 		"&",
 		";",
 		"(",
@@ -13863,51 +13874,70 @@ var require_quote = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		">"
 	];
 	var LINE_TERMINATORS = /[\n\r\u2028\u2029]/;
-	var GLOB_SHELL_SPECIAL = /[\s#!"$&'():;<=>@\\^`|]/g;
+	var GLOB_SHELL_SPECIAL = /[\s#!"$&'():;<=>@\\^`|~]/g;
+	/** @type {typeof import('./quote')} */
 	module.exports = function quote(xs) {
+		var sawComment = false;
 		return xs.map(function(s) {
+			if (sawComment && typeof s === "string" && LINE_TERMINATORS.test(s)) throw new TypeError("a token after a `comment` must not contain line terminators");
 			if (s === "") return "''";
 			if (s && typeof s === "object") {
-				if (s.op === "glob") {
+				if ("op" in s && s.op === "glob") {
 					if (typeof s.pattern !== "string") throw new TypeError("glob token requires a string `pattern`");
 					if (LINE_TERMINATORS.test(s.pattern)) throw new TypeError("glob `pattern` must not contain line terminators");
+					if (s.pattern === "") return "''";
 					return s.pattern.replace(GLOB_SHELL_SPECIAL, "\\$&");
 				}
-				if (typeof s.op === "string") {
+				if ("op" in s && typeof s.op === "string") {
 					if (OPS.indexOf(s.op) < 0) throw new TypeError("invalid `op` value: " + JSON.stringify(s.op));
 					return s.op.replace(/[\s\S]/g, "\\$&");
 				}
-				if (typeof s.comment === "string") {
+				if ("comment" in s && typeof s.comment === "string") {
 					if (LINE_TERMINATORS.test(s.comment)) throw new TypeError("`comment` must not contain line terminators");
+					sawComment = true;
 					return "#" + s.comment;
 				}
 				throw new TypeError("unrecognized object token shape");
 			}
-			if (/["\s\\]/.test(s) && !/'/.test(s)) return "'" + s.replace(/(['])/g, "\\$1") + "'";
-			if (/["'\s]/.test(s)) return "\"" + s.replace(/(["\\$`!])/g, "\\$1") + "\"";
-			return String(s).replace(/([A-Za-z]:)?([#!"$&'()*,:;<=>?@[\\\]^`{|}])/g, "$1\\$2");
+			if (/'/.test(s) && /!/.test(s)) return "'" + s.replace(/'/g, "'\"'\"'") + "'";
+			if (/["\s\\]/.test(s) && !/'/.test(s)) return "'" + s + "'";
+			if (/["'\s]/.test(s)) return "\"" + s.replace(/(["\\$`])/g, "\\$1") + "\"";
+			return String(s).replace(/([A-Za-z]:)?([#!"$&'()*,:;<=>?@[\\\]^`{|}~])/g, "$1\\$2");
 		}).join(" ");
 	};
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/shell-quote@1.8.4/node_modules/shell-quote/parse.js
+//#region ../../node_modules/.pnpm/shell-quote@1.12.0/node_modules/shell-quote/parse.js
 var require_parse = /* @__PURE__ */ __commonJSMin(((exports, module) => {
+	/**
+	* @import {
+	* 	ControlOperator,
+	* 	Env,
+	* 	GlobPattern,
+	* 	ParseEntry,
+	* } from './parse' */
 	var CONTROL = "(?:" + [
 		"\\|\\|",
-		"\\&\\&",
-		";;",
-		"\\|\\&",
+		"\\&(?:\\&|>>?)",
+		";;\\&?",
+		"[;|]\\&",
 		"\\<\\(",
 		"\\<\\<\\<",
+		"\\<\\<-",
+		"\\<\\<(?!\\()",
 		">>",
-		">\\&",
-		"<\\&",
+		">[&|(]",
+		"<[&>]",
 		"[&;()|<>]"
 	].join("|") + ")";
 	var controlRE = new RegExp("^" + CONTROL + "$");
 	var META = "|&;()<> \\t";
-	var SINGLE_QUOTE = "\"((\\\\\"|[^\"])*?)\"";
-	var DOUBLE_QUOTE = "'((\\\\'|[^'])*?)'";
+	var SINGLE_QUOTE = "'([^']*?)'";
+	var ANSI_C_BODY = "(?:\\\\[\\s\\S]|[^\\\\'])*?";
+	var ANSI_C_QUOTE = "\\$'" + ANSI_C_BODY + "'";
+	var ansiCAt = new RegExp("\\$'" + ANSI_C_BODY + "(?:(')|\\\\?$)", "g");
+	var ANSI_C_LETTERS = "abeEfnrtv";
+	var ANSI_C_CHARS = "\x07\b\x1B\x1B\f\n\r	\v";
 	var hash = /^#$/;
 	var SQ = "'";
 	var DQ = "\"";
@@ -13916,17 +13946,26 @@ var require_parse = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	var mult = 4294967296;
 	for (var i = 0; i < 4; i++) TOKEN += (mult * Math.random()).toString(16);
 	var startsWithToken = new RegExp("^" + TOKEN);
+	/**
+	* @param {string} s
+	* @param {RegExp} r
+	*/
 	function matchAll(s, r) {
 		var origIndex = r.lastIndex;
 		var matches = [];
 		var matchObj;
 		while (matchObj = r.exec(s)) {
-			matches.push(matchObj);
+			matches[matches.length] = matchObj;
 			if (r.lastIndex === matchObj.index) r.lastIndex += 1;
 		}
 		r.lastIndex = origIndex;
 		return matches;
 	}
+	/**
+	* @param {Env} env
+	* @param {string} pre
+	* @param {string} key
+	*/
 	function getVar(env, pre, key) {
 		var r = typeof env === "function" ? env(key) : env[key];
 		if (typeof r === "undefined" && key != "") r = "";
@@ -13934,11 +13973,51 @@ var require_parse = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		if (typeof r === "object") return pre + TOKEN + JSON.stringify(r) + TOKEN;
 		return pre + r;
 	}
+	var ansiCEscape = /\\([0-7]{1,3}|x[\dA-Fa-f]{1,2}|u[\dA-Fa-f]{1,4}|U[\dA-Fa-f]{1,8}|c(?:\\\\|[\s\S])|[abeEfnrtv\\'"?])/g;
+	/**
+	* @param {string} m
+	* @param {string} escape
+	*/
+	function expandAnsiCEscape(m, escape) {
+		var kind = escape.charAt(0);
+		if (kind === "c") {
+			var ctrl = escape.charAt(1);
+			return ctrl === "?" ? "" : String.fromCharCode(ctrl.charCodeAt(0) & 31);
+		}
+		if (kind === "x" || kind === "u" || kind === "U") {
+			var cp = parseInt(escape.slice(1), 16);
+			if (cp > 1114111) return m;
+			return String.fromCharCode.apply(null, cp > 65535 ? [55232 + (cp >> 10), 56320 + (cp & 1023)] : [cp]);
+		}
+		if (kind >= "0" && kind <= "7") return String.fromCharCode(parseInt(escape, 8) & 255);
+		var letter = ANSI_C_LETTERS.indexOf(escape);
+		return letter < 0 ? escape : ANSI_C_CHARS.charAt(letter);
+	}
+	/** @param {string} body */
+	function expandAnsiC(body) {
+		return body.replace(ansiCEscape, expandAnsiCEscape).split("\0")[0];
+	}
+	/**
+	* @param {string} s
+	* @param {number} i
+	*/
+	function closesAnsiC(s, i) {
+		ansiCAt.lastIndex = i;
+		return !!ansiCAt.exec(s)[1];
+	}
+	/**
+	* @param {string} string
+	* @param {Env} [env]
+	* @param {{ escape?: string, splitUnquoted?: boolean | string }} [opts]
+	* @returns {ParseEntry[]}
+	*/
 	function parseInternal(string, env, opts) {
 		if (!opts) opts = {};
 		var BS = opts.escape || "\\";
-		var BAREWORD = "(\\" + BS + "['\"" + META + "]|[^\\s'\"" + META + "])+";
-		var matches = matchAll(string, new RegExp(["(" + CONTROL + ")", "(" + BAREWORD + "|" + SINGLE_QUOTE + "|" + DOUBLE_QUOTE + ")+"].join("|"), "g"));
+		var ifs = opts.splitUnquoted === true ? " 	\n" : typeof opts.splitUnquoted === "string" ? opts.splitUnquoted : "";
+		var BAREWORD = "(\\" + BS + "['\"$\\" + BS + META + "]|\\$\\$|\\$(?!" + ANSI_C_QUOTE.slice(2) + ")|[^\\s'\"$" + META + "])+";
+		var DOUBLE_QUOTE = "\"(?:\\" + BS + "[\\s\\S]|[^\"\\" + BS + "])*\"";
+		var matches = matchAll(string, new RegExp(["(" + CONTROL + ")", "(" + ANSI_C_QUOTE + "|" + BAREWORD + "|" + DOUBLE_QUOTE + "|" + SINGLE_QUOTE + ")+"].join("|"), "g"));
 		if (matches.length === 0) return [];
 		if (!env) env = {};
 		var commented = false;
@@ -13946,27 +14025,41 @@ var require_parse = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 			var s = match[0];
 			if (!s || commented) return;
 			if (controlRE.test(s)) return { op: s };
+			/** @type {string | boolean} */
 			var quote = false;
 			var esc = false;
 			var out = "";
+			/** @type {string[]} */
+			var words = [];
+			var sawQuote = false;
+			/** @type {number | null} */
+			var pendingNw = null;
 			var isGlob = false;
+			/** @type {number} */
 			var i;
 			function parseEnvVar() {
 				i += 1;
+				/** @type {number | RegExpMatchArray | null} */
 				var varend;
+				/** @type {string} */
 				var varname;
 				var char = s.charAt(i);
 				if (char === "{") {
 					i += 1;
 					if (s.charAt(i) === "}") throw new Error("Bad substitution: " + s.slice(i - 2, i + 1));
-					varend = s.indexOf("}", i);
-					if (varend < 0) throw new Error("Bad substitution: " + s.slice(i));
+					var depth = 1;
+					varend = i;
+					while (depth > 0 && varend < s.length) {
+						if (s.charAt(varend) === "{" && s.charAt(varend - 1) === "$") depth += 1;
+						else if (s.charAt(varend) === "}") depth -= 1;
+						varend += 1;
+					}
+					if (depth !== 0) throw new Error("Bad substitution: " + s.slice(i));
+					varend -= 1;
 					varname = s.slice(i, varend);
 					i = varend;
-				} else if (/[*@#?$!_-]/.test(char)) {
-					varname = char;
-					i += 1;
-				} else {
+				} else if (/[*@#?$!-]/.test(char)) varname = char;
+				else {
 					var slicedFromI = s.slice(i);
 					varend = slicedFromI.match(/[^\w\d_]/);
 					if (!varend) {
@@ -13979,8 +14072,23 @@ var require_parse = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 				}
 				return getVar(env, "", varname);
 			}
+			function flushRun() {
+				if (pendingNw === null) return;
+				if (pendingNw === 0) {
+					if (out !== "") {
+						words[words.length] = out;
+						out = "";
+					}
+				} else {
+					words[words.length] = out;
+					out = "";
+					for (var fe = 1; fe < pendingNw; fe += 1) words[words.length] = "";
+				}
+				pendingNw = null;
+			}
 			for (i = 0; i < s.length; i++) {
 				var c = s.charAt(i);
+				if (ifs && c !== DS) flushRun();
 				isGlob = isGlob || !quote && (c === "*" || c === "?");
 				if (esc) {
 					out += c;
@@ -13995,48 +14103,85 @@ var require_parse = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 						else out += BS + c;
 					} else if (c === DS) out += parseEnvVar();
 					else out += c;
-				} else if (c === DQ || c === SQ) quote = c;
-				else if (controlRE.test(c)) return { op: s };
+				} else if (c === DQ || c === SQ) {
+					quote = c;
+					sawQuote = true;
+				} else if (controlRE.test(c)) return { op: s };
 				else if (hash.test(c)) {
 					commented = true;
 					var commentObj = { comment: string.slice(match.index + i + 1) };
 					if (out.length) return [out, commentObj];
 					return [commentObj];
 				} else if (c === BS) esc = true;
-				else if (c === DS) out += parseEnvVar();
-				else out += c;
+				else if (c === DS && s.charAt(i + 1) === SQ && closesAnsiC(s, i)) {
+					flushRun();
+					sawQuote = true;
+					out += expandAnsiC(s.slice(i + 2, ansiCAt.lastIndex - 1));
+					i = ansiCAt.lastIndex - 1;
+				} else if (c === DS) {
+					var value = parseEnvVar();
+					if (!ifs) out += value;
+					else for (var vi = 0; vi < value.length; vi += 1) {
+						var vc = value.charAt(vi);
+						if (ifs.indexOf(vc) < 0) {
+							flushRun();
+							out += vc;
+						} else if (pendingNw === null) pendingNw = vc === " " || vc === "	" || vc === "\n" ? 0 : 1;
+						else if (vc !== " " && vc !== "	" && vc !== "\n") pendingNw += 1;
+					}
+				} else out += c;
 			}
 			if (isGlob) return {
 				op: "glob",
 				pattern: out
 			};
+			if (ifs) {
+				if (pendingNw !== null && pendingNw > 0) {
+					words[words.length] = out;
+					out = "";
+					for (var te = 1; te < pendingNw; te += 1) words[words.length] = "";
+				}
+				if (out !== "" || sawQuote && words.length === 0) words[words.length] = out;
+				return words;
+			}
 			return out;
 		}).reduce(function(prev, arg) {
-			return typeof arg === "undefined" ? prev : prev.concat(arg);
+			if (typeof arg === "undefined") return prev;
+			/** @type {ParseEntry[]} */ [].concat(arg).forEach(function(entry) {
+				prev[prev.length] = entry;
+			});
+			return prev;
 		}, []);
 	}
+	/** @type {typeof import('./parse')} */
 	module.exports = function parse(s, env, opts) {
 		var mapped = parseInternal(s, env, opts);
 		if (typeof env !== "function") return mapped;
 		return mapped.reduce(function(acc, s) {
-			if (typeof s === "object") return acc.concat(s);
+			if (typeof s === "object") {
+				acc[acc.length] = s;
+				return acc;
+			}
 			var xs = s.split(RegExp("(" + TOKEN + ".*?" + TOKEN + ")", "g"));
-			if (xs.length === 1) return acc.concat(xs[0]);
-			return acc.concat(xs.filter(Boolean).map(function(x) {
-				if (startsWithToken.test(x)) return JSON.parse(x.split(TOKEN)[1]);
-				return x;
-			}));
+			if (xs.length === 1) {
+				acc[acc.length] = xs[0];
+				return acc;
+			}
+			xs.filter(Boolean).forEach(function(x) {
+				acc[acc.length] = startsWithToken.test(x) ? JSON.parse(x.split(TOKEN)[1]) : x;
+			});
+			return acc;
 		}, []);
 	};
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/shell-quote@1.8.4/node_modules/shell-quote/index.js
+//#region ../../node_modules/.pnpm/shell-quote@1.12.0/node_modules/shell-quote/index.js
 var require_shell_quote = /* @__PURE__ */ __commonJSMin(((exports) => {
 	exports.quote = require_quote();
 	exports.parse = require_parse();
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/editor-info/macos.js
+//#region ../../node_modules/.pnpm/launch-editor@2.14.2/node_modules/launch-editor/editor-info/macos.js
 var require_macos = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = {
 		"/Applications/Atom.app/Contents/MacOS/Atom": "atom",
@@ -14071,7 +14216,7 @@ var require_macos = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	};
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/editor-info/linux.js
+//#region ../../node_modules/.pnpm/launch-editor@2.14.2/node_modules/launch-editor/editor-info/linux.js
 var require_linux = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = {
 		atom: "atom",
@@ -14105,7 +14250,7 @@ var require_linux = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	};
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/editor-info/windows.js
+//#region ../../node_modules/.pnpm/launch-editor@2.14.2/node_modules/launch-editor/editor-info/windows.js
 var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = [
 		"Brackets.exe",
@@ -14138,9 +14283,9 @@ var require_windows = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	];
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/guess.js
+//#region ../../node_modules/.pnpm/launch-editor@2.14.2/node_modules/launch-editor/guess.js
 var require_guess = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const path$5 = __require("path");
+	const path$6 = __require("path");
 	const shellQuote = require_shell_quote();
 	const childProcess$2 = __require("child_process");
 	const COMMON_EDITORS_MACOS = require_macos();
@@ -14164,7 +14309,7 @@ var require_guess = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 		const runningProcesses = output.split("\r\n");
 		for (let i = 0; i < runningProcesses.length; i++) {
 			const fullProcessPath = runningProcesses[i].trim();
-			const shortProcessName = path$5.win32.basename(fullProcessPath);
+			const shortProcessName = path$6.win32.basename(fullProcessPath);
 			if (COMMON_EDITORS_WIN.indexOf(shortProcessName) !== -1) return fullProcessPath;
 		}
 	}
@@ -14213,11 +14358,15 @@ var require_guess = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports.getEditorFromLinuxProcesses = getEditorFromLinuxProcesses;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/get-args.js
+//#region ../../node_modules/.pnpm/launch-editor@2.14.2/node_modules/launch-editor/get-args.js
 var require_get_args = /* @__PURE__ */ __commonJSMin(((exports, module) => {
-	const path$4 = __require("path");
-	module.exports = function getArgumentsForPosition(editor, fileName, lineNumber, columnNumber = 1) {
-		switch (path$4.basename(editor).replace(/\.(exe|cmd|bat)$/i, "")) {
+	const os$1 = __require("os");
+	const path$5 = __require("path");
+	module.exports = function getArgumentsForFile(editor, fileName, lineNumber, columnNumber = 1) {
+		fileName = path$5.resolve(fileName);
+		if (process.platform === "linux" && fileName.startsWith("/mnt/") && /Microsoft/i.test(os$1.release())) fileName = `./${path$5.relative("", fileName)}`;
+		if (!lineNumber) return [fileName];
+		switch (path$5.basename(editor).replace(/\.(exe|cmd|bat)$/i, "")) {
 			case "atom":
 			case "Atom":
 			case "Atom Beta":
@@ -14292,7 +14441,42 @@ var require_get_args = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	};
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/launch-editor@2.14.1/node_modules/launch-editor/index.js
+//#region ../../node_modules/.pnpm/launch-editor@2.14.2/node_modules/launch-editor/construct-windows-launch-command.js
+var require_construct_windows_launch_command = /* @__PURE__ */ __commonJSMin(((exports, module) => {
+	function escapeCmdArgs(cmdArgs) {
+		return cmdArgs.replace(/([&|<>,;=^])/g, "^$1");
+	}
+	function doubleQuoteIfNeeded(str) {
+		if (str.includes("^")) return `^"${str}^"`;
+		else if (str.includes(" ")) return `"${str}"`;
+		return str;
+	}
+	function constructWindowsLaunchCommand(editor, args) {
+		if (args.some((arg) => /[\r\n]/.test(arg))) throw new Error("Cannot launch an editor with an argument containing a line break");
+		if (args.some((arg) => arg.includes("%"))) throw new Error("Cannot launch an editor with an argument containing \"%\"");
+		return [editor, ...args.map(escapeCmdArgs)].map(doubleQuoteIfNeeded).join(" ");
+	}
+	module.exports = constructWindowsLaunchCommand;
+}));
+//#endregion
+//#region ../../node_modules/.pnpm/launch-editor@2.14.2/node_modules/launch-editor/parse-file.js
+var require_parse_file = /* @__PURE__ */ __commonJSMin(((exports, module) => {
+	const path$4 = __require("path");
+	const positionRE = /:(\d+)(:(\d+))?$/;
+	module.exports = function parseFile(file) {
+		if (file.startsWith("file://")) file = __require("url").fileURLToPath(file);
+		const unresolvedFileName = file.replace(positionRE, "");
+		const fileName = unresolvedFileName ? path$4.resolve(unresolvedFileName) : "";
+		const match = file.match(positionRE);
+		return {
+			fileName,
+			lineNumber: match && match[1],
+			columnNumber: match && match[3]
+		};
+	};
+}));
+//#endregion
+//#region ../../node_modules/.pnpm/launch-editor@2.14.2/node_modules/launch-editor/index.js
 var require_launch_editor = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	/**
 	* Copyright (c) 2015-present, Facebook, Inc.
@@ -14304,12 +14488,13 @@ var require_launch_editor = /* @__PURE__ */ __commonJSMin(((exports, module) =>
 	* Modified by Yuxi Evan You
 	*/
 	const fs$2 = __require("fs");
-	const os$1 = __require("os");
 	const path$3 = __require("path");
 	const colors = require_picocolors();
 	const childProcess$1 = __require("child_process");
 	const guessEditor = require_guess();
-	const getArgumentsForPosition = require_get_args();
+	const getArgumentsForFile = require_get_args();
+	const constructWindowsLaunchCommand = require_construct_windows_launch_command();
+	const parseFile = require_parse_file();
 	function wrapErrorCallback(cb) {
 		return (fileName, errorMessage) => {
 			console.log();
@@ -14330,55 +14515,36 @@ var require_launch_editor = /* @__PURE__ */ __commonJSMin(((exports, module) =>
 		}
 		return false;
 	}
-	const positionRE = /:(\d+)(:(\d+))?$/;
-	function parseFile(file) {
-		if (file.startsWith("file://")) file = __require("url").fileURLToPath(file);
-		const fileName = file.replace(positionRE, "");
-		const match = file.match(positionRE);
-		return {
-			fileName,
-			lineNumber: match && match[1],
-			columnNumber: match && match[3]
-		};
-	}
 	let currentChildProcess = null;
 	function launchEditor(file, specifiedEditor, onErrorCallback) {
-		const parsed = parseFile(file);
-		let { fileName } = parsed;
-		const { lineNumber, columnNumber } = parsed;
-		if (process.platform === "win32" && path$3.resolve(fileName).startsWith("\\\\")) return onErrorCallback(fileName, "UNC paths are not supported on Windows to avoid security issues. See https://github.com/vitejs/launch-editor/tree/main/packages/launch-editor#unc-paths-on-windows for details.");
-		if (!fs$2.existsSync(fileName)) return;
+		const { fileName, lineNumber, columnNumber } = parseFile(file);
 		if (typeof specifiedEditor === "function") {
 			onErrorCallback = specifiedEditor;
 			specifiedEditor = void 0;
 		}
 		onErrorCallback = wrapErrorCallback(onErrorCallback);
+		if (process.platform === "win32" && fileName.startsWith("\\\\")) return onErrorCallback(fileName, "UNC paths are not supported on Windows to avoid security issues. See https://github.com/vitejs/launch-editor/tree/main/packages/launch-editor#unc-paths-on-windows for details.");
+		if (!fs$2.existsSync(fileName)) return;
 		const [editor, ...args] = guessEditor(specifiedEditor);
 		if (!editor) {
 			onErrorCallback(fileName, null);
 			return;
 		}
-		if (process.platform === "linux" && fileName.startsWith("/mnt/") && /Microsoft/i.test(os$1.release())) fileName = path$3.relative("", fileName);
-		if (lineNumber) {
-			const extraArgs = getArgumentsForPosition(editor, fileName, lineNumber, columnNumber);
-			args.push.apply(args, extraArgs);
-		} else args.push(fileName);
+		const extraArgs = getArgumentsForFile(editor, fileName, lineNumber, columnNumber);
+		args.push.apply(args, extraArgs);
+		let launchCommand;
+		if (process.platform === "win32") try {
+			launchCommand = constructWindowsLaunchCommand(editor, args);
+		} catch (error) {
+			onErrorCallback(fileName, error.message);
+			return;
+		}
 		if (currentChildProcess && isTerminalEditor(editor)) currentChildProcess.kill("SIGKILL");
-		if (process.platform === "win32") {
-			function escapeCmdArgs(cmdArgs) {
-				return cmdArgs.replace(/([&|<>,;=^])/g, "^$1");
-			}
-			function doubleQuoteIfNeeded(str) {
-				if (str.includes("^")) return `^"${str}^"`;
-				else if (str.includes(" ")) return `"${str}"`;
-				return str;
-			}
-			const launchCommand = [editor, ...args.map(escapeCmdArgs)].map(doubleQuoteIfNeeded).join(" ");
-			currentChildProcess = childProcess$1.exec(launchCommand, {
-				stdio: "inherit",
-				shell: true
-			});
-		} else currentChildProcess = childProcess$1.spawn(editor, args, { stdio: "inherit" });
+		if (process.platform === "win32") currentChildProcess = childProcess$1.exec(launchCommand, {
+			stdio: "inherit",
+			shell: true
+		});
+		else currentChildProcess = childProcess$1.spawn(editor, args, { stdio: "inherit" });
 		currentChildProcess.on("exit", function(errorCode) {
 			currentChildProcess = null;
 			if (errorCode) onErrorCallback(fileName, "(code " + errorCode + ")");
@@ -14392,7 +14558,7 @@ var require_launch_editor = /* @__PURE__ */ __commonJSMin(((exports, module) =>
 	module.exports = launchEditor;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/launch-editor-middleware@2.14.1/node_modules/launch-editor-middleware/index.js
+//#region ../../node_modules/.pnpm/launch-editor-middleware@2.14.2/node_modules/launch-editor-middleware/index.js
 var require_launch_editor_middleware = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const path$2 = __require("path");
 	const launch = require_launch_editor();
@@ -17134,9 +17300,10 @@ async function createClientConfigValueReplacer(config) {
 	const hmrTimeoutReplacement = escapeReplacement(timeout);
 	const hmrEnableOverlayReplacement = escapeReplacement(overlay);
 	const hmrConfigNameReplacement = escapeReplacement(hmrConfigName);
+	const hmrPartialAcceptReplacement = escapeReplacement(config.experimental.hmrPartialAccept);
 	const wsTokenReplacement = escapeReplacement(config.webSocketToken);
 	const serverForwardConsoleReplacement = escapeReplacement(config.server.forwardConsole);
-	return (code) => code.replace(`__MODE__`, modeReplacement).replace(/__BASE__/g, baseReplacement).replace(`__SERVER_HOST__`, serverHostReplacement).replace(`__HMR_PROTOCOL__`, hmrProtocolReplacement).replace(`__HMR_HOSTNAME__`, hmrHostnameReplacement).replace(`__HMR_PORT__`, hmrPortReplacement).replace(`__HMR_DIRECT_TARGET__`, hmrDirectTargetReplacement).replace(`__HMR_BASE__`, hmrBaseReplacement).replace(`__HMR_TIMEOUT__`, hmrTimeoutReplacement).replace(`__HMR_ENABLE_OVERLAY__`, hmrEnableOverlayReplacement).replace(`__HMR_CONFIG_NAME__`, hmrConfigNameReplacement).replace(`__WS_TOKEN__`, wsTokenReplacement).replace(`__SERVER_FORWARD_CONSOLE__`, serverForwardConsoleReplacement);
+	return (code) => code.replace(`__MODE__`, modeReplacement).replace(/__BASE__/g, baseReplacement).replace(`__SERVER_HOST__`, serverHostReplacement).replace(`__HMR_PROTOCOL__`, hmrProtocolReplacement).replace(`__HMR_HOSTNAME__`, hmrHostnameReplacement).replace(`__HMR_PORT__`, hmrPortReplacement).replace(`__HMR_DIRECT_TARGET__`, hmrDirectTargetReplacement).replace(`__HMR_BASE__`, hmrBaseReplacement).replace(`__HMR_TIMEOUT__`, hmrTimeoutReplacement).replace(`__HMR_ENABLE_OVERLAY__`, hmrEnableOverlayReplacement).replace(`__HMR_CONFIG_NAME__`, hmrConfigNameReplacement).replace(`__HMR_PARTIAL_ACCEPT__`, hmrPartialAcceptReplacement).replace(`__WS_TOKEN__`, wsTokenReplacement).replace(`__SERVER_FORWARD_CONSOLE__`, serverForwardConsoleReplacement);
 }
 const ROLLDOWN_DEV_RUNTIME_ENTRY = "rolldown/experimental/runtime";
 async function getHmrImplementation(config) {
@@ -17159,6 +17326,34 @@ function getRolldownDevRuntimeFiles() {
 	if (!files.has(`@rolldown/${path.basename(entry)}`)) throw new Error(`rolldown dev runtime entry ${entry} was not found`);
 	return files;
 }
+function getBundledDevClientAliases(config) {
+	const clientUrl = path.posix.join(config.base, BUNDLED_DEV_CLIENT_FILENAME);
+	return /* @__PURE__ */ new Map([[CLIENT_PUBLIC_PATH.slice(1), `export * from ${JSON.stringify(clientUrl)}`], [ENV_PUBLIC_PATH.slice(1), ""]]);
+}
+function bundledDevClientImportsPlugin(config) {
+	const clientUrl = path.posix.join(config.base, BUNDLED_DEV_CLIENT_FILENAME);
+	return {
+		name: "vite:bundled-dev-client-imports",
+		applyToEnvironment(environment) {
+			return config.command === "serve" && environment.config.isBundled && environment.config.consumer === "client";
+		},
+		resolveId: {
+			filter: { id: [exactRegex(clientUrl), exactRegex(path.posix.join(config.base, CLIENT_PUBLIC_PATH))] },
+			handler() {
+				return {
+					id: clientUrl,
+					external: true
+				};
+			}
+		},
+		load: {
+			filter: { id: new RegExp(`^(?:${escapeRegex(normalizedClientEntry$1)}|${escapeRegex(normalizedEnvEntry$1)})(?:\\?.*)?$`) },
+			handler(id) {
+				return cleanUrl(id) === normalizedClientEntry$1 ? `export * from ${JSON.stringify(clientUrl)}` : "";
+			}
+		}
+	};
+}
 //#endregion
 //#region ../../node_modules/.pnpm/convert-source-map@2.0.0/node_modules/convert-source-map/index.js
 var require_convert_source_map = /* @__PURE__ */ __commonJSMin(((exports) => {
@@ -17793,11 +17988,7 @@ function serveStaticMiddleware(server) {
 		const url = new URL(req.url, "http://example.com");
 		const pathname = decodeURIIfPossible(url.pathname);
 		if (pathname === void 0) return next();
-		let redirectedPathname;
-		for (const { find, replacement } of server.config.resolve.alias) if (typeof find === "string" ? pathname.startsWith(find) : find.test(pathname)) {
-			redirectedPathname = pathname.replace(find, replacement);
-			break;
-		}
+		let redirectedPathname = applyStaticAlias(pathname, server.config.resolve.alias);
 		if (redirectedPathname) {
 			if (redirectedPathname.startsWith(withTrailingSlash(dir))) redirectedPathname = redirectedPathname.slice(dir.length);
 		}
@@ -17819,6 +18010,9 @@ function serveStaticMiddleware(server) {
 		}
 	};
 }
+function applyStaticAlias(pathname, aliases) {
+	for (const { find, replacement } of aliases) if (typeof find === "string" ? pathname === find || pathname.startsWith(`${find}/`) : find.test(pathname)) return pathname.replace(find, replacement);
+}
 function serveRawFsMiddleware(server) {
 	const serveFromRoot = build_default$1("/", sirvOptions({
 		config: server.config,
@@ -17941,8 +18135,9 @@ function createDevHtmlTransformFn(config) {
 	};
 }
 function getHtmlFilename(url, server) {
-	if (url.startsWith(FS_PREFIX)) return decodeURIComponent(fsPathFromId(url));
-	else return decodeURIComponent(normalizePath(path.join(server.config.root, url.slice(1))));
+	const urlPath = cleanUrl(url);
+	if (urlPath.startsWith(FS_PREFIX)) return decodeURIComponent(fsPathFromId(urlPath));
+	else return decodeURIComponent(normalizePath(path.join(server.config.root, urlPath.slice(1))));
 }
 function shouldPreTransform(url, config) {
 	return !checkPublicFile(url, config) && (isJSRequest(url) || isCSSRequest(url));
@@ -17954,6 +18149,7 @@ function isBareRelative(url) {
 function getHtmlDirnameForRelativeUrl(htmlPath) {
 	return htmlPath.endsWith("/") ? htmlPath : path.posix.dirname(htmlPath);
 }
+const multipleLeadingSlashesRE = /^\/{2,}/g;
 const processNodeUrl = (url, useSrcSetReplacer, config, htmlPath, originalUrl, server, isClassicScriptLink) => {
 	const replacer = (url) => {
 		if (url[0] === "/" && url[1] !== "/" || (url[0] === "." || isBareRelative(url)) && originalUrl && originalUrl !== "/" && htmlPath === "/index.html") url = path.posix.join(config.base, url);
@@ -17979,13 +18175,15 @@ const processNodeUrl = (url, useSrcSetReplacer, config, htmlPath, originalUrl, s
 	return useSrcSetReplacer ? processSrcSetSync(url, ({ url }) => replacer(url)) : replacer(url);
 };
 const devHtmlHook = async (html, { path: htmlPath, filename, server, originalUrl }) => {
+	if (htmlPath.startsWith("//")) htmlPath = htmlPath.replace(multipleLeadingSlashesRE, "/");
 	const { config, watcher } = server;
 	const base = config.base || "/";
 	const decodedBase = config.decodedBase || "/";
 	let proxyModulePath;
 	let proxyModuleUrl;
 	const trailingSlash = htmlPath.endsWith("/");
-	if (!trailingSlash && fs.existsSync(filename)) {
+	if (!trailingSlash && tryStatSync(filename)?.isFile()) {
+		ensureWatchedFile(watcher, filename, config.root);
 		proxyModulePath = htmlPath.startsWith(FS_PREFIX) ? filename : htmlPath;
 		proxyModuleUrl = htmlPath;
 	} else {
@@ -18067,7 +18265,6 @@ const devHtmlHook = async (html, { path: htmlPath, filename, server, originalUrl
 	await Promise.all([...styleUrl.map(async ({ start, end, code }, index) => {
 		const url = `${proxyModulePath}?html-proxy&direct&index=${index}.css`;
 		const mod = await server.environments.client.moduleGraph.ensureEntryFromUrl(url, false);
-		ensureWatchedFile(watcher, mod.file, config.root);
 		const result = await server.environments.client.pluginContainer.transform(code, mod.id);
 		let content = "";
 		if (result.map && "version" in result.map) {
@@ -18078,7 +18275,6 @@ const devHtmlHook = async (html, { path: htmlPath, filename, server, originalUrl
 	}), ...inlineStyles.map(async ({ index, location, code }) => {
 		const url = `${proxyModulePath}?html-proxy&inline-css&style-attr&index=${index}.css`;
 		const mod = await server.environments.client.moduleGraph.ensureEntryFromUrl(url, false);
-		ensureWatchedFile(watcher, mod.file, config.root);
 		await server?.environments.client.pluginContainer.transform(code, mod.id);
 		const hash = getHash(cleanUrl(mod.id));
 		const result = htmlProxyResult.get(`${hash}_${index}`);
@@ -18246,7 +18442,7 @@ function memoryFilesMiddleware(server) {
 				}
 				res.setHeader("Etag", file.etag);
 			}
-			const mime = lookup(filePath);
+			const mime = file.contentType ?? lookup(filePath);
 			if (mime) res.setHeader("Content-Type", mime);
 			for (const name in headers) res.setHeader(name, headers[name]);
 			return res.end(file.source);
@@ -20114,8 +20310,9 @@ const urlRE = /[?&]url\b/;
 const rawRE = /[?&]raw\b/;
 const inlineRE$3 = /[?&]inline\b/;
 const svgRE = /\.svg\b/;
+const wasmInstanceRE$1 = /[?&]vite-wasm-instance(?:&|$)/;
 function isServerAccessDeniedForTransform(config, id) {
-	if (rawRE.test(id) || urlRE.test(id) || inlineRE$3.test(id) || svgRE.test(id)) return checkLoadingAccess(config, cleanUrl(id)) !== "allowed" || checkLoadingAccess(config, id) !== "allowed";
+	if (rawRE.test(id) || urlRE.test(id) || inlineRE$3.test(id) || svgRE.test(id) || wasmInstanceRE$1.test(id)) return checkLoadingAccess(config, cleanUrl(id)) !== "allowed" || checkLoadingAccess(config, id) !== "allowed";
 	return false;
 }
 /**
@@ -24625,6 +24822,11 @@ function createServer$2(inlineConfig = {}) {
 }
 async function _createServer(inlineConfig = {}, options) {
 	disableCache();
+	const restartState = options.restartState ?? {
+		promise: null,
+		pending: false,
+		forceOptimize: false
+	};
 	const config = isResolvedConfig(inlineConfig) ? inlineConfig : await resolveConfig(inlineConfig, "serve");
 	if (usedConfigs.has(config)) throw new Error(`There is already a server associated with the config.`);
 	if (config.command !== "serve") throw new Error(`Config was resolved for a "build", expected a "serve" command.`);
@@ -24788,14 +24990,24 @@ async function _createServer(inlineConfig = {}, options) {
 			bindCLIShortcuts(server, options);
 		},
 		async restart(forceOptimize) {
-			if (!server._restartPromise) {
-				server._forceOptimizeOnRestart = !!forceOptimize;
-				server._restartPromise = restartServer(server).finally(() => {
-					server._restartPromise = null;
-					server._forceOptimizeOnRestart = false;
-				});
+			restartState.forceOptimize ||= !!forceOptimize;
+			if (restartState.promise) {
+				restartState.pending = true;
+				return restartState.promise;
 			}
-			return server._restartPromise;
+			restartState.promise = (async () => {
+				try {
+					do {
+						restartState.pending = false;
+						await restartServer(server, restartState);
+					} while (restartState.pending);
+				} finally {
+					restartState.promise = null;
+					restartState.pending = false;
+					restartState.forceOptimize = false;
+				}
+			})();
+			return restartState.promise;
 		},
 		waitForRequestsIdle(ignoredId) {
 			return environments.client.waitForRequestsIdle(ignoredId);
@@ -24807,8 +25019,6 @@ async function _createServer(inlineConfig = {}, options) {
 			if (!closeServerPromise) closeServerPromise = closeServer(reason);
 			return closeServerPromise;
 		},
-		_restartPromise: options.previousRestartPromise ?? null,
-		_forceOptimizeOnRestart: options.previousForceOptimizeOnRestart ?? false,
 		_shortcutsState: options.previousShortcutsState
 	};
 	const reflexServer = new Proxy(server, {
@@ -25061,10 +25271,10 @@ async function resolveServerOptions(root, raw, logger) {
 	}
 	return server;
 }
-async function restartServer(server) {
+async function restartServer(server, restartState) {
 	global.__vite_start_time = performance$1.now();
 	let inlineConfig = server.config.inlineConfig;
-	if (server._forceOptimizeOnRestart) inlineConfig = mergeConfig(inlineConfig, { forceOptimizeDeps: true });
+	if (restartState.forceOptimize) inlineConfig = mergeConfig(inlineConfig, { forceOptimizeDeps: true });
 	{
 		let newServer = null;
 		try {
@@ -25072,8 +25282,7 @@ async function restartServer(server) {
 				listen: false,
 				previousEnvironments: server.environments,
 				previousShortcutsState: server._shortcutsState,
-				previousRestartPromise: server._restartPromise,
-				previousForceOptimizeOnRestart: server._forceOptimizeOnRestart
+				restartState
 			});
 		} catch (err) {
 			server.config.logger.error(err.message, { timestamp: true });
@@ -26491,8 +26700,8 @@ function importAnalysisPlugin(config) {
 					if (specifier === clientPublicPath) return;
 					if (specifier[0] === "/" && !(config.assetsInclude(cleanUrl(specifier)) || urlRE$1.test(specifier)) && checkPublicFile(specifier, config)) throw new Error(`Cannot import non-asset file ${specifier} which is inside /public. JS/CSS files inside /public are copied as-is on build and can only be referenced via <script src> or <link href> in html. If you want to get the URL of that file, use ${injectQuery(specifier, "url")} instead.`);
 					let [url, resolvedId] = await normalizeUrl(specifier, start);
+					if (resolvedId) config.safeModulePaths.add(cleanUrl(resolvedId));
 					resolvedId = resolvedId || url;
-					config.safeModulePaths.add(fsPathFromUrl(stripBase(url, base)));
 					if (url !== specifier) {
 						let rewriteDone = false;
 						if (!(depsOptimizer?.isOptimizedDepFile(importer) && specifier[0] === ".") && depsOptimizer?.isOptimizedDepFile(resolvedId) && !optimizedDepChunkRE.test(resolvedId)) {
@@ -26759,6 +26968,22 @@ function detectScriptRel() {
 	const relList = typeof document !== "undefined" && document.createElement("link").relList;
 	return relList && relList.supports && relList.supports("modulepreload") ? "modulepreload" : "preload";
 }
+function preloadOnce(seen, href, preload) {
+	if (href in seen) return seen[href];
+	const promise = preload();
+	if (!promise) {
+		seen[href] = void 0;
+		return;
+	}
+	const preloadPromise = promise.then(() => {
+		seen[href] = void 0;
+	}, (err) => {
+		seen[href] = void 0;
+		throw err;
+	});
+	seen[href] = preloadPromise;
+	return preloadPromise;
+}
 function preload(baseModule, deps, importerUrl) {
 	let promise = Promise.resolve();
 	if (__VITE_IS_MODERN__ && deps && deps.length > 0) {
@@ -26785,32 +27010,32 @@ function preload(baseModule, deps, importerUrl) {
 		promise = allSettled(deps.map((depString) => {
 			depString = assetsURL(depString, importerUrl);
 			const dep = importMetaResolve(depString);
-			if (dep.href in seen) return;
-			seen[dep.href] = true;
 			const isCss = isCssPreloadUrl(dep);
-			if (preloadedHrefs === void 0) {
-				preloadedHrefs = {
-					all: /* @__PURE__ */ new Set(),
-					styles: /* @__PURE__ */ new Set()
-				};
-				const links = document.getElementsByTagName("link");
-				for (let i = links.length - 1; i >= 0; i--) {
-					const link = links[i];
-					preloadedHrefs.all.add(link.href);
-					if (link.rel === "stylesheet") preloadedHrefs.styles.add(link.href);
-				}
-			}
-			if ((isCss ? preloadedHrefs.styles : preloadedHrefs.all).has(dep.href)) return;
-			const link = document.createElement("link");
-			link.rel = isCss ? "stylesheet" : scriptRel;
-			if (!isCss) link.as = "script";
-			link.crossOrigin = "";
-			link.href = dep.href;
-			if (cspNonce) link.setAttribute("nonce", cspNonce);
-			document.head.appendChild(link);
-			if (isCss) return new Promise((res, rej) => {
-				link.addEventListener("load", res);
-				link.addEventListener("error", () => rej(/* @__PURE__ */ new Error(`Unable to preload CSS for ${dep}`)));
+			return preloadOnce(seen, dep.href, () => {
+				if (preloadedHrefs === void 0) {
+					preloadedHrefs = {
+						all: /* @__PURE__ */ new Set(),
+						styles: /* @__PURE__ */ new Set()
+					};
+					const links = document.getElementsByTagName("link");
+					for (let i = links.length - 1; i >= 0; i--) {
+						const link = links[i];
+						preloadedHrefs.all.add(link.href);
+						if (link.rel === "stylesheet") preloadedHrefs.styles.add(link.href);
+					}
+				}
+				if ((isCss ? preloadedHrefs.styles : preloadedHrefs.all).has(dep.href)) return;
+				const link = document.createElement("link");
+				link.rel = isCss ? "stylesheet" : scriptRel;
+				if (!isCss) link.as = "script";
+				link.crossOrigin = "";
+				link.href = dep.href;
+				if (cspNonce) link.setAttribute("nonce", cspNonce);
+				document.head.appendChild(link);
+				if (isCss) return new Promise((res, rej) => {
+					link.addEventListener("load", res);
+					link.addEventListener("error", () => rej(/* @__PURE__ */ new Error(`Unable to preload CSS for ${dep}`)));
+				});
 			});
 		}).filter((p) => p !== void 0));
 	}
@@ -26833,7 +27058,7 @@ function getPreloadCode(environment, renderBuiltUrlBoolean, isRelativeBase) {
 	const scriptRel = modulePreload && modulePreload.polyfill ? `'modulepreload'` : `/* @__PURE__ */ (${detectScriptRel.toString()})()`;
 	const assetsURL = renderBuiltUrlBoolean || isRelativeBase ? `function(dep, importerUrl) { return new URL(dep, importerUrl).href }` : `function(dep) { return ${JSON.stringify(environment.config.base)}+dep }`;
 	const preloadMethodCode = preload.toString().replaceAll("𝐢𝐦𝐩𝐨𝐫𝐭", "import");
-	return `const scriptRel = ${scriptRel};const assetsURL = ${assetsURL};const seen = {};const isCssPreloadUrl = ${isCssPreloadUrl.toString()};export const ${preloadMethod} = ${preloadMethodCode}`;
+	return `const scriptRel = ${scriptRel};const assetsURL = ${assetsURL};const seen = {};const isCssPreloadUrl = ${isCssPreloadUrl.toString()};const preloadOnce = ${preloadOnce.toString()};export const ${preloadMethod} = ${preloadMethodCode}`;
 }
 /**
 * Build only. During serve this is performed as part of ./importAnalysis.
@@ -28071,9 +28296,10 @@ function rolldownScanPlugin(environment, depImports, missing, entries, jsxOption
 				if (htmlTypesRE.test(id)) {
 					const resolved = await resolve(id, importer);
 					if (!resolved) return;
-					if (isInNodeModules(resolved) && isOptimizable(resolved, optimizeDepsOptions)) return;
-					if (shouldExternalizeDep(resolved, id)) return externalUnlessEntry({ path: id });
-					return resolved;
+					if (!isInNodeModules(resolved) || !isOptimizable(resolved, optimizeDepsOptions)) {
+						if (shouldExternalizeDep(resolved, id)) return externalUnlessEntry({ path: id });
+						return resolved;
+					}
 				}
 				if (/^[\w@][^:]/.test(id)) {
 					if (moduleListContains(exclude, id)) return externalUnlessEntry({ path: id });
@@ -29759,7 +29985,7 @@ function cssPostPlugin(config) {
 					const cssContent = await getContentWithSourcemap(css);
 					return {
 						code: [
-							this.environment.config.isBundled ? `const { updateStyle: __vite__updateStyle, removeStyle: __vite__removeStyle } = import.meta.hot._internal` : `import { updateStyle as __vite__updateStyle, removeStyle as __vite__removeStyle } from ${JSON.stringify(path.posix.join(config.base, CLIENT_PUBLIC_PATH))}`,
+							`import { updateStyle as __vite__updateStyle, removeStyle as __vite__removeStyle } from ${JSON.stringify(path.posix.join(config.base, CLIENT_PUBLIC_PATH))}`,
 							`const __vite__id = ${JSON.stringify(id)}`,
 							`const __vite__css = ${JSON.stringify(cssContent)}`,
 							`__vite__updateStyle(__vite__id, __vite__css)`,
@@ -31062,10 +31288,10 @@ async function compileLightningCSS(environment, id, src, deps, workerController,
 					const code = fs.readFileSync(filePath, "utf-8");
 					const lang = CSS_LANGS_RE.exec(filePath)?.[1];
 					if (isPreProcessor(lang)) {
-						const result = await compileCSSPreprocessors(environment, id, lang, code, workerController);
+						const result = await compileCSSPreprocessors(environment, filePath, lang, code, workerController);
 						result.deps?.forEach((dep) => deps.add(dep));
 						return result.code;
-					} else if (lang === "sss") return (await transformSugarSS(environment, id, code)).code;
+					} else if (lang === "sss") return (await transformSugarSS(environment, filePath, code)).code;
 					return code;
 				},
 				async resolve(id, from) {
@@ -31513,13 +31739,14 @@ function getCssFilesForChunk(chunk, bundle, analyzedImportedCssFiles, seenChunks
 	}
 	const allFiles = [];
 	const filteredFiles = [];
+	let complete = true;
 	chunk.imports.forEach((file) => {
 		const importee = bundle[file];
 		if (importee?.type === "chunk") {
 			const importeeCss = getCssFilesForChunk(importee, bundle, analyzedImportedCssFiles, seenChunks, seenCss);
 			filteredFiles.push(...importeeCss);
 			if (analyzedImportedCssFiles.has(importee)) allFiles.push(...analyzedImportedCssFiles.get(importee));
-			else allFiles.push(...importeeCss);
+			else complete = false;
 		}
 	});
 	chunk.viteMetadata.importedCss.forEach((file) => {
@@ -31529,7 +31756,7 @@ function getCssFilesForChunk(chunk, bundle, analyzedImportedCssFiles, seenChunks
 			filteredFiles.push(file);
 		}
 	});
-	analyzedImportedCssFiles.set(chunk, unique(allFiles));
+	if (complete) analyzedImportedCssFiles.set(chunk, unique(allFiles));
 	return filteredFiles;
 }
 /**
@@ -32136,9 +32363,7 @@ function getImportMapFilename(options) {
 	return "importmap.json";
 }
 function getImportMapBaseUrl(options) {
-	const chunkImportMap = options.build.rolldownOptions.experimental?.chunkImportMap;
-	if (typeof chunkImportMap === "object" && chunkImportMap.baseUrl) return chunkImportMap.baseUrl;
-	return "/";
+	return options.base;
 }
 /**
 * Read and parse the chunk import map asset from the bundle.
@@ -33808,6 +34033,7 @@ async function resolvePlugins(config, prePlugins, normalPlugins, postPlugins) {
 		},
 		...prePlugins,
 		modulePreload !== false && modulePreload.polyfill ? modulePreloadPolyfillPlugin() : null,
+		bundledDevClientImportsPlugin(config),
 		...oxcResolvePlugin({
 			root: config.root,
 			isProduction: config.isProduction,
@@ -36202,11 +36428,13 @@ var BundledDev = class {
 	}
 	async storeStaticFiles() {
 		const sources = new Map([[BUNDLED_DEV_CLIENT_FILENAME, await getHmrImplementation(this.environment.getTopLevelConfig())], ...getRolldownDevRuntimeFiles()]);
+		const aliases = getBundledDevClientAliases(this.environment.getTopLevelConfig());
 		this.staticFiles.clear();
-		for (const [fileName, source] of sources) {
+		for (const [fileName, source] of [...sources, ...aliases]) {
 			const file = {
 				source,
-				etag: (0, import_etag.default)(Buffer.from(source), { weak: true })
+				etag: (0, import_etag.default)(Buffer.from(source), { weak: true }),
+				...aliases.has(fileName) ? { contentType: "text/javascript" } : {}
 			};
 			this.staticFiles.set(fileName, file);
 			this.memoryFiles.set(fileName, file);
@@ -37124,19 +37352,6 @@ const configDefaults = Object.freeze({
 	environments: {},
 	appType: "spa"
 });
-function normalizeInput(input) {
-	if (input === void 0) return;
-	if (typeof input === "string") return unescapeGlobCharacters(input);
-	if (Array.isArray(input)) return input.map(unescapeGlobCharacters);
-	const resolved = {};
-	for (const key in input) resolved[key] = unescapeGlobCharacters(input[key]);
-	return resolved;
-}
-const escapedGlobCharactersRE = /\\([*?[\]{}()!+@|])/g;
-function unescapeGlobCharacters(value) {
-	if (isDynamicPattern(value)) throw new Error(`\`input\` cannot contain glob characters. They are reserved, so the ${JSON.stringify(value)} is not allowed. Please escape them with a backslash (\\)`);
-	return value.replace(escapedGlobCharactersRE, "$1");
-}
 function resolveDevEnvironmentOptions(dev, environmentName, consumer, preTransformRequest) {
 	const resolved = mergeWithDefaults({
 		...configDefaults.dev,
@@ -37165,7 +37380,7 @@ function resolveEnvironmentOptions(options, alias, preserveSymlinks, forceOptimi
 	}
 	const resolve = resolveEnvironmentResolveOptions(options.resolve, alias, preserveSymlinks, logger, consumer, isSsrTargetWebworkerEnvironment);
 	return {
-		input: normalizeInput(options.input),
+		input: options.input,
 		define: options.define,
 		resolve,
 		keepProcessEnv: options.keepProcessEnv ?? (isSsrTargetWebworkerEnvironment ? false : consumer === "server"),
@@ -37466,7 +37681,6 @@ async function resolveConfig(inlineConfig, command, defaultMode = "development",
 	const assetsFilter = config.assetsInclude && (!Array.isArray(config.assetsInclude) || config.assetsInclude.length) ? createFilter$1(config.assetsInclude) : () => false;
 	const { publicDir } = config;
 	const resolvedPublicDir = publicDir !== false && publicDir !== "" ? normalizePath(path.resolve(resolvedRoot, typeof publicDir === "string" ? publicDir : configDefaults.publicDir)) : "";
-	const input = normalizeInput(config.input);
 	const server = await resolveServerOptions(resolvedRoot, config.server, logger);
 	const builder = resolveBuilderOptions(config.builder);
 	const BASE_URL = resolvedBase;
@@ -37593,7 +37807,7 @@ async function resolveConfig(inlineConfig, command, defaultMode = "development",
 			removeSsrLoadModule: "warn"
 		} : config.future,
 		ssr,
-		input,
+		input: config.input,
 		optimizeDeps: backwardCompatibleOptimizeDeps,
 		resolve: resolvedDefaultResolve,
 		dev: resolvedDevEnvironmentOptions,