vitest 4.0.0-beta.1 → 4.0.0-beta.11

package/dist/workers/runVmTests.js

@@ -4,81 +4,64 @@ import timers from 'node:timers';
 import timersPromises from 'node:timers/promises';
 import util from 'node:util';
 import { startTests, collectTests } from '@vitest/runner';
-import { KNOWN_ASSET_TYPES } from 'vite-node/constants';
-import { installSourcemapsSupport } from 'vite-node/source-map';
-import { s as setupChaiConfig, r as resolveTestRunner, a as resolveSnapshotEnvironment } from '../chunks/index.D-VkfKhf.js';
-import { c as setupCommonEnv, s as startCoverageInsideWorker, a as stopCoverageInsideWorker } from '../chunks/setup-common.D7ZqXFx-.js';
-import { V as VitestIndex } from '../chunks/index.BWf_gE5n.js';
-import { c as closeInspector } from '../chunks/inspector.C914Efll.js';
-import { g as getWorkerState } from '../chunks/utils.XdZDrNZV.js';
-import 'chai';
-import 'node:path';
-import '../path.js';
-import 'node:url';
-import '../chunks/rpc.CsFtxqeq.js';
-import '@vitest/utils';
-import '../chunks/index.B521nVV-.js';
-import '../chunks/coverage.DVF1vEu8.js';
-import '@vitest/snapshot';
-import '../chunks/vi.bdSIJ99Y.js';
+import { KNOWN_ASSET_TYPES } from '@vitest/utils/constants';
+import { s as setupChaiConfig, r as resolveTestRunner, a as resolveSnapshotEnvironment } from '../chunks/resolveSnapshotEnvironment.DQVamkje.js';
+import { c as setupCommonEnv, s as startCoverageInsideWorker, a as stopCoverageInsideWorker } from '../chunks/setup-common.NAWRuMRP.js';
+import { i as index } from '../chunks/index.AZOjjqWP.js';
+import { c as closeInspector } from '../chunks/inspector.CvQD-Nie.js';
+import { g as getWorkerState } from '../chunks/utils.DGKhod2J.js';
+import { g as globalExpect } from '../chunks/vi.CiJ0Laa6.js';
 import '@vitest/expect';
+import '../chunks/rpc.jKGRSXIH.js';
+import '@vitest/utils/timers';
+import '../chunks/index.Bgo3tNWt.js';
+import '../chunks/test.KC5tH8hC.js';
+import '@vitest/utils/helpers';
+import '../chunks/benchmark.LXhJ0F0X.js';
 import '@vitest/runner/utils';
-import '../chunks/_commonjsHelpers.BFTU3MAI.js';
 import '@vitest/utils/error';
+import 'pathe';
+import '../chunks/coverage.D_JHT54q.js';
+import '@vitest/snapshot';
+import 'expect-type';
+import 'vite/module-runner';
+import 'node:url';
+import '../chunks/_commonjsHelpers.BFTU3MAI.js';
 import '@vitest/spy';
+import '@vitest/utils/offset';
 import '@vitest/utils/source-map';
-import '../chunks/date.Bq6ZW5rf.js';
-import '../chunks/benchmark.CYdenmiT.js';
-import 'expect-type';
+import '../chunks/date.-jtEtIeV.js';
 
