vitest 4.0.0-beta.4 → 4.0.0-beta.5

package/dist/module-evaluator.js

@@ -0,0 +1,327 @@
+import { isBuiltin, createRequire } from 'node:module';
+import { pathToFileURL } from 'node:url';
+import vm from 'node:vm';
+import { isAbsolute } from 'pathe';
+import { ssrModuleExportsKey, ssrImportMetaKey, ssrImportKey, ssrDynamicImportKey, ssrExportAllKey } from 'vite/module-runner';
+
+const performanceNow = performance.now.bind(performance);
+class ModuleDebug {
+	executionStack = [];
+	startCalculateModuleExecutionInfo(filename, startOffset) {
+		const startTime = performanceNow();
+		this.executionStack.push({
+			filename,
+			startTime,
+			subImportTime: 0
+		});
+		return () => {
+			const duration = 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
+			};
+		};
+	}
+}
+
+const isWindows = process.platform === "win32";
+class VitestModuleEvaluator {
+	stubs = {};
+	env = createImportMetaEnvProxy();
+	vm;
+	compiledFunctionArgumentsNames;
+	compiledFunctionArgumentsValues = [];
+	primitives;
+	debug = new ModuleDebug();
+	constructor(vmOptions, options = {}) {
+		this.options = options;
+		this.vm = vmOptions;
+		this.stubs = getDefaultRequestStubs(vmOptions?.context);
+		if (options.compiledFunctionArgumentsNames) this.compiledFunctionArgumentsNames = options.compiledFunctionArgumentsNames;
+		if (options.compiledFunctionArgumentsValues) this.compiledFunctionArgumentsValues = options.compiledFunctionArgumentsValues;
+		if (vmOptions) this.primitives = vm.runInContext("({ Object, Proxy, Reflect })", vmOptions.context);
+		else this.primitives = {
+			Object,
+			Proxy,
+			Reflect
+		};
+	}
+	convertIdToImportUrl(id) {
+		// TODO: vitest returns paths for external modules, but Vite returns file://
+		// unfortunetly, there is a bug in Vite where ID is resolved incorrectly, so we can't return files until the fix is merged
+		// https://github.com/vitejs/vite/pull/20449
+		if (!isWindows || isBuiltin(id) || /^(?:node:|data:|http:|https:|file:)/.test(id)) return id;
+		const [filepath, query] = id.split("?");
+		if (query) return `${pathToFileURL(filepath).toString()}?${query}`;
+		return pathToFileURL(filepath).toString();
+	}
+	async runExternalModule(id) {
+		if (id in this.stubs) return this.stubs[id];
+		const file = this.convertIdToImportUrl(id);
+		const namespace = this.vm ? await this.vm.externalModulesExecutor.import(file) : await import(file);
+		if (!this.shouldInterop(file, namespace)) return namespace;
+		const { mod, defaultExport } = interopModule(namespace);
+		const { Proxy, Reflect } = this.primitives;
+		const proxy = new Proxy(mod, {
+			get(mod, prop) {
+				if (prop === "default") return defaultExport;
+				return mod[prop] ?? defaultExport?.[prop];
+			},
+			has(mod, prop) {
+				if (prop === "default") return defaultExport !== void 0;
+				return prop in mod || defaultExport && prop in defaultExport;
+			},
+			getOwnPropertyDescriptor(mod, prop) {
+				const descriptor = Reflect.getOwnPropertyDescriptor(mod, prop);
+				if (descriptor) return descriptor;
+				if (prop === "default" && defaultExport !== void 0) return {
+					value: defaultExport,
+					enumerable: true,
+					configurable: true
+				};
+			}
+		});
+		return proxy;
+	}
+	async runInlinedModule(context, code, module) {
+		context.__vite_ssr_import_meta__.env = this.env;
+		const { Reflect, Proxy, Object } = this.primitives;
+		const exportsObject = context[ssrModuleExportsKey];
+		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(exportsObject, {
+			get: (target, 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(module.file, { default: value }) && cjsExports !== value) {
+					exportAll(cjsExports, value);
+					exportsObject.default = value;
+					return true;
+				}
+				if (!Reflect.has(exportsObject, "default")) exportsObject.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)) {
+					defineExport(exportsObject, p, () => void 0);
+					return true;
+				}
+				if (!isPrimitive(exportsObject.default)) exportsObject.default[p] = value;
+				if (p !== "default") defineExport(exportsObject, p, () => value);
+				return true;
+			}
+		});
+		const moduleProxy = {
+			set exports(value) {
+				exportAll(cjsExports, value);
+				exportsObject.default = value;
+				moduleExports = value;
+			},
+			get exports() {
+				return cjsExports;
+			}
+		};
+		const meta = context[ssrImportMetaKey];
+		const testFilepath = this.options.getCurrentTestFilepath?.();
+		if (testFilepath === module.file) {
+			const globalNamespace = this.vm?.context || globalThis;
+			Object.defineProperty(meta, "vitest", { get: () => globalNamespace.__vitest_index__ });
+		}
+		const filename = meta.filename;
+		const dirname = meta.dirname;
+		const require = this.createRequire(filename);
+		const argumentsList = [
+			ssrModuleExportsKey,
+			ssrImportMetaKey,
+			ssrImportKey,
+			ssrDynamicImportKey,
+			ssrExportAllKey,
+			"__vite_ssr_exportName__",
+			"__filename",
+			"__dirname",
+			"module",
+			"exports",
+			"require"
+		];
+		if (this.compiledFunctionArgumentsNames) argumentsList.push(...this.compiledFunctionArgumentsNames);
+		// add 'use strict' since ESM enables it by default
+		const codeDefinition = `'use strict';async (${argumentsList.join(",")})=>{{`;
+		const wrappedCode = `${codeDefinition}${code}\n}}`;
+		const options = {
+			filename: module.file || filename,
+			lineOffset: 0,
+			columnOffset: -codeDefinition.length
+		};
+		const finishModuleExecutionInfo = this.debug.startCalculateModuleExecutionInfo(filename, codeDefinition.length);
+		try {
+			const initModule = this.vm ? vm.runInContext(wrappedCode, this.vm.context, options) : vm.runInThisContext(wrappedCode, options);
+			const dynamicRequest = async (dep, options) => {
+				dep = String(dep);
+				// TODO: support more edge cases?
+				// vite doesn't support dynamic modules by design, but we have to
+				if (dep[0] === "#") return context[ssrDynamicImportKey](wrapId(dep), options);
+				return context[ssrDynamicImportKey](dep, options);
+			};
+			await initModule(
+				context[ssrModuleExportsKey],
+				context[ssrImportMetaKey],
+				context[ssrImportKey],
+				dynamicRequest,
+				context[ssrExportAllKey],
+				// vite 7 support, remove when vite 7+ is supported
+				context.__vite_ssr_exportName__ || ((name, getter) => Object.defineProperty(exportsObject, name, {
+					enumerable: true,
+					configurable: true,
+					get: getter
+				})),
+				filename,
+				dirname,
+				moduleProxy,
+				cjsExports,
+				require,
+				...this.compiledFunctionArgumentsValues
+			);
+		} finally {
+			// moduleExecutionInfo needs to use Node filename instead of the normalized one
+			// because we rely on this behaviour in coverage-v8, for example
+			this.options.moduleExecutionInfo?.set(filename, finishModuleExecutionInfo());
+		}
+	}
+	createRequire(filename) {
+		// \x00 is a rollup convention for virtual files,
+		// it is not allowed in actual file names
+		if (filename.startsWith("\0") || !isAbsolute(filename)) return () => ({});
+		return this.vm ? this.vm.externalModulesExecutor.createRequire(filename) : createRequire(filename);
+	}
+	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;
+	}
+}
+function createImportMetaEnvProxy() {
+	// packages/vitest/src/node/plugins/index.ts:146
+	const booleanKeys = [
+		"DEV",
+		"PROD",
+		"SSR"
+	];
+	return new Proxy(process.env, {
+		get(_, key) {
+			if (typeof key !== "string") return void 0;
+			if (booleanKeys.includes(key)) return !!process.env[key];
+			return process.env[key];
+		},
+		set(_, key, value) {
+			if (typeof key !== "string") return true;
+			if (booleanKeys.includes(key)) process.env[key] = value ? "1" : "";
+			else process.env[key] = value;
+			return true;
+		}
+	});
+}
+function updateStyle(id, css) {
+	if (typeof document === "undefined") return;
+	const element = document.querySelector(`[data-vite-dev-id="${id}"]`);
+	if (element) {
+		element.textContent = css;
+		return;
+	}
+	const head = document.querySelector("head");
+	const style = document.createElement("style");
+	style.setAttribute("type", "text/css");
+	style.setAttribute("data-vite-dev-id", id);
+	style.textContent = css;
+	head?.appendChild(style);
+}
+function removeStyle(id) {
+	if (typeof document === "undefined") return;
+	const sheet = document.querySelector(`[data-vite-dev-id="${id}"]`);
+	if (sheet) document.head.removeChild(sheet);
+}
+const defaultClientStub = {
+	injectQuery: (id) => id,
+	createHotContext: () => {
+		return {
+			accept: () => {},
+			prune: () => {},
+			dispose: () => {},
+			decline: () => {},
+			invalidate: () => {},
+			on: () => {},
+			send: () => {}
+		};
+	},
+	updateStyle: () => {},
+	removeStyle: () => {}
+};
+function getDefaultRequestStubs(context) {
+	if (!context) {
+		const clientStub = {
+			...defaultClientStub,
+			updateStyle,
+			removeStyle
+		};
+		return { "/@vite/client": clientStub };
+	}
+	const clientStub = vm.runInContext(`(defaultClient) => ({ ...defaultClient, updateStyle: ${updateStyle.toString()}, removeStyle: ${removeStyle.toString()} })`, context)(defaultClientStub);
+	return { "/@vite/client": clientStub };
+}
+function exportAll(exports, sourceModule) {
+	// #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 {}
+}
+// keep consistency with Vite on how exports are defined
+function defineExport(exports, key, value) {
+	Object.defineProperty(exports, key, {
+		enumerable: true,
+		configurable: true,
+		get: value
+	});
+}
+function isPrimitive(v) {
+	const isObject = typeof v === "object" || typeof v === "function";
+	return !isObject || v == null;
+}
+function interopModule(mod) {
+	if (isPrimitive(mod)) return {
+		mod: { default: mod },
+		defaultExport: mod
+	};
+	let defaultExport = "default" in mod ? mod.default : mod;
+	if (!isPrimitive(defaultExport) && "__esModule" in defaultExport) {
+		mod = defaultExport;
+		if ("default" in defaultExport) defaultExport = defaultExport.default;
+	}
+	return {
+		mod,
+		defaultExport
+	};
+}
+const VALID_ID_PREFIX = `/@id/`;
+const NULL_BYTE_PLACEHOLDER = `__x00__`;
+function wrapId(id) {
+	return id.startsWith(VALID_ID_PREFIX) ? id : VALID_ID_PREFIX + id.replace("\0", NULL_BYTE_PLACEHOLDER);
+}
+function unwrapId(id) {
+	return id.startsWith(VALID_ID_PREFIX) ? id.slice(VALID_ID_PREFIX.length).replace(NULL_BYTE_PLACEHOLDER, "\0") : id;
+}
+
+export { VitestModuleEvaluator, createImportMetaEnvProxy, getDefaultRequestStubs, isPrimitive, unwrapId, wrapId };

