vitest 4.0.8 → 4.0.10

package/dist/browser.d.ts

@@ -1,7 +1,7 @@
 import { a as SerializedCoverageConfig, S as SerializedConfig } from './chunks/config.d.BTfZNUu9.js';
 import { R as RuntimeCoverageModuleLoader } from './chunks/coverage.d.BZtK59WP.js';
 import { SerializedDiffOptions } from '@vitest/utils/diff';
-import { V as VitestModuleRunner } from './chunks/moduleRunner.d.CzOZ_4wC.js';
+import { V as VitestModuleRunner } from './chunks/moduleRunner.d.BxT-OjLR.js';
 export { collectTests, startTests } from '@vitest/runner';
 import * as _vitest_spy from '@vitest/spy';
 export { _vitest_spy as SpyModule };
@@ -15,7 +15,7 @@ import '@vitest/pretty-format';
 import '@vitest/snapshot';
 import 'node:vm';
 import 'vite/module-runner';
-import './chunks/worker.d.DadbA89M.js';
+import './chunks/worker.d.ZGohxCEd.js';
 import './chunks/environment.d.CrsxCzP1.js';
 import '@vitest/mocker';
 import './chunks/mocker.d.BE_2ls6u.js';

package/dist/browser.js

@@ -1,4 +1,4 @@
-export { l as loadDiffConfig, b as loadSnapshotSerializers, c as setupCommonEnv, s as startCoverageInsideWorker, a as stopCoverageInsideWorker, t as takeCoverageInsideWorker } from './chunks/setup-common.LGjNSzXp.js';
+export { l as loadDiffConfig, b as loadSnapshotSerializers, c as setupCommonEnv, s as startCoverageInsideWorker, a as stopCoverageInsideWorker, t as takeCoverageInsideWorker } from './chunks/setup-common.BOzbXE3x.js';
 export { collectTests, startTests } from '@vitest/runner';
 import * as spyModule from '@vitest/spy';
 export { spyModule as SpyModule };

package/dist/chunks/_commonjsHelpers.D26ty3Ew.js

@@ -0,0 +1,6 @@
+var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
+function getDefaultExportFromCjs(x) {
+	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, "default") ? x["default"] : x;
+}
+
+export { commonjsGlobal as c, getDefaultExportFromCjs as g };

package/dist/chunks/{base.BgTO2qAg.js → base.BFVArrYW.js}

@@ -1,20 +1,20 @@
 import { runInThisContext } from 'node:vm';
 import * as spyModule from '@vitest/spy';
-import { r as resolveTestRunner, a as resolveSnapshotEnvironment, s as setupChaiConfig } from './index.BY4-tcno.js';
-import { l as loadEnvironment } from './init.DMDG-idf.js';
+import { r as resolveTestRunner, a as resolveSnapshotEnvironment, s as setupChaiConfig } from './index.Dua7TZg_.js';
+import { l as loadEnvironment } from './init.Cz2kTB9a.js';
 import { V as VitestEvaluatedModules } from './evaluatedModules.Dg1zASAC.js';
-import { s as startVitestModuleRunner, c as createNodeImportMeta } from './startModuleRunner.BOmUtLIO.js';
+import { s as startVitestModuleRunner, c as createNodeImportMeta } from './startModuleRunner.DLjmA_wU.js';
 import { performance as performance$1 } from 'node:perf_hooks';
 import { startTests, collectTests } from '@vitest/runner';
-import { c as setupCommonEnv, s as startCoverageInsideWorker, a as stopCoverageInsideWorker } from './setup-common.LGjNSzXp.js';
-import { g as globalExpect, v as vi } from './vi.Bgcdy3bQ.js';
+import { c as setupCommonEnv, s as startCoverageInsideWorker, a as stopCoverageInsideWorker } from './setup-common.BOzbXE3x.js';
+import { g as globalExpect, v as vi } from './vi.BiaV1qII.js';
 import { c as closeInspector } from './inspector.CvyFGlXm.js';
 import { createRequire } from 'node:module';
 import timers from 'node:timers';
 import timersPromises from 'node:timers/promises';
 import util from 'node:util';
 import { KNOWN_ASSET_TYPES } from '@vitest/utils/constants';
