vite-node 3.2.0-beta.3 → 3.2.0

package/dist/chunk-hmr.cjs

@@ -36,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,
@@ -161,7 +161,7 @@ function createHotContext(runner, emitter, files, ownerPath) {
 	// 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) || {
@@ -200,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

@@ -34,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,
@@ -159,7 +159,7 @@ function createHotContext(runner, emitter, files, ownerPath) {
 	// 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) || {
@@ -198,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.3";
+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");

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.3";
+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");

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();
@@ -366,7 +385,6 @@ 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}}`;
@@ -375,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;

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';

package/dist/client.mjs

@@ -55,8 +55,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;
 	}
@@ -82,7 +82,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;
@@ -96,7 +96,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;
@@ -132,6 +132,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();
@@ -364,7 +383,6 @@ 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}}`;
@@ -373,9 +391,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;

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-CWZbpOcv.js';
+import { C as CustomEventMap, a as ViteNodeRunner, H as HMRPayload$1, b as HotContext } from './index.d-DGmxD2U7.js';
 import './trace-mapping.d-DLVdEqOp.js';
 
 type EventType = string | symbol;

package/dist/{index.d-CWZbpOcv.d.ts → index.d-DGmxD2U7.d.ts}

@@ -34,6 +34,8 @@ interface Update {
   /** @internal */
   isWithinCircularImport?: boolean
   /** @internal */
+  firstInvalidatedBy?: string
+  /** @internal */
   invalidates?: string[]
 }
 
