vitest 5.0.0-rc.4 → 5.0.1

package/browser/context.d.ts

@@ -4,4 +4,4 @@ export * from '@vitest/browser-playwright/context'
 export * from '@vitest/browser-webdriverio/context'
 // @ts-ignore -- @vitest/browser-preview might not be installed
 export * from '@vitest/browser-preview/context'
-export { BrowserCommands, CDPSession, FsOptions } from 'vitest/internal/browser'
+export { BrowserCommands, BrowserTraceEntryKind, CDPSession, FsOptions, MarkOptions } from 'vitest/internal/browser'

package/config.d.ts

@@ -1,3 +1 @@
-// ensure `@vitest/expect` provides `chai` types
-import type {} from '@vitest/expect'
 export * from './dist/config.js'

package/dist/browser.d.ts

@@ -59,6 +59,19 @@ interface BrowserCommands {
 	removeFile: (path: string) => Promise<void>;
 }
 interface CDPSession {}
+type BrowserTraceEntryKind = "action" | "expect" | "mark" | "lifecycle";
+interface MarkOptions {
+	/**
+	* Optional stack string used to resolve marker location.
+	* Useful for wrapper libraries that need to forward the end-user callsite.
+	*/
+	stack?: string;
+	/**
+	* Optional marker kind that's used to categorize the marker in the trace viewer.
+	* @default 'mark'
+	*/
+	kind?: BrowserTraceEntryKind;
+}
 
 export { FileSpecification, publicCollect as collectTests, getSafeTimers, getType, loadDiffConfig, loadSnapshotSerializers, processError, setSafeTimers, setupCommonEnv, setupEnv, startCoverageInsideWorker, startTests, stopCoverageInsideWorker, takeCoverageInsideWorker };
-export type { BrowserCommands, CDPSession, FsOptions };
+export type { BrowserCommands, BrowserTraceEntryKind, CDPSession, FsOptions, MarkOptions };

package/dist/browser.js

@@ -1,11 +1,11 @@
-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.CQOUYP-x.js';
-export { l as loadDiffConfig, a as loadSnapshotSerializers, s as setupCommonEnv, b as setupEnv } from './chunks/setup-common.QoaKiKGk.js';
-export { s as SpyModule } from './chunks/spy.DPpyuUIA.js';
+export { s as startCoverageInsideWorker, a as stopCoverageInsideWorker, t as takeCoverageInsideWorker } from './chunks/coverage.AipniaqB.js';
+export { p as collectTests, a as processError, s as startTests } from './chunks/run.C5UmxDPh.js';
+export { l as loadDiffConfig, a as loadSnapshotSerializers, s as setupCommonEnv, b as setupEnv } from './chunks/setup-common.BkQOiNcI.js';
+export { s as SpyModule } from './chunks/spy.DQ0ZsPbi.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.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';
+export { g as getType } from './chunks/pathe.M-eThtNZ.DwEga6ro.js';
+export { D as DecodedMap, g as getOriginalPosition, a as getSafeTimers, s as setSafeTimers } from './chunks/source-map.BH0bbrs9.js';
+import './chunks/coverage.CX7NN5s7.js';
 import './chunks/index.M2dsQ_UQ.js';
 import './chunks/tinyrainbow.Ht9iggcq.js';
 import './task-utils.js';

