vitest 4.0.0-beta.8 → 4.0.0

package/dist/chunks/{creator.KEg6n5IC.js → creator.DucAaYBz.js}

@@ -2,11 +2,12 @@ import { existsSync, writeFileSync, readFileSync } from 'node:fs';
 import { mkdir, writeFile } from 'node:fs/promises';
 import { resolve, dirname, relative } from 'node:path';
 import { detectPackageManager, installPackage } from './index.D3XRDfWc.js';
-import { p as prompt, f as findUp } from './index.X0nbfr6-.js';
+import { p as prompt, a as any } from './index.Dc3xnDvT.js';
 import { x } from 'tinyexec';
 import c from 'tinyrainbow';
 import { c as configFiles } from './constants.D_Q9UYh-.js';
 import 'node:process';
+import 'node:module';
 import 'node:url';
 import './_commonjsHelpers.BFTU3MAI.js';
 import 'readline';
@@ -38,7 +39,7 @@ import { render } from '@testing-library/jsx'
 import HelloWorld from './HelloWorld.jsx'
 
 test('renders name', async () => {
-  const { getByText } = render(<HelloWorld name="Vitest" />)
+  const { getByText } = await render(<HelloWorld name="Vitest" />)
   await expect.element(getByText('Hello Vitest!')).toBeInTheDocument()
 })
 `
@@ -297,12 +298,11 @@ async function generateExampleFiles(framework, lang) {
 // eslint-disable-next-line no-console
 const log = console.log;
 function getProviderOptions() {
-	const providers = {
+	return Object.entries({
 		playwright: "Playwright relies on Chrome DevTools protocol. Read more: https://playwright.dev",
 		webdriverio: "WebdriverIO uses WebDriver protocol. Read more: https://webdriver.io",
 		preview: "Preview is useful to quickly run your tests in the browser, but not suitable for CI."
-	};
-	return Object.entries(providers).map(([provider, description]) => {
+	}).map(([provider, description]) => {
 		return {
 			title: provider,
 			description,
@@ -330,23 +330,6 @@ function getBrowserNames(provider) {
 		];
 	}
 }
-function getProviderPackageNames(provider) {
-	switch (provider) {
-		case "webdriverio": return {
-			types: "@vitest/browser/providers/webdriverio",
-			pkg: "webdriverio"
-		};
-		case "playwright": return {
-			types: "@vitest/browser/providers/playwright",
-			pkg: "playwright"
-		};
-		case "preview": return {
-			types: "@vitest/browser/matchers",
-			pkg: null
-		};
-	}
-	throw new Error(`Unsupported provider: ${provider}`);
-}
 function getFramework() {
 	return [
 		{
@@ -422,11 +405,6 @@ function getFrameworkPluginPackage(framework) {
 	}
 	return null;
 }
-async function updateTsConfig(type) {
-	if (type == null) return;
-	const msg = `Add "${c.bold(type)}" to your tsconfig.json "${c.bold("compilerOptions.types")}" field to have better intellisense support.`;
-	log(), log(c.yellow("◼"), c.yellow(msg));
-}
 function getLanguageOptions() {
 	return [{
 		title: "TypeScript",
@@ -476,9 +454,7 @@ function getProviderDocsLink(provider) {
 }
 function sort(choices, value) {
 	const index = choices.findIndex((i) => i.value === value);
-	if (index === -1) return choices;
-	const item = choices.splice(index, 1)[0];
-	return [item, ...choices];
+	return index === -1 ? choices : [choices.splice(index, 1)[0], ...choices];
 }
 function fail() {
 	process.exitCode = 1;
@@ -502,6 +478,7 @@ function getFrameworkImportInfo(framework) {
 async function generateFrameworkConfigFile(options) {
 	const { importName, isNamedExport } = getFrameworkImportInfo(options.framework), frameworkImport = isNamedExport ? `import { ${importName} } from '${options.frameworkPlugin}'` : `import ${importName} from '${options.frameworkPlugin}'`, configContent = [
 		`import { defineConfig } from 'vitest/config'`,
+		`import { ${options.provider} } from '@vitest/browser-${options.provider}'`,
 		options.frameworkPlugin ? frameworkImport : null,
 		``,
 		"export default defineConfig({",
@@ -509,7 +486,7 @@ async function generateFrameworkConfigFile(options) {
 		`  test: {`,
 		`    browser: {`,
 		`      enabled: true,`,
-		`      provider: '${options.provider}',`,
+		`      provider: ${options.provider}(),`,
 		options.provider !== "preview" && `      // ${getProviderDocsLink(options.provider)}`,
 		`      instances: [`,
 		...options.browsers.map((browser) => `      { browser: '${browser}' },`),
@@ -594,15 +571,13 @@ async function create() {
 		message: `Install Playwright browsers (can be done manually via 'pnpm exec playwright install')?`
 	}));
 	if (installPlaywright == null) return fail();
