vitest 5.0.0-rc.2 → 5.0.0-rc.3

package/dist/browser.js

@@ -1,11 +1,11 @@
-export { s as startCoverageInsideWorker, a as stopCoverageInsideWorker, t as takeCoverageInsideWorker } from './chunks/coverage.VANpXofm.js';
-export { p as collectTests, a as processError, s as startTests } from './chunks/run.COOMV-72.js';
-export { l as loadDiffConfig, a as loadSnapshotSerializers, s as setupCommonEnv, b as setupEnv } from './chunks/setup-common.AcXJaDWq.js';
+export { s as startCoverageInsideWorker, a as stopCoverageInsideWorker, t as takeCoverageInsideWorker } from './chunks/coverage.BtDxDqSU.js';
+export { p as collectTests, a as processError, s as startTests } from './chunks/run.DyRH7m0-.js';
+export { l as loadDiffConfig, a as loadSnapshotSerializers, s as setupCommonEnv, b as setupEnv } from './chunks/setup-common.p8NqUXPi.js';
 export { s as SpyModule } from './chunks/spy.DPpyuUIA.js';
 export { f as format, i as inspect, s as stringify } from './chunks/display.pkpxlVcY.js';
-export { g as getType } from './chunks/pathe.M-eThtNZ.k2RS39sQ.js';
-export { D as DecodedMap, g as getOriginalPosition, a as getSafeTimers, s as setSafeTimers } from './chunks/source-map.CTObTzjj.js';
-import './chunks/coverage.CPiksdSj.js';
+export { g as getType } from './chunks/pathe.M-eThtNZ.Clq7AXhv.js';
+export { D as DecodedMap, g as getOriginalPosition, a as getSafeTimers, s as setSafeTimers } from './chunks/source-map.Dx3YPjIe.js';
+import './chunks/coverage.BcXK1DsQ.js';
 import './chunks/index.M2dsQ_UQ.js';
 import './chunks/tinyrainbow.Ht9iggcq.js';
 import './task-utils.js';

package/dist/chunks/{base.C1WTaPOM.js → base.CZYgpg5z.js}

@@ -1,21 +1,21 @@
 import { runInThisContext } from 'node:vm';
 import { s as spyModule } from './spy.DPpyuUIA.js';
-import { r as resolveTestRunner, a as resolveSnapshotEnvironment, d as detectAsyncLeaks, s as setupChaiConfig } from './index.C0qliBI-.js';
-import { l as loadEnvironment, e as emitModuleRunner, a as listenForErrors } from './init.i_K8EJrW.js';
+import { r as resolveTestRunner, a as resolveSnapshotEnvironment, d as detectAsyncLeaks, s as setupChaiConfig } from './index.okypXZ97.js';
+import { l as loadEnvironment, e as emitModuleRunner, a as listenForErrors } from './init.DJ2lKyjE.js';
 import { Traces } from '../traces.js';
-import { V as VitestEvaluatedModules } from './rpc.DaPTofpf.js';
-import { s as startVitestModuleRunner, c as createNodeImportMeta } from './index.BfU4rh_M.js';
+import { V as VitestEvaluatedModules } from './rpc.DWKX1ZbI.js';
+import { s as startVitestModuleRunner, c as createNodeImportMeta } from './index.DQO7054M.js';
 import { performance as performance$1 } from 'node:perf_hooks';
-import { s as startCoverageInsideWorker, a as stopCoverageInsideWorker } from './coverage.VANpXofm.js';
-import { i as index, g as globalExpect, v as vi } from './index.BH4BaN4R.js';
+import { s as startCoverageInsideWorker, a as stopCoverageInsideWorker } from './coverage.BtDxDqSU.js';
+import { i as index, g as globalExpect, v as vi } from './index.CSoBZWW_.js';
 import { c as closeInspector } from './inspector.CvyFGlXm.js';