@@ -98,14 +100,20 @@ interface WebSocketConnectionPayload {
 interface InvalidatePayload {
   path: string
   message: string | undefined
+  firstInvalidatedBy: string
 }
 
 /**
- * provides types for built-in Vite events
+ * provides types for payloads of built-in Vite events
  */
 type InferCustomEventPayload<T extends string> =
   T extends keyof CustomEventMap ? CustomEventMap[T] : any
 
+/**
+ * provides types for names of built-in Vite events
+ */
+type CustomEventName = keyof CustomEventMap | (string & {})
+
 type ModuleNamespace = Record<string, any> & {
   [Symbol.toStringTag]: 'Module'
 }
@@ -130,15 +138,18 @@ interface ViteHotContext {
   prune(cb: (data: any) => void): void
   invalidate(message?: string): void
 
-  on<T extends string>(
+  on<T extends CustomEventName>(
     event: T,
     cb: (payload: InferCustomEventPayload<T>) => void,
   ): void
-  off<T extends string>(
+  off<T extends CustomEventName>(
     event: T,
     cb: (payload: InferCustomEventPayload<T>) => void,
   ): void
-  send<T extends string>(event: T, data?: InferCustomEventPayload<T>): void
+  send<T extends CustomEventName>(
+    event: T,
+    data?: InferCustomEventPayload<T>,
+  ): void
 }
 
 declare const DEFAULT_REQUEST_STUBS: Record<string, Record<string, unknown>>;
@@ -168,9 +179,14 @@ declare class ModuleCacheMap extends Map<string, ModuleCache> {
 	*/
 	getSourceMap(id: string): EncodedSourceMap | null;
 }
-type ModuleExecutionInfo = Map<string, {
-	startOffset: number
-}>;
+type ModuleExecutionInfo = Map<string, ModuleExecutionInfoEntry>;
+interface ModuleExecutionInfoEntry {
+	startOffset: number;
+	/** The duration that was spent executing the module. */
+	duration: number;
+	/** The time that was spent executing the module itself and externalized imports. */
+	selfTime: number;
+}
 declare class ViteNodeRunner {
 	options: ViteNodeRunnerOptions;
 	root: string;
@@ -180,6 +196,25 @@ declare class ViteNodeRunner {
 	* Keys of the map are filepaths, or plain package names
 	*/
 	moduleCache: ModuleCacheMap;
+	/**
+	* 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.
+	*/
+	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>;
 	executeId(rawId: string): Promise<any>;
@@ -193,6 +228,11 @@ declare class ViteNodeRunner {
 		Symbol: SymbolConstructor
 	};
 	protected runModule(context: Record<string, any>, transformed: string): Promise<void>;
+	/**
+	* 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.
+	*/
+	protected startCalculateModuleExecutionInfo(filename: string, startOffset: number): () => ModuleExecutionInfoEntry;
 	prepareContext(context: Record<string, any>): Record<string, any>;
 	/**
 	* Define if a module should be interop-ed
@@ -320,4 +360,4 @@ interface DebuggerOptions {
 }
 
 export { ModuleCacheMap as M, ViteNodeRunner as a, DEFAULT_REQUEST_STUBS as e };
-export type { Arrayable as A, CustomEventMap as C, DebuggerOptions as D, FetchResult as F, HMRPayload as H, Nullable as N, RawSourceMap as R, StartOfSourceMap as S, ViteNodeServerOptions as V, HotContext as b, DepsHandlingOptions as c, ViteNodeResolveId as d, ModuleExecutionInfo as f, Awaitable as g, FetchFunction as h, ResolveIdFunction as i, CreateHotContextFunction as j, ModuleCache as k, ViteNodeRunnerOptions as l, ViteNodeResolveModule as m };
+export type { Arrayable as A, CustomEventMap as C, DebuggerOptions as D, FetchResult as F, HMRPayload as H, Nullable as N, RawSourceMap as R, StartOfSourceMap as S, ViteNodeServerOptions as V, HotContext as b, DepsHandlingOptions as c, ViteNodeResolveId as d, ModuleExecutionInfo as f, ModuleExecutionInfoEntry as g, Awaitable as h, FetchFunction as i, ResolveIdFunction as j, CreateHotContextFunction as k, ModuleCache as l, ViteNodeRunnerOptions as m, ViteNodeResolveModule as n };

package/dist/index.d.ts

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

package/dist/server.cjs

@@ -44,7 +44,7 @@ function hashCode(s) {
 class Debugger {
 	dumpDir;
 	initPromise;
-	externalizeMap = new Map();
+	externalizeMap = /* @__PURE__ */ new Map();
 	constructor(root, options) {
 		this.options = options;
 		if (options.dumpModules) this.dumpDir = pathe.resolve(root, options.dumpModules === true ? ".vite-node/dump" : options.dumpModules);
@@ -89,7 +89,7 @@ class Debugger {
 	async writeInfo() {
 		if (!this.dumpDir) return;
 		const info = JSON.stringify({
-			time: new Date().toLocaleString(),
+			time: (/* @__PURE__ */ new Date()).toLocaleString(),
 			externalize: Object.fromEntries(this.externalizeMap.entries())
 		}, null, 2);
 		return fs.promises.writeFile(pathe.join(this.dumpDir, "info.json"), info, "utf-8");
@@ -147,7 +147,7 @@ async function isValidNodeImport(id) {
 		return false;
 	}
 }
-const _defaultExternalizeCache = new Map();
+const _defaultExternalizeCache = /* @__PURE__ */ new Map();
 async function shouldExternalize(id, options, cache = _defaultExternalizeCache) {
 	if (!cache.has(id)) cache.set(id, _shouldExternalize(id, options));
 	return cache.get(id);
@@ -191,24 +191,24 @@ function patchWindowsImportPath(path) {
 const debugRequest = createDebug("vite-node:server:request");
 class ViteNodeServer {
 	fetchPromiseMap = {
-		ssr: new Map(),
-		web: new Map()
+		ssr: /* @__PURE__ */ new Map(),
+		web: /* @__PURE__ */ new Map()
 	};
 	transformPromiseMap = {
-		ssr: new Map(),
-		web: new Map()
+		ssr: /* @__PURE__ */ new Map(),
+		web: /* @__PURE__ */ new Map()
 	};
 	durations = {
-		ssr: new Map(),
-		web: new Map()
+		ssr: /* @__PURE__ */ new Map(),
+		web: /* @__PURE__ */ new Map()
 	};
-	existingOptimizedDeps = new Set();
+	existingOptimizedDeps = /* @__PURE__ */ new Set();
 	fetchCaches = {
-		ssr: new Map(),
-		web: new Map()
+		ssr: /* @__PURE__ */ new Map(),
+		web: /* @__PURE__ */ new Map()
 	};
-	fetchCache = new Map();
-	externalizeCache = new Map();
+	fetchCache = /* @__PURE__ */ new Map();
+	externalizeCache = /* @__PURE__ */ new Map();
 	debugger;
 	constructor(server, options = {}) {
 		var _options$deps3;

package/dist/server.d.ts

@@ -1,5 +1,5 @@
 import { TransformResult, ViteDevServer } from 'vite';
-import { D as DebuggerOptions, c as DepsHandlingOptions, V as ViteNodeServerOptions, F as FetchResult, d as ViteNodeResolveId } from './index.d-CWZbpOcv.js';
+import { D as DebuggerOptions, c as DepsHandlingOptions, V as ViteNodeServerOptions, F as FetchResult, d as ViteNodeResolveId } from './index.d-DGmxD2U7.js';
 import { E as EncodedSourceMap } from './trace-mapping.d-DLVdEqOp.js';
 
 declare class Debugger {

package/dist/server.mjs

@@ -23,7 +23,7 @@ function hashCode(s) {
 class Debugger {
 	dumpDir;
 	initPromise;
-	externalizeMap = new Map();
+	externalizeMap = /* @__PURE__ */ new Map();
 	constructor(root, options) {
 		this.options = options;
 		if (options.dumpModules) this.dumpDir = resolve(root, options.dumpModules === true ? ".vite-node/dump" : options.dumpModules);
@@ -68,7 +68,7 @@ class Debugger {
 	async writeInfo() {
 		if (!this.dumpDir) return;
 		const info = JSON.stringify({
-			time: new Date().toLocaleString(),
+			time: (/* @__PURE__ */ new Date()).toLocaleString(),
 			externalize: Object.fromEntries(this.externalizeMap.entries())
 		}, null, 2);
 		return promises.writeFile(join(this.dumpDir, "info.json"), info, "utf-8");
@@ -126,7 +126,7 @@ async function isValidNodeImport(id) {
 		return false;
 	}
 }
-const _defaultExternalizeCache = new Map();
+const _defaultExternalizeCache = /* @__PURE__ */ new Map();
 async function shouldExternalize(id, options, cache = _defaultExternalizeCache) {
 	if (!cache.has(id)) cache.set(id, _shouldExternalize(id, options));
 	return cache.get(id);
@@ -170,24 +170,24 @@ function patchWindowsImportPath(path) {
 const debugRequest = createDebug("vite-node:server:request");
 class ViteNodeServer {
 	fetchPromiseMap = {
-		ssr: new Map(),
-		web: new Map()
+		ssr: /* @__PURE__ */ new Map(),
+		web: /* @__PURE__ */ new Map()
 	};
 	transformPromiseMap = {
-		ssr: new Map(),
-		web: new Map()
+		ssr: /* @__PURE__ */ new Map(),
+		web: /* @__PURE__ */ new Map()
 	};
 	durations = {
-		ssr: new Map(),
-		web: new Map()
+		ssr: /* @__PURE__ */ new Map(),
+		web: /* @__PURE__ */ new Map()
 	};
-	existingOptimizedDeps = new Set();
+	existingOptimizedDeps = /* @__PURE__ */ new Set();
 	fetchCaches = {
-		ssr: new Map(),
-		web: new Map()
+		ssr: /* @__PURE__ */ new Map(),
+		web: /* @__PURE__ */ new Map()
 	};
-	fetchCache = new Map();
-	externalizeCache = new Map();
+	fetchCache = /* @__PURE__ */ new Map();
+	externalizeCache = /* @__PURE__ */ new Map();
 	debugger;
 	constructor(server, options = {}) {
 		var _options$deps3;

package/dist/source-map.cjs

@@ -920,7 +920,6 @@ let SOURCEMAPPING_URL = "sourceMa";
 SOURCEMAPPING_URL += "ppingURL";
 const VITE_NODE_SOURCEMAPPING_SOURCE = "//# sourceMappingSource=vite-node";
 const VITE_NODE_SOURCEMAPPING_URL = `${SOURCEMAPPING_URL}=data:application/json;charset=utf-8`;
-const VITE_NODE_SOURCEMAPPING_REGEXP = new RegExp(`//# ${VITE_NODE_SOURCEMAPPING_URL};base64,(.+)`);
 function withInlineSourcemap(result, options) {
 	const map = result.map;
 	let code = result.code;
@@ -953,9 +952,12 @@ function withInlineSourcemap(result, options) {
 	return result;
 }
 function extractSourceMap(code) {
-	var _code$match;
-	const mapString = (_code$match = code.match(VITE_NODE_SOURCEMAPPING_REGEXP)) === null || _code$match === void 0 ? void 0 : _code$match[1];
-	if (mapString) return JSON.parse(Buffer.from(mapString, "base64").toString("utf-8"));
+	const regexp = new RegExp(`//# ${VITE_NODE_SOURCEMAPPING_URL};base64,(.+)`, "gm");
+	let lastMatch, match;
+	// eslint-disable-next-line no-cond-assign
+	while (match = regexp.exec(code)) lastMatch = match;
+	// pick only the last source map keeping user strings that look like maps
+	if (lastMatch) return JSON.parse(Buffer.from(lastMatch[1], "base64").toString("utf-8"));
 	return null;
 }
 function installSourcemapsSupport(options) {

package/dist/source-map.mjs

@@ -918,7 +918,6 @@ let SOURCEMAPPING_URL = "sourceMa";
 SOURCEMAPPING_URL += "ppingURL";
 const VITE_NODE_SOURCEMAPPING_SOURCE = "//# sourceMappingSource=vite-node";
 const VITE_NODE_SOURCEMAPPING_URL = `${SOURCEMAPPING_URL}=data:application/json;charset=utf-8`;
-const VITE_NODE_SOURCEMAPPING_REGEXP = new RegExp(`//# ${VITE_NODE_SOURCEMAPPING_URL};base64,(.+)`);
 function withInlineSourcemap(result, options) {
 	const map = result.map;
 	let code = result.code;
@@ -951,9 +950,12 @@ function withInlineSourcemap(result, options) {
 	return result;
 }
 function extractSourceMap(code) {
-	var _code$match;
-	const mapString = (_code$match = code.match(VITE_NODE_SOURCEMAPPING_REGEXP)) === null || _code$match === void 0 ? void 0 : _code$match[1];
-	if (mapString) return JSON.parse(Buffer.from(mapString, "base64").toString("utf-8"));
+	const regexp = new RegExp(`//# ${VITE_NODE_SOURCEMAPPING_URL};base64,(.+)`, "gm");
+	let lastMatch, match;
+	// eslint-disable-next-line no-cond-assign
+	while (match = regexp.exec(code)) lastMatch = match;
+	// pick only the last source map keeping user strings that look like maps
+	if (lastMatch) return JSON.parse(Buffer.from(lastMatch[1], "base64").toString("utf-8"));
 	return null;
 }
 function installSourcemapsSupport(options) {

package/dist/types.d.ts

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

package/dist/utils.cjs

@@ -177,7 +177,7 @@ function createImportMetaEnvProxy() {
 		}
 	});
 }
-const packageCache = new Map();
+const packageCache = /* @__PURE__ */ new Map();
 async function findNearestPackageData(basedir) {
 	const originalBasedir = basedir;
 	while (basedir) {

package/dist/utils.d.ts

@@ -1,4 +1,4 @@
-import { N as Nullable, A as Arrayable } from './index.d-CWZbpOcv.js';
+import { N as Nullable, A as Arrayable } from './index.d-DGmxD2U7.js';
 import './trace-mapping.d-DLVdEqOp.js';
 
 declare const isWindows: boolean;

package/dist/utils.mjs

@@ -175,7 +175,7 @@ function createImportMetaEnvProxy() {
 		}
 	});
 }
-const packageCache = new Map();
+const packageCache = /* @__PURE__ */ new Map();
 async function findNearestPackageData(basedir) {
 	const originalBasedir = basedir;
 	while (basedir) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vite-node",
   "type": "module",
-  "version": "3.2.0-beta.3",
+  "version": "3.2.0",
   "description": "Vite as Node.js runtime",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",