-	const dependenciesToInstall = ["@vitest/browser"], frameworkPackage = getFrameworkTestPackage(framework);
+	const dependenciesToInstall = [`@vitest/browser-${provider}`], frameworkPackage = getFrameworkTestPackage(framework);
 	if (frameworkPackage) dependenciesToInstall.push(frameworkPackage);
-	const providerPkg = getProviderPackageNames(provider);
-	if (providerPkg.pkg) dependenciesToInstall.push(providerPkg.pkg);
 	const frameworkPlugin = getFrameworkPluginPackage(framework);
 	if (frameworkPlugin) dependenciesToInstall.push(frameworkPlugin);
 	const pkgManager = await detectPackageManager();
 	log(), await installPackages(pkgManager, dependenciesToInstall.filter((pkg) => !dependencies[pkg]));
-	const rootConfig = await findUp(configFiles, { cwd: process.cwd() });
+	const rootConfig = any(configFiles, { cwd: process.cwd() });
 	let scriptCommand = "vitest";
 	if (log(), rootConfig) {
 		const configPath = resolve(dirname(rootConfig), `vitest.browser.config.${lang}`);
@@ -645,8 +620,6 @@ async function create() {
 			"inherit"
 		] } });
 	}
-	// TODO: can we do this ourselves?
-	if (lang === "ts") await updateTsConfig(providerPkg?.types);
 	log();
 	const exampleTestFile = await generateExampleFiles(framework, lang);
 	log(c.green("✔"), "Created example test file in", c.bold(relative(process.cwd(), exampleTestFile))), log(c.dim("  You can safely delete this file once you have written your own tests.")), log(), log(c.cyan("◼"), "All done! Run your tests with", c.bold(getRunScript(pkgManager)));

package/dist/chunks/{defaults.CXFFjsi8.js → defaults.BOqNVLsY.js}

