vitest 4.0.0-beta.9 → 4.0.1

package/dist/config.d.ts

@@ -1,19 +1,20 @@
 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.DmP-iHLr.js';
-export { a as TestProjectConfiguration, g as TestProjectInlineConfiguration, f as TestUserConfig, W as WatcherTriggerPattern } from './chunks/reporters.d.DmP-iHLr.js';
-import { V as VitestPluginContext } from './chunks/plugin.d.CIk0YiKb.js';
-import { F as FakeTimerInstallOpts } from './chunks/config.d.DacWrqWe.js';
+import { I as InlineConfig, c as CoverageV8Options, R as ResolvedCoverageOptions, U as UserWorkspaceConfig, d as UserProjectConfigFn, e as UserProjectConfigExport } from './chunks/reporters.d.BMKt7f6I.js';
+export { a as TestProjectConfiguration, g as TestProjectInlineConfiguration, f as TestUserConfig, W as WatcherTriggerPattern } from './chunks/reporters.d.BMKt7f6I.js';
+import { V as VitestPluginContext } from './chunks/plugin.d.DQU1R5px.js';
+import { F as FakeTimerInstallOpts } from './chunks/config.d.u2CUDWwS.js';
 import '@vitest/runner';
 import '@vitest/utils';
-import './chunks/environment.d.2fYMoz3o.js';
+import './chunks/worker.d.BFk-vvBU.js';
+import 'vite/module-runner';
+import './chunks/environment.d.CrsxCzP1.js';
+import '@vitest/snapshot';
 import 'node:stream';
 import '@vitest/mocker';
 import '@vitest/utils/source-map';
-import './chunks/browser.d.DtfyY9yS.js';
-import './chunks/worker.d.B2r4Ln6p.js';
-import 'vite/module-runner';
-import '@vitest/snapshot';
+import 'vitest/browser';
+import './chunks/browser.d.B9iJzZyn.js';
 import '@vitest/pretty-format';
 import '@vitest/utils/diff';
 import '@vitest/expect';
@@ -26,8 +27,6 @@ import '@vitest/snapshot/manager';
 import 'node:fs';
 import 'node:console';
 
