vitest 4.0.0-beta.4 → 4.0.0-beta.6

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.CqR9-CDJ.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.CqR9-CDJ.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.DuiQJfUL.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.CZz3evYC.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.CZz3evYC.js';
+export { p as parseCLI } from './chunks/cac.WE-urWw5.js';
+import { r as resolveConfig$2 } from './chunks/coverage.BPRS6xgn.js';
+export { b as BaseSequencer, c as createMethodsRPC, g as getFilePoolName, a as resolveApiServerConfig } from './chunks/coverage.BPRS6xgn.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.VNI-1z5c.js';
 import 'node:fs/promises';
-import './chunks/typechecker.CMNPqJOo.js';
+import './chunks/typechecker.Cd1wvxUM.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.Bx6lE0iq.js';
+import 'es-module-lexer';
+import './chunks/index.7w0eqmYM.js';
 import 'node:assert';
 import '@vitest/utils/error';
 import 'node:readline';
@@ -67,20 +68,14 @@ import 'readline';
 
 // this is only exported as a public function and not used inside vitest
 async function resolveConfig(options = {}, viteOverrides = {}) {
-	const root = slash(resolve(options.root || process.cwd()));
-	const configPath = options.config === false ? false : options.config ? resolve(root, options.config) : await findUp(configFiles, { cwd: root });
+	const root = slash(resolve(options.root || process.cwd())), configPath = options.config === false ? false : options.config ? resolve(root, options.config) : await findUp(configFiles, { cwd: root });
 	options.config = configPath;
-	const vitest = new Vitest("test", deepClone(options));
-	const config = await resolveConfig$1(mergeConfig({
+	const vitest = new Vitest("test", deepClone(options)), config = await resolveConfig$1(mergeConfig({
 		configFile: configPath,
 		mode: options.mode || "test",
 		plugins: [await VitestPlugin(options, vitest)]
-	}, mergeConfig(viteOverrides, { root: options.root })), "serve");
-	// Reflect just to avoid type error
-	const updatedOptions = Reflect.get(config, "_vitest");
-	const vitestConfig = resolveConfig$2(vitest, updatedOptions, config);
-	await vitest.close();
-	return {
+	}, mergeConfig(viteOverrides, { root: options.root })), "serve"), updatedOptions = Reflect.get(config, "_vitest"), vitestConfig = resolveConfig$2(vitest, updatedOptions, config);
+	return await vitest.close(), {
 		viteConfig: config,
 		vitestConfig
 	};

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.CqR9-CDJ.js';
 import '@vitest/runner';
-import './chunks/environment.d.Bhm9oc0v.js';
 import '@vitest/utils';
+import './chunks/environment.d.2fYMoz3o.js';
 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.VNI-1z5c.js';
+export { B as BenchmarkReporter, a as BenchmarkReportsMap, V as VerboseBenchmarkReporter } from './chunks/index.7w0eqmYM.js';
 import 'node:fs';
 import 'node:fs/promises';
 import 'pathe';
-import './chunks/typechecker.CMNPqJOo.js';
+import './chunks/typechecker.Cd1wvxUM.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,19 +1,19 @@
 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.UW6Ezvxy.js';
+import { g as getWorkerState } from './chunks/utils.C7__0Iv5.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.BfdOiD4j.js';
+import { r as rpc } from './chunks/rpc.RpPylpp0.js';
 import 'chai';
 import './chunks/_commonjsHelpers.BFTU3MAI.js';
 import '@vitest/snapshot';
 import '@vitest/spy';
 import '@vitest/utils/source-map';
-import './chunks/date.Bq6ZW5rf.js';
+import './chunks/date.-jtEtIeV.js';
 import './chunks/index.Bgo3tNWt.js';
 
 function createBenchmarkResult(name) {
@@ -26,10 +26,7 @@ function createBenchmarkResult(name) {
 }
 const benchmarkTasks = /* @__PURE__ */ new WeakMap();
 async function runBenchmarkSuite(suite, runner) {
-	const { Task, Bench } = await runner.importTinybench();
-	const start = performance.now();
-	const benchmarkGroup = [];
-	const benchmarkSuiteGroup = [];
+	const { Task, Bench } = await runner.importTinybench(), start = performance.now(), benchmarkGroup = [], benchmarkSuiteGroup = [];
 	for (const task of suite.tasks) {
 		if (task.mode !== "run" && task.mode !== "queued") continue;
 		if (task.meta?.benchmark) benchmarkGroup.push(task);
@@ -43,62 +40,45 @@ async function runBenchmarkSuite(suite, runner) {
 			state: "run",
 			startTime: start,
 			benchmark: createBenchmarkResult(suite.name)
-		};
-		updateTask$1("suite-prepare", suite);
+		}, updateTask$1("suite-prepare", suite);
 		const addBenchTaskListener = (task, benchmark) => {
 			task.addEventListener("complete", (e) => {
-				const task = e.task;
-				const taskRes = task.result;
-				const result = benchmark.result.benchmark;
-				benchmark.result.state = "pass";
-				Object.assign(result, taskRes);
+				const task = e.task, taskRes = task.result, result = benchmark.result.benchmark;
+				benchmark.result.state = "pass", Object.assign(result, taskRes);
 				// compute extra stats and free raw samples as early as possible
 				const samples = result.samples;
-				result.sampleCount = samples.length;
-				result.median = samples.length % 2 ? samples[Math.floor(samples.length / 2)] : (samples[samples.length / 2] + samples[samples.length / 2 - 1]) / 2;
-				if (!runner.config.benchmark?.includeSamples) result.samples.length = 0;
+				if (result.sampleCount = samples.length, result.median = samples.length % 2 ? samples[Math.floor(samples.length / 2)] : (samples[samples.length / 2] + samples[samples.length / 2 - 1]) / 2, !runner.config.benchmark?.includeSamples) result.samples.length = 0;
 				updateTask$1("test-finished", benchmark);
-			}, { once: true });
-			task.addEventListener("error", (e) => {
+			}, { once: true }), task.addEventListener("error", (e) => {
 				const task = e.task;
 				defer.reject(benchmark ? task.result.error : e);
 			}, { once: true });
 		};
 		benchmarkGroup.forEach((benchmark) => {
-			const options = getBenchOptions(benchmark);
-			const benchmarkInstance = new Bench(options);
-			const benchmarkFn = getBenchFn(benchmark);
+			const options = getBenchOptions(benchmark), benchmarkInstance = new Bench(options), benchmarkFn = getBenchFn(benchmark);
 			benchmark.result = {
 				state: "run",
 				startTime: start,
 				benchmark: createBenchmarkResult(benchmark.name)
 			};
 			const task = new Task(benchmarkInstance, benchmark.name, benchmarkFn);
-			benchmarkTasks.set(benchmark, task);
-			addBenchTaskListener(task, benchmark);
+			benchmarkTasks.set(benchmark, task), addBenchTaskListener(task, benchmark);
 		});
-		const { setTimeout } = getSafeTimers();
-		const tasks = [];
+		const { setTimeout } = getSafeTimers(), tasks = [];
 		for (const benchmark of benchmarkGroup) {
 			const task = benchmarkTasks.get(benchmark);
-			updateTask$1("test-prepare", benchmark);
-			await task.warmup();
-			tasks.push([await new Promise((resolve) => setTimeout(async () => {
+			updateTask$1("test-prepare", benchmark), await task.warmup(), tasks.push([await new Promise((resolve) => setTimeout(async () => {
 				resolve(await task.run());
 			})), benchmark]);
 		}
-		suite.result.duration = performance.now() - start;
-		suite.result.state = "pass";
-		updateTask$1("suite-finished", suite);
-		defer.resolve(null);
-		await defer;
+		suite.result.duration = performance.now() - start, suite.result.state = "pass", updateTask$1("suite-finished", suite), defer.resolve(null), await defer;
 	}
 	function updateTask$1(event, task) {
 		updateTask(event, task, runner);
 	}
 }
 class NodeBenchmarkRunner {
-	__vitest_executor;
+	moduleRunner;
 	constructor(config) {
 		this.config = config;
 	}
@@ -106,8 +86,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 +106,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 +114,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;
@@ -141,8 +127,7 @@ class VitestTestRunner {
 		this.workerState.onCleanup(listener);
 	}
 	onAfterRunFiles() {
-		this.snapshotClient.clear();
-		this.workerState.current = void 0;
+		this.snapshotClient.clear(), this.workerState.current = void 0;
 	}
 	getWorkerContext() {
 		return workerContext;
@@ -159,9 +144,7 @@ class VitestTestRunner {
 			if (this.workerState.config.snapshotOptions.updateSnapshot === "none" && result.unchecked) {
 				let message = `Obsolete snapshots found when no snapshot update is expected.\n`;
 				for (const key of result.uncheckedKeys) message += `· ${key}\n`;
-				suite.result.errors ??= [];
-				suite.result.errors.push(processError(new Error(message)));
-				suite.result.state = "fail";
+				suite.result.errors ??= [], suite.result.errors.push(processError(new Error(message))), suite.result.state = "fail";
 			}
 			await rpc().snapshotSaved(result);
 		}
@@ -181,8 +164,7 @@ class VitestTestRunner {
 	}
 	async onBeforeRunTask(test) {
 		if (this.cancelRun) test.mode = "skip";
-		if (test.mode !== "run" && test.mode !== "queued") return;
-		this.workerState.current = test;
+		test.mode !== "run" && test.mode !== "queued" || (this.workerState.current = test);
 	}
 	async onBeforeRunSuite(suite) {
 		if (this.cancelRun) suite.mode = "skip";
@@ -191,9 +173,7 @@ class VitestTestRunner {
 		this.workerState.current = suite;
 	}
 	onBeforeTryTask(test) {
-		clearModuleMocks(this.config);
-		this.snapshotClient.clearTest(test.file.filepath, test.id);
-		setState({
+		clearModuleMocks(this.config), this.snapshotClient.clearTest(test.file.filepath, test.id), setState({
 			assertionCalls: 0,
 			isExpectingAssertions: false,
 			isExpectingAssertionsError: null,
@@ -213,14 +193,12 @@ class VitestTestRunner {
 		// create error during the test initialization so we have a nice stack trace
 		if (this.config.expect.requireAssertions) this.assertionsErrors.set(context.task, /* @__PURE__ */ new Error("expected any number of assertion, but got none"));
 		let _expect;
-		Object.defineProperty(context, "expect", { get() {
+		return Object.defineProperty(context, "expect", { get() {
 			if (!_expect) _expect = createExpect(context.task);
 			return _expect;
-		} });
-		Object.defineProperty(context, "_local", { get() {
+		} }), Object.defineProperty(context, "_local", { get() {
 			return _expect != null;
-		} });
-		return context;
+		} }), context;
 	}
 	getImportDurations() {
 		const entries = [...this.workerState.moduleExecutionInfo?.entries() ?? []];

package/dist/snapshot.js

@@ -1,4 +1,4 @@
-export { VitestNodeSnapshotEnvironment as VitestSnapshotEnvironment } from './chunks/node.fjCdwEIl.js';
+export { VitestNodeSnapshotEnvironment as VitestSnapshotEnvironment } from './chunks/node.BOqcT2jW.js';
 import '@vitest/snapshot/environment';
-import './chunks/utils.XdZDrNZV.js';
+import './chunks/utils.C7__0Iv5.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.UW6Ezvxy.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.C7__0Iv5.js';

package/dist/worker.js

@@ -1,50 +1,70 @@
 import { pathToFileURL } from 'node:url';
 import { createStackString, parseStacktrace } from '@vitest/utils/source-map';
 import { workerId } from 'tinypool';
-import { ViteNodeRunner, ModuleCacheMap } from 'vite-node/client';
+import { ModuleRunner, EvaluatedModules } from 'vite/module-runner';
 import { readFileSync } from 'node:fs';
-import { resolve, normalize } from 'pathe';
-import { e as environments } from './chunks/index.CmSc2RE5.js';
-import { s as setupInspect } from './chunks/inspector.C914Efll.js';
-import { c as createRuntimeRpc, a as rpcDone } from './chunks/rpc.jnQO9F8a.js';
-import { i as isChildProcess, s as setProcessTitle } from './chunks/utils.XdZDrNZV.js';
-import { d as disposeInternalListeners } from './chunks/utils.CcGm2cd1.js';
+import { isBuiltin } from 'node:module';
+import { resolve } from 'pathe';
+import { V as VitestTransport } from './chunks/moduleTransport.I-bgQy0S.js';
+import { e as environments } from './chunks/index.BG0gqZH-.js';
+import { s as setupInspect } from './chunks/inspector.CvQD-Nie.js';
+import { c as createRuntimeRpc, a as rpcDone } from './chunks/rpc.RpPylpp0.js';
+import { i as isChildProcess, s as setProcessTitle } from './chunks/utils.C7__0Iv5.js';
+import { d as disposeInternalListeners } from './chunks/utils.C2YI6McM.js';
 import 'node:console';
-import 'node:module';
 import '@vitest/utils';
 import './chunks/index.Bgo3tNWt.js';
 
 function isBuiltinEnvironment(env) {
 	return env in environments;
 }
-const _loaders = /* @__PURE__ */ new Map();
-async function createEnvironmentLoader(options) {
-	if (!_loaders.has(options.root)) {
-		const loader = new ViteNodeRunner(options);
-		await loader.executeId("/@vite/env");
-		_loaders.set(options.root, loader);
+const isWindows = process.platform === "win32", _loaders = /* @__PURE__ */ new Map();
+async function createEnvironmentLoader(root, rpc) {
+	const cachedLoader = _loaders.get(root);
+	if (!cachedLoader || cachedLoader.isClosed()) {
+		_loaders.delete(root);
+		const moduleRunner = new ModuleRunner({
+			hmr: false,
+			sourcemapInterceptor: "prepareStackTrace",
+			transport: new VitestTransport({
+				async fetchModule(id, importer, options) {
+					const result = await rpc.fetch(id, importer, "__vitest__", options);
+					if ("cached" in result) {
+						const code = readFileSync(result.tmp, "utf-8");
+						return {
+							code,
+							...result
+						};
+					}
+					if (isWindows && "externalize" in result)
+ // TODO: vitest returns paths for external modules, but Vite returns file://
+					// https://github.com/vitejs/vite/pull/20449
+					result.externalize = isBuiltin(id) || /^(?:node:|data:|http:|https:|file:)/.test(id) ? result.externalize : pathToFileURL(result.externalize).toString();
+					return result;
+				},
+				async resolveId(id, importer) {
+					return rpc.resolve(id, importer, "__vitest__");
+				}
+			})
+		});
+		_loaders.set(root, moduleRunner), await moduleRunner.import("/@vite/env");
 	}
-	return _loaders.get(options.root);
+	return _loaders.get(root);
 }
 async function loadEnvironment(ctx, rpc) {
 	const name = ctx.environment.name;
-	if (isBuiltinEnvironment(name)) return environments[name];
-	const loader = await createEnvironmentLoader({
-		root: ctx.config.root,
-		fetchModule: async (id) => {
-			const result = await rpc.fetch(id, "ssr");
-			if (result.id) return { code: readFileSync(result.id, "utf-8") };
-			return result;
-		},
-		resolveId: (id, importer) => rpc.resolveId(id, importer, "ssr")
-	});
-	const root = loader.root;
-	const packageId = name[0] === "." || name[0] === "/" ? resolve(root, name) : (await rpc.resolveId(`vitest-environment-${name}`, void 0, "ssr"))?.id ?? resolve(root, name);
-	const pkg = await loader.executeId(normalize(packageId));
+	if (isBuiltinEnvironment(name)) return { environment: environments[name] };
+	const root = ctx.config.root, loader = await createEnvironmentLoader(root, rpc), packageId = name[0] === "." || name[0] === "/" ? resolve(root, name) : (await rpc.resolve(`vitest-environment-${name}`, void 0, "__vitest__"))?.id ?? resolve(root, name), pkg = await loader.import(packageId);
 	if (!pkg || !pkg.default || typeof pkg.default !== "object") throw new TypeError(`Environment "${name}" is not a valid environment. Path "${packageId}" should export default object with a "setup" or/and "setupVM" method.`);
 	const environment = pkg.default;
-	if (environment.transformMode !== "web" && environment.transformMode !== "ssr") throw new TypeError(`Environment "${name}" is not a valid environment. Path "${packageId}" should export default object with a "transformMode" method equal to "ssr" or "web".`);
-	return environment;
+	if (environment.transformMode != null && environment.transformMode !== "web" && environment.transformMode !== "ssr") throw new TypeError(`Environment "${name}" is not a valid environment. Path "${packageId}" should export default object with a "transformMode" method equal to "ssr" or "web", received "${environment.transformMode}".`);
+	if (environment.transformMode)
+ // keep for backwards compat
+	console.warn(`The Vitest environment ${environment.name} defines the "transformMode". This options was deprecated in Vitest 4 and will be removed in the next major version. Please, use "viteEnvironment" instead.`), environment.viteEnvironment ??= environment.transformMode === "ssr" ? "ssr" : "client";
+	return {
+		environment,
+		loader
+	};
 }
 
 const listeners = /* @__PURE__ */ new Set();
@@ -65,18 +85,17 @@ if (isChildProcess()) {
 		process.exit();
 	});
 }
+const resolvingModules = /* @__PURE__ */ new Set();
 // this is what every pool executes when running tests
 async function execute(method, ctx) {
 	disposeInternalListeners();
-	const prepareStart = performance.now();
-	const cleanups = [setupInspect(ctx)];
-	process.env.VITEST_WORKER_ID = String(ctx.workerId);
-	process.env.VITEST_POOL_ID = String(workerId);
+	const prepareStart = performance.now(), cleanups = [setupInspect(ctx)];
+	process.env.VITEST_WORKER_ID = String(ctx.workerId), process.env.VITEST_POOL_ID = String(workerId);
+	let environmentLoader;
 	try {
 		// worker is a filepath or URL to a file that exposes a default export with "getRpcOptions" and "runTests" methods
 		if (ctx.worker[0] === ".") throw new Error(`Path to the test runner cannot be relative, received "${ctx.worker}"`);
-		const file = ctx.worker.startsWith("file:") ? ctx.worker : pathToFileURL(ctx.worker).toString();
-		const testRunnerModule = await import(file);
+		const file = ctx.worker.startsWith("file:") ? ctx.worker : pathToFileURL(ctx.worker).toString(), testRunnerModule = await import(file);
 		if (!testRunnerModule.default || typeof testRunnerModule.default !== "object") throw new TypeError(`Test worker object should be exposed as a default export. Received "${typeof testRunnerModule.default}"`);
 		const worker = testRunnerModule.default;
 		if (!worker.getRpcOptions || typeof worker.getRpcOptions !== "function") throw new TypeError(`Test worker should expose "getRpcOptions" method. Received "${typeof worker.getRpcOptions}".`);
@@ -88,12 +107,12 @@ async function execute(method, ctx) {
 				reject(/* @__PURE__ */ new Error(`[vitest-worker]: Closing rpc while "${method}" was pending`));
 			}));
 		});
-		const beforeEnvironmentTime = performance.now();
-		const environment = await loadEnvironment(ctx, rpc);
-		if (ctx.environment.transformMode) environment.transformMode = ctx.environment.transformMode;
+		const beforeEnvironmentTime = performance.now(), { environment, loader } = await loadEnvironment(ctx, rpc);
+		environmentLoader = loader;
 		const state = {
 			ctx,
-			moduleCache: new ModuleCacheMap(),
+			evaluatedModules: new EvaluatedModules(),
+			resolvingModules,
 			moduleExecutionInfo: /* @__PURE__ */ new Map(),
 			config: ctx.config,
 			onCancel,
@@ -107,14 +126,13 @@ async function execute(method, ctx) {
 			providedContext: ctx.providedContext,
 			onFilterStackTrace(stack) {
 				return createStackString(parseStacktrace(stack));
-			}
-		};
-		const methodName = method === "collect" ? "collectTests" : "runTests";
+			},
+			metaEnv: createImportMetaEnvProxy()
+		}, methodName = method === "collect" ? "collectTests" : "runTests";
 		if (!worker[methodName] || typeof worker[methodName] !== "function") throw new TypeError(`Test worker should expose "runTests" method. Received "${typeof worker.runTests}".`);
 		await worker[methodName](state);
 	} finally {
-		await Promise.all(cleanups.map((fn) => fn()));
-		await rpcDone().catch(() => {});
+		await Promise.all(cleanups.map((fn) => fn())), await rpcDone().catch(() => {}), environmentLoader?.close();
 	}
 }
 function run(ctx) {
@@ -126,5 +144,24 @@ function collect(ctx) {
 async function teardown() {
 	return cleanup();
 }
+function createImportMetaEnvProxy() {
+	// packages/vitest/src/node/plugins/index.ts:146
+	const booleanKeys = [
+		"DEV",
+		"PROD",
+		"SSR"
+	];
+	return new Proxy(process.env, {
+		get(_, key) {
+			return typeof key === "string" ? booleanKeys.includes(key) ? !!process.env[key] : process.env[key] : void 0;
+		},
+		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;
+		}
+	});
+}
 
 export { collect, run, teardown };