-import { s as startTests, p as publicCollect } from './run.COOMV-72.js';
+import { s as startTests, p as publicCollect } from './run.DyRH7m0-.js';
 import { createRequire } from 'node:module';
 import timers from 'node:timers';
 import timersPromises from 'node:timers/promises';
 import util from 'node:util';
-import { K as KNOWN_ASSET_TYPES } from './pathe.M-eThtNZ.k2RS39sQ.js';
-import { s as setupCommonEnv, b as setupEnv } from './setup-common.AcXJaDWq.js';
+import { K as KNOWN_ASSET_TYPES } from './pathe.M-eThtNZ.Clq7AXhv.js';
+import { s as setupCommonEnv, b as setupEnv } from './setup-common.p8NqUXPi.js';
 import { g as getWorkerState, r as resetModules, p as provideWorkerState, a as getSafeWorkerState } from './utils.DYj33du9.js';
 
 // this should only be used in Node
@@ -57,7 +57,7 @@ function resolveAsset(mod, url) {
 	mod.exports = url;
 }
 async function setupConsoleLogSpy() {
-	const { createCustomConsole } = await import('./console.DWNMLVgF.js');
+	const { createCustomConsole } = await import('./console.CHi0lDgQ.js');
 	globalThis.console = createCustomConsole();
 }
 