@@ -40,7 +40,6 @@ const configDefaults = Object.freeze({
 	watch: !isCI && process.stdin.isTTY,
 	globals: false,
 	environment: "node",
-	pool: "forks",
 	clearMocks: false,
 	restoreMocks: false,
 	mockReset: false,

package/dist/chunks/environment.d.CrsxCzP1.d.ts

@@ -0,0 +1,29 @@
+import { Awaitable } from '@vitest/utils';
+
+interface EnvironmentReturn {
+	teardown: (global: any) => Awaitable<void>;
+}
+interface VmEnvironmentReturn {
+	getVmContext: () => {
+		[key: string]: any;
+	};
+	teardown: () => Awaitable<void>;
+}
+interface Environment {
+	name: string;
+	/**
+	* @deprecated use `viteEnvironment` instead. Uses `name` by default
+	*/
+	transformMode?: "web" | "ssr";
+	/**
+	* Environment initiated by the Vite server. It is usually available
+	* as `vite.server.environments.${name}`.
+	*
+	* By default, fallbacks to `name`.
+	*/
+	viteEnvironment?: "client" | "ssr" | ({} & string);
+	setupVM?: (options: Record<string, any>) => Awaitable<VmEnvironmentReturn>;
+	setup: (global: any, options: Record<string, any>) => Awaitable<EnvironmentReturn>;
+}
+
+export type { Environment as E, VmEnvironmentReturn as V, EnvironmentReturn as a };

package/dist/chunks/evaluatedModules.Dg1zASAC.js

@@ -0,0 +1,17 @@
+import { dirname, resolve } from 'pathe';
+import { EvaluatedModules } from 'vite/module-runner';
+
+// TODO: this is not needed in Vite 7.2+
+class VitestEvaluatedModules extends EvaluatedModules {
+	getModuleSourceMapById(id) {
+		const map = super.getModuleSourceMapById(id);
+		if (map != null && !("_patched" in map)) {
+			map._patched = true;
+			const dir = dirname(map.url);
+			map.resolvedSources = (map.map.sources || []).map((s) => resolve(dir, s || ""));
+		}
+		return map;
+	}
+}
+
+export { VitestEvaluatedModules as V };

package/dist/chunks/{global.d.K6uBQHzY.d.ts → global.d.BgJSTpgQ.d.ts}

@@ -2,23 +2,8 @@ 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 './environment.d.2fYMoz3o.js';
+import { U as UserConsoleLog } from './worker.d.BFk-vvBU.js';
 
-declare global {
-	// eslint-disable-next-line ts/no-namespace
-	namespace Chai {
-		interface ContainSubset {
-			(expected: any): Assertion;
-		}
-		interface Assertion {
-			containSubset: ContainSubset;
-		}
-		interface Assert {
-			// eslint-disable-next-line ts/method-signature-style
-			containSubset(val: any, exp: any, msg?: string): void;
-		}
-	}
-}
 interface SnapshotMatcher<T> {
 	<U extends { [P in keyof T] : any }>(snapshot: Partial<U>, hint?: string): void;
 	(hint?: string): void;
@@ -38,6 +23,7 @@ declare module "@vitest/expect" {
 		message?: string;
 	}
 	interface ExpectStatic {
+		assert: Chai.AssertStatic;
 		unreachable: (message?: string) => never;
 		soft: <T>(actual: T, message?: string) => Assertion<T>;
 		poll: <T>(actual: () => T, options?: ExpectPollOptions) => PromisifyAssertion<Awaited<T>>;
@@ -47,7 +33,6 @@ declare module "@vitest/expect" {
 		addSnapshotSerializer: (plugin: Plugin) => void;
 	}
 	interface Assertion<T> {
-		// Snapshots are extended in @vitest/snapshot and are not part of @vitest/expect
 		matchSnapshot: SnapshotMatcher<T>;
 		toMatchSnapshot: SnapshotMatcher<T>;
 		toMatchInlineSnapshot: InlineSnapshotMatcher<T>;

package/dist/chunks/{globals.lgsmH00r.js → globals.BGT_RUsD.js}

@@ -1,26 +1,29 @@
 import { g as globalApis } from './constants.D_Q9UYh-.js';
-import { V as VitestIndex } from './index.AR8aAkCC.js';
-import './vi.BfdOiD4j.js';
+import { i as index } from './index.RwjEGCQ0.js';
+import './vi.BZvkKVkM.js';
 import '@vitest/expect';
 import '@vitest/runner';
 import '@vitest/runner/utils';
-import 'chai';
-import './utils.C7__0Iv5.js';
-import '@vitest/utils';
-import './_commonjsHelpers.BFTU3MAI.js';
+import './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 './_commonjsHelpers.BFTU3MAI.js';
 import './date.-jtEtIeV.js';
-import './benchmark.UW6Ezvxy.js';
-import 'expect-type';
+import './benchmark.DHKMYAts.js';
+import './evaluatedModules.Dg1zASAC.js';
+import 'pathe';
 import 'vite/module-runner';
+import 'expect-type';
 
 function registerApiGlobally() {
 	globalApis.forEach((api) => {
 		// @ts-expect-error I know what I am doing :P
-		globalThis[api] = VitestIndex[api];
+		globalThis[api] = index[api];
 	});
 }
 

package/dist/chunks/{index.BuwjkI-q.js → index.BdSLhLDZ.js}

@@ -2,9 +2,9 @@ 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 } from './index.AzwzFtyi.js';
+import { g as getStateSymbol, t as truncateString, F as F_RIGHT, D as DefaultReporter, f as formatProjectName, s as separator } from './index.CcRZ6fUh.js';
 import { stripVTControlCharacters } from 'node:util';
-import { notNullish } from '@vitest/utils';
+import { notNullish } from '@vitest/utils/helpers';
 
 function createBenchmarkJsonReport(files) {
 	const report = { files: [] };
@@ -183,7 +183,7 @@ class BenchmarkReporter extends DefaultReporter {
 		if (state === "pending" || state === "queued") return;
 		const benches = testTask.task.tasks.filter((t) => t.meta.benchmark), duration = testTask.task.result?.duration || 0;
 		if (benches.length > 0 && benches.every((t) => t.result?.state !== "run" && t.result?.state !== "queued")) {
-			let title = `\n ${getStateSymbol(testTask.task)} ${formatProjectName(testTask.project)}${getFullName(testTask.task, c.dim(" > "))}`;
+			let title = `\n ${getStateSymbol(testTask.task)} ${formatProjectName(testTask.project)}${getFullName(testTask.task, separator)}`;
 			if (duration != null && duration > this.ctx.config.slowTestThreshold) title += c.yellow(` ${Math.round(duration)}${c.dim("ms")}`);
 			this.log(title), this.log(renderTable({
 				tasks: benches,

package/dist/chunks/{index.DfviD7lX.js → index.CbWINfS7.js}

@@ -238,10 +238,10 @@ const skipKeys = [
 	"parent"
 ];
 function getWindowKeys(global, win, additionalKeys = []) {
-	const keysArray = [...additionalKeys, ...KEYS], keys = new Set(keysArray.concat(Object.getOwnPropertyNames(win)).filter((k) => {
+	const keysArray = [...additionalKeys, ...KEYS];
+	return new Set(keysArray.concat(Object.getOwnPropertyNames(win)).filter((k) => {
 		return skipKeys.includes(k) ? false : k in global ? keysArray.includes(k) : true;
 	}));
-	return keys;
 }
 function isClassLikeName(name) {
 	return name[0] === name[0].toUpperCase();
@@ -391,25 +391,20 @@ var jsdom = {
 			userAgent,
 			...restOptions
 		});
-		const clearWindowErrors = catchWindowErrors(dom.window);
+		const clearAddEventListenerPatch = patchAddEventListener(dom.window), clearWindowErrors = catchWindowErrors(dom.window);
 		dom.window.Buffer = Buffer, dom.window.jsdom = dom;
-		// inject web globals if they missing in JSDOM but otherwise available in Nodejs
-		// https://nodejs.org/dist/latest/docs/api/globals.html
-		const globalNames = [
+		for (const name of [
 			"structuredClone",
 			"BroadcastChannel",
 			"MessageChannel",
 			"MessagePort",
 			"TextEncoder",
 			"TextDecoder"
-		];
-		for (const name of globalNames) {
+		]) {
 			const value = globalThis[name];
 			if (typeof value !== "undefined" && typeof dom.window[name] === "undefined") dom.window[name] = value;
 		}
-		// since we are providing Node.js's Fetch API,
-		// we also should override other APIs they use
-		const overrideGlobals = [
+		for (const name of [
 			"fetch",
 			"Request",
 			"Response",
@@ -418,8 +413,7 @@ var jsdom = {
 			"AbortSignal",
 			"URL",
 			"URLSearchParams"
-		];
-		for (const name of overrideGlobals) {
+		]) {
 			const value = globalThis[name];
 			if (typeof value !== "undefined") dom.window[name] = value;
 		}
@@ -428,7 +422,7 @@ var jsdom = {
 				return dom.getInternalVMContext();
 			},
 			teardown() {
-				clearWindowErrors(), dom.window.close(), dom = void 0;
+				clearAddEventListenerPatch(), clearWindowErrors(), dom.window.close(), dom = void 0;
 			}
 		};
 	},
@@ -444,12 +438,37 @@ var jsdom = {
 			contentType,
 			userAgent,
 			...restOptions
-		}), { keys, originals } = populateGlobal(global, dom.window, { bindFunctions: true }), clearWindowErrors = catchWindowErrors(global);
+		}), clearAddEventListenerPatch = patchAddEventListener(dom.window), { keys, originals } = populateGlobal(global, dom.window, { bindFunctions: true }), clearWindowErrors = catchWindowErrors(global);
 		return global.jsdom = dom, { teardown(global) {
-			clearWindowErrors(), dom.window.close(), delete global.jsdom, keys.forEach((key) => delete global[key]), originals.forEach((v, k) => global[k] = v);
+			clearAddEventListenerPatch(), clearWindowErrors(), dom.window.close(), delete global.jsdom, keys.forEach((key) => delete global[key]), originals.forEach((v, k) => global[k] = v);
 		} };
 	}
 };
+function patchAddEventListener(window) {
+	const JSDOMAbortSignal = window.AbortSignal, JSDOMAbortController = window.AbortController, originalAddEventListener = window.EventTarget.prototype.addEventListener;
+	return window.EventTarget.prototype.addEventListener = function addEventListener(type, callback, options) {
+		if (typeof options === "object" && options.signal != null) {
+			const { signal,...otherOptions } = options;
+			// - this happens because AbortSignal is provided by Node.js,
+			// but jsdom APIs require jsdom's AbortSignal, while Node APIs
+			// (like fetch and Request) require a Node.js AbortSignal
+			// - disable narrow typing with "as any" because we need it later
+			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();
+				return signal.addEventListener("abort", () => {
+					jsdomAbortController.abort(signal.reason);
+				}), jsdomCompatOptions.signal = jsdomAbortController.signal, originalAddEventListener.call(this, type, callback, jsdomCompatOptions);
+			}
+		}
+		return originalAddEventListener.call(this, type, callback, options);
+	}, () => {
+		window.EventTarget.prototype.addEventListener = originalAddEventListener;
+	};
+}
 
 // some globals we do not want, either because deprecated or we set it ourselves
 const denyList = new Set([
@@ -459,15 +478,24 @@ const denyList = new Set([
 	"Buffer",
 	"ArrayBuffer",
 	"Uint8Array"
-]), nodeGlobals = new Map(Object.getOwnPropertyNames(globalThis).filter((global) => !denyList.has(global)).map((nodeGlobalsKey) => {
-	const descriptor = Object.getOwnPropertyDescriptor(globalThis, nodeGlobalsKey);
-	if (!descriptor) throw new Error(`No property descriptor for ${nodeGlobalsKey}, this is a bug in Vitest.`);
-	return [nodeGlobalsKey, descriptor];
-}));
+]), nodeGlobals = /* @__PURE__ */ new Map();
+function populateNodeGlobals() {
+	if (nodeGlobals.size !== 0) return;
+	const names = Object.getOwnPropertyNames(globalThis), length = names.length;
+	for (let i = 0; i < length; i++) {
+		const globalName = names[i];
+		if (!denyList.has(globalName)) {
+			const descriptor = Object.getOwnPropertyDescriptor(globalThis, globalName);
+			if (!descriptor) throw new Error(`No property descriptor for ${globalName}, this is a bug in Vitest.`);
+			nodeGlobals.set(globalName, descriptor);
+		}
+	}
+}
 var node = {
 	name: "node",
 	viteEnvironment: "ssr",
 	async setupVM() {
+		populateNodeGlobals();
 		const vm = await import('node:vm');
 		let context = vm.createContext(), global = vm.runInContext("this", context);
 		const contextGlobals = new Set(Object.getOwnPropertyNames(global));