package/dist/module-runner.js

@@ -0,0 +1,15 @@
+export { VitestModuleEvaluator } from './module-evaluator.js';
+export { a as VITEST_VM_CONTEXT_SYMBOL, V as VitestModuleRunner, s as startVitestModuleRunner } from './chunks/startModuleRunner.C8FtT_BY.js';
+export { g as getWorkerState } from './chunks/utils.B9FY3b73.js';
+import 'node:module';
+import 'node:url';
+import 'node:vm';
+import 'pathe';
+import 'vite/module-runner';
+import 'node:fs';
+import '@vitest/utils';
+import './path.js';
+import 'node:path';
+import '@vitest/utils/error';
+import '@vitest/mocker';
+import './chunks/moduleTransport.I-bgQy0S.js';

package/dist/node.d.ts

@@ -3,36 +3,35 @@ import { InlineConfig, UserConfig as UserConfig$1, Plugin, ResolvedConfig as Res
 export { vite as Vite };
 export { esbuildVersion, isCSSRequest, isFileServingAllowed, parseAst, parseAstAsync, rollupVersion, version as viteVersion } from 'vite';
 import { IncomingMessage } from 'node:http';
-import { h as ResolvedConfig, f as UserConfig, i as VitestRunMode, j as VitestOptions, V as Vitest, A as ApiConfig, T as TestProject, k as TestSequencer, l as TestSpecification, L as Logger } from './chunks/reporters.d.DWg40D2B.js';
-export { aq as BaseCoverageOptions, K as BenchmarkUserOptions, N as BrowserBuiltinProvider, Q as BrowserCommand, X as BrowserCommandContext, Y as BrowserConfigOptions, Z as BrowserInstanceOption, _ as BrowserModuleMocker, $ as BrowserOrchestrator, a0 as BrowserProvider, a1 as BrowserProviderInitializationOptions, a2 as BrowserProviderModule, a3 as BrowserProviderOptions, a4 as BrowserScript, a5 as BrowserServerState, a6 as BrowserServerStateSession, ad as BuiltinEnvironment, a7 as CDPSession, ae as CSSModuleScopeStrategy, ar as CoverageIstanbulOptions, as as CoverageOptions, at as CoverageProvider, au as CoverageProviderModule, av as CoverageReporter, c as CoverageV8Options, aw as CustomProviderOptions, af as DepsOptimizationOptions, ag as EnvironmentOptions, H as HTMLOptions, I as InlineConfig, q as JUnitOptions, J as JsonOptions, M as ModuleDiagnostic, O as OnServerRestartHandler, m as OnTestsRerunHandler, a8 as ParentProjectBrowser, ah as Pool, ai as PoolOptions, P as ProcessPool, a9 as ProjectBrowser, aj as ProjectConfig, b as ReportContext, ay as ReportedHookContext, az as Reporter, al as ResolveSnapshotPathHandler, am as ResolveSnapshotPathHandlerContext, aa as ResolvedBrowserOptions, R as ResolvedCoverageOptions, ak as ResolvedProjectConfig, S as SerializedTestProject, r as TaskOptions, s as TestCase, t as TestCollection, u as TestDiagnostic, v as TestModule, w as TestModuleState, x as TestResult, y as TestResultFailed, z as TestResultPassed, B as TestResultSkipped, aA as TestRunEndReason, ax as TestRunResult, G as TestSequencerConstructor, D as TestState, E as TestSuite, F as TestSuiteState, ab as ToMatchScreenshotComparators, ac as ToMatchScreenshotOptions, an as TransformModePatterns, ao as TypecheckConfig, U as UserWorkspaceConfig, ap as VitestEnvironment, n as VitestPackageInstaller, W as WatcherTriggerPattern, o as WorkspaceSpec, p as getFilePoolName } from './chunks/reporters.d.DWg40D2B.js';
-import { R as RuntimeRPC } from './chunks/worker.d.zjyR34Pb.js';
-export { T as TestExecutionType } from './chunks/worker.d.zjyR34Pb.js';
+import { h as ResolvedConfig, f as UserConfig, i as VitestRunMode, j as VitestOptions, V as Vitest, A as ApiConfig, T as TestProject, k as TestSequencer, l as TestSpecification, L as Logger } from './chunks/reporters.d.CYE9sT5z.js';
+export { ap as BaseCoverageOptions, K as BenchmarkUserOptions, N as BrowserBuiltinProvider, Q as BrowserCommand, X as BrowserCommandContext, Y as BrowserConfigOptions, Z as BrowserInstanceOption, _ as BrowserModuleMocker, $ as BrowserOrchestrator, a0 as BrowserProvider, a1 as BrowserProviderInitializationOptions, a2 as BrowserProviderModule, a3 as BrowserProviderOptions, a4 as BrowserScript, a5 as BrowserServerState, a6 as BrowserServerStateSession, ad as BuiltinEnvironment, a7 as CDPSession, ae as CSSModuleScopeStrategy, aq as CoverageIstanbulOptions, ar as CoverageOptions, as as CoverageProvider, at as CoverageProviderModule, au as CoverageReporter, c as CoverageV8Options, av as CustomProviderOptions, af as DepsOptimizationOptions, ag as EnvironmentOptions, H as HTMLOptions, I as InlineConfig, q as JUnitOptions, J as JsonOptions, M as ModuleDiagnostic, O as OnServerRestartHandler, m as OnTestsRerunHandler, a8 as ParentProjectBrowser, ah as Pool, ai as PoolOptions, P as ProcessPool, a9 as ProjectBrowser, aj as ProjectConfig, b as ReportContext, ax as ReportedHookContext, ay as Reporter, al as ResolveSnapshotPathHandler, am as ResolveSnapshotPathHandlerContext, aa as ResolvedBrowserOptions, R as ResolvedCoverageOptions, ak as ResolvedProjectConfig, S as SerializedTestProject, r as TaskOptions, s as TestCase, t as TestCollection, u as TestDiagnostic, v as TestModule, w as TestModuleState, x as TestResult, y as TestResultFailed, z as TestResultPassed, B as TestResultSkipped, az as TestRunEndReason, aw as TestRunResult, G as TestSequencerConstructor, D as TestState, E as TestSuite, F as TestSuiteState, ab as ToMatchScreenshotComparators, ac as ToMatchScreenshotOptions, an as TypecheckConfig, U as UserWorkspaceConfig, ao as VitestEnvironment, n as VitestPackageInstaller, W as WatcherTriggerPattern, o as WorkspaceSpec, p as getFilePoolName } from './chunks/reporters.d.CYE9sT5z.js';
+import { R as RuntimeRPC } from './chunks/worker.d.D9QWnzAe.js';
+export { T as TestExecutionType } from './chunks/worker.d.D9QWnzAe.js';
 import { Writable } from 'node:stream';
-export { V as VitestPluginContext } from './chunks/plugin.d.CLhMcYdD.js';
-export { W as WorkerContext } from './chunks/worker.d.C-1AbnVe.js';
+export { V as VitestPluginContext } from './chunks/plugin.d.CvOlgjxK.js';
+export { W as WorkerContext } from './chunks/worker.d.Db-UVmXc.js';
 import { Debugger } from 'debug';
-import './chunks/global.d.DAhT2emn.js';
+import './chunks/global.d.K6uBQHzY.js';
 export { Task as RunnerTask, TaskResult as RunnerTaskResult, TaskResultPack as RunnerTaskResultPack, Test as RunnerTestCase, File as RunnerTestFile, Suite as RunnerTestSuite, SequenceHooks, SequenceSetupFiles } from '@vitest/runner';
-export { b as RuntimeConfig } from './chunks/config.d.DZo8c7fw.js';
+export { b as RuntimeConfig } from './chunks/config.d.CKNVOKm0.js';
 export { SerializedError } from '@vitest/utils';
 export { generateFileHash } from '@vitest/runner/utils';
-import './chunks/environment.d.Bhm9oc0v.js';
+import './chunks/environment.d.2fYMoz3o.js';
 import 'node:console';
-import './chunks/browser.d.BRP8scJf.js';
+import './chunks/browser.d.Cawq_X_N.js';
 import '@vitest/mocker';
 import '@vitest/utils/source-map';
 import '@vitest/pretty-format';
 import '@vitest/snapshot';
 import '@vitest/utils/diff';
-import 'vite-node';
 import 'chai';
 import 'vitest/optional-types.js';
 import './chunks/benchmark.d.DAaHLpsq.js';
 import 'tinybench';
-import './chunks/coverage.d.CNYjU4GF.js';
-import 'vite-node/client';
+import './chunks/coverage.d.BZtK59WP.js';
 import '@vitest/snapshot/manager';
 import 'node:fs';
+import 'vite/module-runner';
 import 'node:worker_threads';
 import '@vitest/expect';
 

package/dist/node.js

@@ -1,28 +1,26 @@
 import * as vite from 'vite';
 import { resolveConfig as resolveConfig$1, mergeConfig } from 'vite';
 export { esbuildVersion, isCSSRequest, isFileServingAllowed, parseAst, parseAstAsync, rollupVersion, version as viteVersion } from 'vite';
-import { V as Vitest, a as VitestPlugin } from './chunks/cli-api.B8xRY9Zt.js';
-export { G as GitNotFoundError, F as TestsNotFoundError, b as VitestPackageInstaller, e as createViteLogger, c as createVitest, i as isValidApiRequest, d as registerConsoleShortcuts, r as resolveFsAllow, s as startVitest } from './chunks/cli-api.B8xRY9Zt.js';
-export { p as parseCLI } from './chunks/cac.CY0IAxC4.js';
-import { r as resolveConfig$2 } from './chunks/coverage.C84l9G-M.js';
-export { b as BaseSequencer, c as createMethodsRPC, g as getFilePoolName, a as resolveApiServerConfig } from './chunks/coverage.C84l9G-M.js';
+import { V as Vitest, a as VitestPlugin } from './chunks/cli-api.COn58yrl.js';
+export { G as GitNotFoundError, F as TestsNotFoundError, b as VitestPackageInstaller, e as createViteLogger, c as createVitest, i as isValidApiRequest, d as registerConsoleShortcuts, r as resolveFsAllow, s as startVitest } from './chunks/cli-api.COn58yrl.js';
+export { p as parseCLI } from './chunks/cac.CKnbxhn2.js';
+import { r as resolveConfig$2 } from './chunks/coverage.B6cReEn1.js';
+export { b as BaseSequencer, c as createMethodsRPC, g as getFilePoolName, a as resolveApiServerConfig } from './chunks/coverage.B6cReEn1.js';
 import { slash, deepClone } from '@vitest/utils';
 import { f as findUp } from './chunks/index.X0nbfr6-.js';
 import { resolve } from 'pathe';
-import { c as configFiles } from './chunks/constants.CXzqaLmq.js';
+import { c as configFiles } from './chunks/constants.D_Q9UYh-.js';
 export { distDir, rootDir } from './path.js';
 import createDebug from 'debug';
 export { generateFileHash } from '@vitest/runner/utils';
 import 'node:fs';
-import './chunks/coverage.DVF1vEu8.js';
+import './chunks/coverage.D_JHT54q.js';
 import 'node:path';
 import '@vitest/snapshot/manager';
-import 'vite-node/client';
-import 'vite-node/server';
 import './chunks/index.Bgo3tNWt.js';
-import './chunks/index.Bz6b0Ib7.js';
+import './chunks/index.DQhAfQQU.js';
 import 'node:fs/promises';
-import './chunks/typechecker.CMNPqJOo.js';
+import './chunks/typechecker.BgoW4nTA.js';
 import 'node:os';
 import 'node:perf_hooks';
 import '@vitest/utils/source-map';
@@ -46,14 +44,17 @@ import 'zlib';
 import 'buffer';
 import './chunks/_commonjsHelpers.BFTU3MAI.js';
 import 'node:crypto';
+import '#module-evaluator';
+import 'vite/module-runner';
 import 'node:url';
 import 'picomatch';
 import 'tinyglobby';
-import 'vite-node/utils';
+import 'magic-string';
 import '@vitest/mocker/node';
 import './chunks/defaults.CXFFjsi8.js';
-import 'magic-string';
-import './chunks/index.D3SKT3tv.js';
+import './chunks/resolver.D5bG4zy5.js';
+import 'es-module-lexer';
+import './chunks/index.DgN0Zk9a.js';
 import 'node:assert';
 import '@vitest/utils/error';
 import 'node:readline';

package/dist/reporters.d.ts

@@ -1,25 +1,24 @@
-export { aO as BaseReporter, aP as BenchmarkBuiltinReporters, aB as BenchmarkReporter, aC as BenchmarkReportsMap, aQ as BuiltinReporterOptions, aR as BuiltinReporters, aD as DefaultReporter, aE as DotReporter, aF as GithubActionsReporter, aG as HangingProcessReporter, aI as JUnitReporter, aS as JsonAssertionResult, aH as JsonReporter, aT as JsonTestResult, aU as JsonTestResults, ay as ReportedHookContext, az as Reporter, aJ as ReportersMap, aK as TapFlatReporter, aL as TapReporter, aA as TestRunEndReason, aM as VerboseBenchmarkReporter, aN as VerboseReporter } from './chunks/reporters.d.DWg40D2B.js';
+export { aN as BaseReporter, aO as BenchmarkBuiltinReporters, aA as BenchmarkReporter, aB as BenchmarkReportsMap, aP as BuiltinReporterOptions, aQ as BuiltinReporters, aC as DefaultReporter, aD as DotReporter, aE as GithubActionsReporter, aF as HangingProcessReporter, aH as JUnitReporter, aR as JsonAssertionResult, aG as JsonReporter, aS as JsonTestResult, aT as JsonTestResults, ax as ReportedHookContext, ay as Reporter, aI as ReportersMap, aJ as TapFlatReporter, aK as TapReporter, az as TestRunEndReason, aL as VerboseBenchmarkReporter, aM as VerboseReporter } from './chunks/reporters.d.CYE9sT5z.js';
 import '@vitest/runner';
-import './chunks/environment.d.Bhm9oc0v.js';
+import './chunks/environment.d.2fYMoz3o.js';
 import '@vitest/utils';
 import 'node:stream';
 import 'vite';
 import 'node:console';
-import './chunks/browser.d.BRP8scJf.js';
-import './chunks/worker.d.zjyR34Pb.js';
-import './chunks/config.d.DZo8c7fw.js';
+import './chunks/browser.d.Cawq_X_N.js';
+import './chunks/worker.d.D9QWnzAe.js';
+import 'vite/module-runner';
+import './chunks/config.d.CKNVOKm0.js';
 import '@vitest/pretty-format';
 import '@vitest/snapshot';
 import '@vitest/utils/diff';
 import '@vitest/mocker';
 import '@vitest/utils/source-map';
-import 'vite-node';
 import 'chai';
 import 'vitest/optional-types.js';
 import './chunks/benchmark.d.DAaHLpsq.js';
 import '@vitest/runner/utils';
 import 'tinybench';
-import './chunks/coverage.d.CNYjU4GF.js';
-import 'vite-node/client';
+import './chunks/coverage.d.BZtK59WP.js';
 import '@vitest/snapshot/manager';
 import 'node:fs';

package/dist/reporters.js

@@ -1,9 +1,9 @@
-export { D as DefaultReporter, a as DotReporter, G as GithubActionsReporter, H as HangingProcessReporter, b as JUnitReporter, J as JsonReporter, R as ReportersMap, T as TapFlatReporter, c as TapReporter, V as VerboseReporter } from './chunks/index.Bz6b0Ib7.js';
-export { B as BenchmarkReporter, a as BenchmarkReportsMap, V as VerboseBenchmarkReporter } from './chunks/index.D3SKT3tv.js';
+export { D as DefaultReporter, a as DotReporter, G as GithubActionsReporter, H as HangingProcessReporter, b as JUnitReporter, J as JsonReporter, R as ReportersMap, T as TapFlatReporter, c as TapReporter, V as VerboseReporter } from './chunks/index.DQhAfQQU.js';
+export { B as BenchmarkReporter, a as BenchmarkReportsMap, V as VerboseBenchmarkReporter } from './chunks/index.DgN0Zk9a.js';
 import 'node:fs';
 import 'node:fs/promises';
 import 'pathe';
-import './chunks/typechecker.CMNPqJOo.js';
+import './chunks/typechecker.BgoW4nTA.js';
 import 'node:os';
 import 'node:perf_hooks';
 import '@vitest/utils/source-map';

package/dist/runners.d.ts

@@ -1,14 +1,14 @@
 import * as tinybench from 'tinybench';
 import { VitestRunner, VitestRunnerImportSource, Suite, File, Task, CancelReason, Test, TestContext, ImportDuration } from '@vitest/runner';
 export { VitestRunner } from '@vitest/runner';
-import { a as SerializedConfig } from './chunks/config.d.DZo8c7fw.js';
+import { a as SerializedConfig } from './chunks/config.d.CKNVOKm0.js';
 import '@vitest/pretty-format';
 import '@vitest/snapshot';
 import '@vitest/utils/diff';
 
 declare class NodeBenchmarkRunner implements VitestRunner {
 	config: SerializedConfig;
-	private __vitest_executor;
+	private moduleRunner;
 	constructor(config: SerializedConfig);
 	importTinybench(): Promise<typeof tinybench>;
 	importFile(filepath: string, source: VitestRunnerImportSource): unknown;
@@ -20,7 +20,7 @@ declare class VitestTestRunner implements VitestRunner {
 	config: SerializedConfig;
 	private snapshotClient;
 	private workerState;
-	private __vitest_executor;
+	private moduleRunner;
 	private cancelRun;
 	private assertionsErrors;
 	pool: string;

package/dist/runners.js

@@ -1,13 +1,13 @@
 import { updateTask } from '@vitest/runner';
 import { createDefer, getSafeTimers } from '@vitest/utils';
-import { a as getBenchOptions, g as getBenchFn } from './chunks/benchmark.CYdenmiT.js';
-import { g as getWorkerState } from './chunks/utils.XdZDrNZV.js';
+import { a as getBenchOptions, g as getBenchFn } from './chunks/benchmark.CtuRzf-i.js';
+import { g as getWorkerState } from './chunks/utils.B9FY3b73.js';
 import { setState, GLOBAL_EXPECT, getState } from '@vitest/expect';
 import { getTests, getNames, getTestName } from '@vitest/runner/utils';
 import { processError } from '@vitest/utils/error';
 import { normalize } from 'pathe';
-import { g as getSnapshotClient, i as inject, c as createExpect, v as vi } from './chunks/vi.CA0EPI9Y.js';
-import { r as rpc } from './chunks/rpc.jnQO9F8a.js';
+import { g as getSnapshotClient, i as inject, c as createExpect, v as vi } from './chunks/vi.DGAfBY4R.js';
+import { r as rpc } from './chunks/rpc.DGoW_Vl-.js';
 import 'chai';
 import './chunks/_commonjsHelpers.BFTU3MAI.js';
 import '@vitest/snapshot';
@@ -98,7 +98,7 @@ async function runBenchmarkSuite(suite, runner) {
 	}
 }
 class NodeBenchmarkRunner {
-	__vitest_executor;
+	moduleRunner;
 	constructor(config) {
 		this.config = config;
 	}
@@ -106,8 +106,11 @@ class NodeBenchmarkRunner {
 		return await import('tinybench');
 	}
 	importFile(filepath, source) {
-		if (source === "setup") getWorkerState().moduleCache.delete(filepath);
-		return this.__vitest_executor.executeId(filepath);
+		if (source === "setup") {
+			const moduleNode = getWorkerState().evaluatedModules.getModuleById(filepath);
+			if (moduleNode) getWorkerState().evaluatedModules.invalidateModule(moduleNode);
+		}
+		return this.moduleRunner.import(filepath);
 	}
 	async runSuite(suite) {
 		await runBenchmarkSuite(suite, this);
@@ -123,7 +126,7 @@ const workerContext = Object.create(null);
 class VitestTestRunner {
 	snapshotClient = getSnapshotClient();
 	workerState = getWorkerState();
-	__vitest_executor;
+	moduleRunner;
 	cancelRun = false;
 	assertionsErrors = /* @__PURE__ */ new WeakMap();
 	pool = this.workerState.ctx.pool;
@@ -131,8 +134,11 @@ class VitestTestRunner {
 		this.config = config;
 	}
 	importFile(filepath, source) {
-		if (source === "setup") this.workerState.moduleCache.delete(filepath);
-		return this.__vitest_executor.executeId(filepath);
+		if (source === "setup") {
+			const moduleNode = this.workerState.evaluatedModules.getModuleById(filepath);
+			if (moduleNode) this.workerState.evaluatedModules.invalidateModule(moduleNode);
+		}
+		return this.moduleRunner.import(filepath);
 	}
 	onCollectStart(file) {
 		this.workerState.current = file;

package/dist/snapshot.js

@@ -1,4 +1,4 @@
-export { VitestNodeSnapshotEnvironment as VitestSnapshotEnvironment } from './chunks/node.fjCdwEIl.js';
+export { VitestNodeSnapshotEnvironment as VitestSnapshotEnvironment } from './chunks/node.4JV5OXkt.js';
 import '@vitest/snapshot/environment';
-import './chunks/utils.XdZDrNZV.js';
+import './chunks/utils.B9FY3b73.js';
 import '@vitest/utils';

package/dist/suite.js

@@ -1,5 +1,5 @@
-export { g as getBenchFn, a as getBenchOptions } from './chunks/benchmark.CYdenmiT.js';
+export { g as getBenchFn, a as getBenchOptions } from './chunks/benchmark.CtuRzf-i.js';
 export { createTaskCollector, getCurrentSuite, getCurrentTest, getFn, getHooks, setFn, setHooks } from '@vitest/runner';
 export { createChainable } from '@vitest/runner/utils';
 import '@vitest/utils';
-import './chunks/utils.XdZDrNZV.js';
+import './chunks/utils.B9FY3b73.js';