@@ -119,7 +119,7 @@ async function startModuleRunner(options) {
 		let mocker;
 		if (options.state.config.experimental.nodeLoader !== false) {
 			// this additionally imports acorn/magic-string
-			const { NativeModuleMocker } = await import('./nativeModuleMocker.0CD1hdFV.js');
+			const { NativeModuleMocker } = await import('./nativeModuleMocker.DBSXgC3F.js');
 			mocker = new NativeModuleMocker({
 				async resolveId(id, importer) {
 					// TODO: use import.meta.resolve instead
@@ -136,7 +136,7 @@ async function startModuleRunner(options) {
 		}
 		// imported lazily (pulls in `local-pkg`) so it stays out of the default
 		// worker startup graph; only the `viteModuleRunner: false` path needs it
-		const { NativeModuleRunner } = await import('./nativeModuleRunner.Bc3kXpWn.js').then(function (n) { return n.n; });
+		const { NativeModuleRunner } = await import('./nativeModuleRunner.BOvBCgI_.js').then(function (n) { return n.n; });
 		_moduleRunner = new NativeModuleRunner(root, mocker);
 		return _moduleRunner;
 	}
@@ -148,7 +148,7 @@ let _environmentTime;
 /** @experimental */
 async function setupBaseEnvironment(context) {
 	if (context.config.experimental.viteModuleRunner === false) {
-		const { setupNodeLoaderHooks } = await import('./native.offEPk9l.js');
+		const { setupNodeLoaderHooks } = await import('./native.cLbCmZDO.js');
 		await setupNodeLoaderHooks(context);
 	}
 	const startTime = performance.now();

package/dist/chunks/{browser.d.C9OF2Et_.d.ts → browser.d.g5Thl309.d.ts}

@@ -1,6 +1,6 @@
 import { F as FileSpecification } from './config.d.CU_b-wJj.js';
 import { O as OTELCarrier } from './rpc.d.DA9Utv4e.js';
-import { T as TestExecutionMethod } from './worker.d.XSpk7g5N.js';
+import { T as TestExecutionMethod } from './worker.d.MLmnzOJE.js';
 
 interface ModuleDefinitionLocation {
 	line: number;

package/dist/chunks/{cac.D09XQ6pO.js → cac.AVSgLgX0.js}

@@ -1,4 +1,4 @@
-import { n as normalize, t as toArray } from './pathe.M-eThtNZ.k2RS39sQ.js';
+import { n as normalize, t as toArray } from './pathe.M-eThtNZ.Clq7AXhv.js';
 import { EventEmitter } from 'events';
 import { m } from './tinyrainbow.Ht9iggcq.js';
 import { a as isForceColor } from './env.DzFJjrmK.js';
@@ -620,7 +620,7 @@ class CAC extends EventEmitter {
 
 const cac = (name = "") => new CAC(name);
 
-var version = "5.0.0-rc.2";
+var version = "5.0.0-rc.3";
 
 const apiConfig = (port) => ({
 	port: {
@@ -1129,7 +1129,7 @@ const cliOptionsConfig = {
 	},
 	project: {
 		shorthand: "p",
-		description: "The name of the project to run if you are using Vitest workspace feature. This can be repeated for multiple projects: `--project=1 --project=2`. You can also filter projects using wildcards like `--project=packages*`, and exclude projects with `--project=!pattern`.",
+		description: "The name of the project to run if you are using Vitest workspace feature. This can be repeated for multiple projects: `--project=1 --project=2`. You can also filter projects using wildcards like `--project=packages*`, and exclude projects with `--project=!pattern`. A project runs if it matches no negated pattern and, when regular patterns are also given, matches at least one of them.",
 		argument: "<name>",
 		array: true
 	},
@@ -2363,11 +2363,11 @@ function normalizeCliOptions(cliFilters, argv) {
 }
 async function start(cliFilters, options) {
 	try {
-		const { startVitest } = await import('./cli-api.te-1Pvjs.js').then(function (n) { return n.a; });
+		const { startVitest } = await import('./cli-api.BsG_KUyt.js').then(function (n) { return n.a; });
 		const ctx = await startVitest(cliFilters.map(normalize), normalizeCliOptions(cliFilters, options));
 		if (!ctx.shouldKeepServer()) await ctx.exit();
 	} catch (e) {
-		const { errorBanner } = await import('./utils.DtdLoSPT.js').then(function (n) { return n.u; });
+		const { errorBanner } = await import('./utils.CtqmNjXD.js').then(function (n) { return n.u; });
 		console.error(`\n${errorBanner("Startup Error")}`);
 		console.error(e);
 		console.error("\n\n");
@@ -2377,11 +2377,11 @@ async function start(cliFilters, options) {
 }
 async function doctorCommand(cliFilters, options) {
 	try {
-		const { doctor } = await import('./doctor.CNpBUniZ.js');
+		const { doctor } = await import('./doctor.CzJ1dA-i.js');
 		await doctor(cliFilters.map(normalize), normalizeCliOptions(cliFilters, options));
 		process.exit();
 	} catch (e) {
-		const { errorBanner } = await import('./utils.DtdLoSPT.js').then(function (n) { return n.u; });
+		const { errorBanner } = await import('./utils.CtqmNjXD.js').then(function (n) { return n.u; });
 		console.error(`\n${errorBanner("Doctor Error")}`);
 		console.error(e);
 		console.error("\n\n");
@@ -2394,12 +2394,12 @@ async function init(project) {
 		console.error(/* @__PURE__ */ new Error("Only the \"browser\" project is supported. Use \"vitest init browser\" to create a new project."));
 		process.exit(1);
 	}
-	const { create } = await import('./creator.Cqwo9lsW.js');
+	const { create } = await import('./creator.CYvpourF.js');
 	await create();
 }
 async function collect(cliFilters, options) {
 	try {
-		const { prepareVitest, processCollected, outputFileList } = await import('./cli-api.te-1Pvjs.js').then(function (n) { return n.a; });
+		const { prepareVitest, processCollected, outputFileList } = await import('./cli-api.BsG_KUyt.js').then(function (n) { return n.a; });
 		const ctx = await prepareVitest({
 			...normalizeCliOptions(cliFilters, options),
 			watch: false,
@@ -2421,7 +2421,7 @@ async function collect(cliFilters, options) {
 		} else outputFileList(await ctx.getRelevantTestSpecifications(cliFilters.map(normalize)), options);
 		await ctx.close();
 	} catch (e) {
-		const { errorBanner } = await import('./utils.DtdLoSPT.js').then(function (n) { return n.u; });
+		const { errorBanner } = await import('./utils.CtqmNjXD.js').then(function (n) { return n.u; });
 		console.error(`\n${errorBanner("Collect Error")}`);
 		console.error(e);
 		console.error("\n\n");

package/dist/chunks/{cli-api.te-1Pvjs.js → cli-api.BsG_KUyt.js}

@@ -1,11 +1,11 @@
 import { mkdirSync, writeFileSync } from 'node:fs';
-import { C as CoverageProviderMap } from './coverage.CPiksdSj.js';
-import { L as Logger, k as VitestPackageInstaller, P as PluginHarness, v as resolveConfig, V as Vitest, z as stdout, x as prompt, g as FilesNotFoundError, G as GitNotFoundError, I as IncludeTaskLocationDisabledError, A as RangeLocationFilterProvidedError, C as LocationFilterFileNotFoundError } from './index.DzzDnMj8.js';
+import { C as CoverageProviderMap } from './coverage.BcXK1DsQ.js';
+import { L as Logger, k as VitestPackageInstaller, P as PluginHarness, w as resolveConfig, V as Vitest, A as stdout, y as prompt, g as FilesNotFoundError, G as GitNotFoundError, I as IncludeTaskLocationDisabledError, C as RangeLocationFilterProvidedError, E as LocationFilterFileNotFoundError } from './index.CVFiuVPx.js';
 import readline from 'node:readline';
 import { y } from './tinyrainbow.Ht9iggcq.js';
 import { i as isWindows } from './env.DzFJjrmK.js';
 import { stripVTControlCharacters } from 'node:util';
-import { e as createDefer, a as relative, r as resolve, d as dirname, i as isAbsolute } from './pathe.M-eThtNZ.k2RS39sQ.js';
+import { e as createDefer, a as relative, r as resolve, d as dirname, i as isAbsolute } from './pathe.M-eThtNZ.Clq7AXhv.js';
 
 async function createVitest(modeOrOptions, optionsOrViteOverrides = {}, viteOverridesOrVitestOptions = {}, maybeVitestOptions = {}) {
 	let options;

package/dist/chunks/{console.DWNMLVgF.js → console.CHi0lDgQ.js}

@@ -1,10 +1,10 @@
 import { Console } from 'node:console';
 import { relative } from 'node:path';
 import { Writable } from 'node:stream';
-import { a as getSafeTimers } from './source-map.CTObTzjj.js';
+import { a as getSafeTimers } from './source-map.Dx3YPjIe.js';
 import { y } from './tinyrainbow.Ht9iggcq.js';
 import { g as getWorkerState } from './utils.DYj33du9.js';
-import './pathe.M-eThtNZ.k2RS39sQ.js';
+import './pathe.M-eThtNZ.Clq7AXhv.js';
 
 const RealDate = globalThis.Date;
 const UNKNOWN_TEST_ID = "__vitest__unknown_test__";

package/dist/chunks/{coverage.CPiksdSj.js → coverage.BcXK1DsQ.js}

@@ -1,4 +1,4 @@
-import { r as resolve } from './pathe.M-eThtNZ.k2RS39sQ.js';
+import { r as resolve } from './pathe.M-eThtNZ.Clq7AXhv.js';
 
 function getCoverageFilesDirectory(reportsDirectory, shard) {
 	return resolve(reportsDirectory, `.tmp${shard ? `-${shard.index}-${shard.count}` : ""}`);

package/dist/chunks/{coverage.VANpXofm.js → coverage.BtDxDqSU.js}

@@ -1,4 +1,4 @@
-import { r as resolveCoverageProviderModule } from './coverage.CPiksdSj.js';
+import { r as resolveCoverageProviderModule } from './coverage.BcXK1DsQ.js';
 
 async function startCoverageInsideWorker(options, loader, runtimeOptions) {
 	const coverageModule = await resolveCoverageProviderModule(options, loader);

package/dist/chunks/{creator.Cqwo9lsW.js → creator.CYvpourF.js}

@@ -2,51 +2,61 @@ import { existsSync, writeFileSync, readFileSync } from 'node:fs';
 import { mkdir, writeFile } from 'node:fs/promises';
 import { resolve, dirname, relative } from 'node:path';
 import { detectPackageManager, installPackage } from './index.DXQx-kDM.js';
-import { x as prompt, y as findConfigFile } from './index.DzzDnMj8.js';
+import { y as prompt, z as findConfigFile } from './index.CVFiuVPx.js';
 import { x } from 'tinyexec';
 import { y } from './tinyrainbow.Ht9iggcq.js';
 import 'node:process';
 import 'node:os';
-import './pathe.M-eThtNZ.k2RS39sQ.js';
-import './source-map.CTObTzjj.js';
-import './cac.D09XQ6pO.js';
+import './pathe.M-eThtNZ.Clq7AXhv.js';
+import './source-map.Dx3YPjIe.js';
+import './cac.AVSgLgX0.js';
 import 'events';
 import './env.DzFJjrmK.js';
 import 'std-env';
 import './constants.-juJ8b_4.js';
 import 'node:assert';
+import 'node:perf_hooks';
+import './index.DmDMHCg8.js';
+import 'https';
+import 'http';
+import 'net';
+import 'tls';
+import 'crypto';
+import 'stream';
+import 'url';
+import 'zlib';
+import 'buffer';
+import 'util';
+import 'vite';
+import 'node:crypto';
 import '../path.js';
 import 'node:url';
-import './run.COOMV-72.js';
+import './run.DyRH7m0-.js';
 import './index.M2dsQ_UQ.js';
 import './display.pkpxlVcY.js';
 import '../task-utils.js';
-import './nativeModuleRunner.Bc3kXpWn.js';
+import './nativeModuleRunner.BOvBCgI_.js';
 import 'node:module';
 import 'node:v8';
 import 'node:util';
 import 'vite/module-runner';
 import '../traces.js';
-import 'vite';
 import 'obug';
-import 'node:crypto';
 import 'tinyglobby';
 import './defaults.D2ip7f-X.js';
 import 'magic-string';
 import '@vitest/mocker/node';
 import 'node:console';
 import 'node:stream';
-import 'node:perf_hooks';
 import './offset.Dy-5Fdfn.js';
-import './utils.DtdLoSPT.js';
+import './utils.CtqmNjXD.js';
 import '#module-evaluator';
 import 'picomatch';
-import './coverage.CPiksdSj.js';
-import './resolver.B_5CI0Kh.js';
+import './coverage.BcXK1DsQ.js';
+import './resolver.CBCHRZ7j.js';
 import 'es-module-lexer';
 import 'node:tty';
 import 'node:events';
-import './index.CCh1Pb8k.js';
 import './modules.BJuCwlRJ.js';
 import 'node:child_process';
 import 'node:worker_threads';

package/dist/chunks/{doctor.CNpBUniZ.js → doctor.CzJ1dA-i.js}

@@ -4,7 +4,7 @@ import { availableParallelism, tmpdir } from 'node:os';
 import { join } from 'node:path';
 import { performance } from 'node:perf_hooks';
 import { pathToFileURL } from 'node:url';
-import { t as toArray, r as resolve } from './pathe.M-eThtNZ.k2RS39sQ.js';
+import { t as toArray, r as resolve } from './pathe.M-eThtNZ.Clq7AXhv.js';
 import { y } from './tinyrainbow.Ht9iggcq.js';
 import { distDir } from '../path.js';
 
@@ -99,7 +99,7 @@ function log(...args) {
 	console.log(...args);
 }
 async function doctor(cliFilters, options) {
-	const { prepareVitest } = await import('./cli-api.te-1Pvjs.js').then(function (n) { return n.a; });
+	const { prepareVitest } = await import('./cli-api.BsG_KUyt.js').then(function (n) { return n.a; });
 	log();
 	log(y.inverse(y.bold(y.blue(" DOCTOR "))), "resolving the current configuration...");
 	const ctx = await prepareVitest({

package/dist/chunks/{environment.d.C0fjmVGG.d.ts → environment.d.C6xYahWA.d.ts}

@@ -22,6 +22,14 @@ interface Environment {
 	* By default, fallbacks to `name`.
 	*/
 	viteEnvironment?: "client" | "ssr" | ({} & string);
+	/**
+	* Let the server transform the test file's import graph while `setupVM`
+	* runs. Only worth it when `setupVM` is slow (jsdom, happy-dom): otherwise
+	* the transforms compete with the worker's own module requests.
+	*
+	* @default `true`
+	*/
+	prewarmModules?: boolean;
 	setupVM?: (options: Record<string, any>) => Awaitable<VmEnvironmentReturn>;
 	setup: (global: any, options: Record<string, any>) => Awaitable<EnvironmentReturn>;
 }

package/dist/chunks/{globals.C5MA6F-b.js → globals.B4gJ9mZH.js}

@@ -1,20 +1,20 @@
 import { g as globalApis } from './constants.-juJ8b_4.js';
-import { i as index } from './index.BH4BaN4R.js';
-import './run.COOMV-72.js';
+import { i as index } from './index.CSoBZWW_.js';
+import './run.DyRH7m0-.js';
 import './index.M2dsQ_UQ.js';
 import './tinyrainbow.Ht9iggcq.js';
 import './display.pkpxlVcY.js';
-import './pathe.M-eThtNZ.k2RS39sQ.js';
-import './source-map.CTObTzjj.js';
+import './pathe.M-eThtNZ.Clq7AXhv.js';
+import './source-map.Dx3YPjIe.js';
 import '../task-utils.js';
 import './utils.DYj33du9.js';
 import './spy.DPpyuUIA.js';
 import 'chai';
 import './plugins.Cigb0uSy.js';
 import './offset.Dy-5Fdfn.js';
-import './rpc.DaPTofpf.js';
+import './rpc.DWKX1ZbI.js';
 import 'vite/module-runner';
-import './index.CCh1Pb8k.js';
+import './index.DmDMHCg8.js';
 import 'tinybench';
 import 'expect-type';
 

package/dist/chunks/{index.BH4BaN4R.js → index.CSoBZWW_.js}

@@ -1,8 +1,8 @@
-import { b as printDiffOrStringify, d as diff, a as processError, T as TestSyntaxError, g as getCurrentTest, c as createTaskCollector, e as getCurrentSuite, f as createChainable, h as getHooks, i as getFn, m as matchesTags, j as afterAll, k as afterEach, l as aroundAll, n as aroundEach, o as beforeAll, q as beforeEach, r as describe, t as it, u as onTestFailed, v as onTestFinished, w as recordArtifact, x as suite, y as test } from './run.COOMV-72.js';
+import { b as printDiffOrStringify, d as diff, a as processError, T as TestSyntaxError, g as getCurrentTest, c as createTaskCollector, e as getCurrentSuite, f as createChainable, h as getHooks, i as getFn, m as matchesTags, j as afterAll, k as afterEach, l as aroundAll, n as aroundEach, o as beforeAll, q as beforeEach, r as describe, t as it, u as onTestFailed, v as onTestFinished, w as recordArtifact, x as suite, y as test } from './run.DyRH7m0-.js';
 import { i as isChildProcess, r as resetModules, g as getWorkerState } from './utils.DYj33du9.js';
-import { d as getDefaultExportFromCjs, h as parseErrorStacktrace, i as commonjsGlobal, a as getSafeTimers, f as parseSingleStack, j as delay } from './source-map.CTObTzjj.js';
+import { e as getDefaultExportFromCjs, f as parseErrorStacktrace, h as commonjsGlobal, a as getSafeTimers, i as parseSingleStack, j as delay } from './source-map.Dx3YPjIe.js';
 import { i as isMockFunction, f as fn, a as spyOn, r as restoreAllMocks, b as resetAllMocks, c as clearAllMocks } from './spy.DPpyuUIA.js';
-import { v as isObject, D as getCallLastIndex, g as getType, p as noop, y as assertTypes, x as ordinal, E as createSimpleStackTrace, i as isAbsolute, a as relative, n as normalize } from './pathe.M-eThtNZ.k2RS39sQ.js';
+import { u as isObject, B as getCallLastIndex, g as getType, D as noop, x as assertTypes, w as ordinal, E as createSimpleStackTrace, i as isAbsolute, a as relative, n as normalize } from './pathe.M-eThtNZ.Clq7AXhv.js';
 import { s as stringify, i as inspect } from './display.pkpxlVcY.js';
 import { y } from './tinyrainbow.Ht9iggcq.js';
 import * as chai from 'chai';
@@ -11,7 +11,7 @@ import { getNames, getTests, getTestName, createFileTask } from '../task-utils.j
 import { g as getSerializers, a as addSerializer } from './plugins.Cigb0uSy.js';
 import { p as positionToOffset, o as offsetToLineNumber, l as lineSplitRE } from './offset.Dy-5Fdfn.js';
 import { f as format } from './index.M2dsQ_UQ.js';
-import { r as rpc, V as VitestEvaluatedModules } from './rpc.DaPTofpf.js';
+import { r as rpc, V as VitestEvaluatedModules } from './rpc.DWKX1ZbI.js';
 import { Bench } from 'tinybench';
 import { expectTypeOf } from 'expect-type';
 
@@ -815,6 +815,11 @@ class SnapshotClient {
 		let { received } = options;
 		if (!filepath) throw new Error("Snapshot cannot be used outside of test");
 		const snapshotState = this.getSnapshotState(filepath);
+		if (rawSnapshot?.file === snapshotState.snapshotPath)
+ // note that this hard rejection is best-effort in a sense that,
+		// if `toMatchFileSnapshot` is called with a different test file's snapshot path,
+		// this check will not catch it.
+		throw new Error(`File snapshot cannot use the same path as the test snapshot file: ${rawSnapshot.file}`);
 		const testName = [name, ...message ? [message] : []].join(" > ");
 		// Probe first so we can mark as checked even on early return
 		const expectedSnapshot = snapshotState.probeExpectedSnapshot({
@@ -1605,13 +1610,10 @@ function getState(expect) {
 }
 function setState(state, expect) {
 	const map = globalThis[MATCHERS_OBJECT];
-	const current = map.get(expect) || {};
+	const current = map.get(expect);
 	// so it keeps getters from `testPath`
-	const results = Object.defineProperties(current, {
-		...Object.getOwnPropertyDescriptors(current),
-		...Object.getOwnPropertyDescriptors(state)
-	});
-	map.set(expect, results);
+	const next = Object.defineProperties(current || {}, Object.getOwnPropertyDescriptors(state));
+	if (!current) map.set(expect, next);
 }
 
 class AsymmetricMatcher {
@@ -8414,11 +8416,10 @@ class TestRunner {
 		if (this.pool !== "vmThreads" && this.pool !== "vmForks") this.onCleanupWorkerContext = (listener) => this.workerState.onCleanup(listener);
 	}
 	importFile(filepath, source) {
-		const moduleNode = this.workerState.evaluatedModules.getModuleById(filepath);
-		if (moduleNode && (source === "setup" || moduleNode.evaluated)) this.workerState.evaluatedModules.invalidateModule(moduleNode);
 		return this._otel.$(`vitest.module.import_${source === "setup" ? "setup" : "spec"}`, { attributes: { "code.file.path": filepath } }, () => {
 			if (!this.viteModuleRunner) filepath = `${filepath}?vitest=${Date.now()}`;
-			return this.moduleRunner.import(filepath);
+			const options = this.viteModuleRunner ? { invalidate: true } : void 0;
+			return this.moduleRunner.import(filepath, options);
 		});
 	}
 	onCollectStart(file) {