-import { i as index } from './index.DIFZf73e.js';
+import { i as index } from './index.DZ-mI_Nm.js';
 import { g as getWorkerState, r as resetModules, p as provideWorkerState } from './utils.DvEY5TfP.js';
 
 // this should only be used in Node

package/dist/chunks/{browser.d.DTTM2PTh.d.ts → browser.d.DnU_kh8a.d.ts}

@@ -1,5 +1,5 @@
 import { FileSpecification } from '@vitest/runner';
-import { T as TestExecutionMethod } from './worker.d.DadbA89M.js';
+import { T as TestExecutionMethod } from './worker.d.ZGohxCEd.js';
 
 type SerializedTestSpecification = [project: {
 	name: string | undefined;

package/dist/chunks/{cac.CfkWq8Qy.js → cac.D9CYcNPM.js}

@@ -3,7 +3,7 @@ import { EventEmitter } from 'events';
 import { normalize } from 'pathe';
 import c from 'tinyrainbow';
 import { a as defaultPort, d as defaultBrowserPort } from './constants.D_Q9UYh-.js';
-import { R as ReportersMap } from './index.kotH7DY7.js';
+import { R as ReportersMap } from './index.BYek7GgP.js';
 
 function toArr(any) {
 	return any == null ? [] : Array.isArray(any) ? any : [any];
@@ -619,7 +619,7 @@ class CAC extends EventEmitter {
 
 const cac = (name = "") => new CAC(name);
 
-var version = "4.0.8";
+var version = "4.0.10";
 
 const apiConfig = (port) => ({
 	port: {
@@ -1357,11 +1357,11 @@ function normalizeCliOptions(cliFilters, argv) {
 }
 async function start(mode, cliFilters, options) {
 	try {
-		const { startVitest } = await import('./cli-api.BQ-bjcRi.js').then(function (n) { return n.p; });
+		const { startVitest } = await import('./cli-api.RnIE1JbW.js').then(function (n) { return n.p; });
 		const ctx = await startVitest(mode, cliFilters.map(normalize), normalizeCliOptions(cliFilters, options));
 		if (!ctx.shouldKeepServer()) await ctx.exit();
 	} catch (e) {
-		const { errorBanner } = await import('./index.kotH7DY7.js').then(function (n) { return n.u; });
+		const { errorBanner } = await import('./index.BYek7GgP.js').then(function (n) { return n.u; });
 		console.error(`\n${errorBanner("Startup Error")}`);
 		console.error(e);
 		console.error("\n\n");
@@ -1374,12 +1374,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.fzVyoMf3.js');
+	const { create } = await import('./creator.DU9qFjsW.js');
 	await create();
 }
 async function collect(mode, cliFilters, options) {
 	try {
-		const { prepareVitest, processCollected, outputFileList } = await import('./cli-api.BQ-bjcRi.js').then(function (n) { return n.p; });
+		const { prepareVitest, processCollected, outputFileList } = await import('./cli-api.RnIE1JbW.js').then(function (n) { return n.p; });
 		const ctx = await prepareVitest(mode, {
 			...normalizeCliOptions(cliFilters, options),
 			watch: false,
@@ -1398,7 +1398,7 @@ async function collect(mode, cliFilters, options) {
 		} else outputFileList(await ctx.getRelevantTestSpecifications(cliFilters.map(normalize)), options);
 		await ctx.close();
 	} catch (e) {
-		const { errorBanner } = await import('./index.kotH7DY7.js').then(function (n) { return n.u; });
+		const { errorBanner } = await import('./index.BYek7GgP.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.BQ-bjcRi.js → cli-api.RnIE1JbW.js}

@@ -3,8 +3,8 @@ import { relative, resolve, dirname, join, extname, normalize, basename, isAbsol
 import { C as CoverageProviderMap } from './coverage.D_JHT54q.js';
 import path, { resolve as resolve$1 } from 'node:path';
 import { noop, createDefer, slash, isExternalUrl, unwrapId, nanoid, withTrailingSlash, cleanUrl, wrapId, toArray, deepMerge, deepClone, isPrimitive, notNullish } from '@vitest/utils/helpers';
-import { a as any, p as prompt } from './index.Dc3xnDvT.js';
-import { h as hash, R as RandomSequencer, i as isPackageExists, c as isBrowserEnabled, r as resolveConfig, g as getCoverageProvider, a as resolveApiServerConfig, d as resolveModule } from './coverage.NVjCOln1.js';
+import { a as any, p as prompt } from './index.D4KonVSU.js';
+import { h as hash, R as RandomSequencer, i as isPackageExists, c as isBrowserEnabled, r as resolveConfig, g as getCoverageProvider, a as resolveApiServerConfig, d as resolveModule } from './coverage.BUlIqJrL.js';
 import * as vite from 'vite';
 import { parseAst, fetchModule, version, searchForWorkspaceRoot, mergeConfig, createServer } from 'vite';
 import { A as API_PATH, c as configFiles, d as defaultBrowserPort, a as defaultPort } from './constants.D_Q9UYh-.js';
@@ -12,9 +12,10 @@ import * as nodeos from 'node:os';
 import nodeos__default, { tmpdir } from 'node:os';
 import { generateHash as generateHash$1, calculateSuiteHash, someTasksAreOnly, interpretTaskModes, hasFailed, generateFileHash, limitConcurrency, createFileTask as createFileTask$1, getTasks, isTestCase } from '@vitest/runner/utils';
 import { SnapshotManager } from '@vitest/snapshot/manager';
-import { v as version$1 } from './cac.CfkWq8Qy.js';
-import { c as createBirpc } from './index.DAL392Ss.js';
-import { p as parse, d as stringify, e as TraceMap, o as originalPositionFor, h as ancestor, i as printError, f as formatProjectName, w as withLabel, j as errorBanner, k as divider, l as Typechecker, m as generateCodeFrame, n as createDefinesScript, R as ReportersMap, B as BlobReporter, r as readBlobs, q as convertTasksToEvents, H as HangingProcessReporter } from './index.kotH7DY7.js';
+import { v as version$1 } from './cac.D9CYcNPM.js';
+import { performance as performance$1 } from 'node:perf_hooks';
+import { c as createBirpc } from './index.0kCJoeWi.js';
+import { p as parse, d as stringify, e as TraceMap, o as originalPositionFor, h as ancestor, i as printError, f as formatProjectName, w as withLabel, j as errorBanner, k as divider, l as Typechecker, m as generateCodeFrame, n as createDefinesScript, R as ReportersMap, B as BlobReporter, r as readBlobs, q as convertTasksToEvents, H as HangingProcessReporter } from './index.BYek7GgP.js';
 import require$$0$3 from 'events';
 import require$$1$1 from 'https';
 import require$$2 from 'http';
@@ -25,7 +26,7 @@ import require$$0$2 from 'stream';
 import require$$7 from 'url';
 import require$$0 from 'zlib';
 import require$$0$1 from 'buffer';
-import { g as getDefaultExportFromCjs } from './_commonjsHelpers.BFTU3MAI.js';
+import { g as getDefaultExportFromCjs } from './_commonjsHelpers.D26ty3Ew.js';
 import crypto, { createHash } from 'node:crypto';
 import { rootDir, distDir } from '../path.js';
 import createDebug from 'debug';
@@ -41,7 +42,6 @@ import { i as isTTY, a as isWindows } from './env.D4Lgay0q.js';
 import { isatty } from 'node:tty';
 import EventEmitter$1, { EventEmitter } from 'node:events';
 import { fork } from 'node:child_process';
-import v8 from 'node:v8';
 import { Worker } from 'node:worker_threads';
 import pm from 'picomatch';
 import { glob, isDynamicPattern } from 'tinyglobby';
@@ -51,7 +51,7 @@ import { c as configDefaults } from './defaults.BOqNVLsY.js';
 import { KNOWN_ASSET_RE } from '@vitest/utils/constants';
 import { findNearestPackageData } from '@vitest/utils/resolver';
 import * as esModuleLexer from 'es-module-lexer';
-import { a as BenchmarkReportsMap } from './index.op2Re5rn.js';
+import { a as BenchmarkReportsMap } from './index.B8lJfb0J.js';
 import assert$1 from 'node:assert';
 import { serializeValue } from '@vitest/utils/serialize';
 import { parseErrorStacktrace } from '@vitest/utils/source-map';
@@ -5198,6 +5198,8 @@ function setup(ctx, _server) {
 	ctx.reporters.push(new WebSocketReporter(ctx, wss, clients));
 }
 class WebSocketReporter {
+	start = 0;
+	end = 0;
 	constructor(ctx, wss, clients) {
 		this.ctx = ctx;
 		this.wss = wss;
@@ -5211,6 +5213,7 @@ class WebSocketReporter {
 	}
 	onTestRunStart(specifications) {
 		if (this.clients.size === 0) return;
+		this.start = performance$1.now();
 		const serializedSpecs = specifications.map((spec) => spec.toJSON());
 		this.clients.forEach((client) => {
 			client.onSpecsCollected?.(serializedSpecs)?.catch?.(noop);
@@ -5228,12 +5231,21 @@ class WebSocketReporter {
 			client.onTaskUpdate?.(packs, events)?.catch?.(noop);
 		});
 	}
+	sum(items, cb) {
+		return items.reduce((total, next) => {
+			return total + Math.max(cb(next) || 0, 0);
+		}, 0);
+	}
 	onTestRunEnd(testModules, unhandledErrors) {
 		if (!this.clients.size) return;
 		const files = testModules.map((testModule) => testModule.task);
 		const errors = [...unhandledErrors];
+		this.end = performance$1.now();
+		const blobs = this.ctx.state.blobs;
+		// Execution time is either sum of all runs of `--merge-reports` or the current run's time
+		const executionTime = blobs?.executionTimes ? this.sum(blobs.executionTimes, (time) => time) : this.end - this.start;
 		this.clients.forEach((client) => {
-			client.onFinished?.(files, errors)?.catch?.(noop);
+			client.onFinished?.(files, errors, void 0, executionTime)?.catch?.(noop);
 		});
 	}
 	onFinishedReportCoverage() {
@@ -6197,7 +6209,7 @@ This might cause false positive tests. Resolve unhandled errors to make sure you
 	}
 }
 
-const __dirname = url.fileURLToPath(new URL(".", import.meta.url));
+const __dirname$1 = url.fileURLToPath(new URL(".", import.meta.url));
 class VitestPackageInstaller {
 	isPackageExists(name, options) {
 		return isPackageExists(name, options);
@@ -6205,16 +6217,16 @@ class VitestPackageInstaller {
 	async ensureInstalled(dependency, root, version) {
 		if (process.env.VITEST_SKIP_INSTALL_CHECKS) return true;
 		if (process.versions.pnp) {
-			const targetRequire = createRequire(__dirname);
+			const targetRequire = createRequire(__dirname$1);
 			try {
-				targetRequire.resolve(dependency, { paths: [root, __dirname] });
+				targetRequire.resolve(dependency, { paths: [root, __dirname$1] });
 				return true;
 			} catch {}
 		}
-		if (/* @__PURE__ */ isPackageExists(dependency, { paths: [root, __dirname] })) return true;
+		if (/* @__PURE__ */ isPackageExists(dependency, { paths: [root, __dirname$1] })) return true;
 		process.stderr.write(c.red(`${c.inverse(c.red(" MISSING DEPENDENCY "))} Cannot find dependency '${dependency}'\n\n`));
 		if (!isTTY) return false;
-		const { install } = await (await import('./index.Dc3xnDvT.js').then(function (n) { return n.i; })).default({
+		const { install } = await (await import('./index.D4KonVSU.js').then(function (n) { return n.i; })).default({
 			type: "confirm",
 			name: "install",
 			message: c.reset(`Do you want to install ${c.green(dependency)}?`)
@@ -6514,7 +6526,7 @@ class BrowserPool {
 					return;
 				}
 				debug?.("[%s] error during %s test run: %s", sessionId, file, error);
-				this.reject(error);
+				this.reject(new Error(`Failed to run the test ${file.filepath}.`, { cause: error }));
 			});
 		}).catch((err) => this.reject(err));
 	}
@@ -6638,8 +6650,8 @@ var RunnerState = /* @__PURE__ */ function(RunnerState) {
 	RunnerState["STOPPED"] = "stopped";
 	return RunnerState;
 }(RunnerState || {});
-const START_TIMEOUT = 1e4;
-const STOP_TIMEOUT = 1e4;
+const START_TIMEOUT = 6e4;
+const STOP_TIMEOUT = 6e4;
 /** @experimental */
 class PoolRunner {
 	/** Exposed to test runner as `VITEST_POOL_ID`. Value is between 1-`maxWorkers`. */
@@ -6648,11 +6660,16 @@ class PoolRunner {
 	environment;
 	_state = RunnerState.IDLE;
 	_operationLock = null;
+	_terminatePromise = createDefer();
 	_eventEmitter = new EventEmitter();
+	_offCancel;
 	_rpc;
 	get isTerminated() {
 		return this._state === RunnerState.STOPPED;
 	}
+	waitForTerminated() {
+		return this._terminatePromise;
+	}
 	get isStarted() {
 		return this._state === RunnerState.STARTED;
 	}
@@ -6665,11 +6682,13 @@ class PoolRunner {
 			cacheFs: worker.cacheFs
 		}), {
 			eventNames: ["onCancel"],
-			post: (request) => this.postMessage(request),
+			post: (request) => {
+				if (this._state !== RunnerState.STOPPING && this._state !== RunnerState.STOPPED) this.postMessage(request);
+			},
 			on: (callback) => this._eventEmitter.on("rpc", callback),
 			timeout: -1
 		});
-		this.project.vitest.onCancel((reason) => this._rpc.onCancel(reason));
+		this._offCancel = this.project.vitest.onCancel((reason) => this._rpc.onCancel(reason));
 	}
 	postMessage(message) {
 		// Only send messages when runner is active (not fully stopped)
@@ -6744,6 +6763,7 @@ class PoolRunner {
 				});
 			}), STOP_TIMEOUT);
 			this._eventEmitter.removeAllListeners();
+			this._offCancel();
 			this._rpc.$close(/* @__PURE__ */ new Error("[vitest-pool-runner]: Pending methods while closing rpc"));
 			// Stop the worker process (this sets _fork/_thread to undefined)
 			// Worker's event listeners (error, message) are implicitly removed when worker terminates
@@ -6756,6 +6776,7 @@ class PoolRunner {
 		} finally {
 			this._operationLock.resolve();
 			this._operationLock = null;
+			this._terminatePromise.resolve();
 		}
 	}
 	on(event, callback) {
@@ -6835,14 +6856,14 @@ class ForksPoolWorker {
 		this.fork.off(event, callback);
 	}
 	send(message) {
-		if ("context" in message && "config" in message.context) message.context.config = wrapSerializableConfig(message.context.config);
-		this.fork.send(v8.serialize(message));
+		this.fork.send(message);
 	}
 	async start() {
 		this._fork ||= fork(this.entrypoint, [], {
 			env: this.env,
 			execArgv: this.execArgv,
-			stdio: "pipe"
+			stdio: "pipe",
+			serialization: "advanced"
 		});
 		if (this._fork.stdout) {
 			this.stdout.setMaxListeners(1 + this.stdout.getMaxListeners());
@@ -6880,41 +6901,13 @@ class ForksPoolWorker {
 		this._fork = void 0;
 	}
 	deserialize(data) {
-		try {
-			return v8.deserialize(Buffer.from(data));
-		} catch (error) {
-			let stringified = "";
-			try {
-				stringified = `\nReceived value: ${JSON.stringify(data)}`;
-			} catch {}
-			throw new Error(`[vitest-pool]: Unexpected call to process.send(). Make sure your test cases are not interfering with process's channel.${stringified}`, { cause: error });
-		}
+		return data;
 	}
 	get fork() {
 		if (!this._fork) throw new Error(`The child process was torn down or never initialized. This is a bug in Vitest.`);
 		return this._fork;
 	}
 }
-/**
-* Prepares `SerializedConfig` for serialization, e.g. `node:v8.serialize`
-* - Unwrapping done in {@link file://./../../../runtime/workers/init-forks.ts}
-*/
-function wrapSerializableConfig(config) {
-	let testNamePattern = config.testNamePattern;
-	let defines = config.defines;
-	// v8 serialize does not support regex
-	if (testNamePattern && typeof testNamePattern !== "string") testNamePattern = `$$vitest:${testNamePattern.toString()}`;
-	// v8 serialize drops properties with undefined value
-	if (defines) defines = {
-		keys: Object.keys(defines),
-		original: defines
-	};
-	return {
-		...config,
-		testNamePattern,
-		defines
-	};
-}
 
 /** @experimental */
 class ThreadsPoolWorker {
@@ -7171,7 +7164,7 @@ class VmThreadsPoolWorker extends ThreadsPoolWorker {
 	}
 }
 
-const WORKER_START_TIMEOUT = 5e3;
+const WORKER_START_TIMEOUT = 9e4;
 class Pool {
 	maxWorkers = 0;
 	workerIds = /* @__PURE__ */ new Map();
@@ -7215,8 +7208,9 @@ class Pool {
 				cancelTask
 			};
 			this.activeTasks.push(activeTask);
+			// active tasks receive cancel signal and shut down gracefully
 			async function cancelTask() {
-				await runner.stop();
+				await runner.waitForTerminated();
 				resolver.reject(/* @__PURE__ */ new Error("Cancelled"));
 			}
 			const onFinished = (message) => {
@@ -9394,7 +9388,7 @@ function deduped(cb) {
 }
 async function initializeProject(workspacePath, ctx, options) {
 	const project = new TestProject(ctx, options);
-	const { configFile,...restOptions } = options;
+	const { configFile, ...restOptions } = options;
 	await createViteServer({
 		...restOptions,
 		configFile,
@@ -9567,8 +9561,8 @@ async function resolveBrowserProjects(vitest, names, resolvedProjects) {
 	});
 	return resolvedProjects.filter((project) => !removeProjects.has(project));
 }
-function cloneConfig(project, { browser,...config }) {
-	const { locators, viewport, testerHtmlPath, headless, screenshotDirectory, screenshotFailures, browser: _browser, name, provider,...overrideConfig } = config;
+function cloneConfig(project, { browser, ...config }) {
+	const { locators, viewport, testerHtmlPath, headless, screenshotDirectory, screenshotFailures, browser: _browser, name, provider, ...overrideConfig } = config;
 	const currentConfig = project.config.browser;
 	const clonedConfig = deepClone(project.config);
 	return mergeConfig({
@@ -11166,6 +11160,7 @@ class Vitest {
 	/** @internal */ filenamePattern;
 	/** @internal */ runningPromise;
 	/** @internal */ closingPromise;
+	/** @internal */ cancelPromise;
 	/** @internal */ isCancelling = false;
 	/** @internal */ coreWorkspaceProject;
 	/** @internal */ _browserSessions = new BrowserSessions();
@@ -11197,7 +11192,7 @@ class Vitest {
 	_onRestartListeners = [];
 	_onClose = [];
 	_onSetServer = [];
-	_onCancelListeners = [];
+	_onCancelListeners = /* @__PURE__ */ new Set();
 	_onUserTestsRerun = [];
 	_onFilterWatchedSpecification = [];
 	/**
@@ -11590,8 +11585,9 @@ class Vitest {
 	async runFiles(specs, allTestsRun) {
 		await this._testRun.start(specs);
 		// previous run
+		await this.cancelPromise;
 		await this.runningPromise;
-		this._onCancelListeners = [];
+		this._onCancelListeners.clear();
 		this.isCancelling = false;
 		// schedule the new run
 		this.runningPromise = (async () => {
@@ -11656,8 +11652,9 @@ class Vitest {
 		const filepaths = specifications.map((spec) => spec.moduleId);
 		this.state.collectPaths(filepaths);
 		// previous run
+		await this.cancelPromise;
 		await this.runningPromise;
-		this._onCancelListeners = [];
+		this._onCancelListeners.clear();
 		this.isCancelling = false;
 		// schedule the new run
 		this.runningPromise = (async () => {
@@ -11692,7 +11689,8 @@ class Vitest {
 	*/
 	async cancelCurrentRun(reason) {
 		this.isCancelling = true;
-		await Promise.all(this._onCancelListeners.splice(0).map((listener) => listener(reason)));
+		this.cancelPromise = Promise.all([...this._onCancelListeners].map((listener) => listener(reason)));
+		await this.cancelPromise.finally(() => this.cancelPromise = void 0);
 		await this.runningPromise;
 	}
 	/** @internal */
@@ -11817,6 +11815,7 @@ class Vitest {
 	async scheduleRerun(triggerId) {
 		const currentCount = this.restartsCount;
 		clearTimeout(this._rerunTimer);
+		await this.cancelPromise;
 		await this.runningPromise;
 		clearTimeout(this._rerunTimer);
 		// server restarted
@@ -11950,7 +11949,10 @@ class Vitest {
 	* Register a handler that will be called when the test run is cancelled with `vitest.cancelCurrentRun`.
 	*/
 	onCancel(fn) {
-		this._onCancelListeners.push(fn);
+		this._onCancelListeners.add(fn);
+		return () => {
+			this._onCancelListeners.delete(fn);
+		};
 	}
 	/**
 	* Register a handler that will be called when the server is closed.
@@ -12091,7 +12093,7 @@ async function VitestPlugin(options = {}, vitest = new Vitest("test", deepClone(
 				options.api = resolveApiServerConfig(options, defaultPort);
 				// we replace every "import.meta.env" with "process.env"
 				// to allow reassigning, so we need to put all envs on process.env
-				const { PROD, DEV,...envs } = viteConfig.env;
+				const { PROD, DEV, ...envs } = viteConfig.env;
 				// process.env can have only string values and will cast string on it if we pass other type,
 				// so we are making them truthy
 				process.env.PROD ??= PROD ? "1" : "";
@@ -12143,7 +12145,7 @@ async function createVitest(mode, options, viteOverrides = {}, vitestOptions = {
 	const root = slash(resolve$1(options.root || process.cwd()));
 	const configPath = options.config === false ? false : options.config ? resolveModule(options.config, { paths: [root] }) ?? resolve$1(root, options.config) : any(configFiles, { cwd: root });
 	options.config = configPath;
-	const { browser: _removeBrowser,...restOptions } = options;
+	const { browser: _removeBrowser, ...restOptions } = options;
 	const server = await createViteServer(mergeConfig({
 		configFile: configPath,
 		configLoader: options.configLoader,

package/dist/chunks/{coverage.NVjCOln1.js → coverage.BUlIqJrL.js}

@@ -1487,11 +1487,11 @@ function resolvePackageTarget(
  * @param {URL} base
  * @returns {boolean}
  */
-function isConditionalExportsMainSugar(exports, packageJsonUrl, base) {
-  if (typeof exports === 'string' || Array.isArray(exports)) return true
-  if (typeof exports !== 'object' || exports === null) return false
+function isConditionalExportsMainSugar(exports$1, packageJsonUrl, base) {
+  if (typeof exports$1 === 'string' || Array.isArray(exports$1)) return true
+  if (typeof exports$1 !== 'object' || exports$1 === null) return false
 
-  const keys = Object.getOwnPropertyNames(exports);
+  const keys = Object.getOwnPropertyNames(exports$1);
   let isConditionalSugar = false;
   let i = 0;
   let keyIndex = -1;
@@ -1553,19 +1553,19 @@ function packageExportsResolve(
   base,
   conditions
 ) {
-  let exports = packageConfig.exports;
+  let exports$1 = packageConfig.exports;
 
-  if (isConditionalExportsMainSugar(exports, packageJsonUrl, base)) {
-    exports = {'.': exports};
+  if (isConditionalExportsMainSugar(exports$1, packageJsonUrl, base)) {
+    exports$1 = {'.': exports$1};
   }
 
   if (
-    own.call(exports, packageSubpath) &&
+    own.call(exports$1, packageSubpath) &&
     !packageSubpath.includes('*') &&
     !packageSubpath.endsWith('/')
   ) {
     // @ts-expect-error: indexable.
-    const target = exports[packageSubpath];
+    const target = exports$1[packageSubpath];
     const resolveResult = resolvePackageTarget(
       packageJsonUrl,
       target,
@@ -1586,7 +1586,7 @@ function packageExportsResolve(
 
   let bestMatch = '';
   let bestMatchSubpath = '';
-  const keys = Object.getOwnPropertyNames(exports);
+  const keys = Object.getOwnPropertyNames(exports$1);
   let i = -1;
 
   while (++i < keys.length) {
@@ -1630,7 +1630,7 @@ function packageExportsResolve(
 
   if (bestMatch) {
     // @ts-expect-error: indexable.
-    const target = /** @type {unknown} */ (exports[bestMatch]);
+    const target = /** @type {unknown} */ (exports$1[bestMatch]);
     const resolveResult = resolvePackageTarget(
       packageJsonUrl,
       target,

package/dist/chunks/{creator.fzVyoMf3.js → creator.DU9qFjsW.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.D3XRDfWc.js';
-import { p as prompt, a as any } from './index.Dc3xnDvT.js';
+import { p as prompt, a as any } from './index.D4KonVSU.js';
 import { x } from 'tinyexec';
 import c from 'tinyrainbow';
 import { c as configFiles } from './constants.D_Q9UYh-.js';
 import 'node:process';
 import 'node:module';
 import 'node:url';
-import './_commonjsHelpers.BFTU3MAI.js';
+import './_commonjsHelpers.D26ty3Ew.js';
 import 'readline';
 import 'events';
 

package/dist/chunks/{global.d.DVdCfKp5.d.ts → global.d.BQDgW9Pr.d.ts}

@@ -2,7 +2,7 @@ import { PromisifyAssertion, Tester, ExpectStatic } from '@vitest/expect';
 import { Plugin } from '@vitest/pretty-format';
 import { SnapshotState } from '@vitest/snapshot';
 import { B as BenchmarkResult } from './benchmark.d.DAaHLpsq.js';
-import { U as UserConsoleLog } from './worker.d.DadbA89M.js';
+import { U as UserConsoleLog } from './worker.d.ZGohxCEd.js';
 
 interface SnapshotMatcher<T> {
 	<U extends { [P in keyof T] : any }>(snapshot: Partial<U>, hint?: string): void;

package/dist/chunks/{globals.DOh96BiR.js → globals.NLOzC_A5.js}

@@ -1,6 +1,6 @@
 import { g as globalApis } from './constants.D_Q9UYh-.js';
-import { i as index } from './index.DIFZf73e.js';
-import './vi.Bgcdy3bQ.js';
+import { i as index } from './index.DZ-mI_Nm.js';
+import './vi.BiaV1qII.js';
 import '@vitest/expect';
 import '@vitest/runner';
 import '@vitest/runner/utils';
@@ -12,7 +12,7 @@ import '@vitest/utils/helpers';
 import '@vitest/spy';
 import '@vitest/utils/offset';
 import '@vitest/utils/source-map';
-import './_commonjsHelpers.BFTU3MAI.js';
+import './_commonjsHelpers.D26ty3Ew.js';
 import './date.Bq6ZW5rf.js';
 import './benchmark.B3N2zMcH.js';
 import './evaluatedModules.Dg1zASAC.js';