-async function run(method, files, config, executor) {
+async function run(method, files, config, moduleRunner) {
 	const workerState = getWorkerState();
-	await setupCommonEnv(config);
-	Object.defineProperty(globalThis, "__vitest_index__", {
-		value: VitestIndex,
+	await setupCommonEnv(config), Object.defineProperty(globalThis, "__vitest_index__", {
+		value: index,
 		enumerable: false
 	});
-	if (workerState.environment.transformMode === "web") {
+	const viteEnvironment = workerState.environment.viteEnvironment || workerState.environment.name;
+	if (globalExpect.setState({ environment: workerState.environment.name }), viteEnvironment === "client") {
 		const _require = createRequire(import.meta.url);
-		// always mock "required" `css` files, because we cannot process them
-		_require.extensions[".css"] = resolveCss;
-		_require.extensions[".scss"] = resolveCss;
-		_require.extensions[".sass"] = resolveCss;
-		_require.extensions[".less"] = resolveCss;
-		// since we are using Vite, we can assume how these will be resolved
-		KNOWN_ASSET_TYPES.forEach((type) => {
+		_require.extensions[".css"] = resolveCss, _require.extensions[".scss"] = resolveCss, _require.extensions[".sass"] = resolveCss, _require.extensions[".less"] = resolveCss, KNOWN_ASSET_TYPES.forEach((type) => {
 			_require.extensions[`.${type}`] = resolveAsset;
-		});
-		process.env.SSR = "";
+		}), process.env.SSR = "";
 	} else process.env.SSR = "1";
-	// @ts-expect-error not typed global for patched timers
-	globalThis.__vitest_required__ = {
+	if (globalThis.__vitest_required__ = {
 		util,
 		timers,
 		timersPromises
-	};
-	installSourcemapsSupport({ getSourceMap: (source) => workerState.moduleCache.getSourceMap(source) });
-	await startCoverageInsideWorker(config.coverage, executor, { isolate: false });
-	if (config.chaiConfig) setupChaiConfig(config.chaiConfig);
-	const [runner, snapshotEnvironment] = await Promise.all([resolveTestRunner(config, executor), resolveSnapshotEnvironment(config, executor)]);
-	config.snapshotOptions.snapshotEnvironment = snapshotEnvironment;
-	runner.getWorkerContext = void 0;
-	workerState.onCancel.then((reason) => {
-		closeInspector(config);
-		runner.cancel?.(reason);
-	});
-	workerState.durations.prepare = performance.now() - workerState.durations.prepare;
-	const { vi } = VitestIndex;
+	}, await startCoverageInsideWorker(config.coverage, moduleRunner, { isolate: false }), config.chaiConfig) setupChaiConfig(config.chaiConfig);
+	const [runner, snapshotEnvironment] = await Promise.all([resolveTestRunner(config, moduleRunner), resolveSnapshotEnvironment(config, moduleRunner)]);
+	config.snapshotOptions.snapshotEnvironment = snapshotEnvironment, runner.getWorkerContext = void 0, workerState.onCancel.then((reason) => {
+		closeInspector(config), runner.cancel?.(reason);
+	}), workerState.durations.prepare = performance.now() - workerState.durations.prepare;
+	const { vi } = index;
 	for (const file of files) {
-		workerState.filepath = file.filepath;
-		if (method === "run") await startTests([file], runner);
+		if (workerState.filepath = file.filepath, method === "run") await startTests([file], runner);
 		else await collectTests([file], runner);
-		// reset after tests, because user might call `vi.setConfig` in setupFile
-		vi.resetConfig();
 		// mocks should not affect different files
-		vi.restoreAllMocks();
+		vi.resetConfig(), vi.restoreAllMocks();
 	}
-	await stopCoverageInsideWorker(config.coverage, executor, { isolate: false });
+	await stopCoverageInsideWorker(config.coverage, moduleRunner, { isolate: false });
 }
 function resolveCss(mod) {
 	mod.exports = "";

package/globals.d.ts

@@ -1,20 +1,20 @@
 declare global {
-  const suite: typeof import('vitest')['suite']
-  const test: typeof import('vitest')['test']
-  const chai: typeof import("vitest")["chai"]
-  const describe: typeof import('vitest')['describe']
-  const it: typeof import('vitest')['it']
-  const expectTypeOf: typeof import('vitest')['expectTypeOf']
-  const assertType: typeof import('vitest')['assertType']
-  const expect: typeof import('vitest')['expect']
-  const assert: typeof import('vitest')['assert']
-  const vitest: typeof import('vitest')['vitest']
-  const vi: typeof import('vitest')['vitest']
-  const beforeAll: typeof import('vitest')['beforeAll']
-  const afterAll: typeof import('vitest')['afterAll']
-  const beforeEach: typeof import('vitest')['beforeEach']
-  const afterEach: typeof import('vitest')['afterEach']
-  const onTestFailed: typeof import('vitest')['onTestFailed']
-  const onTestFinished: typeof import('vitest')['onTestFinished']
+  let suite: typeof import('vitest')['suite']
+  let test: typeof import('vitest')['test']
+  let chai: typeof import("vitest")["chai"]
+  let describe: typeof import('vitest')['describe']
+  let it: typeof import('vitest')['it']
+  let expectTypeOf: typeof import('vitest')['expectTypeOf']
+  let assertType: typeof import('vitest')['assertType']
+  let expect: typeof import('vitest')['expect']
+  let assert: typeof import('vitest')['assert']
+  let vitest: typeof import('vitest')['vitest']
+  let vi: typeof import('vitest')['vitest']
+  let beforeAll: typeof import('vitest')['beforeAll']
+  let afterAll: typeof import('vitest')['afterAll']
+  let beforeEach: typeof import('vitest')['beforeEach']
+  let afterEach: typeof import('vitest')['afterEach']
+  let onTestFailed: typeof import('vitest')['onTestFailed']
+  let onTestFinished: typeof import('vitest')['onTestFinished']
 }
 export {}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vitest",
   "type": "module",
-  "version": "4.0.0-beta.1",
+  "version": "4.0.0-beta.11",
   "description": "Next generation testing framework powered by Vite",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -22,6 +22,12 @@
     "jest"
   ],
   "sideEffects": false,
+  "imports": {
+    "#module-evaluator": {
+      "types": "./dist/module-evaluator.d.ts",
+      "default": "./dist/module-evaluator.js"
+    }
+  },
   "exports": {
     ".": {
       "import": {
@@ -33,7 +39,11 @@
         "default": "./index.cjs"
       }
     },
-    "./*": "./*",
+    "./package.json": "./package.json",
+    "./optional-types.js": {
+      "types": "./optional-types.d.ts"
+    },
+    "./src/*": "./src/*",
     "./globals": {
       "types": "./globals.d.ts"
     },
@@ -50,18 +60,14 @@
       "types": "./dist/node.d.ts",
       "default": "./dist/node.js"
     },
-    "./execute": {
-      "types": "./dist/execute.d.ts",
-      "default": "./dist/execute.js"
-    },
-    "./workers": {
-      "types": "./dist/workers.d.ts",
-      "import": "./dist/workers.js"
-    },
     "./internal/browser": {
       "types": "./dist/browser.d.ts",
       "default": "./dist/browser.js"
     },
+    "./internal/module-runner": {
+      "types": "./dist/module-runner.d.ts",
+      "default": "./dist/module-runner.js"
+    },
     "./runners": {
       "types": "./dist/runners.d.ts",
       "default": "./dist/runners.js"
@@ -119,8 +125,8 @@
     "@types/node": "^18.0.0 || ^20.0.0 || >=22.0.0",
     "happy-dom": "*",
     "jsdom": "*",
-    "@vitest/browser": "4.0.0-beta.1",
-    "@vitest/ui": "4.0.0-beta.1"
+    "@vitest/browser": "4.0.0-beta.11",
+    "@vitest/ui": "4.0.0-beta.11"
   },
   "peerDependenciesMeta": {
     "@edge-runtime/vm": {
@@ -146,59 +152,55 @@
     }
   },
   "dependencies": {
-    "@types/chai": "^5.2.2",
-    "chai": "^5.2.0",
     "debug": "^4.4.1",
-    "expect-type": "^1.2.1",
-    "magic-string": "^0.30.17",
+    "es-module-lexer": "^1.7.0",
+    "expect-type": "^1.2.2",
+    "magic-string": "^0.30.19",
     "pathe": "^2.0.3",
-    "picomatch": "^4.0.2",
+    "picomatch": "^4.0.3",
     "std-env": "^3.9.0",
     "tinybench": "^2.9.0",
     "tinyexec": "^0.3.2",
-    "tinyglobby": "^0.2.14",
-    "tinypool": "^1.1.1",
-    "tinyrainbow": "^2.0.0",
-    "vite": "^5.0.0 || ^6.0.0 || ^7.0.0-0",
+    "tinyglobby": "^0.2.15",
+    "tinypool": "^2.0.0",
+    "tinyrainbow": "^3.0.3",
+    "vite": "^6.0.0 || ^7.0.0-0",
     "why-is-node-running": "^2.3.0",
-    "@vitest/expect": "4.0.0-beta.1",
-    "@vitest/mocker": "4.0.0-beta.1",
-    "@vitest/runner": "4.0.0-beta.1",
-    "@vitest/snapshot": "4.0.0-beta.1",
-    "@vitest/spy": "4.0.0-beta.1",
-    "@vitest/pretty-format": "^4.0.0-beta.1",
-    "@vitest/utils": "4.0.0-beta.1",
-    "vite-node": "4.0.0-beta.1"
+    "@vitest/expect": "4.0.0-beta.11",
+    "@vitest/mocker": "4.0.0-beta.11",
+    "@vitest/pretty-format": "^4.0.0-beta.11",
+    "@vitest/snapshot": "4.0.0-beta.11",
+    "@vitest/spy": "4.0.0-beta.11",
+    "@vitest/utils": "4.0.0-beta.11",
+    "@vitest/runner": "4.0.0-beta.11"
   },
   "devDependencies": {
-    "@ampproject/remapping": "^2.3.0",
     "@antfu/install-pkg": "^1.1.0",
     "@edge-runtime/vm": "^5.0.0",
+    "@jridgewell/trace-mapping": "0.3.30",
     "@sinonjs/fake-timers": "14.0.0",
     "@types/debug": "^4.1.12",
     "@types/estree": "^1.0.8",
     "@types/istanbul-lib-coverage": "^2.0.6",
     "@types/istanbul-reports": "^3.0.4",
     "@types/jsdom": "^21.1.7",
-    "@types/mime": "^4.0.0",
-    "@types/node": "^22.15.32",
-    "@types/picomatch": "^4.0.0",
+    "@types/node": "^22.18.1",
+    "@types/picomatch": "^4.0.2",
     "@types/prompts": "^2.4.9",
     "@types/sinonjs__fake-timers": "^8.1.5",
     "acorn-walk": "^8.3.4",
-    "birpc": "2.4.0",
+    "birpc": "^2.5.0",
     "cac": "^6.7.14",
     "chai-subset": "^1.6.0",
     "find-up": "^6.3.0",
     "flatted": "^3.3.3",
-    "happy-dom": "^17.6.3",
+    "happy-dom": "^18.0.1",
     "jsdom": "^26.1.0",
-    "local-pkg": "^1.1.1",
+    "local-pkg": "^1.1.2",
     "mime": "^4.0.7",
-    "pretty-format": "^29.7.0",
     "prompts": "^2.4.2",
     "strip-literal": "^3.0.0",
-    "ws": "^8.18.2"
+    "ws": "^8.18.3"
   },
   "scripts": {
     "build": "rimraf dist && rollup -c",

package/browser.d.ts

@@ -1 +0,0 @@
-export * from './dist/browser.js'

package/dist/chunks/base.Bj3pWTr1.js

@@ -1,38 +0,0 @@
-import { ModuleCacheMap } from 'vite-node/client';
-import { g as getDefaultRequestStubs, s as startVitestExecutor } from './execute.B7h3T_Hc.js';
-import { p as provideWorkerState } from './utils.XdZDrNZV.js';
-
-let _viteNode;
-const moduleCache = new ModuleCacheMap();
-const moduleExecutionInfo = /* @__PURE__ */ new Map();
-async function startViteNode(options) {
-	if (_viteNode) return _viteNode;
-	_viteNode = await startVitestExecutor(options);
-	return _viteNode;
-}
-async function runBaseTests(method, state) {
-	const { ctx } = state;
-	// state has new context, but we want to reuse existing ones
-	state.moduleCache = moduleCache;
-	state.moduleExecutionInfo = moduleExecutionInfo;
-	provideWorkerState(globalThis, state);
-	if (ctx.invalidates) ctx.invalidates.forEach((fsPath) => {
-		moduleCache.delete(fsPath);
-		moduleCache.delete(`mock:${fsPath}`);
-	});
-	ctx.files.forEach((i) => state.moduleCache.delete(typeof i === "string" ? i : i.filepath));
-	const [executor, { run }] = await Promise.all([startViteNode({
-		state,
-		requestStubs: getDefaultRequestStubs()
-	}), import('./runBaseTests.BC7ZIH5L.js')]);
-	const fileSpecs = ctx.files.map((f) => typeof f === "string" ? {
-		filepath: f,
-		testLocations: void 0
-	} : f);
-	await run(method, fileSpecs, ctx.config, {
-		environment: state.environment,
-		options: ctx.environment.options
-	}, executor);
-}
-
-export { runBaseTests as r };