vite-node 3.2.0-beta.2 → 3.2.0

package/dist/chunk-hmr.cjs

@@ -14,6 +14,7 @@ function viteNodeHmrPlugin() {
 	return {
 		name: "vite-node:hmr",
 		config() {
+			// chokidar fsevents is unstable on macos when emitting "ready" event
 			if (process.platform === "darwin" && false);
 		},
 		configureServer(server) {
@@ -23,6 +24,8 @@ function viteNodeHmrPlugin() {
 				_send(payload);
 				emitter.emit("message", payload);
 			};
+			// eslint-disable-next-line ts/ban-ts-comment
+			// @ts-ignore Vite 6 compat
 			const environments = server.environments;
 			if (environments) environments.ssr.hot.send = function(payload) {
 				_send(payload);
@@ -33,15 +36,15 @@ function viteNodeHmrPlugin() {
 }
 
 const debugHmr = createDebug("vite-node:hmr");
-const cache = new WeakMap();
+const cache = /* @__PURE__ */ new WeakMap();
 function getCache(runner) {
 	if (!cache.has(runner)) cache.set(runner, {
-		hotModulesMap: new Map(),
-		dataMap: new Map(),
-		disposeMap: new Map(),
-		pruneMap: new Map(),
-		customListenersMap: new Map(),
-		ctxToListenersMap: new Map(),
+		hotModulesMap: /* @__PURE__ */ new Map(),
+		dataMap: /* @__PURE__ */ new Map(),
+		disposeMap: /* @__PURE__ */ new Map(),
+		pruneMap: /* @__PURE__ */ new Map(),
+		customListenersMap: /* @__PURE__ */ new Map(),
+		ctxToListenersMap: /* @__PURE__ */ new Map(),
 		messageBuffer: [],
 		isFirstUpdate: false,
 		pending: false,
@@ -55,6 +58,7 @@ function sendMessageBuffer(runner, emitter) {
 	maps.messageBuffer.length = 0;
 }
 async function reload(runner, files) {
+	// invalidate module cache but not node_modules
 	Array.from(runner.moduleCache.keys()).forEach((fsPath) => {
 		if (!fsPath.includes("node_modules")) runner.moduleCache.delete(fsPath);
 	});
@@ -82,9 +86,14 @@ async function fetchUpdate(runner, { path, acceptedPath }) {
 	acceptedPath = utils.normalizeRequestId(acceptedPath);
 	const maps = getCache(runner);
 	const mod = maps.hotModulesMap.get(path);
-	if (!mod) return;
+	if (!mod)
+ // In a code-splitting project,
+	// it is common that the hot-updating module is not loaded yet.
+	// https://github.com/vitejs/vite/issues/721
+	return;
 	const isSelfUpdate = path === acceptedPath;
 	let fetchedModule;
+	// determine the qualified callbacks before we re-import the modules
 	const qualifiedCallbacks = mod.callbacks.filter(({ deps }) => deps.includes(acceptedPath));
 	if (isSelfUpdate || qualifiedCallbacks.length > 0) {
 		const disposer = maps.disposeMap.get(acceptedPath);
@@ -115,6 +124,7 @@ async function handleMessage(runner, emitter, files, payload) {
 			await notifyListeners(runner, "vite:beforeUpdate", payload);
 			await Promise.all(payload.updates.map((update) => {
 				if (update.type === "js-update") return queueUpdate(runner, fetchUpdate(runner, update));
+				// css-update
 				console.error(`${browser.s.cyan("[vite-node]")} no support css hmr.}`);
 				return null;
 			}));
@@ -147,9 +157,11 @@ function createHotContext(runner, emitter, files, ownerPath) {
 	debugHmr("createHotContext", ownerPath);
 	const maps = getCache(runner);
 	if (!maps.dataMap.has(ownerPath)) maps.dataMap.set(ownerPath, {});
+	// when a file is hot updated, a new context is created
+	// clear its stale callbacks
 	const mod = maps.hotModulesMap.get(ownerPath);
 	if (mod) mod.callbacks = [];
-	const newListeners = new Map();
+	const newListeners = /* @__PURE__ */ new Map();
 	maps.ctxToListenersMap.set(ownerPath, newListeners);
 	function acceptDeps(deps, callback = () => {}) {
 		const mod = maps.hotModulesMap.get(ownerPath) || {
@@ -170,8 +182,12 @@ function createHotContext(runner, emitter, files, ownerPath) {
 			acceptDeps([ownerPath], callback && (([mod]) => callback(mod)));
 		},
 		accept(deps, callback) {
-			if (typeof deps === "function" || !deps) acceptDeps([ownerPath], ([mod]) => deps && deps(mod));
-			else if (typeof deps === "string") acceptDeps([deps], ([mod]) => callback && callback(mod));
+			if (typeof deps === "function" || !deps)
+ // self-accept: hot.accept(() => {})
+			acceptDeps([ownerPath], ([mod]) => deps && deps(mod));
+			else if (typeof deps === "string")
+ // explicit deps
+			acceptDeps([deps], ([mod]) => callback && callback(mod));
 			else if (Array.isArray(deps)) acceptDeps(deps, callback);
 			else throw new TypeError("invalid hot.accept() usage.");
 		},
@@ -184,7 +200,8 @@ function createHotContext(runner, emitter, files, ownerPath) {
 		invalidate() {
 			notifyListeners(runner, "vite:invalidate", {
 				path: ownerPath,
-				message: void 0
+				message: void 0,
+				firstInvalidatedBy: ownerPath
 			});
 			return reload(runner, files);
 		},

package/dist/chunk-hmr.mjs

@@ -12,6 +12,7 @@ function viteNodeHmrPlugin() {
 	return {
 		name: "vite-node:hmr",
 		config() {
+			// chokidar fsevents is unstable on macos when emitting "ready" event
 			if (process.platform === "darwin" && false);
 		},
 		configureServer(server) {
@@ -21,6 +22,8 @@ function viteNodeHmrPlugin() {
 				_send(payload);
 				emitter.emit("message", payload);
 			};
+			// eslint-disable-next-line ts/ban-ts-comment
+			// @ts-ignore Vite 6 compat
 			const environments = server.environments;
 			if (environments) environments.ssr.hot.send = function(payload) {
 				_send(payload);
@@ -31,15 +34,15 @@ function viteNodeHmrPlugin() {
 }
 
 const debugHmr = createDebug("vite-node:hmr");
-const cache = new WeakMap();
+const cache = /* @__PURE__ */ new WeakMap();
 function getCache(runner) {
 	if (!cache.has(runner)) cache.set(runner, {
-		hotModulesMap: new Map(),
-		dataMap: new Map(),
-		disposeMap: new Map(),
-		pruneMap: new Map(),
-		customListenersMap: new Map(),
-		ctxToListenersMap: new Map(),
+		hotModulesMap: /* @__PURE__ */ new Map(),
+		dataMap: /* @__PURE__ */ new Map(),
+		disposeMap: /* @__PURE__ */ new Map(),
+		pruneMap: /* @__PURE__ */ new Map(),
+		customListenersMap: /* @__PURE__ */ new Map(),
+		ctxToListenersMap: /* @__PURE__ */ new Map(),
 		messageBuffer: [],
 		isFirstUpdate: false,
 		pending: false,
@@ -53,6 +56,7 @@ function sendMessageBuffer(runner, emitter) {
 	maps.messageBuffer.length = 0;
 }
 async function reload(runner, files) {
+	// invalidate module cache but not node_modules
 	Array.from(runner.moduleCache.keys()).forEach((fsPath) => {
 		if (!fsPath.includes("node_modules")) runner.moduleCache.delete(fsPath);
 	});
@@ -80,9 +84,14 @@ async function fetchUpdate(runner, { path, acceptedPath }) {
 	acceptedPath = normalizeRequestId(acceptedPath);
 	const maps = getCache(runner);
 	const mod = maps.hotModulesMap.get(path);
-	if (!mod) return;
+	if (!mod)
+ // In a code-splitting project,
+	// it is common that the hot-updating module is not loaded yet.
+	// https://github.com/vitejs/vite/issues/721
+	return;
 	const isSelfUpdate = path === acceptedPath;
 	let fetchedModule;
+	// determine the qualified callbacks before we re-import the modules
 	const qualifiedCallbacks = mod.callbacks.filter(({ deps }) => deps.includes(acceptedPath));
 	if (isSelfUpdate || qualifiedCallbacks.length > 0) {
 		const disposer = maps.disposeMap.get(acceptedPath);
@@ -113,6 +122,7 @@ async function handleMessage(runner, emitter, files, payload) {
 			await notifyListeners(runner, "vite:beforeUpdate", payload);
 			await Promise.all(payload.updates.map((update) => {
 				if (update.type === "js-update") return queueUpdate(runner, fetchUpdate(runner, update));
+				// css-update
 				console.error(`${s.cyan("[vite-node]")} no support css hmr.}`);
 				return null;
 			}));
@@ -145,9 +155,11 @@ function createHotContext(runner, emitter, files, ownerPath) {
 	debugHmr("createHotContext", ownerPath);
 	const maps = getCache(runner);
 	if (!maps.dataMap.has(ownerPath)) maps.dataMap.set(ownerPath, {});
+	// when a file is hot updated, a new context is created
+	// clear its stale callbacks
 	const mod = maps.hotModulesMap.get(ownerPath);
 	if (mod) mod.callbacks = [];
-	const newListeners = new Map();
+	const newListeners = /* @__PURE__ */ new Map();
 	maps.ctxToListenersMap.set(ownerPath, newListeners);
 	function acceptDeps(deps, callback = () => {}) {
 		const mod = maps.hotModulesMap.get(ownerPath) || {
@@ -168,8 +180,12 @@ function createHotContext(runner, emitter, files, ownerPath) {
 			acceptDeps([ownerPath], callback && (([mod]) => callback(mod)));
 		},
 		accept(deps, callback) {
-			if (typeof deps === "function" || !deps) acceptDeps([ownerPath], ([mod]) => deps && deps(mod));
-			else if (typeof deps === "string") acceptDeps([deps], ([mod]) => callback && callback(mod));
+			if (typeof deps === "function" || !deps)
+ // self-accept: hot.accept(() => {})
+			acceptDeps([ownerPath], ([mod]) => deps && deps(mod));
+			else if (typeof deps === "string")
+ // explicit deps
+			acceptDeps([deps], ([mod]) => callback && callback(mod));
 			else if (Array.isArray(deps)) acceptDeps(deps, callback);
 			else throw new TypeError("invalid hot.accept() usage.");
 		},
@@ -182,7 +198,8 @@ function createHotContext(runner, emitter, files, ownerPath) {
 		invalidate() {
 			notifyListeners(runner, "vite:invalidate", {
 				path: ownerPath,
-				message: void 0
+				message: void 0,
+				firstInvalidatedBy: ownerPath
 			});
 			return reload(runner, files);
 		},

package/dist/cli.cjs

@@ -21,7 +21,7 @@ require('node:perf_hooks');
 require('es-module-lexer');
 require('./constants.cjs');
 
-var version = "3.2.0-beta.2";
+var version = "3.2.0";
 
 const cli = cac("vite-node");
 cli.option("-r, --root <path>", "Use specified root directory").option("-c, --config <path>", "Use specified config file").option("-m, --mode <mode>", "Set env mode").option("-w, --watch", "Restart on file changes, similar to \"nodemon\"").option("--script", "Use vite-node as a script runner").option("--options <options>", "Use specified Vite server options").option("-v, --version", "Output the version number").option("-h, --help", "Display help for command");
@@ -76,7 +76,9 @@ async function run(files, options = {}) {
 		plugins: [options.watch && hmr.viteNodeHmrPlugin()]
 	});
 	if (Number(vite.version.split(".")[0]) < 6) await server$1.pluginContainer.buildStart({});
-	else await server$1.environments.client.pluginContainer.buildStart({});
+	else
+ // directly access client plugin container until https://github.com/vitejs/vite/issues/19607
+	await server$1.environments.client.pluginContainer.buildStart({});
 	const env = vite.loadEnv(server$1.config.mode, server$1.config.envDir, "");
 	for (const key in env) {
 		var _process$env;
@@ -97,6 +99,7 @@ async function run(files, options = {}) {
 			return hmr.createHotContext(runner, server$1.emitter, files, url);
 		}
 	});
+	// provide the vite define variable in this context
 	await runner.executeId("/@vite/env");
 	for (const file of files) await runner.executeFile(file);
 	if (!options.watch) await server$1.close();

package/dist/cli.d.ts

@@ -1,4 +1,4 @@
-import { V as ViteNodeServerOptions } from './index.d-CWZbpOcv.js';
+import { V as ViteNodeServerOptions } from './index.d-DGmxD2U7.js';
 import './trace-mapping.d-DLVdEqOp.js';
 
 interface CliOptions {

package/dist/cli.mjs

@@ -3,23 +3,23 @@ import cac from 'cac';
 import { s } from './chunk-browser.mjs';
 import { createServer, version as version$1, loadEnv } from 'vite';
 import { ViteNodeRunner } from './client.mjs';
-import { v as viteNodeHmrPlugin, a as createHotContext, h as handleMessage } from './chunk-hmr.mjs';
 import { ViteNodeServer } from './server.mjs';
 import { installSourcemapsSupport } from './source-map.mjs';
 import { toArray } from './utils.mjs';
+import { v as viteNodeHmrPlugin, a as createHotContext, h as handleMessage } from './chunk-hmr.mjs';
 import 'node:module';
 import 'node:url';
 import 'node:vm';
 import 'debug';
 import 'pathe';
 import 'node:fs';
-import 'node:events';
 import 'node:assert';
 import 'node:perf_hooks';
 import 'es-module-lexer';
 import './constants.mjs';
+import 'node:events';
 
-var version = "3.2.0-beta.2";
+var version = "3.2.0";
 
 const cli = cac("vite-node");
 cli.option("-r, --root <path>", "Use specified root directory").option("-c, --config <path>", "Use specified config file").option("-m, --mode <mode>", "Set env mode").option("-w, --watch", "Restart on file changes, similar to \"nodemon\"").option("--script", "Use vite-node as a script runner").option("--options <options>", "Use specified Vite server options").option("-v, --version", "Output the version number").option("-h, --help", "Display help for command");
@@ -74,7 +74,9 @@ async function run(files, options = {}) {
 		plugins: [options.watch && viteNodeHmrPlugin()]
 	});
 	if (Number(version$1.split(".")[0]) < 6) await server.pluginContainer.buildStart({});
-	else await server.environments.client.pluginContainer.buildStart({});
+	else
+ // directly access client plugin container until https://github.com/vitejs/vite/issues/19607
+	await server.environments.client.pluginContainer.buildStart({});
 	const env = loadEnv(server.config.mode, server.config.envDir, "");
 	for (const key in env) {
 		var _process$env;
@@ -95,6 +97,7 @@ async function run(files, options = {}) {
 			return createHotContext(runner, server.emitter, files, url);
 		}
 	});
+	// provide the vite define variable in this context
 	await runner.executeId("/@vite/env");
 	for (const file of files) await runner.executeFile(file);
 	if (!options.watch) await server.close();

package/dist/client.cjs

@@ -57,8 +57,8 @@ class ModuleCacheMap extends Map {
 		if (!super.has(modulePath)) this.setByModuleId(modulePath, {});
 		const mod = super.get(modulePath);
 		if (!mod.imports) Object.assign(mod, {
-			imports: new Set(),
-			importers: new Set()
+			imports: /* @__PURE__ */ new Set(),
+			importers: /* @__PURE__ */ new Set()
 		});
 		return mod;
 	}
@@ -84,7 +84,7 @@ class ModuleCacheMap extends Map {
 	/**
 	* Invalidate modules that dependent on the given modules, up to the main entry
 	*/
-	invalidateDepTree(ids, invalidated = new Set()) {
+	invalidateDepTree(ids, invalidated = /* @__PURE__ */ new Set()) {
 		for (const _id of ids) {
 			const id = this.normalizePath(_id);
 			if (invalidated.has(id)) continue;
@@ -98,7 +98,7 @@ class ModuleCacheMap extends Map {
 	/**
 	* Invalidate dependency modules of the given modules, down to the bottom-level dependencies
 	*/
-	invalidateSubDepTree(ids, invalidated = new Set()) {
+	invalidateSubDepTree(ids, invalidated = /* @__PURE__ */ new Set()) {
 		for (const _id of ids) {
 			const id = this.normalizePath(_id);
 			if (invalidated.has(id)) continue;
@@ -134,6 +134,25 @@ class ViteNodeRunner {
 	* Keys of the map are filepaths, or plain package names
 	*/
 	moduleCache;
+	/**
+	* Tracks the stack of modules being executed for the purpose of calculating import self-time.
+	*
+	* Note that while in most cases, imports are a linear stack of modules,
+	* this is occasionally not the case, for example when you have parallel top-level dynamic imports like so:
+	*
+	* ```ts
+	* await Promise.all([
+	*  import('./module1'),
+	*  import('./module2'),
+	* ]);
+	* ```
+	*
+	* In this case, the self time will be reported incorrectly for one of the modules (could go negative).
+	* As top-level awaits with dynamic imports like this are uncommon, we don't handle this case specifically.
+	*/
+	executionStack = [];
+	// `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();
@@ -155,12 +174,14 @@ class ViteNodeRunner {
 		const { imports, importers } = mod;
 		if (importee) importers.add(importee);
 		const getStack = () => `stack:\n${[...callstack, fsPath].reverse().map((p) => `  - ${p}`).join("\n")}`;
+		// check circular dependency
 		if (callstack.includes(fsPath) || Array.from(imports.values()).some((i) => importers.has(i))) {
 			if (mod.exports) return mod.exports;
 		}
 		let debugTimer;
 		if (this.debug) debugTimer = setTimeout(() => console.warn(`[vite-node] module ${fsPath} takes over 2s to load.\n${getStack()}`), 2e3);
 		try {
+			// cached module
 			if (mod.promise) return await mod.promise;
 			const promise = this.directRequest(id, fsPath, callstack);
 			Object.assign(mod, {
@@ -183,6 +204,7 @@ class ViteNodeRunner {
 		const { path, exists } = utils.toFilePath(dep, this.root);
 		if (!this.options.resolveId || exists) return [dep, path];
 		const resolved = await this.options.resolveId(dep, importer);
+		// supported since Vite 5-beta.19
 		if (resolved === null || resolved === void 0 || (_resolved$meta = resolved.meta) === null || _resolved$meta === void 0 || (_resolved$meta = _resolved$meta["vite:alias"]) === null || _resolved$meta === void 0 ? void 0 : _resolved$meta.noResolved) {
 			const error = new Error(`Cannot find module '${id}'${importer ? ` imported from '${importer}'` : ""}.
 
@@ -206,6 +228,7 @@ class ViteNodeRunner {
 	}
 	async resolveUrl(id, importee) {
 		const resolveKey = `resolve:${id}`;
+		// put info about new import as soon as possible, so we can start tracking it
 		this.moduleCache.setByModuleId(resolveKey, { resolving: true });
 		try {
 			return await this._resolveUrl(id, importee);
@@ -221,6 +244,7 @@ class ViteNodeRunner {
 		try {
 			return await this.options.fetchModule(id);
 		} catch (cause) {
+			// 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 ${utils.isBareImport(id) ? "package" : "module"} '${id}'${importer ? ` imported from '${importer}'` : ""}`, { cause });
 				error.code = "ERR_MODULE_NOT_FOUND";
@@ -253,6 +277,7 @@ class ViteNodeRunner {
 		if (transformed == null) throw new Error(`[vite-node] Failed to load "${id}" imported from ${callstack[callstack.length - 2]}`);
 		const { Object, Reflect, Symbol } = this.getContextPrimitives();
 		const modulePath = utils.cleanUrl(moduleId);
+		// disambiguate the `<UNIT>:/` on windows: see nodejs/node#31710
 		const href = node_url.pathToFileURL(modulePath).href;
 		const __filename = node_url.fileURLToPath(href);
 		const __dirname = path.dirname(__filename);
@@ -270,6 +295,8 @@ class ViteNodeRunner {
 		});
 		const SYMBOL_NOT_DEFINED = Symbol("not defined");
 		let moduleExports = SYMBOL_NOT_DEFINED;
+		// this proxy is triggered only on exports.{name} and module.exports access
+		// inside the module itself. imported module is always "exports"
 		const cjsExports = new Proxy(exports, {
 			get: (target, p, receiver) => {
 				if (Reflect.has(target, p)) return Reflect.get(target, p, receiver);
@@ -277,12 +304,16 @@ class ViteNodeRunner {
 			},
 			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) {
 					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 && utils.isPrimitive(moduleExports)) {
 					defineExport(exports, p, () => void 0);
 					return true;
@@ -306,6 +337,7 @@ class ViteNodeRunner {
 				return cjsExports;
 			}
 		};
+		// Vite hot context
 		let hotContext;
 		if (this.options.createHotContext) Object.defineProperty(meta, "hot", {
 			enumerable: true,
@@ -318,11 +350,20 @@ class ViteNodeRunner {
 				hotContext = value;
 			}
 		});
+		// Be careful when changing this
+		// changing context will change amount of code added on line :114 (vm.runInThisContext)
+		// this messes up sourcemaps for coverage
+		// adjust `WRAPPER_LENGTH` variable in packages/coverage-v8/src/provider.ts if you do change this
 		const context = this.prepareContext({
 			__vite_ssr_import__: request,
 			__vite_ssr_dynamic_import__: request,
 			__vite_ssr_exports__: exports,
 			__vite_ssr_exportAll__: (obj) => exportAll(exports, obj),
+			__vite_ssr_exportName__: (name, getter) => Object.defineProperty(exports, name, {
+				enumerable: true,
+				configurable: true,
+				get: getter
+			}),
 			__vite_ssr_import_meta__: meta,
 			require: node_module.createRequire(href),
 			exports: cjsExports,
@@ -331,6 +372,7 @@ class ViteNodeRunner {
 			__dirname
 		});
 		debugExecute(__filename);
+		// remove shebang
 		if (transformed[0] === "#") transformed = transformed.replace(/^#!.*/, (s) => " ".repeat(s.length));
 		await this.runModule(context, transformed);
 		return exports;
@@ -343,7 +385,7 @@ class ViteNodeRunner {
 		};
 	}
 	async runModule(context, transformed) {
-		var _this$options$moduleE;
+		// add 'use strict' since ESM enables it by default
 		const codeDefinition = `'use strict';async (${Object.keys(context).join(",")})=>{{`;
 		const code = `${codeDefinition}${transformed}\n}}`;
 		const options = {
@@ -351,9 +393,38 @@ class ViteNodeRunner {
 			lineOffset: 0,
 			columnOffset: -codeDefinition.length
 		};
-		(_this$options$moduleE = this.options.moduleExecutionInfo) === null || _this$options$moduleE === void 0 || _this$options$moduleE.set(options.filename, { startOffset: codeDefinition.length });
-		const fn = vm.runInThisContext(code, options);
-		await fn(...Object.values(context));
+		const finishModuleExecutionInfo = this.startCalculateModuleExecutionInfo(options.filename, codeDefinition.length);
+		try {
+			const fn = vm.runInThisContext(code, options);
+			await fn(...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());
+		}
+	}
+	/**
+	* Starts calculating the module execution info such as the total duration and self time spent on executing the module.
+	* Returns a function to call once the module has finished executing.
+	*/
+	startCalculateModuleExecutionInfo(filename, startOffset) {
+		const startTime = this.performanceNow();
+		this.executionStack.push({
+			filename,
+			startTime,
+			subImportTime: 0
+		});
+		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;
+			return {
+				startOffset,
+				duration,
+				selfTime
+			};
+		};
 	}
 	prepareContext(context) {
 		return context;
@@ -364,6 +435,8 @@ class ViteNodeRunner {
 	*/
 	shouldInterop(path, mod) {
 		if (this.options.interopDefault === false) return false;
+		// never interop ESM modules
+		// TODO: should also skip for `.js` with `type="module"`
 		return !path.endsWith(".mjs") && "default" in mod;
 	}
 	importExternalModule(path) {
@@ -415,6 +488,7 @@ function interopModule(mod) {
 		defaultExport
 	};
 }
+// keep consistency with Vite on how exports are defined
 function defineExport(exports, key, value) {
 	Object.defineProperty(exports, key, {
 		enumerable: true,
@@ -423,6 +497,8 @@ function defineExport(exports, key, value) {
 	});
 }
 function exportAll(exports, sourceModule) {
+	// #1120 when a module exports itself it causes
+	// call stack error
 	if (exports === sourceModule) return;
 	if (utils.isPrimitive(sourceModule) || Array.isArray(sourceModule) || sourceModule instanceof Promise) return;
 	for (const key in sourceModule) if (key !== "default" && !(key in exports)) try {

package/dist/client.d.ts

@@ -1,2 +1,2 @@
 import './trace-mapping.d-DLVdEqOp.js';
-export { e as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, f as ModuleExecutionInfo, a as ViteNodeRunner } from './index.d-CWZbpOcv.js';
+export { e as DEFAULT_REQUEST_STUBS, M as ModuleCacheMap, f as ModuleExecutionInfo, g as ModuleExecutionInfoEntry, a as ViteNodeRunner } from './index.d-DGmxD2U7.js';