vitest 4.0.0-beta.4 → 4.0.0-beta.6

package/dist/workers/forks.js

@@ -1,20 +1,21 @@
 import v8 from 'node:v8';
-import { r as runBaseTests } from '../chunks/base.BaCDDRPG.js';
-import { c as createForksRpcOptions, u as unwrapSerializableConfig } from '../chunks/utils.CcGm2cd1.js';
-import 'vite-node/client';
-import '../chunks/execute.Dt-pCVcL.js';
+import { r as runBaseTests } from '../chunks/base.BXI97p6t.js';
+import { c as createForksRpcOptions, u as unwrapSerializableConfig } from '../chunks/utils.C2YI6McM.js';
+import 'vite/module-runner';
+import '../chunks/startModuleRunner.C8TW8zTN.js';
 import 'node:fs';
+import 'node:module';
+import '@vitest/utils';
 import 'node:url';
-import 'node:vm';
-import '@vitest/utils/error';
 import 'pathe';
-import 'vite-node/utils';
 import '../path.js';
 import 'node:path';
+import '@vitest/utils/error';
+import '../module-evaluator.js';
+import 'node:vm';
 import '@vitest/mocker';
-import 'node:module';
-import '@vitest/utils';
-import '../chunks/utils.XdZDrNZV.js';
+import '../chunks/moduleTransport.I-bgQy0S.js';
+import '../chunks/utils.C7__0Iv5.js';
 
 class ForksBaseWorker {
 	getRpcOptions() {

package/dist/workers/runVmTests.js

@@ -4,81 +4,62 @@ 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.CtUvr1c8.js';
-import { c as setupCommonEnv, s as startCoverageInsideWorker, a as stopCoverageInsideWorker } from '../chunks/setup-common.Ebx5x0eP.js';
-import { V as VitestIndex } from '../chunks/index.D1_MsKEt.js';
-import { c as closeInspector } from '../chunks/inspector.C914Efll.js';
-import { g as getWorkerState } from '../chunks/utils.XdZDrNZV.js';
+import { KNOWN_ASSET_TYPES } from '@vitest/utils';
+import { s as setupChaiConfig, r as resolveTestRunner, a as resolveSnapshotEnvironment } from '../chunks/index.CsFXYRkW.js';
+import { c as setupCommonEnv, s as startCoverageInsideWorker, a as stopCoverageInsideWorker } from '../chunks/setup-common.hLGRxhC8.js';
+import { V as VitestIndex } from '../chunks/index.AR8aAkCC.js';
+import { c as closeInspector } from '../chunks/inspector.CvQD-Nie.js';
+import { g as getWorkerState } from '../chunks/utils.C7__0Iv5.js';
 import 'chai';
 import 'node:path';
 import '../path.js';
 import 'node:url';
-import '../chunks/rpc.jnQO9F8a.js';
-import '@vitest/utils';
+import '../chunks/rpc.RpPylpp0.js';
 import '../chunks/index.Bgo3tNWt.js';
-import '../chunks/coverage.DVF1vEu8.js';
+import '../chunks/coverage.D_JHT54q.js';
 import '@vitest/snapshot';
-import '../chunks/vi.CA0EPI9Y.js';
+import '../chunks/vi.BfdOiD4j.js';
 import '@vitest/expect';
 import '@vitest/runner/utils';
 import '../chunks/_commonjsHelpers.BFTU3MAI.js';
 import '@vitest/utils/error';
 import '@vitest/spy';
 import '@vitest/utils/source-map';
-import '../chunks/date.Bq6ZW5rf.js';
-import '../chunks/benchmark.CYdenmiT.js';
+import '../chunks/date.-jtEtIeV.js';
+import '../chunks/benchmark.UW6Ezvxy.js';
 import 'expect-type';
+import 'vite/module-runner';
 
-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__", {
+	await setupCommonEnv(config), Object.defineProperty(globalThis, "__vitest_index__", {
 		value: VitestIndex,
 		enumerable: false
 	});
-	if (workerState.environment.transformMode === "web") {
+	const viteEnvironment = workerState.environment.viteEnvironment || workerState.environment.name;
+	if (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;
+	}, 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 } = VitestIndex;
 	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/dist/workers/threads.js

@@ -1,19 +1,20 @@
-import { r as runBaseTests } from '../chunks/base.BaCDDRPG.js';
-import { a as createThreadsRpcOptions } from '../chunks/utils.CcGm2cd1.js';
-import 'vite-node/client';
-import '../chunks/execute.Dt-pCVcL.js';
+import { r as runBaseTests } from '../chunks/base.BXI97p6t.js';
+import { a as createThreadsRpcOptions } from '../chunks/utils.C2YI6McM.js';
+import 'vite/module-runner';
+import '../chunks/startModuleRunner.C8TW8zTN.js';
 import 'node:fs';
+import 'node:module';
+import '@vitest/utils';
 import 'node:url';
-import 'node:vm';
-import '@vitest/utils/error';
 import 'pathe';
-import 'vite-node/utils';
 import '../path.js';
 import 'node:path';
+import '@vitest/utils/error';
+import '../module-evaluator.js';
+import 'node:vm';
 import '@vitest/mocker';
-import 'node:module';
-import '@vitest/utils';
-import '../chunks/utils.XdZDrNZV.js';
+import '../chunks/moduleTransport.I-bgQy0S.js';
+import '../chunks/utils.C7__0Iv5.js';
 
 class ThreadsBaseWorker {
 	getRpcOptions(ctx) {

package/dist/workers/vmForks.js

@@ -1,26 +1,27 @@
 import v8 from 'node:v8';
-import { c as createForksRpcOptions, u as unwrapSerializableConfig } from '../chunks/utils.CcGm2cd1.js';
-import { r as runVmTests } from '../chunks/vm.BUnLJt_P.js';
+import { c as createForksRpcOptions, u as unwrapSerializableConfig } from '../chunks/utils.C2YI6McM.js';
+import { r as runVmTests } from '../chunks/vm.BHBje7cC.js';
 import '@vitest/utils';
 import 'node:url';
 import 'node:vm';
 import 'pathe';
 import '../path.js';
 import 'node:path';
-import '../chunks/console.DoJHFxmj.js';
+import '../chunks/console.B0quX7yH.js';
 import 'node:console';
 import 'node:stream';
 import 'tinyrainbow';
-import '../chunks/date.Bq6ZW5rf.js';
-import '../chunks/utils.XdZDrNZV.js';
-import '../chunks/execute.Dt-pCVcL.js';
+import '../chunks/date.-jtEtIeV.js';
+import '../chunks/utils.C7__0Iv5.js';
 import 'node:fs';
+import 'node:module';
+import '../chunks/resolver.Bx6lE0iq.js';
+import '../module-evaluator.js';
+import 'vite/module-runner';
+import '../chunks/startModuleRunner.C8TW8zTN.js';
 import '@vitest/utils/error';
-import 'vite-node/client';
-import 'vite-node/utils';
 import '@vitest/mocker';
-import 'node:module';
-import 'vite-node/constants';
+import '../chunks/moduleTransport.I-bgQy0S.js';
 
 class ForksVmWorker {
 	getRpcOptions() {

package/dist/workers/vmThreads.js

@@ -1,25 +1,26 @@
-import { a as createThreadsRpcOptions } from '../chunks/utils.CcGm2cd1.js';
-import { r as runVmTests } from '../chunks/vm.BUnLJt_P.js';
+import { a as createThreadsRpcOptions } from '../chunks/utils.C2YI6McM.js';
+import { r as runVmTests } from '../chunks/vm.BHBje7cC.js';
 import '@vitest/utils';
 import 'node:url';
 import 'node:vm';
 import 'pathe';
 import '../path.js';
 import 'node:path';
-import '../chunks/console.DoJHFxmj.js';
+import '../chunks/console.B0quX7yH.js';
 import 'node:console';
 import 'node:stream';
 import 'tinyrainbow';
-import '../chunks/date.Bq6ZW5rf.js';
-import '../chunks/utils.XdZDrNZV.js';
-import '../chunks/execute.Dt-pCVcL.js';
+import '../chunks/date.-jtEtIeV.js';
+import '../chunks/utils.C7__0Iv5.js';
 import 'node:fs';
+import 'node:module';
+import '../chunks/resolver.Bx6lE0iq.js';
+import '../module-evaluator.js';
+import 'vite/module-runner';
+import '../chunks/startModuleRunner.C8TW8zTN.js';
 import '@vitest/utils/error';
-import 'vite-node/client';
-import 'vite-node/utils';
 import '@vitest/mocker';
-import 'node:module';
-import 'vite-node/constants';
+import '../chunks/moduleTransport.I-bgQy0S.js';
 
 class ThreadsVmWorker {
 	getRpcOptions(ctx) {

package/dist/workers.d.ts

@@ -1,10 +1,11 @@
-import { W as WorkerGlobalState, C as ContextRPC, B as BirpcOptions, R as RuntimeRPC } from './chunks/worker.d.zjyR34Pb.js';
+import { W as WorkerGlobalState, C as ContextRPC, B as BirpcOptions, R as RuntimeRPC } from './chunks/worker.d.D9QWnzAe.js';
 import { Awaitable } from '@vitest/utils';
 import * as v8 from 'v8';
-import { a as SerializedConfig } from './chunks/config.d.DZo8c7fw.js';
-import { W as WorkerContext } from './chunks/worker.d.C-1AbnVe.js';
+import { a as SerializedConfig } from './chunks/config.d.CKNVOKm0.js';
+import { W as WorkerContext } from './chunks/worker.d.Db-UVmXc.js';
 import '@vitest/runner';
-import './chunks/environment.d.Bhm9oc0v.js';
+import 'vite/module-runner';
+import './chunks/environment.d.2fYMoz3o.js';
 import '@vitest/snapshot';
 import '@vitest/pretty-format';
 import '@vitest/utils/diff';

package/dist/workers.js

@@ -1,30 +1,31 @@
-export { p as provideWorkerState } from './chunks/utils.XdZDrNZV.js';
+export { p as provideWorkerState } from './chunks/utils.C7__0Iv5.js';
 export { collect as collectVitestWorkerTests, run as runVitestWorker } from './worker.js';
-export { r as runBaseTests } from './chunks/base.BaCDDRPG.js';
-export { c as createForksRpcOptions, a as createThreadsRpcOptions, u as unwrapSerializableConfig } from './chunks/utils.CcGm2cd1.js';
-export { r as runVmTests } from './chunks/vm.BUnLJt_P.js';
+export { r as runBaseTests } from './chunks/base.BXI97p6t.js';
+export { c as createForksRpcOptions, a as createThreadsRpcOptions, u as unwrapSerializableConfig } from './chunks/utils.C2YI6McM.js';
+export { r as runVmTests } from './chunks/vm.BHBje7cC.js';
 import '@vitest/utils';
 import 'node:url';
 import '@vitest/utils/source-map';
 import 'tinypool';
-import 'vite-node/client';
+import 'vite/module-runner';
 import 'node:fs';
+import 'node:module';
 import 'pathe';
-import './chunks/index.CmSc2RE5.js';
+import './chunks/moduleTransport.I-bgQy0S.js';
+import './chunks/index.BG0gqZH-.js';
 import 'node:console';
-import './chunks/inspector.C914Efll.js';
-import 'node:module';
-import './chunks/rpc.jnQO9F8a.js';
+import './chunks/inspector.CvQD-Nie.js';
+import './chunks/rpc.RpPylpp0.js';
 import './chunks/index.Bgo3tNWt.js';
-import './chunks/execute.Dt-pCVcL.js';
-import 'node:vm';
-import '@vitest/utils/error';
-import 'vite-node/utils';
+import './chunks/startModuleRunner.C8TW8zTN.js';
 import './path.js';
 import 'node:path';
+import '@vitest/utils/error';
+import './module-evaluator.js';
+import 'node:vm';
 import '@vitest/mocker';
-import './chunks/console.DoJHFxmj.js';
+import './chunks/console.B0quX7yH.js';
 import 'node:stream';
 import 'tinyrainbow';
-import './chunks/date.Bq6ZW5rf.js';
-import 'vite-node/constants';
+import './chunks/date.-jtEtIeV.js';
+import './chunks/resolver.Bx6lE0iq.js';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vitest",
   "type": "module",
-  "version": "4.0.0-beta.4",
+  "version": "4.0.0-beta.6",
   "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": {
@@ -50,10 +56,6 @@
       "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"
@@ -62,6 +64,10 @@
       "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.4",
-    "@vitest/ui": "4.0.0-beta.4"
+    "@vitest/ui": "4.0.0-beta.6",
+    "@vitest/browser": "4.0.0-beta.6"
   },
   "peerDependenciesMeta": {
     "@edge-runtime/vm": {
@@ -149,6 +155,7 @@
     "@types/chai": "^5.2.2",
     "chai": "^5.2.1",
     "debug": "^4.4.1",
+    "es-module-lexer": "^1.7.0",
     "expect-type": "^1.2.2",
     "magic-string": "^0.30.17",
     "pathe": "^2.0.3",
@@ -161,14 +168,13 @@
     "tinyrainbow": "^2.0.0",
     "vite": "^6.0.0 || ^7.0.0-0",
     "why-is-node-running": "^2.3.0",
-    "@vitest/expect": "4.0.0-beta.4",
-    "@vitest/mocker": "4.0.0-beta.4",
-    "@vitest/pretty-format": "^4.0.0-beta.4",
-    "@vitest/runner": "4.0.0-beta.4",
-    "@vitest/spy": "4.0.0-beta.4",
-    "@vitest/snapshot": "4.0.0-beta.4",
-    "vite-node": "4.0.0-beta.4",
-    "@vitest/utils": "4.0.0-beta.4"
+    "@vitest/mocker": "4.0.0-beta.6",
+    "@vitest/expect": "4.0.0-beta.6",
+    "@vitest/runner": "4.0.0-beta.6",
+    "@vitest/snapshot": "4.0.0-beta.6",
+    "@vitest/spy": "4.0.0-beta.6",
+    "@vitest/utils": "4.0.0-beta.6",
+    "@vitest/pretty-format": "^4.0.0-beta.6"
   },
   "devDependencies": {
     "@ampproject/remapping": "^2.3.0",
@@ -180,9 +186,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.16.5",
-    "@types/picomatch": "^4.0.1",
+    "@types/picomatch": "^4.0.2",
     "@types/prompts": "^2.4.9",
     "@types/sinonjs__fake-timers": "^8.1.5",
     "acorn-walk": "^8.3.4",

package/dist/chunks/base.BaCDDRPG.js

@@ -1,38 +0,0 @@
-import { ModuleCacheMap } from 'vite-node/client';
-import { g as getDefaultRequestStubs, s as startVitestExecutor } from './execute.Dt-pCVcL.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.DBVVLMSb.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 };