vitest 4.0.12 → 4.0.14

package/dist/browser.d.ts

@@ -1,7 +1,6 @@
-import { a as SerializedCoverageConfig, S as SerializedConfig } from './chunks/traces.d.Brik_NWu.js';
+import { a as SerializedCoverageConfig, S as SerializedConfig } from './chunks/config.d.g6OOauRt.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.RBEiFdiW.js';
 export { collectTests, startTests } from '@vitest/runner';
 import * as _vitest_spy from '@vitest/spy';
 export { _vitest_spy as SpyModule };
@@ -13,12 +12,6 @@ export { DecodedMap, getOriginalPosition } from '@vitest/utils/source-map';
 export { getSafeTimers, setSafeTimers } from '@vitest/utils/timers';
 import '@vitest/pretty-format';
 import '@vitest/snapshot';
-import 'node:vm';
-import 'vite/module-runner';
-import './chunks/worker.d.Dxl5oW0C.js';
-import './chunks/environment.d.CrsxCzP1.js';
-import '@vitest/mocker';
-import './chunks/mocker.d.BE_2ls6u.js';
 
 declare function startCoverageInsideWorker(options: SerializedCoverageConfig | undefined, loader: RuntimeCoverageModuleLoader, runtimeOptions: {
 	isolate: boolean;
@@ -28,9 +21,13 @@ declare function stopCoverageInsideWorker(options: SerializedCoverageConfig | un
 	isolate: boolean;
 }): Promise<unknown>;
 
+interface PublicModuleRunner {
+	import: (id: string) => Promise<any>;
+}
+
 declare function setupCommonEnv(config: SerializedConfig): Promise<void>;
-declare function loadDiffConfig(config: SerializedConfig, moduleRunner: VitestModuleRunner): Promise<SerializedDiffOptions | undefined>;
-declare function loadSnapshotSerializers(config: SerializedConfig, moduleRunner: VitestModuleRunner): Promise<void>;
+declare function loadDiffConfig(config: SerializedConfig, moduleRunner: PublicModuleRunner): Promise<SerializedDiffOptions | undefined>;
+declare function loadSnapshotSerializers(config: SerializedConfig, moduleRunner: PublicModuleRunner): Promise<void>;
 
 interface FsOptions {
 	encoding?: BufferEncoding;

package/dist/chunks/{base.CDEiaaLz.js → base.BEv8sRbK.js}

@@ -1,9 +1,9 @@
 import { runInThisContext } from 'node:vm';
 import * as spyModule from '@vitest/spy';
 import { r as resolveTestRunner, a as resolveSnapshotEnvironment, s as setupChaiConfig } from './index.CQwQ_SLL.js';
-import { l as loadEnvironment } from './init.D-GGeAxo.js';
+import { l as loadEnvironment } from './init.a5SCIJ0x.js';
 import { V as VitestEvaluatedModules } from './evaluatedModules.Dg1zASAC.js';
-import { s as startVitestModuleRunner, c as createNodeImportMeta } from './startModuleRunner.BEYtrq5Y.js';
+import { s as startVitestModuleRunner, c as createNodeImportMeta } from './startModuleRunner.W28wBIgJ.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.DGHc_BUK.js';

package/dist/chunks/{browser.d.Bq3zc1l_.d.ts → browser.d.F6jMf15V.d.ts}

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

package/dist/chunks/{cac.D9QaLeSz.js → cac.DnEx6DOX.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.DWDW6mLz.js';
+import { R as ReportersMap } from './index.D6PC4Dpu.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.12";
+var version = "4.0.14";
 
 const apiConfig = (port) => ({
 	port: {
@@ -1371,11 +1371,11 @@ function normalizeCliOptions(cliFilters, argv) {
 }
 async function start(mode, cliFilters, options) {
 	try {
-		const { startVitest } = await import('./cli-api.BJh-POxZ.js').then(function (n) { return n.p; });
+		const { startVitest } = await import('./cli-api.CbjxIXjQ.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.DWDW6mLz.js').then(function (n) { return n.u; });
+		const { errorBanner } = await import('./index.D6PC4Dpu.js').then(function (n) { return n.u; });
 		console.error(`\n${errorBanner("Startup Error")}`);
 		console.error(e);
 		console.error("\n\n");
@@ -1393,7 +1393,7 @@ async function init(project) {
 }
 async function collect(mode, cliFilters, options) {
 	try {
-		const { prepareVitest, processCollected, outputFileList } = await import('./cli-api.BJh-POxZ.js').then(function (n) { return n.p; });
+		const { prepareVitest, processCollected, outputFileList } = await import('./cli-api.CbjxIXjQ.js').then(function (n) { return n.p; });
 		const ctx = await prepareVitest(mode, {
 			...normalizeCliOptions(cliFilters, options),
 			watch: false,
@@ -1412,7 +1412,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.DWDW6mLz.js').then(function (n) { return n.u; });
+		const { errorBanner } = await import('./index.D6PC4Dpu.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.BJh-POxZ.js → cli-api.CbjxIXjQ.js}

@@ -10,12 +10,12 @@ import { parseAst, searchForWorkspaceRoot, fetchModule, version, mergeConfig, cr
 import { A as API_PATH, c as configFiles, d as defaultBrowserPort, a as defaultPort } from './constants.D_Q9UYh-.js';
 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 { generateHash as generateHash$1, createTaskName, 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.D9QaLeSz.js';
+import { v as version$1 } from './cac.DnEx6DOX.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.DWDW6mLz.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.D6PC4Dpu.js';
 import require$$0$3 from 'events';
 import require$$1$1 from 'https';
 import require$$2 from 'http';
@@ -30,7 +30,7 @@ import { g as getDefaultExportFromCjs } from './_commonjsHelpers.D26ty3Ew.js';
 import crypto, { createHash } from 'node:crypto';
 import { rootDir, distDir } from '../path.js';
 import { T as Traces } from './traces.U4xDYhzZ.js';
-import createDebug from 'debug';
+import { createDebug } from 'obug';
 import { rm, readFile, writeFile, rename, stat, unlink, mkdir, copyFile } from 'node:fs/promises';
 import c from 'tinyrainbow';
 import { VitestModuleEvaluator } from '#module-evaluator';
@@ -52,7 +52,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.CMvpbrsJ.js';
+import { a as BenchmarkReportsMap } from './index.B88tjlE5.js';
 import assert$1 from 'node:assert';
 import { serializeValue } from '@vitest/utils/serialize';
 import { parseErrorStacktrace } from '@vitest/utils/source-map';
@@ -5401,6 +5401,7 @@ function createFailedFileTask(project, filepath, error) {
 		type: "suite",
 		id: /* @__PURE__ */ generateHash$1(`${testFilepath}${project.config.name || ""}`),
 		name: testFilepath,
+		fullName: testFilepath,
 		mode: "run",
 		tasks: [],
 		start: 0,
@@ -5438,6 +5439,7 @@ function createFileTask(testFilepath, code, requestMap, options) {
 		type: "suite",
 		id: /* @__PURE__ */ generateHash$1(`${testFilepath}${options.name || ""}`),
 		name: testFilepath,
+		fullName: testFilepath,
 		mode: "run",
 		tasks: [],
 		start: ast.start,
@@ -5482,6 +5484,8 @@ function createFileTask(testFilepath, code, requestMap, options) {
 				tasks: [],
 				mode,
 				name: definition.name,
+				fullName: createTaskName([latestSuite.fullName, definition.name]),
+				fullTestName: createTaskName([latestSuite.fullTestName, definition.name]),
 				end: definition.end,
 				start: definition.start,
 				location,
@@ -5501,6 +5505,8 @@ function createFileTask(testFilepath, code, requestMap, options) {
 			mode,
 			context: {},
 			name: definition.name,
+			fullName: createTaskName([latestSuite.fullName, definition.name]),
+			fullTestName: createTaskName([latestSuite.fullTestName, definition.name]),
 			end: definition.end,
 			start: definition.start,
 			location,
@@ -5747,6 +5753,7 @@ const debugMemory = createDebugger("vitest:cache:memory");
 const cacheComment = "\n//# vitestCache=";
 const cacheCommentLength = 17;
 const METADATA_FILE = "_metadata.json";
+const parallelFsCacheRead = /* @__PURE__ */ new Map();
 /**
 * @experimental
 */
@@ -5759,7 +5766,7 @@ class FileSystemModuleCache {
 	*/
 	rootCache;
 	metadataFilePath;
-	version = "1.0.0-beta.1";
+	version = "1.0.0-beta.2";
 	fsCacheRoots = /* @__PURE__ */ new WeakMap();
 	fsEnvironmentHashMap = /* @__PURE__ */ new WeakMap();
 	fsCacheKeyGenerators = /* @__PURE__ */ new Set();
@@ -5786,25 +5793,30 @@ class FileSystemModuleCache {
 		})));
 		if (log) this.vitest.logger.log(`[cache] cleared fs module cache at ${uniquePaths.join(", ")}`);
 	}
+	readCachedFileConcurrently(cachedFilePath) {
+		if (!parallelFsCacheRead.has(cachedFilePath)) parallelFsCacheRead.set(cachedFilePath, readFile(cachedFilePath, "utf-8").then((code) => {
+			const matchIndex = code.lastIndexOf(cacheComment);
+			if (matchIndex === -1) {
+				debugFs?.(`${c.red("[empty]")} ${cachedFilePath} exists, but doesn't have a ${cacheComment} comment, transforming by vite instead`);
+				return;
+			}
+			return {
+				code,
+				meta: this.fromBase64(code.slice(matchIndex + cacheCommentLength))
+			};
+		}).finally(() => {
+			parallelFsCacheRead.delete(cachedFilePath);
+		}));
+		return parallelFsCacheRead.get(cachedFilePath);
+	}
 	async getCachedModule(cachedFilePath) {
 		if (!existsSync(cachedFilePath)) {
 			debugFs?.(`${c.red("[empty]")} ${cachedFilePath} doesn't exist, transforming by vite instead`);
 			return;
 		}
-		const code = await readFile(cachedFilePath, "utf-8");
-		const matchIndex = code.lastIndexOf(cacheComment);
-		if (matchIndex === -1) {
-			debugFs?.(`${c.red("[empty]")} ${cachedFilePath} exists, but doesn't have a ${cacheComment} comment, transforming by vite instead`);
-			return;
-		}
-		const meta = this.fromBase64(code.slice(matchIndex + cacheCommentLength));
-		if (meta.externalize) {
-			debugFs?.(`${c.green("[read]")} ${meta.externalize} is externalized inside ${cachedFilePath}`);
-			return {
-				externalize: meta.externalize,
-				type: meta.type
-			};
-		}
+		const fileResult = await this.readCachedFileConcurrently(cachedFilePath);
+		if (!fileResult) return;
+		const { code, meta } = fileResult;
 		debugFs?.(`${c.green("[read]")} ${meta.id} is cached in ${cachedFilePath}`);
 		return {
 			id: meta.id,
@@ -5816,10 +5828,7 @@ class FileSystemModuleCache {
 		};
 	}
 	async saveCachedModule(cachedFilePath, fetchResult, importers = [], mappings = false) {
-		if ("externalize" in fetchResult) {
-			debugFs?.(`${c.yellow("[write]")} ${fetchResult.externalize} is externalized inside ${cachedFilePath}`);
-			await atomicWriteFile(cachedFilePath, `${cacheComment}${this.toBase64(fetchResult)}`);
-		} else if ("code" in fetchResult) {
+		if ("code" in fetchResult) {
 			const result = {
 				file: fetchResult.file,
 				id: fetchResult.id,
@@ -5853,7 +5862,6 @@ class FileSystemModuleCache {
 		return result;
 	}
 	generateCachePath(vitestConfig, environment, resolver, id, fileContent) {
-		let hashString = "";
 		// bail out if file has import.meta.glob because it depends on other files
 		// TODO: figure out a way to still support it
 		if (fileContent.includes("import.meta.glob(")) {
@@ -5861,6 +5869,7 @@ class FileSystemModuleCache {
 			debugMemory?.(`${c.yellow("[write]")} ${id} was bailed out`);
 			return null;
 		}
+		let hashString = "";
 		for (const generator of this.fsCacheKeyGenerators) {
 			const result = generator({
 				environment,
@@ -5889,13 +5898,7 @@ class FileSystemModuleCache {
 				plugins: config.plugins.map((p) => p.name),
 				configFileDependencies: config.configFileDependencies.map((file) => tryReadFileSync(file)),
 				environment: environment.name,
-				css: vitestConfig.css,
-				resolver: {
-					inline: resolver.options.inline,
-					external: resolver.options.external,
-					inlineFiles: resolver.options.inlineFiles,
-					moduleDirectories: resolver.options.moduleDirectories
-				}
+				css: vitestConfig.css
 			}, (_, value) => {
 				if (typeof value === "function" || value instanceof RegExp) return value.toString();
 				return value;
@@ -6111,6 +6114,11 @@ class ModuleFetcher {
 		const cached = !!moduleGraphModule.transformResult;
 		if (moduleGraphModule.file) trace.setAttribute("code.file.path", moduleGraphModule.file);
 		if (options?.cached && cached) return { cache: true };
+		const externalize = await this.resolver.shouldExternalize(moduleGraphModule.id);
+		if (externalize) return {
+			externalize,
+			type: "module"
+		};
 		const cachePath = await this.getCachePath(environment, moduleGraphModule);
 		// full fs caching is disabled, but we still want to keep tmp files if makeTmpCopies is enabled
 		// this is primarily used by the forks pool to avoid using process.send(bigBuffer)
@@ -6156,7 +6164,7 @@ class ModuleFetcher {
 	}
 	recordResult(trace, result) {
 		if ("externalize" in result) trace.setAttributes({
-			"vitest.module.external": result.externalize,
+			"vitest.fetched_module.external": result.externalize,
 			"vitest.fetched_module.type": result.type
 		});
 		if ("id" in result) {
@@ -6191,42 +6199,42 @@ class ModuleFetcher {
 		return "";
 	}
 	async getCachedModule(cachePath, environment, moduleGraphModule) {
+		if (moduleGraphModule.transformResult?.__vitestTmp) return {
+			cached: true,
+			file: moduleGraphModule.file,
+			id: moduleGraphModule.id,
+			tmp: moduleGraphModule.transformResult.__vitestTmp,
+			url: moduleGraphModule.url,
+			invalidate: false
+		};
 		const cachedModule = await this.fsCache.getCachedModule(cachePath);
-		if (cachedModule && "code" in cachedModule) {
-			// keep the module graph in sync
-			if (!moduleGraphModule.transformResult) {
-				let map = extractSourceMap(cachedModule.code);
-				if (map && cachedModule.file) map.file = cachedModule.file;
-				// mappings is a special source map identifier in rollup
-				if (!map && cachedModule.mappings) map = { mappings: "" };
-				moduleGraphModule.transformResult = {
-					code: cachedModule.code,
-					map,
-					ssr: true
-				};
-				// we populate the module graph to make the watch mode work because it relies on importers
-				cachedModule.importers.forEach((importer) => {
-					const environmentNode = environment.moduleGraph.getModuleById(importer);
-					if (environmentNode) moduleGraphModule.importers.add(environmentNode);
-				});
-			}
-			return {
-				cached: true,
-				file: cachedModule.file,
-				id: cachedModule.id,
-				tmp: cachePath,
-				url: cachedModule.url,
-				invalidate: false
-			};
-		}
-		return cachedModule;
+		if (!cachedModule) return;
+		// keep the module graph in sync
+		let map = extractSourceMap(cachedModule.code);
+		if (map && cachedModule.file) map.file = cachedModule.file;
+		// mappings is a special source map identifier in rollup
+		if (!map && cachedModule.mappings) map = { mappings: "" };
+		moduleGraphModule.transformResult = {
+			code: cachedModule.code,
+			map,
+			ssr: true,
+			__vitestTmp: cachePath
+		};
+		// we populate the module graph to make the watch mode work because it relies on importers
+		cachedModule.importers.forEach((importer) => {
+			const environmentNode = environment.moduleGraph.getModuleById(importer);
+			if (environmentNode) moduleGraphModule.importers.add(environmentNode);
+		});
+		return {
+			cached: true,
+			file: cachedModule.file,
+			id: cachedModule.id,
+			tmp: cachePath,
+			url: cachedModule.url,
+			invalidate: false
+		};
 	}
 	async fetchAndProcess(environment, url, importer, moduleGraphModule, options) {
-		const externalize = await this.resolver.shouldExternalize(moduleGraphModule.id);
-		if (externalize) return {
-			externalize,
-			type: "module"
-		};
 		return processResultSource(environment, await fetchModule(environment, url, importer, {
 			...options,
 			inlineSourceMap: false
@@ -7177,7 +7185,6 @@ class PoolRunner {
 			__vitest_worker_request__: true,
 			type: method,
 			context,
-			poolId: this.poolId,
 			otelCarrier: this.getOTELCarrier()
 		});
 	}
@@ -7185,7 +7192,7 @@ class PoolRunner {
 		const activeContext = this._otel?.currentContext || this._otel?.workerContext;
 		return activeContext ? this._traces.getContextCarrier(activeContext) : void 0;
 	}
-	async start() {
+	async start(options) {
 		// Wait for any ongoing operation to complete
 		if (this._operationLock) await this._operationLock;
 		if (this._state === RunnerState.STARTED || this._state === RunnerState.STARTING) return;
@@ -7209,6 +7216,8 @@ class PoolRunner {
 			const tracesSdk = projectConfig?.sdkPath ?? globalConfig?.sdkPath;
 			this.postMessage({
 				type: "start",
+				poolId: this.poolId,
+				workerId: options.workerId,
 				__vitest_worker_request__: true,
 				options: { reportMemory: this.worker.reportMemory ?? false },
 				context: {
@@ -7714,6 +7723,8 @@ class Pool {
 		try {
 			let isMemoryLimitReached = false;
 			const runner = this.getPoolRunner(task, method);
+			const poolId = runner.poolId ?? this.getWorkerId();
+			runner.poolId = poolId;
 			const activeTask = {
 				task,
 				resolver,
@@ -7740,10 +7751,8 @@ class Pool {
 					resolver.reject(new Error(`[vitest-pool]: Worker ${task.worker} emitted error.`, { cause: error }));
 				});
 				const id = setTimeout(() => resolver.reject(/* @__PURE__ */ new Error(`[vitest-pool]: Timeout starting ${task.worker} runner.`)), WORKER_START_TIMEOUT);
-				await runner.start().finally(() => clearTimeout(id));
+				await runner.start({ workerId: task.context.workerId }).finally(() => clearTimeout(id));
 			}
-			const poolId = runner.poolId ?? this.getWorkerId();
-			runner.poolId = poolId;
 			const span = runner.startTracesSpan(`vitest.worker.${method}`);
 			// Start running the test in the worker
 			runner.request(method, task.context);

package/dist/chunks/{traces.d.Brik_NWu.d.ts → config.d.g6OOauRt.d.ts}

@@ -201,21 +201,4 @@ type RuntimeConfig = Pick<SerializedConfig, "allowOnly" | "testTimeout" | "hookT
 type RuntimeOptions = Partial<RuntimeConfig>;
 type BrowserTraceViewMode = "on" | "off" | "on-first-retry" | "on-all-retries" | "retain-on-failure";
 
-interface OTELCarrier {
-	traceparent?: string;
-	tracestate?: string;
-}
-interface TracesOptions {
-	enabled: boolean;
-	watchMode?: boolean;
-	sdkPath?: string;
-	tracerName?: string;
-}
-declare class Traces {
-	#private;
-	constructor(options: TracesOptions);
-	isEnabled(): boolean;
-}
-
-export { Traces as T };
-export type { BrowserTraceViewMode as B, FakeTimerInstallOpts as F, OTELCarrier as O, RuntimeOptions as R, SerializedConfig as S, SerializedCoverageConfig as a, RuntimeConfig as b };
+export type { BrowserTraceViewMode as B, FakeTimerInstallOpts as F, RuntimeOptions as R, SerializedConfig as S, SerializedCoverageConfig as a, RuntimeConfig as b };

package/dist/chunks/{global.d.Dheepru6.d.ts → global.d.B15mdLcR.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.Dxl5oW0C.js';
+import { U as UserConsoleLog } from './rpc.d.RH3apGEf.js';
 
 interface SnapshotMatcher<T> {
 	<U extends { [P in keyof T] : any }>(snapshot: Partial<U>, hint?: string): void;

package/dist/chunks/{index.CMvpbrsJ.js → index.B88tjlE5.js}

@@ -2,7 +2,7 @@ import fs from 'node:fs';
 import { getTasks, getFullName, getTests } from '@vitest/runner/utils';
 import * as pathe from 'pathe';
 import c from 'tinyrainbow';
-import { g as getStateSymbol, t as truncateString, F as F_RIGHT, D as DefaultReporter, f as formatProjectName, s as separator } from './index.DWDW6mLz.js';
+import { g as getStateSymbol, t as truncateString, F as F_RIGHT, D as DefaultReporter, f as formatProjectName, s as separator } from './index.D6PC4Dpu.js';
 import { stripVTControlCharacters } from 'node:util';
 import { notNullish } from '@vitest/utils/helpers';
 

package/dist/chunks/{index.QWbK7rHY.js → index.BspFP3mn.js}

@@ -588,9 +588,20 @@ function createCompatUtils(window) {
 	return utils;
 }
 function patchAddEventListener(window) {
+	const abortControllers = /* @__PURE__ */ new WeakMap();
 	const JSDOMAbortSignal = window.AbortSignal;
 	const JSDOMAbortController = window.AbortController;
 	const originalAddEventListener = window.EventTarget.prototype.addEventListener;
+	function getJsdomAbortController(signal) {
+		if (!abortControllers.has(signal)) {
+			const jsdomAbortController = new JSDOMAbortController();
+			signal.addEventListener("abort", () => {
+				jsdomAbortController.abort(signal.reason);
+			});
+			abortControllers.set(signal, jsdomAbortController);
+		}
+		return abortControllers.get(signal);
+	}
 	window.EventTarget.prototype.addEventListener = function addEventListener(type, callback, options) {
 		if (typeof options === "object" && options.signal != null) {
 			const { signal, ...otherOptions } = options;
@@ -601,13 +612,7 @@ function patchAddEventListener(window) {
 			if (!(signal instanceof JSDOMAbortSignal)) {
 				const jsdomCompatOptions = Object.create(null);
 				Object.assign(jsdomCompatOptions, otherOptions);
-				// use jsdom-native abort controller instead and forward the
-				// previous one with `addEventListener`
-				const jsdomAbortController = new JSDOMAbortController();
-				signal.addEventListener("abort", () => {
-					jsdomAbortController.abort(signal.reason);
-				});
-				jsdomCompatOptions.signal = jsdomAbortController.signal;
+				jsdomCompatOptions.signal = getJsdomAbortController(signal).signal;
 				return originalAddEventListener.call(this, type, callback, jsdomCompatOptions);
 			}
 		}

package/dist/chunks/{index.DWDW6mLz.js → index.D6PC4Dpu.js}

@@ -2,7 +2,7 @@ import { existsSync, readFileSync, promises } from 'node:fs';
 import { mkdir, writeFile, readdir, stat, readFile } from 'node:fs/promises';
 import { resolve as resolve$1, dirname, isAbsolute, relative, basename, join, normalize } from 'pathe';
 import { performance as performance$1 } from 'node:perf_hooks';
-import { getTests, getTestName, hasFailed, getSuites, generateHash, calculateSuiteHash, someTasksAreOnly, interpretTaskModes, getTasks, getFullName } from '@vitest/runner/utils';
+import { getTests, getTestName, hasFailed, getSuites, generateHash, createTaskName, calculateSuiteHash, someTasksAreOnly, interpretTaskModes, getTasks, getFullName } from '@vitest/runner/utils';
 import { slash, toArray, isPrimitive } from '@vitest/utils/helpers';
 import { parseStacktrace, defaultStackIgnorePatterns, parseErrorStacktrace } from '@vitest/utils/source-map';
 import c from 'tinyrainbow';
@@ -795,16 +795,14 @@ class BaseReporter {
 			// Execution time is either sum of all runs of `--merge-reports` or the current run's time
 			const executionTime = blobs?.executionTimes ? sum(blobs.executionTimes, (time) => time) : this.end - this.start;
 			const environmentTime = sum(files, (file) => file.environmentLoad);
-			const prepareTime = sum(files, (file) => file.prepareDuration);
 			const transformTime = this.ctx.state.transformTime;
 			const typecheck = sum(this.ctx.projects, (project) => project.typechecker?.getResult().time);
 			const timers = [
 				`transform ${formatTime(transformTime)}`,
 				`setup ${formatTime(setupTime)}`,
-				`collect ${formatTime(collectTime)}`,
+				`import ${formatTime(collectTime)}`,
 				`tests ${formatTime(testsTime)}`,
 				`environment ${formatTime(environmentTime)}`,
-				`prepare ${formatTime(prepareTime)}`,
 				typecheck && `typecheck ${formatTime(typecheck)}`
 			].filter(Boolean).join(", ");
 			this.log(padSummaryTitle("Duration"), formatTime(executionTime) + c.dim(` (${timers})`));
@@ -2350,6 +2348,7 @@ async function collectTests(ctx, filepath) {
 		type: "suite",
 		id: generateHash(`${testFilepath}${projectName ? `${projectName}:__typecheck__` : "__typecheck__"}`),
 		name: testFilepath,
+		fullName: testFilepath,
 		mode: "run",
 		tasks: [],
 		start: ast.start,
@@ -2442,6 +2441,8 @@ async function collectTests(ctx, filepath) {
 				tasks: [],
 				mode,
 				name: definition.name,
+				fullName: createTaskName([lastSuite.fullName, definition.name]),
+				fullTestName: createTaskName([lastSuite.fullTestName, definition.name]),
 				end: definition.end,
 				start: definition.start,
 				meta: { typecheck: true }
@@ -2460,6 +2461,8 @@ async function collectTests(ctx, filepath) {
 			timeout: 0,
 			context: {},
 			name: definition.name,
+			fullName: createTaskName([lastSuite.fullName, definition.name]),
+			fullTestName: createTaskName([lastSuite.fullTestName, definition.name]),
 			end: definition.end,
 			start: definition.start,
 			annotations: [],
@@ -3500,6 +3503,8 @@ class JUnitReporter {
 					id: file.id,
 					type: "test",
 					name: file.name,
+					fullName: file.name,
+					fullTestName: file.name,
 					mode: "run",
 					result: file.result,
 					meta: {},

package/dist/chunks/{init-forks.FphdQhPI.js → init-forks.DmvIFK4U.js}

@@ -1,4 +1,4 @@
-import { i as init } from './init.D-GGeAxo.js';
+import { i as init } from './init.a5SCIJ0x.js';
 
 if (!process.send) throw new Error("Expected worker to be run in node:child_process");
 // Store globals in case tests overwrite them

package/dist/chunks/{init-threads.BfqfWDNi.js → init-threads.De6b3S3g.js}

@@ -1,5 +1,5 @@
 import { isMainThread, parentPort } from 'node:worker_threads';
-import { i as init } from './init.D-GGeAxo.js';
+import { i as init } from './init.a5SCIJ0x.js';
 
 if (isMainThread || !parentPort) throw new Error("Expected worker to be run in node:worker_threads");
 function workerInit(options) {

package/dist/chunks/{init.D-GGeAxo.js → init.a5SCIJ0x.js}

@@ -3,8 +3,8 @@ import { isBuiltin } from 'node:module';
 import { pathToFileURL } from 'node:url';
 import { resolve } from 'pathe';
 import { ModuleRunner } from 'vite/module-runner';
-import { b as VitestTransport } from './startModuleRunner.BEYtrq5Y.js';
-import { e as environments } from './index.QWbK7rHY.js';
+import { b as VitestTransport } from './startModuleRunner.W28wBIgJ.js';
+import { e as environments } from './index.BspFP3mn.js';
 import { serializeError } from '@vitest/utils/error';
 import { T as Traces } from './traces.U4xDYhzZ.js';
 import { o as onCancel, a as rpcDone, c as createRuntimeRpc } from './rpc.BytlcPfC.js';
@@ -158,6 +158,8 @@ function init(worker) {
 		if (message?.__vitest_worker_request__ !== true) return;
 		switch (message.type) {
 			case "start": {
+				process.env.VITEST_POOL_ID = String(message.poolId);
+				process.env.VITEST_WORKER_ID = String(message.workerId);
 				reportMemory = message.options.reportMemory;
 				const tracesStart = performance.now();
 				traces ??= await new Traces({
@@ -203,7 +205,6 @@ function init(worker) {
 					return;
 				}
 				try {
-					process.env.VITEST_POOL_ID = String(message.poolId);
 					process.env.VITEST_WORKER_ID = String(message.context.workerId);
 				} catch (error) {
 					return send({
@@ -248,7 +249,6 @@ function init(worker) {
 					return;
 				}
 				try {
-					process.env.VITEST_POOL_ID = String(message.poolId);
 					process.env.VITEST_WORKER_ID = String(message.context.workerId);
 				} catch (error) {
 					return send({

package/dist/chunks/{plugin.d.DGpEw-QV.d.ts → plugin.d.B6hlg3fN.d.ts}

@@ -1,5 +1,5 @@
 import { DevEnvironment } from 'vite';
-import { V as Vitest, T as TestProject, b as TestProjectConfiguration } from './reporters.d.C2PtoEFY.js';
+import { V as Vitest, T as TestProject, b as TestProjectConfiguration } from './reporters.d.DeFcIuza.js';
 
 /**
 * Generate a unique cache identifier.