vite 8.3.3 → 8.3.4

package/dist/client/bundledDevClient.mjs

@@ -9,7 +9,7 @@ let nanoid = (size = 21) => {
 	return id;
 };
 //#endregion
-//#region \0@oxc-project+runtime@0.151.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.152.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -19,7 +19,7 @@ function _typeof(o) {
 	}, _typeof(o);
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.151.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.152.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -31,13 +31,13 @@ function toPrimitive(t, r) {
 	return ("string" === r ? String : Number)(t);
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.151.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.152.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.151.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.152.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -73,8 +73,8 @@ var HMRContext = class {
 		else if (Array.isArray(deps)) this.acceptDeps(deps, callback);
 		else throw new 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);
@@ -127,14 +127,15 @@ var HMRContext = class {
 			data
 		});
 	}
-	acceptDeps(deps, callback = () => {}) {
+	acceptDeps(deps, callback = () => {}, exports) {
 		const 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);
 	}
@@ -247,10 +248,28 @@ var BundledDevHMRClient = class extends HMRClient {
 		this.reloadPending = false;
 	}
 	isSelfAccepted(id) {
-		return this.hotModulesMap.get(id)?.callbacks.some((c) => c.deps.includes(id)) ?? false;
+		return this.acceptsDep(id, id);
 	}
 	acceptsDep(parent, id) {
-		return this.hotModulesMap.get(parent)?.callbacks.some((c) => c.deps.includes(id)) ?? false;
+		return this.hotModulesMap.get(parent)?.callbacks.some((c) => !c.exports && c.deps.includes(id)) ?? false;
+	}
+	getAcceptedExports(id) {
+		let accepted;
+		for (const c of this.hotModulesMap.get(id)?.callbacks ?? []) {
+			if (!c.exports) continue;
+			accepted ?? (accepted = /* @__PURE__ */ new Set());
+			for (const name of c.exports) accepted.add(name);
+		}
+		return accepted;
+	}
+	acceptsAllExports(id, accepted) {
+		const exports = this.runtime.loadExports(id);
+		if (typeof exports !== "object" || exports == null) return false;
+		return Object.keys(exports).every((name) => accepted.has(name));
+	}
+	importsOnlyAccepted(parent, id, accepted) {
+		if (!this.options.partialAccept) return false;
+		return this.runtime.getImportedBindings(parent, id)?.every((name) => accepted.has(name)) ?? false;
 	}
 	computeHmrUpdate(changedIds, opts) {
 		const boundaries = [];
@@ -275,16 +294,18 @@ var BundledDevHMRClient = class extends HMRClient {
 			type: "full-reload",
 			reason: `update propagated back to ${firstInvalidatedBy}, which already called \`import.meta.hot.invalidate()\``
 		};
-		if (this.isSelfAccepted(id)) {
+		const acceptedExports = this.getAcceptedExports(id);
+		const selfAccepted = this.isSelfAccepted(id) || acceptedExports !== void 0 && this.acceptsAllExports(id, acceptedExports);
+		if (selfAccepted || acceptedExports) {
 			boundaries.push({
 				boundary: id,
 				acceptedVia: id,
 				isWithinCircularImport: this.isNodeWithinCircularImports(id, stack)
 			});
-			return;
+			if (selfAccepted) return;
 		}
 		const parents = this.runtime.getImporters(id).filter((p) => this.runtime.isExecuted(p));
-		if (!parents.length) return {
+		if (!acceptedExports && !parents.length) return {
 			type: "full-reload",
 			reason: `no hmr boundary found for module \`${id}\``
 		};
@@ -298,6 +319,7 @@ var BundledDevHMRClient = class extends HMRClient {
 				});
 				continue;
 			}
+			if (acceptedExports && this.importsOnlyAccepted(parent, id, acceptedExports)) continue;
 			if (!stack.includes(parent)) {
 				const fullReload = this.bubble(parent, subChain, updateSet, boundaries, firstInvalidatedBy, traversedModules);
 				if (fullReload) return fullReload;
@@ -1535,7 +1557,7 @@ function updateStyle(id, content) {
 			}, 0);
 		} else lastInsertedStyle.insertAdjacentElement("afterend", style);
 		lastInsertedStyle = style;