-/* eslint-disable unused-imports/no-unused-vars */
-
 type VitestInlineConfig = InlineConfig;
 declare module "vite" {
 	interface UserConfig {
@@ -45,7 +44,6 @@ declare const defaultBrowserPort = 63315;
 
 declare const defaultInclude: string[];
 declare const defaultExclude: string[];
-// These are the generic defaults for coverage. Providers may also set some provider specific defaults.
 declare const coverageConfigDefaults: ResolvedCoverageOptions;
 declare const configDefaults: Readonly<{
 	allowOnly: boolean;
@@ -53,7 +51,6 @@ declare const configDefaults: Readonly<{
 	watch: boolean;
 	globals: boolean;
 	environment: "node";
-	pool: "forks";
 	clearMocks: boolean;
 	restoreMocks: boolean;
 	mockReset: boolean;
@@ -94,6 +91,7 @@ type ViteUserConfigExport = UserConfig | Promise<UserConfig> | ViteUserConfigFnO
 declare function defineConfig(config: UserConfig): UserConfig;
 declare function defineConfig(config: Promise<UserConfig>): Promise<UserConfig>;
 declare function defineConfig(config: ViteUserConfigFnObject): ViteUserConfigFnObject;
+declare function defineConfig(config: ViteUserConfigFnPromise): ViteUserConfigFnPromise;
 declare function defineConfig(config: ViteUserConfigExport): ViteUserConfigExport;
 declare function defineProject(config: UserWorkspaceConfig): UserWorkspaceConfig;
 declare function defineProject(config: Promise<UserWorkspaceConfig>): Promise<UserWorkspaceConfig>;

package/dist/config.js

@@ -1,4 +1,4 @@
-export { c as configDefaults, a as coverageConfigDefaults, d as defaultExclude, b as defaultInclude } from './chunks/defaults.CXFFjsi8.js';
+export { c as configDefaults, a as coverageConfigDefaults, d as defaultExclude, b as defaultInclude } from './chunks/defaults.BOqNVLsY.js';
 export { mergeConfig } from 'vite';
 export { d as defaultBrowserPort } from './chunks/constants.D_Q9UYh-.js';
 import 'node:os';

package/dist/coverage.d.ts

@@ -1,18 +1,17 @@
-import { R as ResolvedCoverageOptions, V as Vitest, C as CoverageMap, b as ReportContext } from './chunks/reporters.d.DmP-iHLr.js';
+import { R as ResolvedCoverageOptions, V as Vitest, C as CoverageMap, b as ReportContext } from './chunks/reporters.d.BMKt7f6I.js';
 import { TransformResult } from 'vite';
-import { A as AfterSuiteRunMeta } from './chunks/environment.d.2fYMoz3o.js';
+import { A as AfterSuiteRunMeta } from './chunks/worker.d.BFk-vvBU.js';
 import '@vitest/runner';
 import '@vitest/utils';
 import 'node:stream';
 import '@vitest/mocker';
 import '@vitest/utils/source-map';
-import './chunks/browser.d.DtfyY9yS.js';
-import './chunks/worker.d.B2r4Ln6p.js';
-import 'vite/module-runner';
-import './chunks/config.d.DacWrqWe.js';
+import 'vitest/browser';
+import './chunks/config.d.u2CUDWwS.js';
 import '@vitest/pretty-format';
 import '@vitest/snapshot';
 import '@vitest/utils/diff';
+import './chunks/browser.d.B9iJzZyn.js';
 import '@vitest/expect';
 import 'vitest/optional-types.js';
 import './chunks/benchmark.d.DAaHLpsq.js';
@@ -22,6 +21,8 @@ import './chunks/coverage.d.BZtK59WP.js';
 import '@vitest/snapshot/manager';
 import 'node:fs';
 import 'node:console';
+import 'vite/module-runner';
+import './chunks/environment.d.CrsxCzP1.js';
 
 type Threshold = "lines" | "functions" | "statements" | "branches";
 interface ResolvedThreshold {

package/dist/coverage.js

@@ -1,12 +1,12 @@
-export { B as BaseCoverageProvider } from './chunks/coverage.CDRAMTt7.js';
+export { B as BaseCoverageProvider } from './chunks/coverage.FU3w4IrQ.js';
 import 'node:fs';
 import 'node:path';
-import '@vitest/utils';
+import '@vitest/utils/helpers';
 import 'pathe';
 import 'picomatch';
 import 'tinyglobby';
 import 'tinyrainbow';
-import './chunks/defaults.CXFFjsi8.js';
+import './chunks/defaults.BOqNVLsY.js';
 import 'node:os';
 import './chunks/env.D4Lgay0q.js';
 import 'std-env';
@@ -20,15 +20,4 @@ import 'node:v8';
 import 'node:util';
 import 'vite';
 import './chunks/constants.D_Q9UYh-.js';
-import 'node:tty';
-import 'node:events';
-import './chunks/index.Bgo3tNWt.js';
-import 'tinypool';
-import './chunks/typechecker.DB-fIMaH.js';
-import 'node:perf_hooks';
-import '@vitest/utils/source-map';
-import 'tinyexec';
-import './path.js';
-import '@vitest/runner/utils';
-import 'node:worker_threads';
 import './chunks/coverage.D_JHT54q.js';

package/dist/environments.d.ts

@@ -1,5 +1,6 @@
-import { E as Environment } from './chunks/environment.d.2fYMoz3o.js';
-export { a as EnvironmentReturn, V as VmEnvironmentReturn } from './chunks/environment.d.2fYMoz3o.js';
+import { E as Environment } from './chunks/environment.d.CrsxCzP1.js';
+export { a as EnvironmentReturn, V as VmEnvironmentReturn } from './chunks/environment.d.CrsxCzP1.js';
+import '@vitest/utils';
 
 declare const environments: {
 	"node": Environment;
@@ -9,10 +10,6 @@ declare const environments: {
 };
 
 interface PopulateOptions {
-	// we bind functions such as addEventListener and others
-	// because they rely on `this` in happy-dom, and in jsdom it
-	// has a priority for getting implementation from symbols
-	// (global doesn't have these symbols, but window - does)
 	bindFunctions?: boolean;
 	additionalKeys?: string[];
 }

package/dist/environments.js

@@ -1,2 +1,2 @@
-export { e as builtinEnvironments, p as populateGlobal } from './chunks/index.DfviD7lX.js';
+export { e as builtinEnvironments, p as populateGlobal } from './chunks/index.CbWINfS7.js';
 import 'node:console';

package/dist/index.d.ts

@@ -1,28 +1,28 @@
-import { S as SerializedTestSpecification } from './chunks/browser.d.DtfyY9yS.js';
-export { B as BrowserTesterOptions } from './chunks/browser.d.DtfyY9yS.js';
-import './chunks/global.d.K6uBQHzY.js';
+import { S as SerializedTestSpecification } from './chunks/browser.d.B9iJzZyn.js';
+export { B as BrowserTesterOptions } from './chunks/browser.d.B9iJzZyn.js';
+import './chunks/global.d.BgJSTpgQ.js';
 import { File, TestAnnotation, TaskResultPack, TaskEventPack, TaskPopulated } from '@vitest/runner';
-export { CancelReason, HookCleanupCallback, HookListener, 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, TestContext, TestFunction, TestOptions, afterAll, afterEach, beforeAll, beforeEach, describe, it, onTestFailed, onTestFinished, suite, test } from '@vitest/runner';
-import { a as BirpcReturn } from './chunks/worker.d.B2r4Ln6p.js';
-export { C as ContextRPC, c as ContextTestEnvironment, b as RunnerRPC, R as RuntimeRPC, T as TestExecutionMethod, W as WorkerGlobalState } from './chunks/worker.d.B2r4Ln6p.js';
-import { a as SerializedConfig, F as FakeTimerInstallOpts, R as RuntimeOptions } from './chunks/config.d.DacWrqWe.js';
-export { b as RuntimeConfig, S as SerializedCoverageConfig } from './chunks/config.d.DacWrqWe.js';
-import { b as Awaitable, U as UserConsoleLog, L as LabelColor, M as ModuleGraphData, P as ProvidedContext } from './chunks/environment.d.2fYMoz3o.js';
-export { A as AfterSuiteRunMeta } from './chunks/environment.d.2fYMoz3o.js';
+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, TestContext, TestFunction, TestOptions, afterAll, afterEach, beforeAll, beforeEach, describe, it, onTestFailed, onTestFinished, suite, test } from '@vitest/runner';
+import { Awaitable } from '@vitest/utils';
+export { ParsedStack, SerializedError, TestError } from '@vitest/utils';
+import { U as UserConsoleLog, L as LabelColor, M as ModuleGraphData, a as BirpcReturn, P as ProvidedContext } from './chunks/worker.d.BFk-vvBU.js';
+export { A as AfterSuiteRunMeta, C as ContextRPC, c as ContextTestEnvironment, b as RunnerRPC, R as RuntimeRPC, T as TestExecutionMethod, W as WorkerGlobalState } from './chunks/worker.d.BFk-vvBU.js';
+import { S as SerializedConfig, F as FakeTimerInstallOpts, R as RuntimeOptions } from './chunks/config.d.u2CUDWwS.js';
+export { b as RuntimeConfig, a as SerializedCoverageConfig } from './chunks/config.d.u2CUDWwS.js';
 import { ExpectStatic } from '@vitest/expect';
 export { Assertion, AsymmetricMatchersContaining, DeeplyAllowMatchers, ExpectPollOptions, ExpectStatic, JestAssertion, Matchers, chai } from '@vitest/expect';
 import { spyOn, fn, MaybeMockedDeep, MaybeMocked, MaybePartiallyMocked, MaybePartiallyMockedDeep, MockInstance } from '@vitest/spy';
 export { Mock, MockContext, MockInstance, Mocked, MockedClass, MockedFunction, MockedObject } from '@vitest/spy';
 import { M as MockFactoryWithHelper, a as MockOptions } from './chunks/mocker.d.BE_2ls6u.js';
 export { b as bench } from './chunks/suite.d.BJWk38HB.js';
+import { EvaluatedModules } from 'vite/module-runner';
 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 { ParsedStack, SerializedError, TestError } from '@vitest/utils';
 export { DiffOptions } from '@vitest/utils/diff';
-export { EvaluatedModules } from 'vite/module-runner';
 export { Bench as BenchFactory, Options as BenchOptions, Task as BenchTask, TaskResult as BenchTaskResult } from 'tinybench';
 import '@vitest/pretty-format';
+import './chunks/environment.d.CrsxCzP1.js';
 import '@vitest/mocker';
 import '@vitest/runner/utils';
 
@@ -88,7 +88,6 @@ declare const should: () => Chai.Should;
 */
 declare function inject<T extends keyof ProvidedContext & string>(key: T): ProvidedContext[T];
 
-// The waitFor function was inspired by https://github.com/testing-library/web-testing-library/pull/2
 type WaitForCallback<T> = () => T | Promise<T>;
 interface WaitForOptions {
 	/**
@@ -277,13 +276,11 @@ interface VitestUtils {
 	* The call to `vi.mock` is hoisted to the top of the file, so you don't have access to variables declared in the global file scope
 	* unless they are defined with [`vi.hoisted`](https://vitest.dev/api/vi#vi-hoisted) before this call.
 	*
-	* Mocking algorithm is described in [documentation](https://vitest.dev/guide/mocking#modules).
+	* Mocking algorithm is described in [documentation](https://vitest.dev/guide/mocking/modules).
 	* @param path Path to the module. Can be aliased, if your Vitest config supports it
 	* @param factory Mocked module factory. The result of this function will be an exports object
 	*/
-	// eslint-disable-next-line ts/method-signature-style
 	mock(path: string, factory?: MockFactoryWithHelper | MockOptions): void;
-	// eslint-disable-next-line ts/method-signature-style
 	mock<T>(module: Promise<T>, factory?: MockFactoryWithHelper<T> | MockOptions): void;
 	/**
 	* Removes module from mocked registry. All calls to import will return the original module even if it was mocked before.
@@ -291,22 +288,18 @@ interface VitestUtils {
 	* This call is hoisted to the top of the file, so it will only unmock modules that were defined in `setupFiles`, for example.
 	* @param path Path to the module. Can be aliased, if your Vitest config supports it
 	*/
-	// eslint-disable-next-line ts/method-signature-style
 	unmock(path: string): void;
-	// eslint-disable-next-line ts/method-signature-style
 	unmock(module: Promise<unknown>): void;
 	/**
 	* Mocks every subsequent [dynamic import](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Operators/import) call.
 	*
 	* Unlike [`vi.mock`](https://vitest.dev/api/vi#vi-mock), this method will not mock statically imported modules because it is not hoisted to the top of the file.
 	*
-	* Mocking algorithm is described in [documentation](https://vitest.dev/guide/mocking#modules).
+	* Mocking algorithm is described in [documentation](https://vitest.dev/guide/mocking/modules).
 	* @param path Path to the module. Can be aliased, if your Vitest config supports it
 	* @param factory Mocked module factory. The result of this function will be an exports object
 	*/
-	// eslint-disable-next-line ts/method-signature-style
 	doMock(path: string, factory?: MockFactoryWithHelper | MockOptions): void;
-	// eslint-disable-next-line ts/method-signature-style
 	doMock<T>(module: Promise<T>, factory?: MockFactoryWithHelper<T> | MockOptions): void;
 	/**
 	* Removes module from mocked registry. All subsequent calls to import will return original module.
@@ -314,9 +307,7 @@ interface VitestUtils {
 	* Unlike [`vi.unmock`](https://vitest.dev/api/vi#vi-unmock), this method is not hoisted to the top of the file.
 	* @param path Path to the module. Can be aliased, if your Vitest config supports it
 	*/
-	// eslint-disable-next-line ts/method-signature-style
 	doUnmock(path: string): void;
-	// eslint-disable-next-line ts/method-signature-style
 	doUnmock(module: Promise<unknown>): void;
 	/**
 	* Imports module, bypassing all checks if it should be mocked.
@@ -335,7 +326,7 @@ interface VitestUtils {
 	/**
 	* Imports a module with all of its properties and nested properties mocked.
 	*
-	* Mocking algorithm is described in [documentation](https://vitest.dev/guide/mocking#modules).
+	* Mocking algorithm is described in [documentation](https://vitest.dev/guide/mocking/modules).
 	* @example
 	* ```ts
 	* const example = await vi.importMock<typeof import('./example.js')>('./example.js')
@@ -485,6 +476,10 @@ 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;
 }
@@ -495,5 +490,5 @@ interface BrowserUI {
 	setIframeViewport: (width: number, height: number) => Promise<void>;
 }
 
-export { LabelColor, ModuleGraphData, ProvidedContext, SerializedConfig, SerializedTestSpecification, UserConsoleLog, assert, assertType, createExpect, globalExpect as expect, inject, should, vi, vitest };
+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 };

package/dist/index.js

@@ -1,16 +1,20 @@
-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.BB37KeLx.js';
-export { b as bench } from './chunks/benchmark.CJUa-Hsa.js';
-export { a as assertType } from './chunks/index.C832ioot.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.BZvkKVkM.js';
+export { b as bench } from './chunks/benchmark.DHKMYAts.js';
+export { V as EvaluatedModules } from './chunks/evaluatedModules.Dg1zASAC.js';
+export { a as assertType } from './chunks/index.RwjEGCQ0.js';
 export { expectTypeOf } from 'expect-type';
 export { afterAll, afterEach, beforeAll, beforeEach, describe, it, onTestFailed, onTestFinished, suite, test } from '@vitest/runner';
-export { EvaluatedModules } from 'vite/module-runner';
 export { chai } from '@vitest/expect';
 import '@vitest/runner/utils';
-import './chunks/utils.D2R2NiOH.js';
-import '@vitest/utils';
-import './chunks/_commonjsHelpers.BFTU3MAI.js';
+import './chunks/utils.CG9h5ccR.js';
+import '@vitest/utils/timers';
 import '@vitest/snapshot';
 import '@vitest/utils/error';
+import '@vitest/utils/helpers';
 import '@vitest/spy';
+import '@vitest/utils/offset';
 import '@vitest/utils/source-map';
+import './chunks/_commonjsHelpers.BFTU3MAI.js';
 import './chunks/date.-jtEtIeV.js';
+import 'pathe';
+import 'vite/module-runner';

package/dist/module-evaluator.d.ts

@@ -1,13 +1,14 @@
 import 'vite/module-runner';
-export { b as VitestModuleEvaluator, a as VitestModuleEvaluatorOptions, c as createImportMetaEnvProxy, g as getDefaultRequestStubs, i as isPrimitive, u as unwrapId, w as wrapId } from './chunks/moduleRunner.d.DxTLreRD.js';
+export { b as VitestModuleEvaluator, a as VitestModuleEvaluatorOptions, c as createImportMetaEnvProxy, g as getDefaultRequestStubs, i as isPrimitive, u as unwrapId, w as wrapId } from './chunks/moduleRunner.d.YtNsMIoJ.js';
 import 'node:vm';
 import '@vitest/spy';
-import './chunks/worker.d.B2r4Ln6p.js';
+import './chunks/worker.d.BFk-vvBU.js';
 import '@vitest/runner';
-import './chunks/config.d.DacWrqWe.js';
+import './chunks/config.d.u2CUDWwS.js';
 import '@vitest/pretty-format';
 import '@vitest/snapshot';
 import '@vitest/utils/diff';
-import './chunks/environment.d.2fYMoz3o.js';
+import './chunks/environment.d.CrsxCzP1.js';
+import '@vitest/utils';
 import '@vitest/mocker';
 import './chunks/mocker.d.BE_2ls6u.js';

package/dist/module-evaluator.js

@@ -58,7 +58,8 @@ class VitestModuleEvaluator {
 		if (id in this.stubs) return this.stubs[id];
 		const file = this.convertIdToImportUrl(id), namespace = this.vm ? await this.vm.externalModulesExecutor.import(file) : await import(file);
 		if (!this.shouldInterop(file, namespace)) return namespace;
-		const { mod, defaultExport } = interopModule(namespace), { Proxy, Reflect } = this.primitives, proxy = new Proxy(mod, {
+		const { mod, defaultExport } = interopModule(namespace), { Proxy, Reflect } = this.primitives;
+		return new Proxy(mod, {
 			get(mod, prop) {
 				return prop === "default" ? defaultExport : mod[prop] ?? defaultExport?.[prop];
 			},
@@ -75,7 +76,6 @@ class VitestModuleEvaluator {
 				};
 			}
 		});
-		return proxy;
 	}
 	async runInlinedModule(context, code, module) {
 		context.__vite_ssr_import_meta__.env = this.env;
@@ -107,8 +107,8 @@ class VitestModuleEvaluator {
 			get exports() {
 				return cjsExports;
 			}
-		}, meta = context[ssrImportMetaKey], testFilepath = this.options.getCurrentTestFilepath?.();
-		if (testFilepath === module.file) {
+		}, meta = context[ssrImportMetaKey];
+		if (this.options.getCurrentTestFilepath?.() === module.file) {
 			const globalNamespace = this.vm?.context || globalThis;
 			Object.defineProperty(meta, "vitest", { get: () => globalNamespace.__vitest_index__ });
 		}
@@ -133,14 +133,13 @@ class VitestModuleEvaluator {
 			columnOffset: -codeDefinition.length
 		}, finishModuleExecutionInfo = this.debug.startCalculateModuleExecutionInfo(options.filename, codeDefinition.length);
 		try {
-			const initModule = this.vm ? vm.runInContext(wrappedCode, this.vm.context, options) : vm.runInThisContext(wrappedCode, options), dynamicRequest = async (dep, options) => {
-				return dep = String(dep), dep[0] === "#" ? context[ssrDynamicImportKey](wrapId(dep), options) : context[ssrDynamicImportKey](dep, options);
-			};
-			await initModule(
+			await (this.vm ? vm.runInContext(wrappedCode, this.vm.context, options) : vm.runInThisContext(wrappedCode, options))(
 				context[ssrModuleExportsKey],
 				context[ssrImportMetaKey],
 				context[ssrImportKey],
-				dynamicRequest,
+				async (dep, options) => {
+					return dep = String(dep), dep[0] === "#" ? context[ssrDynamicImportKey](wrapId(dep), options) : context[ssrDynamicImportKey](dep, options);
+				},
 				context[ssrExportAllKey],
 				// vite 7 support, remove when vite 7+ is supported
 				context.__vite_ssr_exportName__ || ((name, getter) => Object.defineProperty(exportsObject, name, {
@@ -162,7 +161,7 @@ class VitestModuleEvaluator {
 		}
 	}
 	createRequire(filename) {
-		return filename.startsWith("\0") || !isAbsolute(filename) ? () => ({}) : this.vm ? this.vm.externalModulesExecutor.createRequire(filename) : createRequire(filename);
+		return filename[0] === "\0" || !isAbsolute(filename) ? () => ({}) : this.vm ? this.vm.externalModulesExecutor.createRequire(filename) : createRequire(filename);
 	}
 	shouldInterop(path, mod) {
 		// never interop ESM modules
@@ -179,7 +178,7 @@ function createImportMetaEnvProxy() {
 	];
 	return new Proxy(process.env, {
 		get(_, key) {
-			return typeof key === "string" ? booleanKeys.includes(key) ? !!process.env[key] : process.env[key] : void 0;
+			if (typeof key === "string") return booleanKeys.includes(key) ? !!process.env[key] : process.env[key];
 		},
 		set(_, key, value) {
 			if (typeof key !== "string") return true;
@@ -248,8 +247,7 @@ function defineExport(exports, key, value) {
 	});
 }
 function isPrimitive(v) {
-	const isObject = typeof v === "object" || typeof v === "function";
-	return !isObject || v == null;
+	return !(typeof v === "object" || typeof v === "function") || v == null;
 }
 function interopModule(mod) {
 	if (isPrimitive(mod)) return {

package/dist/module-runner.js

@@ -1,15 +1,15 @@
 export { VitestModuleEvaluator } from './module-evaluator.js';
-export { a as VITEST_VM_CONTEXT_SYMBOL, V as VitestModuleRunner, s as startVitestModuleRunner } from './chunks/startModuleRunner.BDRvKSdz.js';
-export { g as getWorkerState } from './chunks/utils.D2R2NiOH.js';
+export { a as VITEST_VM_CONTEXT_SYMBOL, V as VitestModuleRunner, s as startVitestModuleRunner } from './chunks/startModuleRunner.iF1E9Bt4.js';
+export { g as getWorkerState } from './chunks/utils.CG9h5ccR.js';
 import 'node:module';
 import 'node:url';
 import 'node:vm';
 import 'pathe';
 import 'vite/module-runner';
 import 'node:fs';
-import '@vitest/utils';
+import '@vitest/utils/helpers';
 import './path.js';
 import 'node:path';
-import '@vitest/utils/error';
+import '@vitest/utils/serialize';
 import '@vitest/mocker';
-import './chunks/moduleTransport.I-bgQy0S.js';
+import '@vitest/utils/timers';

package/dist/node.d.ts

@@ -3,24 +3,23 @@ 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 Pool, l as TestSequencer, L as Logger } from './chunks/reporters.d.DmP-iHLr.js';
-export { an as BaseCoverageOptions, G as BenchmarkUserOptions, K as BrowserBuiltinProvider, N as BrowserCommand, Q as BrowserCommandContext, X as BrowserConfigOptions, Y as BrowserInstanceOption, Z as BrowserModuleMocker, _ as BrowserOrchestrator, $ as BrowserProvider, a0 as BrowserProviderInitializationOptions, a1 as BrowserProviderModule, a2 as BrowserProviderOptions, a3 as BrowserScript, a4 as BrowserServerState, a5 as BrowserServerStateSession, ac as BuiltinEnvironment, a6 as CDPSession, ad as CSSModuleScopeStrategy, ao as CoverageIstanbulOptions, ap as CoverageOptions, aq as CoverageProvider, ar as CoverageProviderModule, as as CoverageReporter, c as CoverageV8Options, at as CustomProviderOptions, ae as DepsOptimizationOptions, af as EnvironmentOptions, H as HTMLOptions, I as InlineConfig, o as JUnitOptions, J as JsonOptions, M as ModuleDiagnostic, O as OnServerRestartHandler, m as OnTestsRerunHandler, a7 as ParentProjectBrowser, ag as PoolOptions, a8 as ProjectBrowser, ah as ProjectConfig, b as ReportContext, av as ReportedHookContext, aw as Reporter, aj as ResolveSnapshotPathHandler, ak as ResolveSnapshotPathHandlerContext, a9 as ResolvedBrowserOptions, R as ResolvedCoverageOptions, ai as ResolvedProjectConfig, S as SerializedTestProject, p as TaskOptions, q as TestCase, r as TestCollection, s as TestDiagnostic, t as TestModule, u as TestModuleState, v as TestResult, w as TestResultFailed, x as TestResultPassed, y as TestResultSkipped, ax as TestRunEndReason, au as TestRunResult, F as TestSequencerConstructor, z as TestState, B as TestSuite, D as TestSuiteState, aa as ToMatchScreenshotComparators, ab as ToMatchScreenshotOptions, al as TypecheckConfig, U as UserWorkspaceConfig, am as VitestEnvironment, n as VitestPackageInstaller, W as WatcherTriggerPattern, E as experimental_getRunnerTask } from './chunks/reporters.d.DmP-iHLr.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.BMKt7f6I.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, b 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.BMKt7f6I.js';
 import { Awaitable } from '@vitest/utils';
 export { SerializedError } from '@vitest/utils';
-import { R as RuntimeRPC } from './chunks/worker.d.B2r4Ln6p.js';
-export { T as TestExecutionType } from './chunks/worker.d.B2r4Ln6p.js';
+import { R as RuntimeRPC, C as ContextRPC } from './chunks/worker.d.BFk-vvBU.js';
+export { T as TestExecutionType } from './chunks/worker.d.BFk-vvBU.js';
 import { Writable } from 'node:stream';
-export { V as VitestPluginContext } from './chunks/plugin.d.CIk0YiKb.js';
-export { W as WorkerContext } from './chunks/worker.d.DJ6qxO2w.js';
+export { V as VitestPluginContext } from './chunks/plugin.d.DQU1R5px.js';
 import { Debugger } from 'debug';
-import './chunks/global.d.K6uBQHzY.js';
+import './chunks/global.d.BgJSTpgQ.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.DacWrqWe.js';
+export { b as RuntimeConfig } from './chunks/config.d.u2CUDWwS.js';
 export { generateFileHash } from '@vitest/runner/utils';
-import './chunks/environment.d.2fYMoz3o.js';
 import '@vitest/mocker';
 import '@vitest/utils/source-map';
-import './chunks/browser.d.DtfyY9yS.js';
+import 'vitest/browser';
+import './chunks/browser.d.B9iJzZyn.js';
 import '@vitest/pretty-format';
 import '@vitest/snapshot';
 import '@vitest/utils/diff';
@@ -33,7 +32,7 @@ import '@vitest/snapshot/manager';
 import 'node:fs';
 import 'node:console';
 import 'vite/module-runner';
-import 'node:worker_threads';
+import './chunks/environment.d.CrsxCzP1.js';
 
 type RawErrsMap = Map<string, TscErrorInfo[]>;
 interface TscErrorInfo {
@@ -120,7 +119,6 @@ declare class GitNotFoundError extends Error {
 
 declare function VitestPlugin(options?: UserConfig, vitest?: Vitest): Promise<Plugin[]>;
 
-// this is only exported as a public function and not used inside vitest
 declare function resolveConfig(options?: UserConfig, viteOverrides?: UserConfig$1): Promise<{
 	vitestConfig: ResolvedConfig;
 	viteConfig: ResolvedConfig$1;
@@ -128,39 +126,99 @@ declare function resolveConfig(options?: UserConfig, viteOverrides?: UserConfig$
 
 declare function resolveFsAllow(projectRoot: string, rootConfigFile: string | false | undefined): string[];
 
-type RunWithFiles = (files: TestSpecification[], invalidates?: string[]) => Awaitable<void>;
+type RunWithFiles = (files: TestSpecification[], invalidates?: string[]) => Promise<void>;
 interface ProcessPool {
 	name: string;
 	runTests: RunWithFiles;
 	collectTests: RunWithFiles;
 	close?: () => Awaitable<void>;
 }
-declare function getFilePoolName(project: TestProject): Pool;
+declare function getFilePoolName(project: TestProject): ResolvedConfig["pool"];
 
 interface MethodsOptions {
 	cacheFs?: boolean;
-	// do not report files
 	collect?: boolean;
 }
 declare function createMethodsRPC(project: TestProject, options?: MethodsOptions): RuntimeRPC;
 
+/** @experimental */
+declare class ForksPoolWorker implements PoolWorker {
+	readonly name: string;
+	readonly cacheFs: boolean;
+	protected readonly entrypoint: string;
+	protected execArgv: string[];
+	protected env: Partial<NodeJS.ProcessEnv>;
+	private _fork?;
+	constructor(options: PoolOptions);
+	on(event: string, callback: (arg: any) => void): void;
+	off(event: string, callback: (arg: any) => void): void;
+	send(message: WorkerRequest): void;
+	start(): Promise<void>;
+	stop(): Promise<void>;
+	deserialize(data: unknown): unknown;
+	private get fork();
+}
+
+/** @experimental */
+declare class ThreadsPoolWorker implements PoolWorker {
+	readonly name: string;
+	protected readonly entrypoint: string;
+	protected execArgv: string[];
+	protected env: Partial<NodeJS.ProcessEnv>;
+	private _thread?;
+	constructor(options: PoolOptions);
+	on(event: string, callback: (arg: any) => void): void;
+	off(event: string, callback: (arg: any) => void): void;
+	send(message: WorkerRequest): void;
+	start(): Promise<void>;
+	stop(): Promise<void>;
+	deserialize(data: unknown): unknown;
+	private get thread();
+}
+
+/** @experimental */
+declare class TypecheckPoolWorker implements PoolWorker {
+	readonly name: string;
+	private readonly project;
+	private _eventEmitter;
+	constructor(options: PoolOptions);
+	start(): Promise<void>;
+	stop(): Promise<void>;
+	canReuse(): boolean;
+	send(message: WorkerRequest): void;
+	on(event: string, callback: (arg: any) => any): void;
+	off(event: string, callback: (arg: any) => any): void;
+	deserialize(data: unknown): unknown;
+}
+
+/** @experimental */
+declare class VmForksPoolWorker extends ForksPoolWorker {
+	readonly name = "vmForks";
+	readonly reportMemory: true;
+	protected readonly entrypoint: string;
+	constructor(options: PoolOptions);
+}
+
+/** @experimental */
+declare class VmThreadsPoolWorker extends ThreadsPoolWorker {
+	readonly name = "vmThreads";
+	readonly reportMemory: true;
+	protected readonly entrypoint: string;
+	constructor(options: PoolOptions);
+}
+
 declare class BaseSequencer implements TestSequencer {
 	protected ctx: Vitest;
 	constructor(ctx: Vitest);
-	// async so it can be extended by other sequelizers
 	shard(files: TestSpecification[]): Promise<TestSpecification[]>;
-	// async so it can be extended by other sequelizers
 	sort(files: TestSpecification[]): Promise<TestSpecification[]>;
-	// Calculate distributed shard range [start, end] distributed equally
 	private calculateShardRange;
 }
 
 declare function registerConsoleShortcuts(ctx: Vitest, stdin: NodeJS.ReadStream | undefined, stdout: NodeJS.WriteStream | Writable): () => void;
 
-// This is copy-pasted and needs to be synced from time to time. Ideally, Vite's `createLogger` should accept a custom `console`
-// https://github.com/vitejs/vite/blob/main/packages/vite/src/node/logger.ts?rgh-link-date=2024-10-16T23%3A29%3A19Z
-// When Vitest supports only Vite 6 and above, we can use Vite's `createLogger({ console })`
-// https://github.com/vitejs/vite/pull/18379
+interface WorkerContext extends ContextRPC {}
+
 declare function createViteLogger(console: Logger, level?: LogLevel, options?: LoggerOptions): Logger$1;
 
 declare const rootDir: string;
@@ -172,8 +230,7 @@ declare const version: string;
 
 declare const createViteServer: typeof vite.createServer;
 
-// rolldownVersion is exported only by rolldown-vite
 declare const rolldownVersion: string | undefined;
 
-export { ApiConfig, BaseSequencer, GitNotFoundError, Pool, ResolvedConfig, TestProject, TestSequencer, TestSpecification, UserConfig as TestUserConfig, FilesNotFoundError as TestsNotFoundError, Vitest, VitestOptions, VitestPlugin, VitestRunMode, createDebugger, createMethodsRPC, createViteLogger, createViteServer, createVitest, distDir, escapeTestName, getFilePoolName, isValidApiRequest, parseCLI, registerConsoleShortcuts, resolveApiServerConfig, resolveConfig, resolveFsAllow, rolldownVersion, rootDir, startVitest, version };
-export type { CliParseOptions, ProcessPool, CollectLineNumbers as TypeCheckCollectLineNumbers, CollectLines as TypeCheckCollectLines, Context as TypeCheckContext, TscErrorInfo as TypeCheckErrorInfo, RawErrsMap as TypeCheckRawErrorsMap, RootAndTarget as TypeCheckRootAndTarget };
+export { ApiConfig, BaseSequencer, ForksPoolWorker, GitNotFoundError, PoolOptions, PoolWorker, ResolvedConfig, TestProject, TestSequencer, TestSpecification, UserConfig as TestUserConfig, FilesNotFoundError as TestsNotFoundError, ThreadsPoolWorker, TypecheckPoolWorker, Vitest, VitestOptions, VitestPlugin, VitestRunMode, VmForksPoolWorker, VmThreadsPoolWorker, WorkerRequest, createDebugger, createMethodsRPC, createViteLogger, createViteServer, createVitest, distDir, escapeTestName, getFilePoolName, isValidApiRequest, parseCLI, registerConsoleShortcuts, resolveApiServerConfig, resolveConfig, resolveFsAllow, rolldownVersion, rootDir, startVitest, version };
+export type { CliParseOptions, ProcessPool, CollectLineNumbers as TypeCheckCollectLineNumbers, CollectLines as TypeCheckCollectLines, Context as TypeCheckContext, TscErrorInfo as TypeCheckErrorInfo, RawErrsMap as TypeCheckRawErrorsMap, RootAndTarget as TypeCheckRootAndTarget, WorkerContext };