package/dist/chunks/{base.DE9oA_9r.js → base.Cc3oda2V.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.DKvCqCMl.js';
-import { l as loadEnvironment, e as emitModuleRunner, a as listenForErrors } from './init.DJ2lKyjE.js';
+import { s as spyModule } from './spy.DQ0ZsPbi.js';
+import { r as resolveTestRunner, a as resolveSnapshotEnvironment, d as detectAsyncLeaks, s as setupChaiConfig } from './index.DNv8WNGe.js';
+import { l as loadEnvironment, e as emitModuleRunner, a as listenForErrors } from './init.3UJvPvQg.js';
 import { Traces } from '../traces.js';
-import { V as VitestEvaluatedModules } from './rpc.DWKX1ZbI.js';
-import { s as startVitestModuleRunner, c as createNodeImportMeta } from './index.DQO7054M.js';
+import { V as VitestEvaluatedModules } from './rpc.Bvs-iVxs.js';
+import { s as startVitestModuleRunner, c as createNodeImportMeta } from './index.D4dXTzh9.js';
 import { performance as performance$1 } from 'node:perf_hooks';
-import { s as startCoverageInsideWorker, a as stopCoverageInsideWorker } from './coverage.BtDxDqSU.js';
-import { i as index, g as globalExpect, v as vi } from './index.CD2j-4_2.js';
+import { s as startCoverageInsideWorker, a as stopCoverageInsideWorker } from './coverage.AipniaqB.js';
+import { i as index, g as globalExpect, v as vi } from './index.m3L2HgmY.js';
 import { c as closeInspector } from './inspector.CvyFGlXm.js';
-import { s as startTests, p as publicCollect } from './run.CQOUYP-x.js';
+import { s as startTests, p as publicCollect } from './run.C5UmxDPh.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.Clq7AXhv.js';
-import { s as setupCommonEnv, b as setupEnv } from './setup-common.QoaKiKGk.js';
+import { K as KNOWN_ASSET_TYPES } from './pathe.M-eThtNZ.DwEga6ro.js';
+import { s as setupCommonEnv, b as setupEnv } from './setup-common.BkQOiNcI.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.CHi0lDgQ.js');
+	const { createCustomConsole } = await import('./console.B09ye7y0.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.DBSXgC3F.js');
+			const { NativeModuleMocker } = await import('./nativeModuleMocker.B20FEd-E.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.BOvBCgI_.js').then(function (n) { return n.n; });
+		const { NativeModuleRunner } = await import('./nativeModuleRunner.J0QLzNtK.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.cLbCmZDO.js');
+		const { setupNodeLoaderHooks } = await import('./native.CF4uT5hY.js');
 		await setupNodeLoaderHooks(context);
 	}
 	const startTime = performance.now();

package/dist/chunks/{cac.Bf8-pv1O.js → cac.fSuRXrAx.js}