-	} else style.textContent = content;
+	} else if (style.textContent !== content) style.textContent = content;
 	sheetsMap.set(id, style);
 }
 function removeStyle(id) {
@@ -1574,12 +1596,7 @@ if (typeof DevRuntime !== "undefined") {
 			});
 		}
 		createModuleHotContext(moduleId) {
-			const ctx = new BundledDevHMRContext(bundledDevHmrClient, moduleId);
-			ctx._internal = {
-				updateStyle,
-				removeStyle
-			};
-			return ctx;
+			return new BundledDevHMRContext(bundledDevHmrClient, moduleId);
 		}
 	}
 	const clientId = nanoid();
@@ -1594,6 +1611,7 @@ if (typeof DevRuntime !== "undefined") {
 		debug: (...msg) => console.debug("[vite]", ...msg)
 	}, transport, runtime, {
 		base,
+		partialAccept: __HMR_PARTIAL_ACCEPT__,
 		beforeApply: clearOverlayOrReloadOnFirstUpdate
 	});
 	registerBundledDevClient(bundledDevHmrClient);

package/dist/client/client.mjs

@@ -432,7 +432,7 @@ function isHighSurrogate(value) {
 	return value >= "\ud800" && value <= "\udbff";
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.151.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.152.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -442,7 +442,7 @@ function _typeof(o) {
 	}, _typeof(o);
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.151.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.152.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -454,13 +454,13 @@ function toPrimitive(t, r) {
 	return ("string" === r ? String : Number)(t);
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.151.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.152.0/helpers/esm/toPropertyKey.js
 function toPropertyKey(t) {
 	var i = toPrimitive(t, "string");
 	return "symbol" == _typeof(i) ? i : i + "";
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.151.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.152.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -496,8 +496,8 @@ var HMRContext = class {
 		else if (Array.isArray(deps)) this.acceptDeps(deps, callback);
 		else throw new 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);
@@ -550,14 +550,15 @@ var HMRContext = class {
 			data
 		});
 	}
-	acceptDeps(deps, callback = () => {}) {
+	acceptDeps(deps, callback = () => {}, exports) {
 		const 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);
 	}
@@ -1293,7 +1294,7 @@ function updateStyle(id, content) {
 			}, 0);
 		} else lastInsertedStyle.insertAdjacentElement("afterend", style);
 		lastInsertedStyle = style;
