vitest 4.0.13 → 4.0.15

package/dist/chunks/{test.DqQZzsWf.js → test.BT8LKgU9.js}

@@ -7,7 +7,7 @@ import { setState, GLOBAL_EXPECT, getState } from '@vitest/expect';
 import { getTests, getNames, getTestName } from '@vitest/runner/utils';
 import { processError } from '@vitest/utils/error';
 import { normalize } from 'pathe';
-import { a as getSnapshotClient, i as inject, c as createExpect, v as vi } from './vi.BiaV1qII.js';
+import { a as getSnapshotClient, i as inject, c as createExpect, v as vi } from './vi.2VT5v0um.js';
 import { r as rpc } from './rpc.BytlcPfC.js';
 
 function createBenchmarkResult(name) {
@@ -122,8 +122,11 @@ class VitestTestRunner {
 	assertionsErrors = /* @__PURE__ */ new WeakMap();
 	pool = this.workerState.ctx.pool;
 	_otel;
+	viteEnvironment;
 	constructor(config) {
 		this.config = config;
+		const environment = this.workerState.environment;
+		this.viteEnvironment = environment.viteEnvironment || environment.name;
 	}
 	importFile(filepath, source) {
 		if (source === "setup") {
@@ -223,9 +226,11 @@ class VitestTestRunner {
 	getImportDurations() {
 		const importDurations = {};
 		const entries = this.workerState.moduleExecutionInfo?.entries() || [];
-		for (const [filepath, { duration, selfTime }] of entries) importDurations[normalize(filepath)] = {
+		for (const [filepath, { duration, selfTime, external, importer }] of entries) importDurations[normalize(filepath)] = {
 			selfTime,
-			totalTime: duration
+			totalTime: duration,
+			external,
+			importer
 		};
 		return importDurations;
 	}

package/dist/chunks/{vi.BiaV1qII.js → vi.2VT5v0um.js}

@@ -1,8 +1,8 @@
 import { chai, equals, iterableEquality, subsetEquality, JestExtend, JestChaiExpect, JestAsymmetricMatchers, GLOBAL_EXPECT, ASYMMETRIC_MATCHERS_OBJECT, getState, setState, addCustomEqualityTesters, customMatchers } from '@vitest/expect';
 import { getCurrentTest } from '@vitest/runner';
-import { getNames, getTestName } from '@vitest/runner/utils';
 import { g as getWorkerState, i as isChildProcess, w as waitForImportsToResolve, r as resetModules } from './utils.DvEY5TfP.js';
-import { getSafeTimers } from '@vitest/utils/timers';
+import { getSafeTimers, delay } from '@vitest/utils/timers';
+import { getNames } from '@vitest/runner/utils';
 import { stripSnapshotIndentation, addSerializer, SnapshotClient } from '@vitest/snapshot';
 import '@vitest/utils/error';
 import { assertTypes, createSimpleStackTrace } from '@vitest/utils/helpers';
@@ -25,6 +25,18 @@ const unsupported = [
 	"toThrow",
 	"toThrowError"
 ];
+/**
+* Attaches a `cause` property to the error if missing, copies the stack trace from the source, and throws.
+*
+* @param error - The error to throw
+* @param source - Error to copy the stack trace from
+*
+* @throws Always throws the provided error with an amended stack trace
+*/
+function throwWithCause(error, source) {
+	if (error.cause == null) error.cause = /* @__PURE__ */ new Error("Matcher did not succeed in time.");
+	throw copyStackTrace$1(error, source);
+}
 function createExpectPoll(expect) {
 	return function poll(fn, options = {}) {
 		const defaults = getWorkerState().config.expect?.poll ?? {};
@@ -41,35 +53,33 @@ function createExpectPoll(expect) {
 			if (typeof key === "string" && unsupported.includes(key)) throw new SyntaxError(`expect.poll() is not supported in combination with .${key}(). Use vi.waitFor() if your assertion condition is unstable.`);
 			return function(...args) {
 				const STACK_TRACE_ERROR = /* @__PURE__ */ new Error("STACK_TRACE_ERROR");
-				const promise = () => new Promise((resolve, reject) => {
-					let intervalId;
-					let timeoutId;
-					let lastError;
+				const promise = async () => {
 					const { setTimeout, clearTimeout } = getSafeTimers();
-					const check = async () => {
-						try {
-							chai.util.flag(assertion, "_name", key);
-							const obj = await fn();
-							chai.util.flag(assertion, "object", obj);
-							resolve(await assertionFunction.call(assertion, ...args));
-							clearTimeout(intervalId);
-							clearTimeout(timeoutId);
-						} catch (err) {
-							lastError = err;
-							if (!chai.util.flag(assertion, "_isLastPollAttempt")) intervalId = setTimeout(check, interval);
-						}
-					};
-					timeoutId = setTimeout(() => {
-						clearTimeout(intervalId);
-						chai.util.flag(assertion, "_isLastPollAttempt", true);
-						const rejectWithCause = (error) => {
-							if (error.cause == null) error.cause = /* @__PURE__ */ new Error("Matcher did not succeed in time.");
-							reject(copyStackTrace$1(error, STACK_TRACE_ERROR));
-						};
-						check().then(() => rejectWithCause(lastError)).catch((e) => rejectWithCause(e));
+					let executionPhase = "fn";
+					let hasTimedOut = false;
+					const timerId = setTimeout(() => {
+						hasTimedOut = true;
 					}, timeout);
-					check();
-				});
+					chai.util.flag(assertion, "_name", key);
+					try {
+						while (true) {
+							const isLastAttempt = hasTimedOut;
+							if (isLastAttempt) chai.util.flag(assertion, "_isLastPollAttempt", true);
+							try {
+								executionPhase = "fn";
+								const obj = await fn();
+								chai.util.flag(assertion, "object", obj);
+								executionPhase = "assertion";
+								return await assertionFunction.call(assertion, ...args);
+							} catch (err) {
+								if (isLastAttempt || executionPhase === "assertion" && chai.util.flag(assertion, "_poll.assert_once")) throwWithCause(err, STACK_TRACE_ERROR);
+								await delay(interval, setTimeout);
+							}
+						}
+					} finally {
+						clearTimeout(timerId);
+					}
+				};
 				let awaited = false;
 				test.onFinished ??= [];
 				test.onFinished.push(() => {
@@ -315,7 +325,7 @@ function createExpect(test) {
 		get testPath() {
 			return getWorkerState().filepath;
 		},
-		currentTestName: test ? getTestName(test) : globalState.currentTestName
+		currentTestName: test ? test.fullTestName ?? "" : globalState.currentTestName
 	}, expect);
 	expect.assert = chai.assert;
 	// @ts-expect-error untyped

package/dist/chunks/{vm.Y19jrZy2.js → vm.BwmD1Rql.js}

@@ -1,7 +1,7 @@
 import { fileURLToPath, pathToFileURL } from 'node:url';
 import vm, { isContext, runInContext } from 'node:vm';
 import { dirname, basename, extname, normalize, resolve } from 'pathe';
-import { l as loadEnvironment } from './init.MkYs5nmh.js';
+import { l as loadEnvironment } from './init.B04saIIg.js';
 import { distDir } from '../path.js';
 import { createCustomConsole } from './console.Cf-YriPC.js';
 import fs from 'node:fs';
@@ -11,7 +11,7 @@ import { findNearestPackageData } from '@vitest/utils/resolver';
 import { dirname as dirname$1 } from 'node:path';
 import { CSS_LANGS_RE, KNOWN_ASSET_RE } from '@vitest/utils/constants';
 import { getDefaultRequestStubs } from '../module-evaluator.js';
-import { s as startVitestModuleRunner, c as createNodeImportMeta, a as VITEST_VM_CONTEXT_SYMBOL } from './startModuleRunner.W28wBIgJ.js';
+import { s as startVitestModuleRunner, c as createNodeImportMeta, a as VITEST_VM_CONTEXT_SYMBOL } from './startModuleRunner.Iz2V0ESw.js';
 import { p as provideWorkerState } from './utils.DvEY5TfP.js';
 
 function interopCommonJsModule(interopDefault, mod) {

package/dist/chunks/{worker.d.DCy61tzi.d.ts → worker.d.B4A26qg6.d.ts}

@@ -1,6 +1,6 @@
 import { FileSpecification, Task, CancelReason } from '@vitest/runner';
 import { EvaluatedModules } from 'vite/module-runner';
-import { S as SerializedConfig } from './config.d.g6OOauRt.js';
+import { S as SerializedConfig } from './config.d.CzIjkicf.js';
 import { E as Environment } from './environment.d.CrsxCzP1.js';
 import { R as RuntimeRPC, a as RunnerRPC } from './rpc.d.RH3apGEf.js';
 
@@ -235,4 +235,4 @@ interface WorkerGlobalState {
 	onFilterStackTrace?: (trace: string) => string;
 }
 
-export type { BirpcOptions as B, ContextRPC as C, TestExecutionMethod as T, WorkerGlobalState as W, WorkerSetupContext as a, BirpcReturn as b, ContextTestEnvironment as c, WorkerTestEnvironment as d, WorkerExecuteContext as e };
+export type { BirpcOptions as B, ContextRPC as C, TestExecutionMethod as T, WorkerGlobalState as W, WorkerSetupContext as a, BirpcReturn as b, ContextTestEnvironment as c, WorkerExecuteContext as d, WorkerTestEnvironment as e };

package/dist/cli.js

@@ -1,10 +1,10 @@
-import { c as createCLI } from './chunks/cac.L-UbQ_Ix.js';
+import { c as createCLI } from './chunks/cac.BNNpZQl7.js';
 import '@vitest/utils/helpers';
 import 'events';
 import 'pathe';
 import 'tinyrainbow';
 import './chunks/constants.D_Q9UYh-.js';
-import './chunks/index.DWDW6mLz.js';
+import './chunks/index.456_DGfR.js';
 import 'node:fs';
 import 'node:fs/promises';
 import 'node:perf_hooks';

package/dist/config.d.ts

@@ -1,9 +1,9 @@
 import { HookHandler, ConfigEnv, UserConfig } from 'vite';
 export { ConfigEnv, Plugin, UserConfig as ViteUserConfig, mergeConfig } from 'vite';
-import { I as InlineConfig, c as CoverageV8Options, R as ResolvedCoverageOptions, U as UserWorkspaceConfig, d as UserProjectConfigFn, e as UserProjectConfigExport } from './chunks/reporters.d.J2RlBlp9.js';
-export { b as TestProjectConfiguration, g as TestProjectInlineConfiguration, f as TestUserConfig, W as WatcherTriggerPattern } from './chunks/reporters.d.J2RlBlp9.js';
-import { V as VitestPluginContext } from './chunks/plugin.d.B4l3vYM_.js';
-import { F as FakeTimerInstallOpts } from './chunks/config.d.g6OOauRt.js';
+import { I as InlineConfig, c as CoverageV8Options, R as ResolvedCoverageOptions, U as UserWorkspaceConfig, d as UserProjectConfigFn, e as UserProjectConfigExport } from './chunks/reporters.d.OXEK7y4s.js';
+export { b as TestProjectConfiguration, g as TestProjectInlineConfiguration, f as TestUserConfig, W as WatcherTriggerPattern } from './chunks/reporters.d.OXEK7y4s.js';
+import { V as VitestPluginContext } from './chunks/plugin.d.CY7CUjf-.js';
+import { F as FakeTimerInstallOpts } from './chunks/config.d.CzIjkicf.js';
 import '@vitest/runner';
 import '@vitest/utils';
 import './chunks/rpc.d.RH3apGEf.js';
@@ -11,12 +11,12 @@ import '@vitest/snapshot';
 import 'vite/module-runner';
 import './chunks/traces.d.402V_yFI.js';
 import 'node:stream';
+import './chunks/browser.d.DBzUq_Na.js';
+import './chunks/worker.d.B4A26qg6.js';
+import './chunks/environment.d.CrsxCzP1.js';
 import '@vitest/mocker';
 import '@vitest/utils/source-map';
 import 'vitest/browser';
-import './chunks/browser.d.CDvMh6F9.js';
-import './chunks/worker.d.DCy61tzi.js';
-import './chunks/environment.d.CrsxCzP1.js';
 import '@vitest/pretty-format';
 import '@vitest/utils/diff';
 import '@vitest/expect';

package/dist/coverage.d.ts

@@ -1,20 +1,20 @@
-import { R as ResolvedCoverageOptions, V as Vitest, C as CoverageMap, a as ReportContext } from './chunks/reporters.d.J2RlBlp9.js';
+import { R as ResolvedCoverageOptions, V as Vitest, C as CoverageMap, a as ReportContext } from './chunks/reporters.d.OXEK7y4s.js';
 import { TransformResult } from 'vite';
 import { A as AfterSuiteRunMeta } from './chunks/rpc.d.RH3apGEf.js';
 import '@vitest/runner';
 import '@vitest/utils';
 import 'node:stream';
-import '@vitest/mocker';
-import '@vitest/utils/source-map';
-import 'vitest/browser';
-import './chunks/config.d.g6OOauRt.js';
+import './chunks/browser.d.DBzUq_Na.js';
+import './chunks/worker.d.B4A26qg6.js';
+import 'vite/module-runner';
+import './chunks/config.d.CzIjkicf.js';
 import '@vitest/pretty-format';
 import '@vitest/snapshot';
 import '@vitest/utils/diff';
-import './chunks/browser.d.CDvMh6F9.js';
-import './chunks/worker.d.DCy61tzi.js';
-import 'vite/module-runner';
 import './chunks/environment.d.CrsxCzP1.js';
+import '@vitest/mocker';
+import '@vitest/utils/source-map';
+import 'vitest/browser';
 import '@vitest/expect';
 import 'vitest/optional-types.js';
 import './chunks/traces.d.402V_yFI.js';

package/dist/environments.js

@@ -1,3 +1,3 @@
-export { e as builtinEnvironments, p as populateGlobal } from './chunks/index.QWbK7rHY.js';
+export { e as builtinEnvironments, p as populateGlobal } from './chunks/index.BspFP3mn.js';
 import 'node:url';
 import 'node:console';

package/dist/index.d.ts

@@ -1,14 +1,14 @@
-import { S as SerializedTestSpecification } from './chunks/browser.d.CDvMh6F9.js';
-export { B as BrowserTesterOptions } from './chunks/browser.d.CDvMh6F9.js';
+import { M as ModuleDefinitionDurationsDiagnostic, U as UntrackedModuleDefinitionDiagnostic, S as SerializedTestSpecification, a as ModuleDefinitionDiagnostic, b as ModuleDefinitionLocation, c as SourceModuleDiagnostic, d as SourceModuleLocations } from './chunks/browser.d.DBzUq_Na.js';
+export { B as BrowserTesterOptions } from './chunks/browser.d.DBzUq_Na.js';
 import './chunks/global.d.B15mdLcR.js';
 import { File, TestAnnotation, TestArtifact, TaskResultPack, TaskEventPack, Test, TaskPopulated } from '@vitest/runner';
 export { CancelReason, ImportDuration, OnTestFailedHandler, OnTestFinishedHandler, RunMode, Task as RunnerTask, TaskBase as RunnerTaskBase, TaskEventPack as RunnerTaskEventPack, TaskResult as RunnerTaskResult, TaskResultPack as RunnerTaskResultPack, Test as RunnerTestCase, File as RunnerTestFile, Suite as RunnerTestSuite, SuiteAPI, SuiteCollector, SuiteFactory, TaskCustomOptions, TaskMeta, TaskState, TestAPI, TestAnnotation, TestAnnotationArtifact, TestArtifact, TestArtifactBase, TestArtifactLocation, TestArtifactRegistry, TestAttachment, TestContext, TestFunction, TestOptions, afterAll, afterEach, beforeAll, beforeEach, describe, it, onTestFailed, onTestFinished, recordArtifact, suite, test } from '@vitest/runner';
 import { Awaitable } from '@vitest/utils';
 export { ParsedStack, SerializedError, TestError } from '@vitest/utils';
-import { b as BirpcReturn } from './chunks/worker.d.DCy61tzi.js';
-export { C as ContextRPC, c as ContextTestEnvironment, T as TestExecutionMethod, W as WorkerGlobalState } from './chunks/worker.d.DCy61tzi.js';
-import { S as SerializedConfig, F as FakeTimerInstallOpts, R as RuntimeOptions } from './chunks/config.d.g6OOauRt.js';
-export { b as RuntimeConfig, a as SerializedCoverageConfig } from './chunks/config.d.g6OOauRt.js';
+import { b as BirpcReturn } from './chunks/worker.d.B4A26qg6.js';
+export { C as ContextRPC, c as ContextTestEnvironment, T as TestExecutionMethod, W as WorkerGlobalState } from './chunks/worker.d.B4A26qg6.js';
+import { S as SerializedConfig, F as FakeTimerInstallOpts, R as RuntimeOptions } from './chunks/config.d.CzIjkicf.js';
+export { b as RuntimeConfig, a as SerializedCoverageConfig } from './chunks/config.d.CzIjkicf.js';
 import { U as UserConsoleLog, L as LabelColor, M as ModuleGraphData, P as ProvidedContext } from './chunks/rpc.d.RH3apGEf.js';
 export { A as AfterSuiteRunMeta, a as RunnerRPC, R as RuntimeRPC } from './chunks/rpc.d.RH3apGEf.js';
 import { ExpectStatic } from '@vitest/expect';
@@ -16,13 +16,14 @@ export { Assertion, AsymmetricMatchersContaining, DeeplyAllowMatchers, ExpectPol
 import { spyOn, fn, MaybeMockedDeep, MaybeMocked, MaybePartiallyMocked, MaybePartiallyMockedDeep, MockInstance } from '@vitest/spy';
 export { Mock, MockContext, MockInstance, MockResult, MockResultIncomplete, MockResultReturn, MockResultThrow, MockSettledResult, MockSettledResultFulfilled, MockSettledResultIncomplete, MockSettledResultRejected, Mocked, MockedClass, MockedFunction, MockedObject } from '@vitest/spy';
 export { b as bench } from './chunks/suite.d.BJWk38HB.js';
-import { EvaluatedModules } from 'vite/module-runner';
+export { V as EvaluatedModules } from './chunks/evaluatedModules.d.BxJ5omdx.js';
 export { a as BenchFunction, b as Benchmark, c as BenchmarkAPI, B as BenchmarkResult } from './chunks/benchmark.d.DAaHLpsq.js';
 export { ExpectTypeOf, expectTypeOf } from 'expect-type';
 export { SnapshotData, SnapshotMatchOptions, SnapshotResult, SnapshotSerializer, SnapshotStateOptions, SnapshotSummary, SnapshotUpdateState, UncheckedSnapshot } from '@vitest/snapshot';
 export { DiffOptions } from '@vitest/utils/diff';
 export { Bench as BenchFactory, Options as BenchOptions, Task as BenchTask, TaskResult as BenchTaskResult } from 'tinybench';
 import '@vitest/pretty-format';
+import 'vite/module-runner';
 import './chunks/environment.d.CrsxCzP1.js';
 import './chunks/traces.d.402V_yFI.js';
 import '@vitest/runner/utils';
@@ -37,6 +38,9 @@ interface SourceMap {
 	toString: () => string;
 	toUrl: () => string;
 }
+interface ExternalResult {
+	source?: string;
+}
 interface TransformResultWithSource {
 	code: string;
 	map: SourceMap | {
@@ -46,6 +50,9 @@ interface TransformResultWithSource {
 	deps?: string[];
 	dynamicDeps?: string[];
 	source?: string;
+	transformTime?: number;
+	modules?: ModuleDefinitionDurationsDiagnostic[];
+	untrackedModules?: UntrackedModuleDefinitionDiagnostic[];
 }
 interface WebSocketHandlers {
 	onTaskUpdate: (packs: TaskResultPack[], events: TaskEventPack[]) => void;
@@ -58,7 +65,8 @@ interface WebSocketHandlers {
 		color?: LabelColor;
 	}[];
 	getModuleGraph: (projectName: string, id: string, browser?: boolean) => Promise<ModuleGraphData>;
-	getTransformResult: (projectName: string, id: string, browser?: boolean) => Promise<TransformResultWithSource | undefined>;
+	getTransformResult: (projectName: string, id: string, testFileId: string, browser?: boolean) => Promise<TransformResultWithSource | undefined>;
+	getExternalResult: (id: string, testFileId: string) => Promise<ExternalResult | undefined>;
 	readTestFile: (id: string) => Promise<string | null>;
 	saveTestFile: (id: string, content: string) => Promise<void>;
 	rerun: (files: string[], resetTestNamePattern?: boolean) => Promise<void>;
@@ -484,10 +492,6 @@ interface VitestUtils {
 declare const vitest: VitestUtils;
 declare const vi: VitestUtils;
 
-declare class VitestEvaluatedModules extends EvaluatedModules {
-	getModuleSourceMapById(id: string): any;
-}
-
 interface AssertType {
 	<T>(value: T): void;
 }
@@ -498,5 +502,9 @@ interface BrowserUI {
 	setIframeViewport: (width: number, height: number) => Promise<void>;
 }
 
-export { VitestEvaluatedModules as EvaluatedModules, LabelColor, ModuleGraphData, ProvidedContext, SerializedConfig, SerializedTestSpecification, UserConsoleLog, assert, assertType, createExpect, globalExpect as expect, inject, should, vi, vitest };
-export type { AssertType, BrowserUI, TransformResultWithSource, VitestUtils, WebSocketEvents, WebSocketHandlers, WebSocketRPC };
+declare namespace Experimental {
+	export { ModuleDefinitionDiagnostic, ModuleDefinitionDurationsDiagnostic, ModuleDefinitionLocation, SourceModuleDiagnostic, SourceModuleLocations, UntrackedModuleDefinitionDiagnostic };
+}
+
+export { Experimental, LabelColor, ModuleGraphData, ProvidedContext, SerializedConfig, SerializedTestSpecification, UserConsoleLog, assert, assertType, createExpect, globalExpect as expect, inject, should, vi, vitest };
+export type { AssertType, BrowserUI, ExternalResult, TransformResultWithSource, VitestUtils, WebSocketEvents, WebSocketHandlers, WebSocketRPC };

package/dist/index.js

@@ -1,13 +1,13 @@
-export { b as assert, c as createExpect, g as expect, i as inject, s as should, v as vi, d as vitest } from './chunks/vi.BiaV1qII.js';
+export { b as assert, c as createExpect, g as expect, i as inject, s as should, v as vi, d as vitest } from './chunks/vi.2VT5v0um.js';
 export { b as bench } from './chunks/benchmark.B3N2zMcH.js';
 export { V as EvaluatedModules } from './chunks/evaluatedModules.Dg1zASAC.js';
-export { a as assertType } from './chunks/index.DBx1AtPJ.js';
+export { a as assertType } from './chunks/index.Z5E_ObnR.js';
 export { expectTypeOf } from 'expect-type';
 export { afterAll, afterEach, beforeAll, beforeEach, describe, it, onTestFailed, onTestFinished, recordArtifact, suite, test } from '@vitest/runner';
 export { chai } from '@vitest/expect';
-import '@vitest/runner/utils';
 import './chunks/utils.DvEY5TfP.js';
 import '@vitest/utils/timers';
+import '@vitest/runner/utils';
 import '@vitest/snapshot';
 import '@vitest/utils/error';
 import '@vitest/utils/helpers';

package/dist/module-evaluator.d.ts

@@ -1,4 +1,5 @@
 import { ModuleEvaluator, ModuleRunnerImportMeta, ModuleRunnerContext, EvaluatedModuleNode } from 'vite/module-runner';
+import { V as VitestEvaluatedModules } from './chunks/evaluatedModules.d.BxJ5omdx.js';
 import vm from 'node:vm';
 import { R as RuntimeRPC } from './chunks/rpc.d.RH3apGEf.js';
 import '@vitest/runner';
@@ -12,6 +13,8 @@ interface ModuleExecutionInfoEntry {
 	duration: number;
 	/** The time that was spent executing the module itself and externalized imports. */
 	selfTime: number;
+	external?: boolean;
+	importer?: string;
 }
 
 declare class FileMap {
@@ -85,6 +88,7 @@ interface VitestVmOptions {
 }
 
 interface VitestModuleEvaluatorOptions {
+	evaluatedModules?: VitestEvaluatedModules;
 	interopDefault?: boolean | undefined;
 	moduleExecutionInfo?: ModuleExecutionInfo;
 	getCurrentTestFilepath?: () => string | undefined;
@@ -101,6 +105,7 @@ declare class VitestModuleEvaluator implements ModuleEvaluator {
 	private primitives;
 	private debug;
 	private _otel;
+	private _evaluatedModules?;
 	constructor(vmOptions?: VitestVmOptions | undefined, options?: VitestModuleEvaluatorOptions);
 	private convertIdToImportUrl;
 	runExternalModule(id: string): Promise<any>;

package/dist/module-evaluator.js

@@ -1,5 +1,5 @@
 import { isBuiltin, createRequire } from 'node:module';
-import { pathToFileURL } from 'node:url';
+import { pathToFileURL, fileURLToPath } from 'node:url';
 import vm from 'node:vm';
 import { isAbsolute } from 'pathe';
 import { ssrModuleExportsKey, ssrImportMetaKey, ssrImportKey, ssrDynamicImportKey, ssrExportAllKey } from 'vite/module-runner';
@@ -8,7 +8,7 @@ import { T as Traces } from './chunks/traces.U4xDYhzZ.js';
 const performanceNow = performance.now.bind(performance);
 class ModuleDebug {
 	executionStack = [];
-	startCalculateModuleExecutionInfo(filename, startOffset) {
+	startCalculateModuleExecutionInfo(filename, options) {
 		const startTime = performanceNow();
 		this.executionStack.push({
 			filename,
@@ -22,7 +22,9 @@ class ModuleDebug {
 			const selfTime = duration - currentExecution.subImportTime;
 			if (this.executionStack.length > 0) this.executionStack.at(-1).subImportTime += duration;
 			return {
-				startOffset,
+				startOffset: options.startOffset,
+				external: options.external,
+				importer: options.importer,
 				duration,
 				selfTime
 			};
@@ -40,11 +42,13 @@ class VitestModuleEvaluator {
 	primitives;
 	debug = new ModuleDebug();
 	_otel;
+	_evaluatedModules;
 	constructor(vmOptions, options = {}) {
 		this.options = options;
 		this._otel = options.traces || new Traces({ enabled: false });
 		this.vm = vmOptions;
 		this.stubs = getDefaultRequestStubs(vmOptions?.context);
+		this._evaluatedModules = options.evaluatedModules;
 		if (options.compiledFunctionArgumentsNames) this.compiledFunctionArgumentsNames = options.compiledFunctionArgumentsNames;
 		if (options.compiledFunctionArgumentsValues) this.compiledFunctionArgumentsValues = options.compiledFunctionArgumentsValues;
 		if (vmOptions) this.primitives = vm.runInContext("({ Object, Proxy, Reflect })", vmOptions.context);
@@ -67,7 +71,16 @@ class VitestModuleEvaluator {
 	async runExternalModule(id) {
 		if (id in this.stubs) return this.stubs[id];
 		const file = this.convertIdToImportUrl(id);
-		const namespace = await this._otel.$("vitest.module.external", { attributes: { "code.file.path": file } }, () => this.vm ? this.vm.externalModulesExecutor.import(file) : import(file));
+		const importer = (this._evaluatedModules?.getModuleById(id)?.importers)?.values().next().value;
+		const filename = id.startsWith("file://") ? fileURLToPath(id) : id;
+		const finishModuleExecutionInfo = this.debug.startCalculateModuleExecutionInfo(filename, {
+			startOffset: 0,
+			external: true,
+			importer
+		});
+		const namespace = await this._otel.$("vitest.module.external", { attributes: { "code.file.path": file } }, () => this.vm ? this.vm.externalModulesExecutor.import(file) : import(file)).finally(() => {
+			this.options.moduleExecutionInfo?.set(filename, finishModuleExecutionInfo());
+		});
 		if (!this.shouldInterop(file, namespace)) return namespace;
 		const { mod, defaultExport } = interopModule(namespace);
 		const { Proxy, Reflect } = this.primitives;
@@ -174,7 +187,12 @@ class VitestModuleEvaluator {
 			lineOffset: 0,
 			columnOffset: -codeDefinition.length
 		};
-		const finishModuleExecutionInfo = this.debug.startCalculateModuleExecutionInfo(options.filename, codeDefinition.length);
+		// this will always be 1 element because it's cached after load
+		const importer = module.importers.values().next().value;
+		const finishModuleExecutionInfo = this.debug.startCalculateModuleExecutionInfo(options.filename, {
+			startOffset: codeDefinition.length,
+			importer
+		});
 		try {
 			const initModule = this.vm ? vm.runInContext(wrappedCode, this.vm.context, options) : vm.runInThisContext(wrappedCode, options);
 			const dynamicRequest = async (dep, options) => {

package/dist/module-runner.js

@@ -1,5 +1,5 @@
 export { VitestModuleEvaluator } from './module-evaluator.js';
-export { a as VITEST_VM_CONTEXT_SYMBOL, V as VitestModuleRunner, s as startVitestModuleRunner } from './chunks/startModuleRunner.W28wBIgJ.js';
+export { a as VITEST_VM_CONTEXT_SYMBOL, V as VitestModuleRunner, s as startVitestModuleRunner } from './chunks/startModuleRunner.Iz2V0ESw.js';
 export { g as getWorkerState } from './chunks/utils.DvEY5TfP.js';
 import 'node:module';
 import 'node:url';
@@ -9,6 +9,7 @@ import 'vite/module-runner';
 import './chunks/traces.U4xDYhzZ.js';
 import 'node:fs';
 import '@vitest/utils/helpers';
+import './chunks/modules.DJPjQW6m.js';
 import './path.js';
 import 'node:path';
 import '@vitest/utils/serialize';

package/dist/node.d.ts

@@ -3,24 +3,24 @@ import { InlineConfig, UserConfig as UserConfig$1, Plugin, ResolvedConfig as Res
 export { vite as Vite };
 export { esbuildVersion, isCSSRequest, isFileServingAllowed, parseAst, parseAstAsync, rollupVersion, version as viteVersion } from 'vite';
 import { IncomingMessage } from 'node:http';
-import { h as ResolvedConfig, f as UserConfig, i as VitestRunMode, j as VitestOptions, V as Vitest, A as ApiConfig, k as TestSpecification, T as TestProject, P as PoolWorker, l as PoolOptions, m as WorkerRequest, n as TestSequencer, L as Logger } from './chunks/reporters.d.J2RlBlp9.js';
-export { at as BaseCoverageOptions, Y as BenchmarkUserOptions, Z as BrowserBuiltinProvider, $ as BrowserCommand, a0 as BrowserCommandContext, a1 as BrowserConfigOptions, a2 as BrowserInstanceOption, a3 as BrowserModuleMocker, a4 as BrowserOrchestrator, a5 as BrowserProvider, a6 as BrowserProviderOption, a7 as BrowserScript, a8 as BrowserServerFactory, a9 as BrowserServerOptions, aa as BrowserServerState, ab as BrowserServerStateSession, ai as BuiltinEnvironment, ac as CDPSession, aj as CSSModuleScopeStrategy, au as CoverageIstanbulOptions, av as CoverageOptions, aw as CoverageProvider, ax as CoverageProviderModule, ay as CoverageReporter, c as CoverageV8Options, az as CustomProviderOptions, ak as DepsOptimizationOptions, al as EnvironmentOptions, H as HTMLOptions, I as InlineConfig, t as JUnitOptions, J as JsonOptions, M as ModuleDiagnostic, O as OnServerRestartHandler, o as OnTestsRerunHandler, ad as ParentProjectBrowser, am as Pool, q as PoolRunnerInitializer, r as PoolTask, ae as ProjectBrowser, an as ProjectConfig, a as ReportContext, aB as ReportedHookContext, aC as Reporter, ap as ResolveSnapshotPathHandler, aq as ResolveSnapshotPathHandlerContext, af as ResolvedBrowserOptions, R as ResolvedCoverageOptions, ao as ResolvedProjectConfig, S as SerializedTestProject, u as TaskOptions, v as TestCase, w as TestCollection, x as TestDiagnostic, y as TestModule, z as TestModuleState, B as TestResult, D as TestResultFailed, E as TestResultPassed, F as TestResultSkipped, aD as TestRunEndReason, aA as TestRunResult, X as TestSequencerConstructor, G as TestState, K as TestSuite, N as TestSuiteState, ag as ToMatchScreenshotComparators, ah as ToMatchScreenshotOptions, ar as TypecheckConfig, U as UserWorkspaceConfig, as as VitestEnvironment, p as VitestPackageInstaller, W as WatcherTriggerPattern, s as WorkerResponse, _ as _BrowserNames, Q as experimental_getRunnerTask } from './chunks/reporters.d.J2RlBlp9.js';
-export { C as CacheKeyIdGenerator, a as CacheKeyIdGeneratorContext, V as VitestPluginContext } from './chunks/plugin.d.B4l3vYM_.js';
+import { h as ResolvedConfig, f as UserConfig, i as VitestRunMode, j as VitestOptions, V as Vitest, A as ApiConfig, k as TestSpecification, T as TestProject, P as PoolWorker, l as PoolOptions, m as WorkerRequest, n as TestSequencer, L as Logger } from './chunks/reporters.d.OXEK7y4s.js';
+export { at as BaseCoverageOptions, Y as BenchmarkUserOptions, Z as BrowserBuiltinProvider, $ as BrowserCommand, a0 as BrowserCommandContext, a1 as BrowserConfigOptions, a2 as BrowserInstanceOption, a3 as BrowserModuleMocker, a4 as BrowserOrchestrator, a5 as BrowserProvider, a6 as BrowserProviderOption, a7 as BrowserScript, a8 as BrowserServerFactory, a9 as BrowserServerOptions, aa as BrowserServerState, ab as BrowserServerStateSession, ai as BuiltinEnvironment, ac as CDPSession, aj as CSSModuleScopeStrategy, au as CoverageIstanbulOptions, av as CoverageOptions, aw as CoverageProvider, ax as CoverageProviderModule, ay as CoverageReporter, c as CoverageV8Options, az as CustomProviderOptions, ak as DepsOptimizationOptions, al as EnvironmentOptions, H as HTMLOptions, I as InlineConfig, t as JUnitOptions, J as JsonOptions, M as ModuleDiagnostic, O as OnServerRestartHandler, o as OnTestsRerunHandler, ad as ParentProjectBrowser, am as Pool, q as PoolRunnerInitializer, r as PoolTask, ae as ProjectBrowser, an as ProjectConfig, a as ReportContext, aB as ReportedHookContext, aC as Reporter, ap as ResolveSnapshotPathHandler, aq as ResolveSnapshotPathHandlerContext, af as ResolvedBrowserOptions, R as ResolvedCoverageOptions, ao as ResolvedProjectConfig, S as SerializedTestProject, u as TaskOptions, v as TestCase, w as TestCollection, x as TestDiagnostic, y as TestModule, z as TestModuleState, B as TestResult, D as TestResultFailed, E as TestResultPassed, F as TestResultSkipped, aD as TestRunEndReason, aA as TestRunResult, X as TestSequencerConstructor, G as TestState, K as TestSuite, N as TestSuiteState, ag as ToMatchScreenshotComparators, ah as ToMatchScreenshotOptions, ar as TypecheckConfig, U as UserWorkspaceConfig, as as VitestEnvironment, p as VitestPackageInstaller, W as WatcherTriggerPattern, s as WorkerResponse, _ as _BrowserNames, Q as experimental_getRunnerTask } from './chunks/reporters.d.OXEK7y4s.js';
+export { C as CacheKeyIdGenerator, a as CacheKeyIdGeneratorContext, V as VitestPluginContext } from './chunks/plugin.d.CY7CUjf-.js';
 import { Awaitable } from '@vitest/utils';
 export { SerializedError } from '@vitest/utils';
 import { R as RuntimeRPC } from './chunks/rpc.d.RH3apGEf.js';
 import { Writable } from 'node:stream';
-import { C as ContextRPC } from './chunks/worker.d.DCy61tzi.js';
-export { T as TestExecutionType } from './chunks/worker.d.DCy61tzi.js';
-import { Debugger } from 'debug';
+import { C as ContextRPC } from './chunks/worker.d.B4A26qg6.js';
+export { T as TestExecutionType } from './chunks/worker.d.B4A26qg6.js';
+import { Debugger } from 'obug';
 import './chunks/global.d.B15mdLcR.js';
 export { Task as RunnerTask, TaskResult as RunnerTaskResult, TaskResultPack as RunnerTaskResultPack, Test as RunnerTestCase, File as RunnerTestFile, Suite as RunnerTestSuite, SequenceHooks, SequenceSetupFiles } from '@vitest/runner';
-export { b as RuntimeConfig } from './chunks/config.d.g6OOauRt.js';
+export { b as RuntimeConfig } from './chunks/config.d.CzIjkicf.js';
 export { generateFileHash } from '@vitest/runner/utils';
+import './chunks/browser.d.DBzUq_Na.js';
 import '@vitest/mocker';
 import '@vitest/utils/source-map';
 import 'vitest/browser';
-import './chunks/browser.d.CDvMh6F9.js';
 import '@vitest/pretty-format';
 import '@vitest/snapshot';
 import '@vitest/utils/diff';

package/dist/node.js

@@ -1,9 +1,9 @@
 import * as vite from 'vite';
 import { resolveConfig as resolveConfig$1, mergeConfig } from 'vite';
 export { esbuildVersion, isCSSRequest, isFileServingAllowed, parseAst, parseAstAsync, rollupVersion, version as viteVersion } from 'vite';
-import { V as Vitest, a as VitestPlugin } from './chunks/cli-api.CdZ6wo9-.js';
-export { f as ForksPoolWorker, G as GitNotFoundError, F as TestsNotFoundError, T as ThreadsPoolWorker, h as TypecheckPoolWorker, b as VitestPackageInstaller, j as VmForksPoolWorker, k as VmThreadsPoolWorker, o as createDebugger, d as createMethodsRPC, n as createViteLogger, c as createVitest, e as escapeTestName, l as experimental_getRunnerTask, g as getFilePoolName, i as isValidApiRequest, m as registerConsoleShortcuts, r as resolveFsAllow, s as startVitest } from './chunks/cli-api.CdZ6wo9-.js';
-export { p as parseCLI } from './chunks/cac.L-UbQ_Ix.js';
+import { V as Vitest, a as VitestPlugin } from './chunks/cli-api.C7sYjHmQ.js';
+export { f as ForksPoolWorker, G as GitNotFoundError, F as TestsNotFoundError, T as ThreadsPoolWorker, h as TypecheckPoolWorker, b as VitestPackageInstaller, j as VmForksPoolWorker, k as VmThreadsPoolWorker, o as createDebugger, d as createMethodsRPC, n as createViteLogger, c as createVitest, e as escapeTestName, l as experimental_getRunnerTask, g as getFilePoolName, i as isValidApiRequest, m as registerConsoleShortcuts, r as resolveFsAllow, s as startVitest } from './chunks/cli-api.C7sYjHmQ.js';
+export { p as parseCLI } from './chunks/cac.BNNpZQl7.js';
 import { r as resolveConfig$2 } from './chunks/coverage.CtyeYmKM.js';
 export { b as BaseSequencer, a as resolveApiServerConfig } from './chunks/coverage.CtyeYmKM.js';
 import { slash, deepClone } from '@vitest/utils/helpers';
@@ -19,7 +19,7 @@ import 'node:os';
 import '@vitest/snapshot/manager';
 import 'node:perf_hooks';
 import './chunks/index.0kCJoeWi.js';
-import './chunks/index.DWDW6mLz.js';
+import './chunks/index.456_DGfR.js';
 import 'node:fs/promises';
 import '@vitest/utils/source-map';
 import 'tinyrainbow';
@@ -45,13 +45,14 @@ import 'buffer';
 import './chunks/_commonjsHelpers.D26ty3Ew.js';
 import 'node:crypto';
 import './chunks/traces.U4xDYhzZ.js';
-import 'debug';
+import 'obug';
 import '#module-evaluator';
 import 'vite/module-runner';
 import '@vitest/utils/highlight';
 import 'node:url';
 import 'node:tty';
 import 'node:events';
+import './chunks/modules.DJPjQW6m.js';
 import 'node:child_process';
 import 'node:worker_threads';
 import 'picomatch';
@@ -62,7 +63,7 @@ import './chunks/defaults.BOqNVLsY.js';
 import '@vitest/utils/constants';
 import '@vitest/utils/resolver';
 import 'es-module-lexer';
-import './chunks/index.CMvpbrsJ.js';
+import './chunks/index.Drsj_6e7.js';
 import 'node:assert';
 import '@vitest/utils/serialize';
 import 'node:readline';

package/dist/reporters.d.ts

@@ -1,4 +1,4 @@
-export { aR as BaseReporter, aS as BenchmarkBuiltinReporters, aE as BenchmarkReporter, aF as BenchmarkReportsMap, aT as BuiltinReporterOptions, aU as BuiltinReporters, aG as DefaultReporter, aH as DotReporter, aI as GithubActionsReporter, aJ as HangingProcessReporter, aL as JUnitReporter, aV as JsonAssertionResult, aK as JsonReporter, aW as JsonTestResult, aX as JsonTestResults, aB as ReportedHookContext, aC as Reporter, aM as ReportersMap, aN as TapFlatReporter, aO as TapReporter, aD as TestRunEndReason, aP as VerboseBenchmarkReporter, aQ as VerboseReporter } from './chunks/reporters.d.J2RlBlp9.js';
+export { aR as BaseReporter, aS as BenchmarkBuiltinReporters, aE as BenchmarkReporter, aF as BenchmarkReportsMap, aT as BuiltinReporterOptions, aU as BuiltinReporters, aG as DefaultReporter, aH as DotReporter, aI as GithubActionsReporter, aJ as HangingProcessReporter, aL as JUnitReporter, aV as JsonAssertionResult, aK as JsonReporter, aW as JsonTestResult, aX as JsonTestResults, aB as ReportedHookContext, aC as Reporter, aM as ReportersMap, aN as TapFlatReporter, aO as TapReporter, aD as TestRunEndReason, aP as VerboseBenchmarkReporter, aQ as VerboseReporter } from './chunks/reporters.d.OXEK7y4s.js';
 import '@vitest/runner';
 import '@vitest/utils';
 import './chunks/rpc.d.RH3apGEf.js';
@@ -7,15 +7,15 @@ import 'vite/module-runner';
 import './chunks/traces.d.402V_yFI.js';
 import 'node:stream';
 import 'vite';
-import '@vitest/mocker';
-import '@vitest/utils/source-map';
-import 'vitest/browser';
-import './chunks/config.d.g6OOauRt.js';
+import './chunks/browser.d.DBzUq_Na.js';
+import './chunks/worker.d.B4A26qg6.js';
+import './chunks/config.d.CzIjkicf.js';
 import '@vitest/pretty-format';
 import '@vitest/utils/diff';
-import './chunks/browser.d.CDvMh6F9.js';
-import './chunks/worker.d.DCy61tzi.js';
 import './chunks/environment.d.CrsxCzP1.js';
+import '@vitest/mocker';
+import '@vitest/utils/source-map';
+import 'vitest/browser';
 import '@vitest/expect';
 import 'vitest/optional-types.js';
 import './chunks/benchmark.d.DAaHLpsq.js';

package/dist/reporters.js

@@ -1,5 +1,5 @@
-export { D as DefaultReporter, a as DotReporter, G as GithubActionsReporter, H as HangingProcessReporter, b as JUnitReporter, J as JsonReporter, R as ReportersMap, T as TapFlatReporter, c as TapReporter, V as VerboseReporter } from './chunks/index.DWDW6mLz.js';
-export { B as BenchmarkReporter, a as BenchmarkReportsMap, V as VerboseBenchmarkReporter } from './chunks/index.CMvpbrsJ.js';
+export { D as DefaultReporter, a as DotReporter, G as GithubActionsReporter, H as HangingProcessReporter, b as JUnitReporter, J as JsonReporter, R as ReportersMap, T as TapFlatReporter, c as TapReporter, V as VerboseReporter } from './chunks/index.456_DGfR.js';
+export { B as BenchmarkReporter, a as BenchmarkReportsMap, V as VerboseBenchmarkReporter } from './chunks/index.Drsj_6e7.js';
 import 'node:fs';
 import 'node:fs/promises';
 import 'pathe';

package/dist/runners.d.ts

@@ -1,7 +1,7 @@
 import * as tinybench from 'tinybench';
 import { VitestRunner, VitestRunnerImportSource, Suite, File, Task, CancelReason, Test, TestContext, ImportDuration } from '@vitest/runner';
 export { VitestRunner } from '@vitest/runner';
-import { S as SerializedConfig } from './chunks/config.d.g6OOauRt.js';
+import { S as SerializedConfig } from './chunks/config.d.CzIjkicf.js';
 import { T as Traces } from './chunks/traces.d.402V_yFI.js';
 import '@vitest/pretty-format';
 import '@vitest/snapshot';
@@ -26,6 +26,7 @@ declare class VitestTestRunner implements VitestRunner {
 	private assertionsErrors;
 	pool: string;
 	private _otel;
+	viteEnvironment: string;
 	constructor(config: SerializedConfig);
 	importFile(filepath: string, source: VitestRunnerImportSource): unknown;
 	onCollectStart(file: File): void;