@@ -1,4 +1,4 @@
-import { n as normalize, t as toArray } from './pathe.M-eThtNZ.Clq7AXhv.js';
+import { n as normalize, t as toArray } from './pathe.M-eThtNZ.DwEga6ro.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.4";
+var version = "5.0.1";
 
 const apiConfig = (port) => ({
 	port: {
@@ -2366,11 +2366,11 @@ function normalizeCliOptions(cliFilters, argv) {
 }
 async function start(cliFilters, options) {
 	try {
-		const { startVitest } = await import('./cli-api.rZIctZe8.js').then(function (n) { return n.a; });
+		const { startVitest } = await import('./cli-api.DcLieX4F.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.CtqmNjXD.js').then(function (n) { return n.u; });
+		const { errorBanner } = await import('./utils.CJ0JImL8.js').then(function (n) { return n.u; });
 		console.error(`\n${errorBanner("Startup Error")}`);
 		console.error(e);
 		console.error("\n\n");
@@ -2380,11 +2380,11 @@ async function start(cliFilters, options) {
 }
 async function doctorCommand(cliFilters, options) {
 	try {
-		const { doctor } = await import('./doctor.heFfAozl.js');
+		const { doctor } = await import('./doctor.DR3u0Z_G.js');
 		await doctor(cliFilters.map(normalize), normalizeCliOptions(cliFilters, options));
 		process.exit();
 	} catch (e) {
-		const { errorBanner } = await import('./utils.CtqmNjXD.js').then(function (n) { return n.u; });
+		const { errorBanner } = await import('./utils.CJ0JImL8.js').then(function (n) { return n.u; });
 		console.error(`\n${errorBanner("Doctor Error")}`);
 		console.error(e);
 		console.error("\n\n");
@@ -2397,12 +2397,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.BNqrBW1W.js');
+	const { create } = await import('./creator.BEj8pIIH.js');
 	await create();
 }
 async function collect(cliFilters, options) {
 	try {
-		const { prepareVitest, processCollected, outputFileList } = await import('./cli-api.rZIctZe8.js').then(function (n) { return n.a; });
+		const { prepareVitest, processCollected, outputFileList } = await import('./cli-api.DcLieX4F.js').then(function (n) { return n.a; });
 		const ctx = await prepareVitest({
 			...normalizeCliOptions(cliFilters, options),
 			watch: false,
@@ -2424,7 +2424,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.CtqmNjXD.js').then(function (n) { return n.u; });
+		const { errorBanner } = await import('./utils.CJ0JImL8.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.rZIctZe8.js → cli-api.DcLieX4F.js}

@@ -1,11 +1,11 @@
 import { mkdirSync, writeFileSync } from 'node:fs';
-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.Cd7SnpwO.js';
+import { C as CoverageProviderMap } from './coverage.CX7NN5s7.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.DzobfTyw.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.Clq7AXhv.js';
+import { e as createDefer, a as relative, r as resolve, d as dirname, i as isAbsolute } from './pathe.M-eThtNZ.DwEga6ro.js';
 
 async function createVitest(modeOrOptions, optionsOrViteOverrides = {}, viteOverridesOrVitestOptions = {}, maybeVitestOptions = {}) {
 	let options;

package/dist/chunks/{console.CHi0lDgQ.js → console.B09ye7y0.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.Dx3YPjIe.js';
+import { a as getSafeTimers } from './source-map.BH0bbrs9.js';
 import { y } from './tinyrainbow.Ht9iggcq.js';
 import { g as getWorkerState } from './utils.DYj33du9.js';
-import './pathe.M-eThtNZ.Clq7AXhv.js';
+import './pathe.M-eThtNZ.DwEga6ro.js';
 
 const RealDate = globalThis.Date;
 const UNKNOWN_TEST_ID = "__vitest__unknown_test__";

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

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

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

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

package/dist/chunks/{creator.BNqrBW1W.js → creator.BEj8pIIH.js}

@@ -2,14 +2,14 @@ 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 { y as prompt, z as findConfigFile } from './index.Cd7SnpwO.js';
+import { y as prompt, z as findConfigFile } from './index.DzobfTyw.js';
 import { x } from 'tinyexec';
 import { y } from './tinyrainbow.Ht9iggcq.js';
 import 'node:process';
 import 'node:os';
-import './pathe.M-eThtNZ.Clq7AXhv.js';
-import './source-map.Dx3YPjIe.js';
-import './cac.Bf8-pv1O.js';
+import './pathe.M-eThtNZ.DwEga6ro.js';
+import './source-map.BH0bbrs9.js';
+import './cac.fSuRXrAx.js';
 import 'events';
 import './env.DzFJjrmK.js';
 import 'std-env';
@@ -31,17 +31,19 @@ import 'vite';
 import 'node:crypto';
 import '../path.js';
 import 'node:url';
-import './run.CQOUYP-x.js';
+import './run.C5UmxDPh.js';
 import './index.M2dsQ_UQ.js';
 import './display.pkpxlVcY.js';
 import '../task-utils.js';
-import './nativeModuleRunner.BOvBCgI_.js';
+import './nativeModuleRunner.J0QLzNtK.js';
 import 'node:module';
 import 'node:v8';
 import 'node:util';
 import 'vite/module-runner';
 import '../traces.js';
 import 'obug';
+import './resolver.NpfwMKt9.js';
+import 'es-module-lexer';
 import 'tinyglobby';
 import './defaults.D2ip7f-X.js';
 import 'magic-string';
@@ -49,12 +51,10 @@ import '@vitest/mocker/node';
 import 'node:console';
 import 'node:stream';
 import './offset.Dy-5Fdfn.js';
-import './utils.CtqmNjXD.js';
+import './utils.CJ0JImL8.js';
 import '#module-evaluator';
 import 'picomatch';
-import './coverage.BcXK1DsQ.js';
-import './resolver.CBCHRZ7j.js';
-import 'es-module-lexer';
+import './coverage.CX7NN5s7.js';
 import 'node:tty';
 import 'node:events';
 import './modules.BJuCwlRJ.js';

package/dist/chunks/{doctor.heFfAozl.js → doctor.DR3u0Z_G.js}

@@ -4,11 +4,12 @@ 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.Clq7AXhv.js';
+import { t as toArray, r as resolve } from './pathe.M-eThtNZ.DwEga6ro.js';
 import { y } from './tinyrainbow.Ht9iggcq.js';
 import { distDir } from '../path.js';
 
-const DOM_ENVIRONMENTS = /* @__PURE__ */ new Set(["jsdom", "happy-dom"]);
+// custom environments are measured too: the run fails if they lack setupVM
+const ENVIRONMENTS_WITHOUT_VM_UPSIDE = /* @__PURE__ */ new Set(["node", "edge-runtime"]);
 /**
 * Builds the list of configurations worth measuring for this config. The
 * candidates are pruned by what the config already uses - there is no point
@@ -22,7 +23,7 @@ function resolveDoctorCandidates(projects, options = {}) {
 	const testProjects = projects.filter((project) => !project.browser);
 	const pools = new Set(testProjects.map((project) => project.pool));
 	const usesVmPool = pools.has("vmThreads") || pools.has("vmForks");
-	const runsDom = testProjects.some((project) => DOM_ENVIRONMENTS.has(project.environment));
+	const benefitsFromVm = testProjects.some((project) => !ENVIRONMENTS_WITHOUT_VM_UPSIDE.has(project.environment));
 	const isolates = projects.some((project) => project.isolate && (project.browser || project.pool !== "vmThreads" && project.pool !== "vmForks"));
 	if (pools.has("forks")) candidates.push({
 		id: "threads",
@@ -31,7 +32,7 @@ function resolveDoctorCandidates(projects, options = {}) {
 		configLines: [`pool: 'threads'`],
 		preservesIsolation: true
 	});
-	if (runsDom && !pools.has("vmThreads")) candidates.push({
+	if (benefitsFromVm && !pools.has("vmThreads")) candidates.push({
 		id: "vmThreads",
 		title: `pool: 'vmThreads'`,
 		overrides: { pool: "vmThreads" },
@@ -41,7 +42,7 @@ function resolveDoctorCandidates(projects, options = {}) {
 	// vmForks trades vmThreads' worker threads for child processes: each child
 	// gets its own heap and GC, which can beat vmThreads on GC-heavy suites, and
 	// it is the vm option for suites that cannot run in worker threads
-	if (runsDom && !pools.has("vmForks")) candidates.push({
+	if (benefitsFromVm && !pools.has("vmForks")) candidates.push({
 		id: "vmForks",
 		title: `pool: 'vmForks'`,
 		overrides: { pool: "vmForks" },
@@ -99,7 +100,7 @@ function log(...args) {
 	console.log(...args);
 }
 async function doctor(cliFilters, options) {
-	const { prepareVitest } = await import('./cli-api.rZIctZe8.js').then(function (n) { return n.a; });
+	const { prepareVitest } = await import('./cli-api.DcLieX4F.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/{globals.xG0BzeWF.js → globals.D9ucJdZZ.js}

@@ -1,18 +1,18 @@
 import { g as globalApis } from './constants.-juJ8b_4.js';
-import { i as index } from './index.CD2j-4_2.js';
-import './run.CQOUYP-x.js';
+import { i as index } from './index.m3L2HgmY.js';
+import './run.C5UmxDPh.js';
 import './index.M2dsQ_UQ.js';
 import './tinyrainbow.Ht9iggcq.js';
 import './display.pkpxlVcY.js';
-import './pathe.M-eThtNZ.Clq7AXhv.js';
-import './source-map.Dx3YPjIe.js';
+import './pathe.M-eThtNZ.DwEga6ro.js';
+import './source-map.BH0bbrs9.js';
 import '../task-utils.js';
 import './utils.DYj33du9.js';
-import './spy.DPpyuUIA.js';
+import './spy.DQ0ZsPbi.js';
 import 'chai';
 import './plugins.Cigb0uSy.js';
 import './offset.Dy-5Fdfn.js';
-import './rpc.DWKX1ZbI.js';
+import './rpc.Bvs-iVxs.js';
 import 'vite/module-runner';
 import './index.DmDMHCg8.js';
 import 'tinybench';

package/dist/chunks/{index.DQO7054M.js → index.D4dXTzh9.js}

@@ -1,5 +1,5 @@
 import fs__default from 'node:fs';
-import { n as normalize, k as splitFileAndPostfix$1, j as join, l as isBareImport } from './pathe.M-eThtNZ.Clq7AXhv.js';
+import { n as normalize, k as splitFileAndPostfix$1, j as join, l as isBareImport } from './pathe.M-eThtNZ.DwEga6ro.js';
 import { i as isBuiltin, a as isBrowserExternal, t as toBuiltin } from './modules.BJuCwlRJ.js';
 import { E as EnvironmentTeardownError, a as getSafeWorkerState } from './utils.DYj33du9.js';
 import { pathToFileURL, URL as URL$1 } from 'node:url';
@@ -103,17 +103,27 @@ class BareModuleMocker {
 	}
 	async resolveMocks() {
 		if (!BareModuleMocker.pendingIds.length) return;
+		const pendingIds = BareModuleMocker.pendingIds;
+		BareModuleMocker.pendingIds = [];
 		const resolveMock = async (mock) => {
-			const { id, url, external } = await this.resolveId(mock.id, mock.importer);
-			if (mock.action === "unmock") this.unmockPath(id);
-			if (mock.action === "mock") this.mockPath(mock.id, id, url, external, mock.type, mock.factory);
+			return {
+				mock,
+				...await this.resolveId(mock.id, mock.importer)
+			};
 		};
 		// group consecutive mocks of the same action type together,
 		// resolve in parallel inside each group, but run groups sequentially
 		// to preserve mock/unmock ordering
-		const groups = groupByConsecutiveAction(BareModuleMocker.pendingIds);
-		for (const group of groups) await Promise.all(group.map(resolveMock));
-		BareModuleMocker.pendingIds = [];
+		const groups = groupByConsecutiveAction(pendingIds);
+		for (const group of groups) {
+			// apply in queue order: two mocks of the same path can resolve out of
+			// order, and the last queued one must win
+			const resolvedGroup = await Promise.all(group.map(resolveMock));
+			for (const { mock, id, url, external } of resolvedGroup) {
+				if (mock.action === "unmock") this.unmockPath(id);
+				if (mock.action === "mock") this.mockPath(mock.id, id, url, external, mock.type, mock.factory);
+			}
+		}
 	}
 	// public method to avoid circular dependency
 	getMockContext() {
@@ -609,6 +619,11 @@ const bareVitestRegexp = /^@?vitest(?:\/|$)/;
 const normalizedDistDir = normalize(distDir);
 const relativeIds = {};
 const externalizeMap = /* @__PURE__ */ new Map();
+function getRelativeDistDir(root) {
+	const normalizedRoot = normalize(root).replace(/\/+$/, "") || "/";
+	const rootPrefix = normalizedRoot === "/" ? normalizedRoot : `${normalizedRoot}/`;
+	return normalizedDistDir.startsWith(rootPrefix) ? normalizedDistDir.slice(normalizedRoot.length) : "";
+}
 // all Vitest imports always need to be externalized
 function getCachedVitestImport(id, state) {
 	if (id.startsWith("/@fs/") || id.startsWith("\\@fs\\")) id = id.slice(process.platform === "win32" ? 5 : 4);
@@ -619,7 +634,7 @@ function getCachedVitestImport(id, state) {
 	// always externalize Vitest because we import from there before running tests
 	// so we already have it cached by Node.js
 	const root = state().config.root;
-	const relativeRoot = relativeIds[root] ?? (relativeIds[root] = normalizedDistDir.slice(root.length));
+	const relativeRoot = relativeIds[root] ?? (relativeIds[root] = getRelativeDistDir(root));
 	if (id.includes(distDir) || id.includes(normalizedDistDir)) {
 		const { file, postfix } = splitFileAndPostfix$1(id);
 		const externalize = id.startsWith("file://") ? id : `${pathToFileURL(file)}${postfix}`;
@@ -732,7 +747,7 @@ function startVitestModuleRunner(options) {
 				const vitest = getCachedVitestImport(id, state);
 				if (vitest) return vitest;
 				// strip _vitest_original query added by importActual so that
-				// the plugin pipeline sees the original import id (e.g. virtual modules's load hook)
+				// the plugin pipeline sees the original import id (e.g. virtual modules' load hook)
 				const isImportActual = id.includes("_vitest_original");
 				if (isImportActual) id = removeQuery(id, "_vitest_original");
 				const rawId = unwrapId(id);

package/dist/chunks/{index.DKvCqCMl.js → index.DNv8WNGe.js}

@@ -1,10 +1,10 @@
 import * as chai from 'chai';
 import { createHook } from 'node:async_hooks';
-import { t as takeCoverageInsideWorker } from './coverage.BtDxDqSU.js';
-import { r as rpc } from './rpc.DWKX1ZbI.js';
-import { l as loadDiffConfig, a as loadSnapshotSerializers } from './setup-common.QoaKiKGk.js';
+import { t as takeCoverageInsideWorker } from './coverage.AipniaqB.js';
+import { r as rpc } from './rpc.Bvs-iVxs.js';
+import { l as loadDiffConfig, a as loadSnapshotSerializers } from './setup-common.BkQOiNcI.js';
 import { g as getWorkerState } from './utils.DYj33du9.js';
-import { T as TestRunner } from './index.CD2j-4_2.js';
+import { T as TestRunner } from './index.m3L2HgmY.js';
 
 function setupChaiConfig(config) {
 	Object.assign(chai.config, config);
@@ -12,7 +12,7 @@ function setupChaiConfig(config) {
 
 async function resolveSnapshotEnvironment(config, moduleRunner) {
 	if (!config.snapshotEnvironment) {
-		const { VitestNodeSnapshotEnvironment } = await import('./node.Es9ukMGX.js');
+		const { VitestNodeSnapshotEnvironment } = await import('./node.CfQ_OGWr.js');
 		return new VitestNodeSnapshotEnvironment();
 	}
 	const mod = await moduleRunner.import(config.snapshotEnvironment);