-	} else style.textContent = content;
+	} else if (style.textContent !== content) style.textContent = content;
 	sheetsMap.set(id, style);
 }
 function removeStyle(id) {

package/dist/node/chunks/build.js

@@ -1,6 +1,6 @@
 import { ft as __commonJSMin, pt as __require } from "./node.js";
 import { t as require_lib } from "./lib.js";
-//#region ../../node_modules/.pnpm/postcss-modules@9.0.1_postcss@8.5.28/node_modules/postcss-modules/build/fs.js
+//#region ../../node_modules/.pnpm/postcss-modules@9.0.1_postcss@8.5.29/node_modules/postcss-modules/build/fs.js
 var require_fs = /* @__PURE__ */ __commonJSMin(((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
 	function _export(target, all) {
@@ -34,7 +34,7 @@ var require_fs = /* @__PURE__ */ __commonJSMin(((exports) => {
 	}
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-modules@9.0.1_postcss@8.5.28/node_modules/postcss-modules/build/unquote.js
+//#region ../../node_modules/.pnpm/postcss-modules@9.0.1_postcss@8.5.29/node_modules/postcss-modules/build/unquote.js
 var require_unquote = /* @__PURE__ */ __commonJSMin(((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
 	Object.defineProperty(exports, "default", {
@@ -52,7 +52,7 @@ var require_unquote = /* @__PURE__ */ __commonJSMin(((exports) => {
 	}
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/icss-utils@5.1.0_postcss@8.5.28/node_modules/icss-utils/src/replaceValueSymbols.js
+//#region ../../node_modules/.pnpm/icss-utils@5.1.0_postcss@8.5.29/node_modules/icss-utils/src/replaceValueSymbols.js
 var require_replaceValueSymbols = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const matchValueName = /[$]?[\w-]+/g;
 	const replaceValueSymbols = (value, replacements) => {
@@ -69,7 +69,7 @@ var require_replaceValueSymbols = /* @__PURE__ */ __commonJSMin(((exports, modul
 	module.exports = replaceValueSymbols;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/icss-utils@5.1.0_postcss@8.5.28/node_modules/icss-utils/src/replaceSymbols.js
+//#region ../../node_modules/.pnpm/icss-utils@5.1.0_postcss@8.5.29/node_modules/icss-utils/src/replaceSymbols.js
 var require_replaceSymbols = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const replaceValueSymbols = require_replaceValueSymbols();
 	const replaceSymbols = (css, replacements) => {
@@ -82,7 +82,7 @@ var require_replaceSymbols = /* @__PURE__ */ __commonJSMin(((exports, module) =>
 	module.exports = replaceSymbols;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/icss-utils@5.1.0_postcss@8.5.28/node_modules/icss-utils/src/extractICSS.js
+//#region ../../node_modules/.pnpm/icss-utils@5.1.0_postcss@8.5.29/node_modules/icss-utils/src/extractICSS.js
 var require_extractICSS = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const importPattern = /^:import\(("[^"]*"|'[^']*'|[^"']+)\)$/;
 	const balancedQuotes = /^("[^"]*"|'[^']*'|[^"']+)$/;
@@ -136,7 +136,7 @@ var require_extractICSS = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = extractICSS;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/icss-utils@5.1.0_postcss@8.5.28/node_modules/icss-utils/src/createICSSRules.js
+//#region ../../node_modules/.pnpm/icss-utils@5.1.0_postcss@8.5.29/node_modules/icss-utils/src/createICSSRules.js
 var require_createICSSRules = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const createImports = (imports, postcss, mode = "rule") => {
 		return Object.keys(imports).map((path) => {
@@ -180,7 +180,7 @@ var require_createICSSRules = /* @__PURE__ */ __commonJSMin(((exports, module) =
 	module.exports = createICSSRules;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/icss-utils@5.1.0_postcss@8.5.28/node_modules/icss-utils/src/index.js
+//#region ../../node_modules/.pnpm/icss-utils@5.1.0_postcss@8.5.29/node_modules/icss-utils/src/index.js
 var require_src$4 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = {
 		replaceValueSymbols: require_replaceValueSymbols(),
@@ -190,7 +190,7 @@ var require_src$4 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	};
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-modules@9.0.1_postcss@8.5.28/node_modules/postcss-modules/build/Parser.js
+//#region ../../node_modules/.pnpm/postcss-modules@9.0.1_postcss@8.5.29/node_modules/postcss-modules/build/Parser.js
 var require_Parser = /* @__PURE__ */ __commonJSMin(((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
 	Object.defineProperty(exports, "default", {
@@ -262,7 +262,7 @@ var require_Parser = /* @__PURE__ */ __commonJSMin(((exports) => {
 	};
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-modules@9.0.1_postcss@8.5.28/node_modules/postcss-modules/build/saveJSON.js
+//#region ../../node_modules/.pnpm/postcss-modules@9.0.1_postcss@8.5.29/node_modules/postcss-modules/build/saveJSON.js
 var require_saveJSON = /* @__PURE__ */ __commonJSMin(((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
 	Object.defineProperty(exports, "default", {
@@ -944,7 +944,7 @@ var require_lodash_camelcase = /* @__PURE__ */ __commonJSMin(((exports, module)
 	module.exports = camelCase;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-modules@9.0.1_postcss@8.5.28/node_modules/postcss-modules/build/localsConvention.js
+//#region ../../node_modules/.pnpm/postcss-modules@9.0.1_postcss@8.5.29/node_modules/postcss-modules/build/localsConvention.js
 var require_localsConvention = /* @__PURE__ */ __commonJSMin(((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
 	Object.defineProperty(exports, "makeLocalsConventionReducer", {
@@ -999,7 +999,7 @@ var require_localsConvention = /* @__PURE__ */ __commonJSMin(((exports) => {
 	}
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-modules@9.0.1_postcss@8.5.28/node_modules/postcss-modules/build/FileSystemLoader.js
+//#region ../../node_modules/.pnpm/postcss-modules@9.0.1_postcss@8.5.29/node_modules/postcss-modules/build/FileSystemLoader.js
 var require_FileSystemLoader = /* @__PURE__ */ __commonJSMin(((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
 	Object.defineProperty(exports, "default", {
@@ -1088,7 +1088,7 @@ var require_FileSystemLoader = /* @__PURE__ */ __commonJSMin(((exports) => {
 	};
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-modules-extract-imports@3.1.0_postcss@8.5.28/node_modules/postcss-modules-extract-imports/src/topologicalSort.js
+//#region ../../node_modules/.pnpm/postcss-modules-extract-imports@3.1.0_postcss@8.5.29/node_modules/postcss-modules-extract-imports/src/topologicalSort.js
 var require_topologicalSort = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const PERMANENT_MARKER = 2;
 	const TEMPORARY_MARKER = 1;
@@ -1127,7 +1127,7 @@ var require_topologicalSort = /* @__PURE__ */ __commonJSMin(((exports, module) =
 	module.exports = topologicalSort;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-modules-extract-imports@3.1.0_postcss@8.5.28/node_modules/postcss-modules-extract-imports/src/index.js
+//#region ../../node_modules/.pnpm/postcss-modules-extract-imports@3.1.0_postcss@8.5.29/node_modules/postcss-modules-extract-imports/src/index.js
 var require_src$3 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const topologicalSort = require_topologicalSort();
 	const matchImports = /^(.+?)\s+from\s+(?:"([^"]+)"|'([^']+)'|(global))$/;
@@ -4654,7 +4654,7 @@ var require_dist = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = exports.default;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-modules-local-by-default@4.2.0_postcss@8.5.28/node_modules/postcss-modules-local-by-default/src/index.js
+//#region ../../node_modules/.pnpm/postcss-modules-local-by-default@4.2.0_postcss@8.5.29/node_modules/postcss-modules-local-by-default/src/index.js
 var require_src$2 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const selectorParser = require_dist();
 	const valueParser = require_lib();
@@ -5050,7 +5050,7 @@ var require_src$2 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports.postcss = true;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-modules-scope@3.2.1_postcss@8.5.28/node_modules/postcss-modules-scope/src/index.js
+//#region ../../node_modules/.pnpm/postcss-modules-scope@3.2.1_postcss@8.5.29/node_modules/postcss-modules-scope/src/index.js
 var require_src$1 = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const selectorParser = require_dist();
 	const hasOwnProperty = Object.prototype.hasOwnProperty;
@@ -5228,7 +5228,7 @@ var require_string_hash = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = hash;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-modules-values@4.0.0_postcss@8.5.28/node_modules/postcss-modules-values/src/index.js
+//#region ../../node_modules/.pnpm/postcss-modules-values@4.0.0_postcss@8.5.29/node_modules/postcss-modules-values/src/index.js
 var require_src = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const ICSSUtils = require_src$4();
 	const matchImports = /^(.+?|\([\s\S]+?\))\s+from\s+("[^"]*"|'[^']*'|[\w-]+)$/;
@@ -5315,7 +5315,7 @@ var require_src = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports.postcss = true;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-modules@9.0.1_postcss@8.5.28/node_modules/postcss-modules/build/scoping.js
+//#region ../../node_modules/.pnpm/postcss-modules@9.0.1_postcss@8.5.29/node_modules/postcss-modules/build/scoping.js
 var require_scoping = /* @__PURE__ */ __commonJSMin(((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
 	function _export(target, all) {
@@ -5394,7 +5394,7 @@ var require_scoping = /* @__PURE__ */ __commonJSMin(((exports) => {
 	}
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-modules@9.0.1_postcss@8.5.28/node_modules/postcss-modules/build/pluginFactory.js
+//#region ../../node_modules/.pnpm/postcss-modules@9.0.1_postcss@8.5.29/node_modules/postcss-modules/build/pluginFactory.js
 var require_pluginFactory = /* @__PURE__ */ __commonJSMin(((exports) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
 	Object.defineProperty(exports, "makePlugin", {
@@ -5476,7 +5476,7 @@ var require_pluginFactory = /* @__PURE__ */ __commonJSMin(((exports) => {
 	}
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-modules@9.0.1_postcss@8.5.28/node_modules/postcss-modules/build/index.js
+//#region ../../node_modules/.pnpm/postcss-modules@9.0.1_postcss@8.5.29/node_modules/postcss-modules/build/index.js
 var require_build = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	Object.defineProperty(exports, "__esModule", { value: true });
 	const _fs = __require("fs");

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.3";
+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;
 	}
@@ -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;
@@ -17300,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) {
@@ -17325,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) => {
@@ -17959,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);
 		}
@@ -17985,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,
@@ -18154,7 +18182,8 @@ const devHtmlHook = async (html, { path: htmlPath, filename, server, originalUrl
 	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 {
@@ -18236,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) {
@@ -18247,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}`);
@@ -18415,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);
@@ -24795,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.`);
@@ -24958,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);
@@ -24977,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, {
@@ -25231,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 {
@@ -25242,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 });
@@ -26929,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) {
@@ -26955,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));
 	}
@@ -27003,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.
@@ -28241,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 });
@@ -29929,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)`,
@@ -31232,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) {
@@ -31683,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) => {
@@ -31699,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;
 }
 /**
@@ -32306,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.
@@ -33978,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,
@@ -36372,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);
@@ -37294,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,
@@ -37335,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"),
@@ -37636,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;
@@ -37763,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,

package/dist/node/chunks/postcss-import.js

@@ -1,6 +1,6 @@
 import { ft as __commonJSMin, pt as __require } from "./node.js";
 import { t as require_lib } from "./lib.js";
-//#region ../../node_modules/.pnpm/postcss-import@16.2.0_postcss@8.5.28/node_modules/postcss-import/lib/format-import-prelude.js
+//#region ../../node_modules/.pnpm/postcss-import@16.2.0_postcss@8.5.29/node_modules/postcss-import/lib/format-import-prelude.js
 var require_format_import_prelude = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = function formatImportPrelude(layer, media, supports) {
 		const parts = [];
@@ -15,7 +15,7 @@ var require_format_import_prelude = /* @__PURE__ */ __commonJSMin(((exports, mod
 	};
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-import@16.2.0_postcss@8.5.28/node_modules/postcss-import/lib/base64-encoded-import.js
+//#region ../../node_modules/.pnpm/postcss-import@16.2.0_postcss@8.5.29/node_modules/postcss-import/lib/base64-encoded-import.js
 var require_base64_encoded_import = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const formatImportPrelude = require_format_import_prelude();
 	module.exports = function base64EncodedConditionalImport(prelude, conditions) {
@@ -28,7 +28,7 @@ var require_base64_encoded_import = /* @__PURE__ */ __commonJSMin(((exports, mod
 	};
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-import@16.2.0_postcss@8.5.28/node_modules/postcss-import/lib/apply-conditions.js
+//#region ../../node_modules/.pnpm/postcss-import@16.2.0_postcss@8.5.29/node_modules/postcss-import/lib/apply-conditions.js
 var require_apply_conditions = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const base64EncodedConditionalImport = require_base64_encoded_import();
 	module.exports = function applyConditions(bundle, atRule) {
@@ -103,7 +103,7 @@ var require_apply_conditions = /* @__PURE__ */ __commonJSMin(((exports, module)
 	};
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-import@16.2.0_postcss@8.5.28/node_modules/postcss-import/lib/apply-raws.js
+//#region ../../node_modules/.pnpm/postcss-import@16.2.0_postcss@8.5.29/node_modules/postcss-import/lib/apply-raws.js
 var require_apply_raws = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = function applyRaws(bundle) {
 		bundle.forEach((stmt, index) => {
@@ -114,7 +114,7 @@ var require_apply_raws = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	};
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-import@16.2.0_postcss@8.5.28/node_modules/postcss-import/lib/apply-styles.js
+//#region ../../node_modules/.pnpm/postcss-import@16.2.0_postcss@8.5.29/node_modules/postcss-import/lib/apply-styles.js
 var require_apply_styles = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = function applyStyles(bundle, styles) {
 		styles.nodes = [];
@@ -134,7 +134,7 @@ var require_apply_styles = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	};
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-import@16.2.0_postcss@8.5.28/node_modules/postcss-import/lib/data-url.js
+//#region ../../node_modules/.pnpm/postcss-import@16.2.0_postcss@8.5.29/node_modules/postcss-import/lib/data-url.js
 var require_data_url = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const anyDataURLRegexp = /^data:text\/css(?:;(base64|plain))?,/i;
 	const base64DataURLRegexp = /^data:text\/css;base64,/i;
@@ -153,7 +153,7 @@ var require_data_url = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	};
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-import@16.2.0_postcss@8.5.28/node_modules/postcss-import/lib/parse-statements.js
+//#region ../../node_modules/.pnpm/postcss-import@16.2.0_postcss@8.5.29/node_modules/postcss-import/lib/parse-statements.js
 var require_parse_statements = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const valueParser = require_lib();
 	const { stringify } = valueParser;
@@ -278,7 +278,7 @@ var require_parse_statements = /* @__PURE__ */ __commonJSMin(((exports, module)
 	}
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-import@16.2.0_postcss@8.5.28/node_modules/postcss-import/lib/process-content.js
+//#region ../../node_modules/.pnpm/postcss-import@16.2.0_postcss@8.5.29/node_modules/postcss-import/lib/process-content.js
 var require_process_content = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const path$2 = __require("path");
 	let sugarss;
@@ -312,7 +312,7 @@ var require_process_content = /* @__PURE__ */ __commonJSMin(((exports, module) =
 	}
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-import@16.2.0_postcss@8.5.28/node_modules/postcss-import/lib/parse-styles.js
+//#region ../../node_modules/.pnpm/postcss-import@16.2.0_postcss@8.5.29/node_modules/postcss-import/lib/parse-styles.js
 var require_parse_styles = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const path$1 = __require("path");
 	const dataURL = require_data_url();
@@ -416,7 +416,7 @@ var require_parse_styles = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	module.exports = parseStyles;
 }));
 //#endregion
-//#region ../../node_modules/.pnpm/postcss-import@16.2.0_postcss@8.5.28/node_modules/postcss-import/index.js
+//#region ../../node_modules/.pnpm/postcss-import@16.2.0_postcss@8.5.29/node_modules/postcss-import/index.js
 var require_postcss_import = /* @__PURE__ */ __commonJSMin(((exports, module) => {
 	const path = __require("path");
 	const applyConditions = require_apply_conditions();

package/dist/node/index.d.ts

@@ -1100,6 +1100,7 @@ export declare function optimizeDeps(config: ResolvedConfig, force?: boolean | u
 type MemoryFile = {
   source: string | Uint8Array;
   etag?: string;
+  contentType?: string;
 };
 declare class MemoryFiles {
   private files;
@@ -3132,7 +3133,7 @@ type ResolveIdFn = (environment: PartialEnvironment, id: string, importer?: stri
  */
 export declare function createIdResolver(config: ResolvedConfig, options?: Partial<InternalResolveOptions>): ResolveIdFn;
 //#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.d.ts
+//#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.d.ts
 type ConfigPlugin = Transformer | PostCSS.Plugin | Processor;
 interface Config {
   parser?: string | ProcessOptions['parser'] | false;

package/dist/node/module-runner.d.ts

@@ -37,6 +37,7 @@ interface HotModule {
 interface HotCallback {
   deps: string[];
   fn: (modules: Array<ModuleNamespace | undefined>) => void;
+  exports?: readonly string[];
 }
 interface HMRLogger {
   error(msg: string | Error): void;

package/dist/node/module-runner.js

@@ -402,8 +402,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);
@@ -451,14 +451,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 {
@@ -1073,13 +1074,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();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "vite",
-  "version": "8.3.3",
+  "version": "8.3.4",
   "description": "Native-ESM powered web dev build tool",
   "keywords": [
     "build-tool",
@@ -58,8 +58,8 @@
   "dependencies": {
     "lightningcss": "^1.33.0",
     "picomatch": "^4.0.7",
-    "postcss": "^8.5.28",
-    "rolldown": "~1.2.11",
+    "postcss": "^8.5.29",
+    "rolldown": "~1.2.12",
     "tinyglobby": "^0.2.17"
   },
   "devDependencies": {
@@ -77,7 +77,7 @@
     "@vitest/utils": "^4.1.11",
     "@voidzero-dev/vite-task-client": "^0.2.0",
     "artichokie": "^0.4.5",
-    "baseline-browser-mapping": "^2.11.26",
+    "baseline-browser-mapping": "^2.11.27",
     "cac": "^7.0.0",
     "chokidar": "^3.6.0",
     "connect": "^3.7.0",
@@ -93,7 +93,7 @@
     "host-validation-middleware": "^0.1.4",
     "http-proxy-3": "^1.23.3",
     "launch-editor-middleware": "^2.14.2",
-    "magic-string": "^1.4.2",
+    "magic-string": "^1.4.3",
     "mlly": "^1.8.2",
     "mrmime": "^2.0.1",
     "nanoid": "^5.1.16",
@@ -111,8 +111,8 @@
     "rolldown-plugin-dts": "^0.28.6",
     "rollup": "^4.59.0",
     "rollup-plugin-license": "^3.7.1",
-    "sass": "^1.105.0",
-    "sass-embedded": "^1.105.0",
+    "sass": "^1.105.1",
+    "sass-embedded": "^1.105.1",
     "sirv": "^3.0.2",
     "strip-literal": "^4.0.0",
     "terser": "^5.51.2",