vite 8.2.1 → 8.3.0-beta.0

package/bin/vite.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
-import { performance } from 'node:perf_hooks'
 import module from 'node:module'
+import { performance } from 'node:perf_hooks'
 
 if (!import.meta.url.includes('node_modules')) {
   if (!process.env.DEBUG_DISABLE_SOURCE_MAP) {
@@ -20,7 +20,9 @@ const debugIndex = process.argv.findIndex((arg) => /^(?:-d|--debug)$/.test(arg))
 const filterIndex = process.argv.findIndex((arg) =>
   /^(?:-f|--filter)$/.test(arg),
 )
-const profileIndex = process.argv.indexOf('--profile')
+const profileIndex = process.argv.findIndex(
+  (arg) => arg === '--profile' || arg.startsWith('--profile='),
+)
 
 if (debugIndex > 0) {
   let value = process.argv[debugIndex + 1]
@@ -63,10 +65,19 @@ function start() {
 }
 
 if (profileIndex > 0) {
-  process.argv.splice(profileIndex, 1)
-  const next = process.argv[profileIndex]
-  if (next && next[0] !== '-') {
-    process.argv.splice(profileIndex, 1)
+  const [profileArg] = process.argv.splice(profileIndex, 1)
+  // `--profile [name]` writes the profile to `<name>.cpuprofile`. The value is
+  // optional and consumed like cac does for other `[optional]` value flags.
+  let profileName = profileArg.slice('--profile='.length)
+  if (!profileName) {
+    const next = process.argv[profileIndex]
+    if (next && next[0] !== '-') {
+      process.argv.splice(profileIndex, 1)
+      profileName = next
+    }
+  }
+  if (profileName) {
+    global.__vite_profile_name = profileName
   }
   const inspector = await import('node:inspector').then((r) => r.default)
   const session = (global.__vite_profile_session = new inspector.Session())

package/dist/client/bundledDevClient.mjs

@@ -8,7 +8,7 @@ let nanoid = (size = 21) => {
 	return id;
 };
 //#endregion
-//#region ../../node_modules/.pnpm/rolldown@1.2.1/node_modules/rolldown/dist/experimental-runtime-base.mjs
+//#region ../../node_modules/.pnpm/rolldown@1.2.6/node_modules/rolldown/dist/experimental-runtime-base.mjs
 var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
@@ -41,7 +41,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 }) : target, mod));
 var __toCommonJS = (mod) => __hasOwnProp.call(mod, "module.exports") ? mod["module.exports"] : __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 //#endregion
-//#region \0@oxc-project+runtime@0.142.0/helpers/esm/typeof.js
+//#region \0@oxc-project+runtime@0.147.0/helpers/esm/typeof.js
 function _typeof(o) {
 	"@babel/helpers - typeof";
 	return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function(o) {
@@ -51,7 +51,7 @@ function _typeof(o) {
 	}, _typeof(o);
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.142.0/helpers/esm/toPrimitive.js
+//#region \0@oxc-project+runtime@0.147.0/helpers/esm/toPrimitive.js
 function toPrimitive(t, r) {
 	if ("object" != _typeof(t) || !t) return t;
 	var e = t[Symbol.toPrimitive];
@@ -63,13 +63,13 @@ function toPrimitive(t, r) {
 	return ("string" === r ? String : Number)(t);
 }
 //#endregion
-//#region \0@oxc-project+runtime@0.142.0/helpers/esm/toPropertyKey.js
+//#region \0@oxc-project+runtime@0.147.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.142.0/helpers/esm/defineProperty.js
+//#region \0@oxc-project+runtime@0.147.0/helpers/esm/defineProperty.js
 function _defineProperty(e, r, t) {
 	return (r = toPropertyKey(r)) in e ? Object.defineProperty(e, r, {
 		value: t,
@@ -79,7 +79,7 @@ function _defineProperty(e, r, t) {
 	}) : e[r] = t, e;
 }
 //#endregion
-//#region ../../node_modules/.pnpm/rolldown@1.2.1/node_modules/rolldown/dist/experimental-runtime.mjs
+//#region ../../node_modules/.pnpm/rolldown@1.2.6/node_modules/rolldown/dist/experimental-runtime.mjs
 var Module = class {
 	/**
 	* @param {string} id
@@ -287,9 +287,9 @@ var DevRuntime = class {
 	}
 	/**
 	* @param {string} id
-	* @param {{ exports: any }} exportsHolder
+	* @param {{ exports: any }} [exportsHolder]
 	*/
-	registerModule(id, exportsHolder) {
+	registerModule(id, exportsHolder = { exports: {} }) {
 		const module = new Module(id);
 		module.exportsHolder = exportsHolder;
 		this.moduleCache.set(id, module);
@@ -585,7 +585,11 @@ var BundledDevHMRClient = class extends HMRClient {
 			reason: `update propagated back to ${firstInvalidatedBy}, which already called \`import.meta.hot.invalidate()\``
 		};
 		if (this.isSelfAccepted(id)) {
-			boundaries.push([id, id]);
+			boundaries.push({
+				boundary: id,
+				acceptedVia: id,
+				isWithinCircularImport: this.isNodeWithinCircularImports(id, stack)
+			});
 			return;
 		}
 		const parents = this.runtime.getImporters(id).filter((p) => this.runtime.isExecuted(p));
@@ -594,17 +598,52 @@ var BundledDevHMRClient = class extends HMRClient {
 			reason: `no hmr boundary found for module \`${id}\``
 		};
 		for (const parent of parents) {
+			const subChain = [...stack, parent];
 			if (this.acceptsDep(parent, id)) {
-				boundaries.push([parent, id]);
+				boundaries.push({
+					boundary: parent,
+					acceptedVia: id,
+					isWithinCircularImport: this.isNodeWithinCircularImports(parent, subChain)
+				});
 				continue;
 			}
-			if (stack.includes(parent)) return {
-				type: "full-reload",
-				reason: `circular import chain between \`${id}\` and \`${parent}\``
-			};
-			const fullReload = this.bubble(parent, [...stack, parent], updateSet, boundaries, firstInvalidatedBy, traversedModules);
-			if (fullReload) return fullReload;
+			if (!stack.includes(parent)) {
+				const fullReload = this.bubble(parent, subChain, updateSet, boundaries, firstInvalidatedBy, traversedModules);
+				if (fullReload) return fullReload;
+			}
+		}
+	}
+	/**
+	* Check importers recursively if it's an import loop. An accepted module within
+	* an import loop cannot recover its execution order and should be reloaded.
+	*
+	* @param node The node that accepts HMR and is a boundary
+	* @param nodeChain The chain of nodes/imports that lead to the node.
+	*   (The last node in the chain imports the `node` parameter)
+	* @param currentChain The current chain tracked from the `node` parameter
+	* @param traversedModules The set of modules that have traversed
+	*/
+	isNodeWithinCircularImports(node, nodeChain, currentChain = [node], traversedModules = /* @__PURE__ */ new Set()) {
+		if (traversedModules.has(node)) return false;
+		traversedModules.add(node);
+		for (const importer of this.runtime.getImporters(node)) {
+			if (importer === node) continue;
+			const importerIndex = nodeChain.indexOf(importer);
+			if (importerIndex > -1) {
+				const importChain = [
+					importer,
+					...[...currentChain].reverse(),
+					...nodeChain.slice(importerIndex, -1).reverse()
+				];
+				this.logger.debug(`circular imports detected: ${importChain.join(" -> ")}`);
+				return true;
+			}
+			if (!currentChain.includes(importer)) {
+				const result = this.isNodeWithinCircularImports(importer, nodeChain, currentChain.concat(importer), traversedModules);
+				if (result) return result;
+			}
 		}
+		return false;
 	}
 	handlePush(payload) {
 		this.applyQueue = this.applyQueue.then(() => this.applyPush(payload)).catch((err) => {
@@ -674,15 +713,25 @@ var BundledDevHMRClient = class extends HMRClient {
 			this.requestFullReload(`no factory for module \`${id}\``);
 			return;
 		}
-		const applies = update.boundaries.map(([boundary, acceptedVia]) => ({
+		const applies = update.boundaries.map(({ boundary, acceptedVia, isWithinCircularImport }) => ({
 			boundary,
 			acceptedVia,
+			isWithinCircularImport,
 			callbacks: this.hotModulesMap.get(boundary)?.callbacks.filter((c) => c.deps.includes(acceptedVia)) ?? []
 		}));
 		for (const id of update.updateSet) this.runtime.removeModuleCache(id);
-		for (const { boundary, acceptedVia, callbacks } of applies) {
-			this.runtime.initModule(acceptedVia);
-			const fresh = this.runtime.loadExports(acceptedVia);
+		for (const { boundary, acceptedVia, isWithinCircularImport, callbacks } of applies) {
+			let fresh;
+			try {
+				this.runtime.initModule(acceptedVia);
+				fresh = this.runtime.loadExports(acceptedVia);
+			} catch (err) {
+				if (isWithinCircularImport) {
+					this.requestFullReload(`${acceptedVia} failed to apply HMR as it's within a circular import. Reloading page to reset the execution order.`);
+					return;
+				}
+				throw err;
+			}
 			try {
 				this.currentFirstInvalidatedBy = firstInvalidatedBy;
 				for (const { deps, fn } of callbacks) fn(deps.map((dep) => dep === acceptedVia ? fresh : void 0));
@@ -695,11 +744,12 @@ var BundledDevHMRClient = class extends HMRClient {
 	toUpdatePayload(boundaries, firstInvalidatedBy) {
 		return {
 			type: "update",
-			updates: boundaries.map(([boundary, acceptedVia]) => ({
+			updates: boundaries.map(({ boundary, acceptedVia, isWithinCircularImport }) => ({
 				type: "js-update",
 				path: boundary,
 				acceptedPath: acceptedVia,
 				timestamp: Date.now(),
+				isWithinCircularImport,
 				firstInvalidatedBy
 			}))
 		};
@@ -732,9 +782,33 @@ var BundledDevHMRContext = class extends HMRContext {
 };
 //#endregion
 //#region src/shared/constants.ts
+/**
+* Prefix for resolved Ids that are not valid browser import specifiers
+*/
+const VALID_ID_PREFIX = `/@id/`;
+/**
+* Plugins that use 'virtual modules' (e.g. for helper functions), prefix the
+* module ID with `\0`, a convention from the rollup ecosystem.
+* This prevents other plugins from trying to process the id (like node resolution),
+* and core features like sourcemaps can use this info to differentiate between
+* virtual modules and regular files.
+* `\0` is not a permitted char in import URLs so we have to replace them during
+* import analysis. The id will be decoded back before entering the plugins pipeline.
+* These encoded virtual ids are also prefixed by the VALID_ID_PREFIX, so virtual
+* modules in the browser end up encoded as `/@id/__x00__{id}`
+*/
+const NULL_BYTE_PLACEHOLDER = `__x00__`;
 let SOURCEMAPPING_URL = "sourceMa";
 SOURCEMAPPING_URL += "ppingURL";
 typeof process !== "undefined" && process.platform;
+/**
+* Prepend `/@id/` and replace null byte so the id is URL-safe.
+* This is prepended to resolved ids that are not valid browser
+* import specifiers by the importAnalysis plugin.
+*/
+function wrapId(id) {
+	return id.startsWith(VALID_ID_PREFIX) ? id : VALID_ID_PREFIX + id.replace("\0", NULL_BYTE_PLACEHOLDER);
+}
 (async function() {}).constructor;
 function promiseWithResolvers() {
 	let resolve;
@@ -882,13 +956,17 @@ const normalizeModuleRunnerTransport = (transport) => {
 		} } : {},
 		async send(data) {
 			if (!invokeableTransport.send) return;
-			if (!isConnected) if (connectingPromise) await connectingPromise;
-			else throw new SendBeforeConnectError("send was called before connect");
+			if (!isConnected) {
+				if (connectingPromise) await connectingPromise;
+				else throw new SendBeforeConnectError("send was called before connect");
+			}
 			await invokeableTransport.send(data);
 		},
 		async invoke(name, data) {
-			if (!isConnected) if (connectingPromise) await connectingPromise;
-			else throw new SendBeforeConnectError("invoke was called before connect");
+			if (!isConnected) {
+				if (connectingPromise) await connectingPromise;
+				else throw new SendBeforeConnectError("invoke was called before connect");
+			}
 			return invokeableTransport.invoke(name, data);
 		}
 	};
@@ -948,39 +1026,6 @@ const createWebSocketModuleRunnerTransport = (options) => {
 	};
 };
 //#endregion
-//#region src/shared/hmrHandler.ts
-function createHMRHandler(handler) {
-	const queue = new Queue();
-	return (payload) => queue.enqueue(() => handler(payload));
-}
-var Queue = class {
-	constructor() {
-		_defineProperty(this, "queue", []);
-		_defineProperty(this, "pending", false);
-	}
-	enqueue(promise) {
-		return new Promise((resolve, reject) => {
-			this.queue.push({
-				promise,
-				resolve,
-				reject
-			});
-			this.dequeue();
-		});
-	}
-	dequeue() {
-		if (this.pending) return false;
-		const item = this.queue.shift();
-		if (!item) return false;
-		this.pending = true;
-		item.promise().then(item.resolve).catch(item.reject).finally(() => {
-			this.pending = false;
-			this.dequeue();
-		});
-		return true;
-	}
-};
-//#endregion
 //#region src/shared/forwardConsole.ts
 function setupForwardConsoleHandler(transport, options, console = globalThis.console) {
 	if (!options.enabled) return;
@@ -1109,6 +1154,39 @@ function stringifyConsoleArg(value) {
 	}
 }
 //#endregion
+//#region src/shared/hmrHandler.ts
+function createHMRHandler(handler) {
+	const queue = new Queue();
+	return (payload) => queue.enqueue(() => handler(payload));
+}
+var Queue = class {
+	constructor() {
+		_defineProperty(this, "queue", []);
+		_defineProperty(this, "pending", false);
+	}
+	enqueue(promise) {
+		return new Promise((resolve, reject) => {
+			this.queue.push({
+				promise,
+				resolve,
+				reject
+			});
+			this.dequeue();
+		});
+	}
+	dequeue() {
+		if (this.pending) return false;
+		const item = this.queue.shift();
+		if (!item) return false;
+		this.pending = true;
+		item.promise().then(item.resolve).catch(item.reject).finally(() => {
+			this.pending = false;
+			this.dequeue();
+		});
+		return true;
+	}
+};
+//#endregion
 //#region src/client/overlay.ts
 const hmrConfigName = __HMR_CONFIG_NAME__;
 const base$1 = __BASE__ || "/";
@@ -1426,14 +1504,18 @@ const debounceReload = (time) => {
 	};
 };
 const pageReload = debounceReload(20);
+function wrapIdIfNeeded(id) {
+	return id[0] === "." || id[0] === "/" ? id : wrapId(id);
+}
 const hmrClient = new HMRClient({
 	error: (err) => console.error("[vite]", err),
 	debug: (...msg) => console.debug("[vite]", ...msg)
 }, transport, async function importUpdatedModule({ acceptedPath, timestamp, explicitImportRequired, isWithinCircularImport }) {
 	const [acceptedPathWithoutQuery, query] = acceptedPath.split(`?`);
+	const browserPath = wrapIdIfNeeded(acceptedPathWithoutQuery);
 	const importPromise = import(
 		/* @vite-ignore */
-		base + acceptedPathWithoutQuery.slice(1) + `?${explicitImportRequired ? "import&" : ""}t=${timestamp}${query ? `&${query}` : ""}`
+		base + browserPath.slice(1) + `?${explicitImportRequired ? "import&" : ""}t=${timestamp}${query ? `&${query}` : ""}`
 );
 	if (isWithinCircularImport) importPromise.catch(() => {
 		console.info(`[hmr] ${acceptedPath} failed to apply HMR as it's within a circular import. Reloading page to reset the execution order. To debug and break the circular import, you can run \`vite --debug hmr\` to log the circular dependency path if a file change triggered it.`);
@@ -1509,12 +1591,14 @@ async function handleMessage(payload) {
 		case "full-reload":
 			if (payload.ifFallback && !globalThis.__vite_is_fallback_page__) break;
 			await activeHmrClient.notifyListeners("vite:beforeFullReload", payload);
-			if (hasDocument) if (payload.path && payload.path.endsWith(".html")) {
-				const pagePath = decodeURI(location.pathname);
-				const payloadPath = base + payload.path.slice(1);
-				if (pagePath === payloadPath || payload.path === "/index.html" || pagePath.endsWith("/") && pagePath + "index.html" === payloadPath) pageReload();
-				return;
-			} else pageReload();
+			if (hasDocument) {
+				if (payload.path && payload.path.endsWith(".html")) {
+					const pagePath = decodeURI(location.pathname);
+					const payloadPath = base + payload.path.slice(1);
+					if (pagePath === payloadPath || payload.path === "/index.html" || pagePath.endsWith("/") && pagePath + "index.html" === payloadPath) pageReload();
+					return;
+				} else pageReload();
+			}
 			break;
 		case "prune":
 			await activeHmrClient.notifyListeners("vite:beforePrune", payload);