vite-node 4.0.0-beta.9 → 5.0.0

package/dist/{client.mjs → client.js}

@@ -1,14 +1,19 @@
 import { createRequire } from 'node:module';
 import { resolve, dirname } from 'node:path';
+import process from 'node:process';
 import { pathToFileURL, fileURLToPath } from 'node:url';
 import vm from 'node:vm';
 import createDebug from 'debug';
-import { extractSourceMap } from './source-map.mjs';
-import { createImportMetaEnvProxy, slash, isInternalRequest, isNodeBuiltin, normalizeRequestId, toFilePath, normalizeModuleId, cleanUrl, isPrimitive, isBareImport } from './utils.mjs';
+import { extractSourceMap } from './source-map.js';
+import { createImportMetaEnvProxy, slash, isInternalRequest, isNodeBuiltin, normalizeRequestId, toFilePath, normalizeModuleId, cleanUrl, isPrimitive, isBareImport } from './utils.js';
+import 'node:buffer';
 import 'pathe';
 import 'node:fs';
 
-const { setTimeout, clearTimeout } = globalThis, debugExecute = createDebug("vite-node:client:execute"), debugNative = createDebug("vite-node:client:native"), clientStub = {
+const { setTimeout, clearTimeout } = globalThis;
+const debugExecute = createDebug("vite-node:client:execute");
+const debugNative = createDebug("vite-node:client:native");
+const clientStub = {
 	injectQuery: (id) => id,
 	createHotContext: () => {
 		return {
@@ -23,7 +28,8 @@ const { setTimeout, clearTimeout } = globalThis, debugExecute = createDebug("vit
 	},
 	updateStyle: () => {},
 	removeStyle: () => {}
-}, env = createImportMetaEnvProxy();
+};
+const env = createImportMetaEnvProxy();
 const DEFAULT_REQUEST_STUBS = {
 	"/@vite/client": clientStub,
 	"@vite/client": clientStub
@@ -36,7 +42,8 @@ class ModuleCacheMap extends Map {
 	* Assign partial data to the map
 	*/
 	update(fsPath, mod) {
-		if (fsPath = this.normalizePath(fsPath), !super.has(fsPath)) this.setByModuleId(fsPath, mod);
+		fsPath = this.normalizePath(fsPath);
+		if (!super.has(fsPath)) this.setByModuleId(fsPath, mod);
 		else Object.assign(super.get(fsPath), mod);
 		return this;
 	}
@@ -66,7 +73,13 @@ class ModuleCacheMap extends Map {
 	}
 	invalidateModule(mod) {
 		var _mod$importers, _mod$imports;
-		return delete mod.evaluated, delete mod.resolving, delete mod.promise, delete mod.exports, (_mod$importers = mod.importers) === null || _mod$importers === void 0 || _mod$importers.clear(), (_mod$imports = mod.imports) === null || _mod$imports === void 0 || _mod$imports.clear(), true;
+		delete mod.evaluated;
+		delete mod.resolving;
+		delete mod.promise;
+		delete mod.exports;
+		(_mod$importers = mod.importers) === null || _mod$importers === void 0 || _mod$importers.clear();
+		(_mod$imports = mod.imports) === null || _mod$imports === void 0 || _mod$imports.clear();
+		return true;
 	}
 	/**
 	* Invalidate modules that dependent on the given modules, up to the main entry
@@ -106,7 +119,11 @@ class ModuleCacheMap extends Map {
 		const cache = this.get(id);
 		if (cache.map) return cache.map;
 		const map = cache.code && extractSourceMap(cache.code);
-		return map ? (cache.map = map, map) : null;
+		if (map) {
+			cache.map = map;
+			return map;
+		}
+		return null;
 	}
 }
 class ViteNodeRunner {
@@ -137,7 +154,10 @@ class ViteNodeRunner {
 	// `performance` can be mocked, so make sure we're using the original function
 	performanceNow = performance.now.bind(performance);
 	constructor(options) {
-		this.options = options, this.root = options.root ?? process.cwd(), this.moduleCache = options.moduleCache ?? new ModuleCacheMap(), this.debug = options.debug ?? (typeof process !== "undefined" ? !!process.env.VITE_NODE_DEBUG_RUNNER : false);
+		this.options = options;
+		this.root = options.root ?? process.cwd();
+		this.moduleCache = options.moduleCache ?? new ModuleCacheMap();
+		this.debug = options.debug ?? (typeof process !== "undefined" ? !!process.env.VITE_NODE_DEBUG_RUNNER : false);
 	}
 	async executeFile(file) {
 		const url = `/@fs/${slash(resolve(file))}`;
@@ -149,7 +169,9 @@ class ViteNodeRunner {
 	}
 	/** @internal */
 	async cachedRequest(id, fsPath, callstack) {
-		const importee = callstack[callstack.length - 1], mod = this.moduleCache.get(fsPath), { imports, importers } = mod;
+		const importee = callstack[callstack.length - 1];
+		const mod = this.moduleCache.get(fsPath);
+		const { imports, importers } = mod;
 		if (importee) importers.add(importee);
 		const getStack = () => `stack:\n${[...callstack, fsPath].reverse().map((p) => `  - ${p}`).join("\n")}`;
 		// check circular dependency
@@ -162,12 +184,14 @@ class ViteNodeRunner {
 			// cached module
 			if (mod.promise) return await mod.promise;
 			const promise = this.directRequest(id, fsPath, callstack);
-			return Object.assign(mod, {
+			Object.assign(mod, {
 				promise,
 				evaluated: false
-			}), await promise;
+			});
+			return await promise;
 		} finally {
-			if (mod.evaluated = true, debugTimer) clearTimeout(debugTimer);
+			mod.evaluated = true;
+			if (debugTimer) clearTimeout(debugTimer);
 		}
 	}
 	shouldResolveId(id, _importee) {
@@ -186,16 +210,18 @@ class ViteNodeRunner {
 
 - If you rely on tsconfig.json's "paths" to resolve modules, please install "vite-tsconfig-paths" plugin to handle module resolution.
 - Make sure you don't have relative aliases in your Vitest config. Use absolute paths instead. Read more: https://vitest.dev/guide/common-errors`);
-			throw Object.defineProperty(error, "code", {
+			Object.defineProperty(error, "code", {
 				value: "ERR_MODULE_NOT_FOUND",
 				enumerable: true
-			}), Object.defineProperty(error, Symbol.for("vitest.error.not_found.data"), {
+			});
+			Object.defineProperty(error, Symbol.for("vitest.error.not_found.data"), {
 				value: {
 					id: dep,
 					importer
 				},
 				enumerable: false
-			}), error;
+			});
+			throw error;
 		}
 		const resolvedId = resolved ? normalizeRequestId(resolved.id, this.options.base) : dep;
 		return [resolvedId, resolvedId];
@@ -221,31 +247,46 @@ class ViteNodeRunner {
 			// rethrow vite error if it cannot load the module because it's not resolved
 			if (typeof cause === "object" && cause.code === "ERR_LOAD_URL" || typeof (cause === null || cause === void 0 ? void 0 : cause.message) === "string" && cause.message.includes("Failed to load url")) {
 				const error = new Error(`Cannot find ${isBareImport(id) ? "package" : "module"} '${id}'${importer ? ` imported from '${importer}'` : ""}`, { cause });
-				throw error.code = "ERR_MODULE_NOT_FOUND", error;
+				error.code = "ERR_MODULE_NOT_FOUND";
+				throw error;
 			}
 			throw cause;
 		}
 	}
 	/** @internal */
 	async directRequest(id, fsPath, _callstack) {
-		const moduleId = normalizeModuleId(fsPath), callstack = [..._callstack, moduleId], mod = this.moduleCache.getByModuleId(moduleId), request = async (dep) => {
-			const [id, depFsPath] = await this.resolveUrl(String(dep), fsPath), depMod = this.moduleCache.getByModuleId(depFsPath);
-			return depMod.importers.add(moduleId), mod.imports.add(depFsPath), this.dependencyRequest(id, depFsPath, callstack);
-		}, requestStubs = this.options.requestStubs || DEFAULT_REQUEST_STUBS;
+		const moduleId = normalizeModuleId(fsPath);
+		const callstack = [..._callstack, moduleId];
+		const mod = this.moduleCache.getByModuleId(moduleId);
+		const request = async (dep) => {
+			const [id, depFsPath] = await this.resolveUrl(String(dep), fsPath);
+			this.moduleCache.getByModuleId(depFsPath).importers.add(moduleId);
+			mod.imports.add(depFsPath);
+			return this.dependencyRequest(id, depFsPath, callstack);
+		};
+		const requestStubs = this.options.requestStubs || DEFAULT_REQUEST_STUBS;
 		if (id in requestStubs) return requestStubs[id];
 		let { code: transformed, externalize } = await this._fetchModule(id, callstack[callstack.length - 2]);
 		if (externalize) {
 			debugNative(externalize);
 			const exports = await this.interopedImport(externalize);
-			return mod.exports = exports, exports;
+			mod.exports = exports;
+			return exports;
 		}
 		if (transformed == null) throw new Error(`[vite-node] Failed to load "${id}" imported from ${callstack[callstack.length - 2]}`);
-		const { Object, Reflect, Symbol } = this.getContextPrimitives(), modulePath = cleanUrl(moduleId), href = pathToFileURL(modulePath).href, __filename = fileURLToPath(href), __dirname = dirname(__filename), meta = {
+		const { Object, Reflect, Symbol } = this.getContextPrimitives();
+		const modulePath = cleanUrl(moduleId);
+		// disambiguate the `<UNIT>:/` on windows: see nodejs/node#31710
+		const href = pathToFileURL(modulePath).href;
+		const __filename = fileURLToPath(href);
+		const __dirname = dirname(__filename);
+		const meta = {
 			url: href,
 			env,
 			filename: __filename,
 			dirname: __dirname
-		}, exports = Object.create(null);
+		};
+		const exports = Object.create(null);
 		Object.defineProperty(exports, Symbol.toStringTag, {
 			value: "Module",
 			enumerable: false,
@@ -257,17 +298,25 @@ class ViteNodeRunner {
 		// inside the module itself. imported module is always "exports"
 		const cjsExports = new Proxy(exports, {
 			get: (target, p, receiver) => {
-				return Reflect.has(target, p) ? Reflect.get(target, p, receiver) : Reflect.get(Object.prototype, p, receiver);
+				if (Reflect.has(target, p)) return Reflect.get(target, p, receiver);
+				return Reflect.get(Object.prototype, p, receiver);
 			},
 			getPrototypeOf: () => Object.prototype,
 			set: (_, p, value) => {
 				// treat "module.exports =" the same as "exports.default =" to not have nested "default.default",
 				// so "exports.default" becomes the actual module
-				if (p === "default" && this.shouldInterop(modulePath, { default: value }) && cjsExports !== value) return exportAll(cjsExports, value), exports.default = value, true;
+				if (p === "default" && this.shouldInterop(modulePath, { default: value }) && cjsExports !== value) {
+					exportAll(cjsExports, value);
+					exports.default = value;
+					return true;
+				}
 				if (!Reflect.has(exports, "default")) exports.default = {};
 				// returns undefined, when accessing named exports, if default is not an object
 				// but is still present inside hasOwnKeys, this is Node behaviour for CJS
-				if (moduleExports !== SYMBOL_NOT_DEFINED && isPrimitive(moduleExports)) return defineExport(exports, p, () => void 0), true;
+				if (moduleExports !== SYMBOL_NOT_DEFINED && isPrimitive(moduleExports)) {
+					defineExport(exports, p, () => void 0);
+					return true;
+				}
 				if (!isPrimitive(exports.default)) exports.default[p] = value;
 				if (p !== "default") defineExport(exports, p, () => value);
 				return true;
@@ -279,7 +328,9 @@ class ViteNodeRunner {
 		});
 		const moduleProxy = {
 			set exports(value) {
-				exportAll(cjsExports, value), exports.default = value, moduleExports = value;
+				exportAll(cjsExports, value);
+				exports.default = value;
+				moduleExports = value;
 			},
 			get exports() {
 				return cjsExports;
@@ -291,7 +342,8 @@ class ViteNodeRunner {
 			enumerable: true,
 			get: () => {
 				var _this$options$createH, _this$options;
-				return hotContext || (hotContext = (_this$options$createH = (_this$options = this.options).createHotContext) === null || _this$options$createH === void 0 ? void 0 : _this$options$createH.call(_this$options, this, moduleId)), hotContext;
+				hotContext || (hotContext = (_this$options$createH = (_this$options = this.options).createHotContext) === null || _this$options$createH === void 0 ? void 0 : _this$options$createH.call(_this$options, this, moduleId));
+				return hotContext;
 			},
 			set: (value) => {
 				hotContext = value;
@@ -318,9 +370,11 @@ class ViteNodeRunner {
 			__filename,
 			__dirname
 		});
+		debugExecute(__filename);
 		// remove shebang
-		if (debugExecute(__filename), transformed[0] === "#") transformed = transformed.replace(/^#!.*/, (s) => " ".repeat(s.length));
-		return await this.runModule(context, transformed), exports;
+		if (transformed[0] === "#") transformed = transformed.replace(/^#!.*/, (s) => " ".repeat(s.length));
+		await this.runModule(context, transformed);
+		return exports;
 	}
 	getContextPrimitives() {
 		return {
@@ -331,14 +385,16 @@ class ViteNodeRunner {
 	}
 	async runModule(context, transformed) {
 		// add 'use strict' since ESM enables it by default
-		const codeDefinition = `'use strict';async (${Object.keys(context).join(",")})=>{{`, code = `${codeDefinition}${transformed}\n}}`, options = {
+		const codeDefinition = `'use strict';async (${Object.keys(context).join(",")})=>{{`;
+		const code = `${codeDefinition}${transformed}\n}}`;
+		const options = {
 			filename: context.__filename,
 			lineOffset: 0,
 			columnOffset: -codeDefinition.length
-		}, finishModuleExecutionInfo = this.startCalculateModuleExecutionInfo(options.filename, codeDefinition.length);
+		};
+		const finishModuleExecutionInfo = this.startCalculateModuleExecutionInfo(options.filename, codeDefinition.length);
 		try {
-			const fn = vm.runInThisContext(code, options);
-			await fn(...Object.values(context));
+			await vm.runInThisContext(code, options)(...Object.values(context));
 		} finally {
 			var _this$options$moduleE;
 			(_this$options$moduleE = this.options.moduleExecutionInfo) === null || _this$options$moduleE === void 0 || _this$options$moduleE.set(options.filename, finishModuleExecutionInfo());
@@ -350,12 +406,14 @@ class ViteNodeRunner {
 	*/
 	startCalculateModuleExecutionInfo(filename, startOffset) {
 		const startTime = this.performanceNow();
-		return this.executionStack.push({
+		this.executionStack.push({
 			filename,
 			startTime,
 			subImportTime: 0
-		}), () => {
-			const duration = this.performanceNow() - startTime, currentExecution = this.executionStack.pop();
+		});
+		return () => {
+			const duration = this.performanceNow() - startTime;
+			const currentExecution = this.executionStack.pop();
 			if (currentExecution == null) throw new Error("Execution stack is empty, this should never happen");
 			const selfTime = duration - currentExecution.subImportTime;
 			if (this.executionStack.length > 0) this.executionStack.at(-1).subImportTime += duration;
@@ -374,9 +432,10 @@ class ViteNodeRunner {
 	* This function mostly for the ability to override by subclass
 	*/
 	shouldInterop(path, mod) {
+		if (this.options.interopDefault === false) return false;
 		// never interop ESM modules
 		// TODO: should also skip for `.js` with `type="module"`
-		return this.options.interopDefault === false ? false : !path.endsWith(".mjs") && "default" in mod;
+		return !path.endsWith(".mjs") && "default" in mod;
 	}
 	importExternalModule(path) {
 		return import(
@@ -393,10 +452,12 @@ class ViteNodeRunner {
 		const { mod, defaultExport } = interopModule(importedModule);
 		return new Proxy(mod, {
 			get(mod, prop) {
-				return prop === "default" ? defaultExport : mod[prop] ?? (defaultExport === null || defaultExport === void 0 ? void 0 : defaultExport[prop]);
+				if (prop === "default") return defaultExport;
+				return mod[prop] ?? (defaultExport === null || defaultExport === void 0 ? void 0 : defaultExport[prop]);
 			},
 			has(mod, prop) {
-				return prop === "default" ? defaultExport !== void 0 : prop in mod || defaultExport && prop in defaultExport;
+				if (prop === "default") return defaultExport !== void 0;
+				return prop in mod || defaultExport && prop in defaultExport;
 			},
 			getOwnPropertyDescriptor(mod, prop) {
 				const descriptor = Reflect.getOwnPropertyDescriptor(mod, prop);
@@ -417,7 +478,8 @@ function interopModule(mod) {
 	};
 	let defaultExport = "default" in mod ? mod.default : mod;
 	if (!isPrimitive(defaultExport) && "__esModule" in defaultExport) {
-		if (mod = defaultExport, "default" in defaultExport) defaultExport = defaultExport.default;
+		mod = defaultExport;
+		if ("default" in defaultExport) defaultExport = defaultExport.default;
 	}
 	return {
 		mod,
@@ -433,11 +495,13 @@ function defineExport(exports, key, value) {
 	});
 }
 function exportAll(exports, sourceModule) {
-	if (exports !== sourceModule && !(isPrimitive(sourceModule) || Array.isArray(sourceModule) || sourceModule instanceof Promise)) {
-		for (const key in sourceModule) if (key !== "default" && !(key in exports)) try {
-			defineExport(exports, key, () => sourceModule[key]);
-		} catch {}
-	}
+	// #1120 when a module exports itself it causes
+	// call stack error
+	if (exports === sourceModule) return;
+	if (isPrimitive(sourceModule) || Array.isArray(sourceModule) || sourceModule instanceof Promise) return;
+	for (const key in sourceModule) if (key !== "default" && !(key in exports)) try {
+		defineExport(exports, key, () => sourceModule[key]);
+	} catch {}
 }
 
 export { DEFAULT_REQUEST_STUBS, ModuleCacheMap, ViteNodeRunner };

package/dist/hmr.d.ts

@@ -1,6 +1,6 @@
 import { HMRPayload, Plugin } from 'vite';
 import { EventEmitter } from 'node:events';
-import { C as CustomEventMap, a as ViteNodeRunner, H as HMRPayload$1, b as HotContext } from './index.d-CvIJUDRh.js';
+import { C as CustomEventMap, a as ViteNodeRunner, H as HMRPayload$1, b as HotContext } from './index.d-D6Pqey3g.js';
 import './trace-mapping.d-BWFx6tPc.js';
 
 type EventType = string | symbol;
@@ -21,8 +21,6 @@ declare module "vite" {
 declare function createHmrEmitter(): HMREmitter;
 declare function viteNodeHmrPlugin(): Plugin;
 
-/* eslint-disable no-console */
-
 type ModuleNamespace = Record<string, any> & {
 	[Symbol.toStringTag]: "Module";
 };
@@ -32,7 +30,6 @@ interface HotModule {
 	callbacks: HotCallback[];
 }
 interface HotCallback {
-	// the dependencies must be fetchable paths
 	deps: string[];
 	fn: (modules: (ModuleNamespace | undefined)[]) => void;
 }

package/dist/{hmr.mjs → hmr.js}

@@ -1,8 +1,9 @@
-export { c as createHmrEmitter, a as createHotContext, g as getCache, h as handleMessage, r as reload, s as sendMessageBuffer, v as viteNodeHmrPlugin } from './chunk-hmr.mjs';
+export { c as createHmrEmitter, a as createHotContext, g as getCache, h as handleMessage, r as reload, s as sendMessageBuffer, v as viteNodeHmrPlugin } from './chunk-hmr.js';
 import 'node:events';
+import 'node:process';
 import 'debug';
-import './chunk-browser.mjs';
-import './utils.mjs';
+import './chunk-index.js';
+import './utils.js';
 import 'node:fs';
 import 'node:module';
 import 'node:url';

package/dist/{index.d-CvIJUDRh.d.ts → index.d-D6Pqey3g.d.ts}

@@ -76,6 +76,7 @@ interface ErrorPayload {
 }
 
 interface CustomEventMap {
+  // client events
   'vite:beforeUpdate': UpdatePayload
   'vite:afterUpdate': UpdatePayload
   'vite:beforePrune': PrunePayload
@@ -84,6 +85,10 @@ interface CustomEventMap {
   'vite:invalidate': InvalidatePayload
   'vite:ws:connect': WebSocketConnectionPayload
   'vite:ws:disconnect': WebSocketConnectionPayload
+
+  // server events
+  'vite:client:connect': undefined
+  'vite:client:disconnect': undefined
 }
 
 interface WebSocketConnectionPayload {
@@ -213,7 +218,6 @@ declare class ViteNodeRunner {
 	* As top-level awaits with dynamic imports like this are uncommon, we don't handle this case specifically.
 	*/
 	private executionStack;
-	// `performance` can be mocked, so make sure we're using the original function
 	private performanceNow;
 	constructor(options: ViteNodeRunnerOptions);
 	executeFile(file: string): Promise<any>;

package/dist/index.d.ts

@@ -1,2 +1,2 @@
-export { A as Arrayable, h as Awaitable, k as CreateHotContextFunction, D as DebuggerOptions, c as DepsHandlingOptions, i as FetchFunction, F as FetchResult, b as HotContext, l as ModuleCache, M as ModuleCacheMap, f as ModuleExecutionInfo, N as Nullable, R as RawSourceMap, j as ResolveIdFunction, S as StartOfSourceMap, d as ViteNodeResolveId, n as ViteNodeResolveModule, m as ViteNodeRunnerOptions, V as ViteNodeServerOptions } from './index.d-CvIJUDRh.js';
+export { A as Arrayable, h as Awaitable, k as CreateHotContextFunction, D as DebuggerOptions, c as DepsHandlingOptions, i as FetchFunction, F as FetchResult, b as HotContext, l as ModuleCache, M as ModuleCacheMap, f as ModuleExecutionInfo, N as Nullable, R as RawSourceMap, j as ResolveIdFunction, S as StartOfSourceMap, d as ViteNodeResolveId, n as ViteNodeResolveModule, m as ViteNodeRunnerOptions, V as ViteNodeServerOptions } from './index.d-D6Pqey3g.js';
 export { D as DecodedSourceMap, E as EncodedSourceMap, S as SourceMapInput } from './trace-mapping.d-BWFx6tPc.js';

package/dist/server.d.ts

@@ -1,9 +1,9 @@
 import { TransformResult, ViteDevServer } from 'vite';
-import { D as DebuggerOptions, c as DepsHandlingOptions, V as ViteNodeServerOptions, F as FetchResult, d as ViteNodeResolveId } from './index.d-CvIJUDRh.js';
+import { D as DebuggerOptions, c as DepsHandlingOptions, V as ViteNodeServerOptions, F as FetchResult, d as ViteNodeResolveId } from './index.d-D6Pqey3g.js';
 import { E as EncodedSourceMap } from './trace-mapping.d-BWFx6tPc.js';
 
 declare class Debugger {
-	options: string;
+	options: DebuggerOptions;
 	dumpDir: string | undefined;
 	initPromise: Promise<void> | undefined;
 	externalizeMap: Map<string, string>;