vitest 0.34.4 → 0.34.6

package/dist/browser.d.ts

@@ -1,5 +1,6 @@
 export { startTests } from '@vitest/runner';
-import { R as ResolvedConfig, C as CoverageOptions, a as CoverageProvider, b as CoverageProviderModule } from './reporters-cb94c88b.js';
+import { R as ResolvedConfig, e as CoverageOptions, f as CoverageProvider, g as CoverageProviderModule } from './reporters-5f784f42.js';
+import { VitestExecutor } from './execute.js';
 import 'vite';
 import 'vite-node';
 import '@vitest/snapshot';
@@ -14,8 +15,33 @@ import 'node:worker_threads';
 import 'rollup';
 import 'node:fs';
 import 'chai';
+import 'node:vm';
+
+type Formatter = (input: string | number | null | undefined) => string;
+
+interface DiffOptions {
+    aAnnotation?: string;
+    aColor?: Formatter;
+    aIndicator?: string;
+    bAnnotation?: string;
+    bColor?: Formatter;
+    bIndicator?: string;
+    changeColor?: Formatter;
+    changeLineTrailingSpaceColor?: Formatter;
+    commonColor?: Formatter;
+    commonIndicator?: string;
+    commonLineTrailingSpaceColor?: Formatter;
+    contextLines?: number;
+    emptyFirstOrLastLinePlaceholder?: string;
+    expand?: boolean;
+    includeChangeCounts?: boolean;
+    omitAnnotationLines?: boolean;
+    patchColor?: Formatter;
+    compareKeys?: any;
+}
 
 declare function setupCommonEnv(config: ResolvedConfig): Promise<void>;
+declare function loadDiffConfig(config: ResolvedConfig, executor: VitestExecutor): Promise<DiffOptions | undefined>;
 
 interface Loader {
     executeId: (id: string) => Promise<{
@@ -27,4 +53,4 @@ declare function startCoverageInsideWorker(options: CoverageOptions | undefined,
 declare function takeCoverageInsideWorker(options: CoverageOptions | undefined, loader: Loader): Promise<unknown>;
 declare function stopCoverageInsideWorker(options: CoverageOptions | undefined, loader: Loader): Promise<unknown>;
 
-export { getCoverageProvider, setupCommonEnv, startCoverageInsideWorker, stopCoverageInsideWorker, takeCoverageInsideWorker };
+export { getCoverageProvider, loadDiffConfig, setupCommonEnv, startCoverageInsideWorker, stopCoverageInsideWorker, takeCoverageInsideWorker };

package/dist/browser.js

@@ -13,11 +13,20 @@ async function setupCommonEnv(config) {
   globalSetup = true;
   setSafeTimers();
   if (config.globals)
-    (await import('./chunk-integrations-globals.09bbbed7.js')).registerApiGlobally();
+    (await import('./chunk-integrations-globals.5afac659.js')).registerApiGlobally();
 }
 function setupDefines(defines) {
   for (const key in defines)
     globalThis[key] = defines[key];
 }
+async function loadDiffConfig(config, executor) {
+  if (typeof config.diff !== "string")
+    return;
+  const diffModule = await executor.executeId(config.diff);
+  if (diffModule && typeof diffModule.default === "object" && diffModule.default != null)
+    return diffModule.default;
+  else
+    throw new Error(`invalid diff config file ${config.diff}. Must have a default export with config object`);
+}
 
-export { setupCommonEnv };
+export { loadDiffConfig, setupCommonEnv };

package/dist/child.js

@@ -2,24 +2,24 @@ import { performance } from 'node:perf_hooks';
 import v8 from 'node:v8';
 import { c as createBirpc } from './vendor-index.b271ebe4.js';
 import { parseRegexp } from '@vitest/utils';
-import { l as loadEnvironment } from './vendor-environments.c9c96bf7.js';
-import { s as startViteNode, m as moduleCache, a as mockMap } from './vendor-execute.a63e187f.js';
+import { l as loadEnvironment } from './vendor-environments.7aba93d9.js';
+import { s as startViteNode, m as moduleCache, a as mockMap } from './vendor-execute.07d1a420.js';
 import { r as rpcDone, c as createSafeRpc } from './vendor-rpc.cbd8e972.js';
 import { s as setupInspect } from './vendor-inspector.47fc8cbb.js';
-import 'node:url';
 import 'pathe';
 import './vendor-index.0b5b3600.js';
 import 'acorn';
 import 'node:module';
 import 'node:fs';
+import 'node:url';
 import 'node:assert';
 import 'node:process';
 import 'node:path';
 import 'node:util';
+import 'vite-node/client';
 import 'node:console';
 import 'local-pkg';
 import 'node:vm';
-import 'vite-node/client';
 import 'vite-node/utils';
 import '@vitest/utils/error';
 import './vendor-paths.84fc7a99.js';
@@ -36,7 +36,7 @@ async function init(ctx) {
   const onCancel = new Promise((resolve) => {
     setCancel = resolve;
   });
-  const rpc = createBirpc(
+  const rpc = createSafeRpc(createBirpc(
     {
       onCancel: setCancel
     },
@@ -52,8 +52,12 @@ async function init(ctx) {
         process.on("message", fn);
       }
     }
-  );
-  const environment = await loadEnvironment(ctx.environment.name, ctx.config.root);
+  ));
+  const environment = await loadEnvironment(ctx.environment.name, {
+    root: ctx.config.root,
+    fetchModule: (id) => rpc.fetch(id, "ssr"),
+    resolveId: (id, importer) => rpc.resolveId(id, importer, "ssr")
+  });
   if (ctx.environment.transformMode)
     environment.transformMode = ctx.environment.transformMode;
   const state = {
@@ -67,7 +71,7 @@ async function init(ctx) {
       environment: 0,
       prepare: performance.now()
     },
-    rpc: createSafeRpc(rpc)
+    rpc
   };
   globalThis.__vitest_worker__ = state;
   if (ctx.invalidates) {

package/dist/{chunk-install-pkg.b2bdbadc.js → chunk-install-pkg.6c4f388a.js}

@@ -3,8 +3,8 @@ import f from 'path';
 import { g as getDefaultExportFromCjs } from './vendor-_commonjsHelpers.7d1333e8.js';
 import require$$2 from 'util';
 import require$$0$1 from 'child_process';
-import { p as pathKeyExports, s as signalExitExports, m as mergeStream$1, g as getStreamExports, c as crossSpawnExports } from './vendor-index.1f85e5f1.js';
-import { o as onetimeExports } from './vendor-node.b14cb9ad.js';
+import { p as pathKeyExports, s as signalExitExports, m as mergeStream$1, g as getStreamExports, c as crossSpawnExports } from './vendor-index.85fc950a.js';
+import { o as onetimeExports } from './vendor-node.a7c48fe1.js';
 import require$$0 from 'os';
 import 'node:buffer';
 import 'node:path';
@@ -51,7 +51,7 @@ import 'acorn';
 import 'acorn-walk';
 import 'magic-string';
 import 'strip-literal';
-import './vendor-environments.c9c96bf7.js';
+import './vendor-environments.7aba93d9.js';
 import './vendor-index.0b5b3600.js';
 import 'node:assert';
 import 'node:console';

package/dist/{chunk-integrations-globals.09bbbed7.js → chunk-integrations-globals.5afac659.js}

@@ -1,7 +1,7 @@
 import { g as globalApis } from './vendor-constants.538d9b49.js';
-import { i as index } from './vendor-index.e951dd92.js';
+import { i as index } from './vendor-index.7646b3af.js';
 import '@vitest/runner';
-import './vendor-vi.befc11a6.js';
+import './vendor-vi.6873a1c1.js';
 import '@vitest/runner/utils';
 import '@vitest/utils';
 import './vendor-index.29282562.js';

package/dist/{chunk-node-git.c410fed8.js → chunk-node-git.36288174.js}

@@ -1,5 +1,5 @@
 import { resolve } from 'pathe';
-import { e as execa } from './vendor-index.1f85e5f1.js';
+import { e as execa } from './vendor-index.85fc950a.js';
 import 'node:buffer';
 import 'node:path';
 import 'node:child_process';

package/dist/cli-wrapper.js

@@ -1,6 +1,6 @@
 import { fileURLToPath } from 'node:url';
 import c from 'picocolors';
-import { e as execa } from './vendor-index.1f85e5f1.js';
+import { e as execa } from './vendor-index.85fc950a.js';
 import { E as EXIT_CODE_RESTART } from './vendor-constants.538d9b49.js';
 import 'node:buffer';
 import 'node:path';

package/dist/cli.js

@@ -1,7 +1,7 @@
 import { normalize } from 'pathe';
 import cac from 'cac';
 import c from 'picocolors';
-import { v as version, s as startVitest } from './vendor-node.b14cb9ad.js';
+import { v as version, s as startVitest } from './vendor-node.a7c48fe1.js';
 import './vendor-index.29282562.js';
 import { d as divider } from './vendor-reporters.f6975b8d.js';
 import { t as toArray } from './vendor-base.9c08bbd0.js';
@@ -34,7 +34,7 @@ import '@vitest/utils';
 import 'local-pkg';
 import 'std-env';
 import 'node:crypto';
-import './vendor-index.1f85e5f1.js';
+import './vendor-index.85fc950a.js';
 import 'node:buffer';
 import 'child_process';
 import 'assert';
@@ -48,7 +48,7 @@ import 'acorn-walk';
 import '@vitest/runner/utils';
 import 'magic-string';
 import 'strip-literal';
-import './vendor-environments.c9c96bf7.js';
+import './vendor-environments.7aba93d9.js';
 import './vendor-index.0b5b3600.js';
 import 'node:module';
 import 'node:assert';
@@ -60,7 +60,7 @@ import 'node:perf_hooks';
 import './vendor-tasks.f9d75aed.js';
 
 const cli = cac("vitest");
-cli.version(version).option("-r, --root <path>", "Root path").option("-c, --config <path>", "Path to config file").option("-u, --update", "Update snapshot").option("-w, --watch", "Enable watch mode").option("-t, --testNamePattern <pattern>", "Run tests with full names matching the specified regexp pattern").option("--dir <path>", "Base directory to scan for the test files").option("--ui", "Enable UI").option("--open", "Open UI automatically (default: !process.env.CI))").option("--api [api]", "Serve API, available options: --api.port <port>, --api.host [host] and --api.strictPort").option("--threads", "Enabled threads (default: true)").option("--single-thread", "Run tests inside a single thread, requires --threads (default: false)").option("--experimental-vm-threads", "Run tests in a worker pool using VM isolation (default: false)").option("--experimental-vm-worker-memory-limit", "Set the maximum allowed memory for a worker. When reached, a new worker will be created instead").option("--silent", "Silent console output from tests").option("--hideSkippedTests", "Hide logs for skipped tests").option("--isolate", "Isolate environment for each test file (default: true)").option("--reporter <name>", "Specify reporters").option("--outputFile <filename/-s>", "Write test results to a file when supporter reporter is also specified, use cac's dot notation for individual outputs of multiple reporters").option("--coverage", "Enable coverage report").option("--run", "Disable watch mode").option("--mode <name>", "Override Vite mode (default: test)").option("--globals", "Inject apis globally").option("--dom", "Mock browser api with happy-dom").option("--browser [options]", "Run tests in the browser (default: false)").option("--environment <env>", "Specify runner environment, if not running in the browser (default: node)").option("--passWithNoTests", "Pass when no tests found").option("--logHeapUsage", "Show the size of heap for each test").option("--allowOnly", "Allow tests and suites that are marked as only (default: !process.env.CI)").option("--dangerouslyIgnoreUnhandledErrors", "Ignore any unhandled errors that occur").option("--shard <shard>", "Test suite shard to execute in a format of <index>/<count>").option("--changed [since]", "Run tests that are affected by the changed files (default: false)").option("--sequence <options>", "Define in what order to run tests (use --sequence.shuffle to run tests in random order, use --sequence.concurrent to run tests in parallel)").option("--segfaultRetry <times>", "Return tests on segment fault (default: 0)", { default: 0 }).option("--no-color", "Removes colors from the console output").option("--inspect", "Enable Node.js inspector").option("--inspect-brk", "Enable Node.js inspector with break").option("--test-timeout <time>", "Default timeout of a test in milliseconds (default: 5000)").option("--bail <number>", "Stop test execution when given number of tests have failed", { default: 0 }).option("--retry <times>", "Retry the test specific number of times if it fails", { default: 0 }).help();
+cli.version(version).option("-r, --root <path>", "Root path").option("-c, --config <path>", "Path to config file").option("-u, --update", "Update snapshot").option("-w, --watch", "Enable watch mode").option("-t, --testNamePattern <pattern>", "Run tests with full names matching the specified regexp pattern").option("--dir <path>", "Base directory to scan for the test files").option("--ui", "Enable UI").option("--open", "Open UI automatically (default: !process.env.CI))").option("--api [api]", "Serve API, available options: --api.port <port>, --api.host [host] and --api.strictPort").option("--threads", "Enabled threads (default: true)").option("--single-thread", "Run tests inside a single thread, requires --threads (default: false)").option("--experimental-vm-threads", "Run tests in a worker pool using VM isolation (default: false)").option("--experimental-vm-worker-memory-limit", "Set the maximum allowed memory for a worker. When reached, a new worker will be created instead").option("--silent", "Silent console output from tests").option("--hideSkippedTests", "Hide logs for skipped tests").option("--isolate", "Isolate environment for each test file (default: true)").option("--reporter <name>", "Specify reporters").option("--outputFile <filename/-s>", "Write test results to a file when supporter reporter is also specified, use cac's dot notation for individual outputs of multiple reporters").option("--coverage", "Enable coverage report").option("--run", "Disable watch mode").option("--mode <name>", "Override Vite mode (default: test)").option("--globals", "Inject apis globally").option("--dom", "Mock browser api with happy-dom").option("--browser [options]", "Run tests in the browser (default: false)").option("--environment <env>", "Specify runner environment, if not running in the browser (default: node)").option("--passWithNoTests", "Pass when no tests found").option("--logHeapUsage", "Show the size of heap for each test").option("--allowOnly", "Allow tests and suites that are marked as only (default: !process.env.CI)").option("--dangerouslyIgnoreUnhandledErrors", "Ignore any unhandled errors that occur").option("--shard <shard>", "Test suite shard to execute in a format of <index>/<count>").option("--changed [since]", "Run tests that are affected by the changed files (default: false)").option("--sequence <options>", "Define in what order to run tests (use --sequence.shuffle to run tests in random order, use --sequence.concurrent to run tests in parallel)").option("--segfaultRetry <times>", "Return tests on segment fault (default: 0)", { default: 0 }).option("--no-color", "Removes colors from the console output").option("--inspect", "Enable Node.js inspector").option("--inspect-brk", "Enable Node.js inspector with break").option("--test-timeout <time>", "Default timeout of a test in milliseconds (default: 5000)").option("--bail <number>", "Stop test execution when given number of tests have failed", { default: 0 }).option("--retry <times>", "Retry the test specific number of times if it fails", { default: 0 }).option("--diff <path>", "Path to a diff config that will be used to generate diff interface").help();
 cli.command("run [...filters]").action(run);
 cli.command("related [...filters]").action(runRelated);
 cli.command("watch [...filters]").action(watch);

package/dist/config.d.ts

@@ -1,6 +1,6 @@
 import { UserConfig as UserConfig$1, ConfigEnv } from 'vite';
 export { ConfigEnv, UserConfig, mergeConfig } from 'vite';
-import { c as ResolvedCoverageOptions, U as UserConfig, d as CoverageV8Options, P as ProjectConfig } from './reporters-cb94c88b.js';
+import { a as ResolvedCoverageOptions, U as UserConfig, C as CoverageV8Options, P as ProjectConfig } from './reporters-5f784f42.js';
 import '@vitest/runner';
 import 'vite-node';
 import '@vitest/snapshot';

package/dist/coverage.d.ts

@@ -1,4 +1,4 @@
-import { B as BaseCoverageOptions, c as ResolvedCoverageOptions } from './reporters-cb94c88b.js';
+import { B as BaseCoverageOptions, a as ResolvedCoverageOptions } from './reporters-5f784f42.js';
 import 'vite';
 import '@vitest/runner';
 import 'vite-node';

package/dist/entry-vm.js

@@ -3,10 +3,10 @@ import { createRequire } from 'node:module';
 import { performance } from 'node:perf_hooks';
 import { startTests } from '@vitest/runner';
 import { setupColors, createColors } from '@vitest/utils';
-import { V as VitestSnapshotEnvironment, s as setupChaiConfig, r as resolveTestRunner } from './vendor-index.9378c9a4.js';
+import { V as VitestSnapshotEnvironment, s as setupChaiConfig, r as resolveTestRunner } from './vendor-index.3e351f42.js';
 import { s as startCoverageInsideWorker, a as stopCoverageInsideWorker } from './vendor-coverage.78040316.js';
 import { g as getWorkerState } from './vendor-global.97e4527c.js';
-import { i as index } from './vendor-index.e951dd92.js';
+import { i as index } from './vendor-index.7646b3af.js';
 import { setupCommonEnv } from './browser.js';
 import 'chai';
 import '@vitest/snapshot/environment';
@@ -14,7 +14,7 @@ import 'pathe';
 import './vendor-paths.84fc7a99.js';
 import 'node:url';
 import './vendor-rpc.cbd8e972.js';
-import './vendor-vi.befc11a6.js';
+import './vendor-vi.6873a1c1.js';
 import '@vitest/runner/utils';
 import './vendor-index.29282562.js';
 import 'std-env';

package/dist/entry.js

@@ -1,14 +1,14 @@
 import { performance } from 'node:perf_hooks';
 import { startTests } from '@vitest/runner';
 import './vendor-index.29282562.js';
-import { d as globalExpect, r as resetModules, v as vi } from './vendor-vi.befc11a6.js';
+import { d as globalExpect, r as resetModules, v as vi } from './vendor-vi.6873a1c1.js';
 import { s as startCoverageInsideWorker, a as stopCoverageInsideWorker } from './vendor-coverage.78040316.js';
-import { V as VitestSnapshotEnvironment, s as setupChaiConfig, r as resolveTestRunner } from './vendor-index.9378c9a4.js';
+import { V as VitestSnapshotEnvironment, s as setupChaiConfig, r as resolveTestRunner } from './vendor-index.3e351f42.js';
 import { createRequire } from 'node:module';
 import { isatty } from 'node:tty';
 import { installSourcemapsSupport } from 'vite-node/source-map';
 import { setupColors, createColors, getSafeTimers } from '@vitest/utils';
-import { i as index } from './vendor-index.e951dd92.js';
+import { i as index } from './vendor-index.7646b3af.js';
 import { setupCommonEnv } from './browser.js';
 import { g as getWorkerState } from './vendor-global.97e4527c.js';
 import 'pathe';

package/dist/environments.d.ts

@@ -1,4 +1,4 @@
-import { E as Environment } from './reporters-cb94c88b.js';
+import { E as Environment } from './reporters-5f784f42.js';
 import 'vite';
 import '@vitest/runner';
 import 'vite-node';

package/dist/environments.js

@@ -1,14 +1,15 @@
-export { e as builtinEnvironments, p as populateGlobal } from './vendor-environments.c9c96bf7.js';
-import 'node:url';
+export { e as builtinEnvironments, p as populateGlobal } from './vendor-environments.7aba93d9.js';
 import 'pathe';
 import './vendor-index.0b5b3600.js';
 import 'acorn';
 import 'node:module';
 import 'node:fs';
+import 'node:url';
 import 'node:assert';
 import 'node:process';
 import 'node:path';
 import 'node:v8';
 import 'node:util';
+import 'vite-node/client';
 import 'node:console';
 import 'local-pkg';

package/dist/execute.d.ts

@@ -1,7 +1,7 @@
 import vm from 'node:vm';
 import { ViteNodeRunner } from 'vite-node/client';
 import { ViteNodeRunnerOptions } from 'vite-node';
-import { h as PendingSuiteMock, M as MockFactory, i as WorkerGlobalState, j as MockMap, k as RuntimeRPC } from './reporters-cb94c88b.js';
+import { ag as PendingSuiteMock, ah as MockFactory, Z as WorkerGlobalState, ai as MockMap, K as RuntimeRPC } from './reporters-5f784f42.js';
 import 'vite';
 import '@vitest/runner';
 import '@vitest/snapshot';

package/dist/execute.js

@@ -1,4 +1,4 @@
-export { V as VitestExecutor } from './vendor-execute.a63e187f.js';
+export { V as VitestExecutor } from './vendor-execute.07d1a420.js';
 import 'node:url';
 import 'node:vm';
 import 'vite-node/client';

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { Test, File, TaskResultPack, CancelReason } from '@vitest/runner';
 export { DoneCallback, File, HookCleanupCallback, HookListener, OnTestFailedHandler, RunMode, RuntimeContext, SequenceHooks, SequenceSetupFiles, Suite, SuiteAPI, SuiteCollector, SuiteFactory, SuiteHooks, Task, TaskBase, TaskMeta, TaskResult, TaskResultPack, TaskState, Test, TestAPI, TestContext, TestFunction, TestOptions, afterAll, afterEach, beforeAll, beforeEach, describe, it, onTestFailed, suite, test } from '@vitest/runner';
-import { l as BenchmarkAPI, F as FakeTimerInstallOpts, m as MockFactoryWithHelper, n as RuntimeConfig, A as AfterSuiteRunMeta, o as UserConsoleLog, R as ResolvedConfig, p as ModuleGraphData, q as Reporter } from './reporters-cb94c88b.js';
-export { I as ApiConfig, a4 as ArgumentsType, a3 as Arrayable, a1 as Awaitable, B as BaseCoverageOptions, ai as BenchFunction, ag as Benchmark, ah as BenchmarkResult, af as BenchmarkUserOptions, y as BuiltinEnvironment, G as CSSModuleScopeStrategy, u as CollectLineNumbers, v as CollectLines, a6 as Constructable, x as Context, Z as ContextRPC, X as ContextTestEnvironment, ad as CoverageIstanbulOptions, C as CoverageOptions, a as CoverageProvider, b as CoverageProviderModule, ac as CoverageReporter, d as CoverageV8Options, ae as CustomProviderOptions, L as DepsOptimizationOptions, E as Environment, K as EnvironmentOptions, a8 as EnvironmentReturn, H as HappyDOMOptions, O as InlineConfig, J as JSDOMOptions, a7 as ModuleCache, a5 as MutableArray, a2 as Nullable, aa as OnServerRestartHandler, P as ProjectConfig, r as RawErrsMap, ab as ReportContext, $ as ResolveIdFunction, c as ResolvedCoverageOptions, Y as ResolvedTestEnvironment, w as RootAndTarget, S as RunnerRPC, k as RuntimeRPC, N as TransformModePatterns, t as TscErrorInfo, Q as TypecheckConfig, U as UserConfig, e as Vitest, z as VitestEnvironment, D as VitestPool, V as VitestRunMode, a9 as VmEnvironmentReturn, _ as WorkerContext, i as WorkerGlobalState, a0 as WorkerRPC } from './reporters-cb94c88b.js';
+import { h as BenchmarkAPI, F as FakeTimerInstallOpts, M as MockFactoryWithHelper, i as RuntimeConfig, A as AfterSuiteRunMeta, j as UserConsoleLog, R as ResolvedConfig, k as ModuleGraphData, l as Reporter } from './reporters-5f784f42.js';
+export { x as ApiConfig, a1 as ArgumentsType, a0 as Arrayable, _ as Awaitable, B as BaseCoverageOptions, af as BenchFunction, ad as Benchmark, ae as BenchmarkResult, ac as BenchmarkUserOptions, t as BuiltinEnvironment, w as CSSModuleScopeStrategy, o as CollectLineNumbers, p as CollectLines, a3 as Constructable, r as Context, Q as ContextRPC, N as ContextTestEnvironment, aa as CoverageIstanbulOptions, e as CoverageOptions, f as CoverageProvider, g as CoverageProviderModule, a9 as CoverageReporter, C as CoverageV8Options, ab as CustomProviderOptions, D as DepsOptimizationOptions, E as Environment, y as EnvironmentOptions, a5 as EnvironmentReturn, H as HappyDOMOptions, I as InlineConfig, J as JSDOMOptions, a4 as ModuleCache, a2 as MutableArray, $ as Nullable, a7 as OnServerRestartHandler, P as ProjectConfig, m as RawErrsMap, a8 as ReportContext, X as ResolveIdFunction, a as ResolvedCoverageOptions, O as ResolvedTestEnvironment, q as RootAndTarget, L as RunnerRPC, K as RuntimeRPC, z as TransformModePatterns, n as TscErrorInfo, G as TypecheckConfig, U as UserConfig, b as Vitest, u as VitestEnvironment, v as VitestPool, V as VitestRunMode, a6 as VmEnvironmentReturn, S as WorkerContext, Z as WorkerGlobalState, Y as WorkerRPC } from './reporters-5f784f42.js';
 import { ExpectStatic } from '@vitest/expect';
 export { Assertion, AsymmetricMatchersContaining, ExpectStatic, JestAssertion } from '@vitest/expect';
 import { spyOn, fn, MaybeMockedDeep, MaybeMocked, MaybePartiallyMocked, MaybePartiallyMockedDeep, EnhancedSpy } from '@vitest/spy';
@@ -9,6 +9,7 @@ export { EnhancedSpy, Mock, MockContext, MockInstance, Mocked, MockedClass, Mock
 export { SnapshotEnvironment } from '@vitest/snapshot/environment';
 import { SnapshotResult } from '@vitest/snapshot';
 export { SnapshotData, SnapshotMatchOptions, SnapshotResult, SnapshotStateOptions, SnapshotSummary, SnapshotUpdateState, UncheckedSnapshot } from '@vitest/snapshot';
+export { DiffOptions } from '@vitest/utils/diff';
 import { TransformResult } from 'vite';
 import * as chai from 'chai';
 export { chai };
@@ -207,7 +208,27 @@ declare function isFirstRun(): boolean;
 declare function createExpect(test?: Test): ExpectStatic;
 declare const globalExpect: ExpectStatic;
 
+type WaitForCallback<T> = () => T | Promise<T>;
+interface WaitForOptions {
+    /**
+     * @description Time in ms between each check callback
+     * @default 50ms
+     */
+    interval?: number;
+    /**
+     * @description Time in ms after which the throw a timeout error
+     * @default 1000ms
+     */
+    timeout?: number;
+}
+declare function waitFor<T>(callback: WaitForCallback<T>, options?: number | WaitForOptions): Promise<T>;
+type WaitUntilCallback<T> = () => T | Promise<T>;
+interface WaitUntilOptions extends Pick<WaitForOptions, 'interval' | 'timeout'> {
+}
+declare function waitUntil<T>(callback: WaitUntilCallback<T>, options?: number | WaitUntilOptions): Promise<T>;
+
 interface VitestUtils {
+    isFakeTimers(): boolean;
     useFakeTimers(config?: FakeTimerInstallOpts): this;
     useRealTimers(): this;
     runOnlyPendingTimers(): this;
@@ -226,6 +247,8 @@ interface VitestUtils {
     clearAllTimers(): this;
     spyOn: typeof spyOn;
     fn: typeof fn;
+    waitFor: typeof waitFor;
+    waitUntil: typeof waitUntil;
     /**
      * Run the factory before imports are evaluated. You can return a value from the factory
      * to reuse it inside your `vi.mock` factory and tests.
@@ -351,7 +374,7 @@ interface VitestUtils {
 declare const vitest: VitestUtils;
 declare const vi: VitestUtils;
 
-declare function getRunningMode(): "watch" | "run";
+declare function getRunningMode(): "run" | "watch";
 declare function isWatchMode(): boolean;
 
 interface TransformResultWithSource extends TransformResult {

package/dist/index.js

@@ -1,8 +1,8 @@
 export { afterAll, afterEach, beforeAll, beforeEach, describe, it, onTestFailed, suite, test } from '@vitest/runner';
-export { e as bench, c as createExpect, d as expect, v as vi, f as vitest } from './vendor-vi.befc11a6.js';
+export { e as bench, c as createExpect, d as expect, v as vi, f as vitest } from './vendor-vi.6873a1c1.js';
 export { i as isFirstRun, r as runOnce } from './vendor-run-once.3e5ef7d7.js';
-import { d as dist } from './vendor-index.e951dd92.js';
-export { b as assertType, g as getRunningMode, a as isWatchMode } from './vendor-index.e951dd92.js';
+import { d as dist } from './vendor-index.7646b3af.js';
+export { b as assertType, g as getRunningMode, a as isWatchMode } from './vendor-index.7646b3af.js';
 import * as chai from 'chai';
 export { chai };
 export { assert, should } from 'chai';

package/dist/node.d.ts

@@ -1,5 +1,5 @@
-import { V as VitestRunMode, U as UserConfig, e as Vitest, T as TestSequencer, W as WorkspaceSpec } from './reporters-cb94c88b.js';
-export { g as TestSequencerConstructor, f as VitestWorkspace, s as startVitest } from './reporters-cb94c88b.js';
+import { V as VitestRunMode, U as UserConfig, b as Vitest, T as TestSequencer, W as WorkspaceSpec } from './reporters-5f784f42.js';
+export { d as TestSequencerConstructor, c as VitestWorkspace, s as startVitest } from './reporters-5f784f42.js';
 import { UserConfig as UserConfig$1, Plugin } from 'vite';
 import '@vitest/runner';
 import 'vite-node';

package/dist/node.js

@@ -1,4 +1,4 @@
-export { B as BaseSequencer, V as VitestPlugin, c as createVitest, r as registerConsoleShortcuts, s as startVitest } from './vendor-node.b14cb9ad.js';
+export { B as BaseSequencer, V as VitestPlugin, c as createVitest, r as registerConsoleShortcuts, s as startVitest } from './vendor-node.a7c48fe1.js';
 import 'pathe';
 import 'vite';
 import 'node:path';
@@ -39,7 +39,7 @@ import './vendor-tasks.f9d75aed.js';
 import '@vitest/utils/source-map';
 import 'node:module';
 import 'node:crypto';
-import './vendor-index.1f85e5f1.js';
+import './vendor-index.85fc950a.js';
 import 'node:buffer';
 import 'child_process';
 import 'assert';
@@ -51,7 +51,7 @@ import 'acorn';
 import 'acorn-walk';
 import 'magic-string';
 import 'strip-literal';
-import './vendor-environments.c9c96bf7.js';
+import './vendor-environments.7aba93d9.js';
 import './vendor-index.0b5b3600.js';
 import 'node:assert';
 import 'node:console';

package/dist/{reporters-cb94c88b.d.ts → reporters-5f784f42.d.ts}

@@ -463,6 +463,7 @@ declare class WorkspaceProject {
     constructor(path: string | number, ctx: Vitest);
     getName(): string;
     isCore(): boolean;
+    getModulesByFilepath(file: string): Set<vite.ModuleNode>;
     getModuleById(id: string): vite.ModuleNode | undefined;
     getSourceMapModuleById(id: string): rollup.SourceMap | null | undefined;
     getBrowserSourceMapModuleById(id: string): rollup.SourceMap | null | undefined;
@@ -1354,6 +1355,12 @@ interface BaseCoverageOptions {
      * @default false
      */
     allowExternal?: boolean;
+    /**
+     * Shortcut for `{ lines: 100, functions: 100, branches: 100, statements: 100 }`
+     *
+     * @default false
+     */
+    100?: boolean;
 }
 interface CoverageIstanbulOptions extends BaseCoverageOptions {
     /**
@@ -1364,12 +1371,6 @@ interface CoverageIstanbulOptions extends BaseCoverageOptions {
     ignoreClassMethods?: string[];
 }
 interface CoverageV8Options extends BaseCoverageOptions {
-    /**
-     * Shortcut for `--check-coverage --lines 100 --functions 100 --branches 100 --statements 100`
-     *
-     * @default false
-     */
-    100?: boolean;
 }
 interface CustomProviderOptions extends Pick<BaseCoverageOptions, FieldsWithDefaultValues> {
     /** Name of the module or path to a file to load the custom provider from */
@@ -1470,6 +1471,9 @@ interface HappyDOMOptions {
         disableIframePageLoading?: boolean;
         disableComputedStyleRendering?: boolean;
         enableFileSystemHttpRequests?: boolean;
+        navigator?: {
+            userAgent?: string;
+        };
         device?: {
             prefersColorScheme?: string;
             mediaType?: string;
@@ -1985,6 +1989,10 @@ interface InlineConfig {
      * Format options for snapshot testing.
      */
     snapshotFormat?: PrettyFormatOptions;
+    /**
+     * Path to a module which has a default export of diff config.
+     */
+    diff?: string;
     /**
      * Resolve custom snapshot path
      */
@@ -2287,4 +2295,4 @@ type Context = RootAndTarget & {
     lastActivePath?: string;
 };
 
-export { ResolveIdFunction as $, AfterSuiteRunMeta as A, BaseCoverageOptions as B, CoverageOptions as C, VitestPool as D, Environment as E, FakeTimerInstallOpts as F, CSSModuleScopeStrategy as G, HappyDOMOptions as H, ApiConfig as I, JSDOMOptions as J, EnvironmentOptions as K, DepsOptimizationOptions as L, MockFactory as M, TransformModePatterns as N, InlineConfig as O, ProjectConfig as P, TypecheckConfig as Q, ResolvedConfig as R, RunnerRPC as S, TestSequencer as T, UserConfig as U, VitestRunMode as V, WorkspaceSpec as W, ContextTestEnvironment as X, ResolvedTestEnvironment as Y, ContextRPC as Z, WorkerContext as _, CoverageProvider as a, WorkerRPC as a0, Awaitable as a1, Nullable as a2, Arrayable as a3, ArgumentsType$1 as a4, MutableArray as a5, Constructable as a6, ModuleCache as a7, EnvironmentReturn as a8, VmEnvironmentReturn as a9, OnServerRestartHandler as aa, ReportContext as ab, CoverageReporter as ac, CoverageIstanbulOptions as ad, CustomProviderOptions as ae, BenchmarkUserOptions as af, Benchmark as ag, BenchmarkResult as ah, BenchFunction as ai, DefaultReporter as aj, BasicReporter as ak, DotReporter as al, JsonReporter$1 as am, VerboseReporter as an, TapReporter as ao, JUnitReporter as ap, TapFlatReporter as aq, HangingProcessReporter as ar, BaseReporter as as, ReportersMap as at, BuiltinReporters as au, BenchmarkReportsMap as av, BenchmarkBuiltinReporters as aw, CoverageProviderModule as b, ResolvedCoverageOptions as c, CoverageV8Options as d, Vitest as e, WorkspaceProject as f, TestSequencerConstructor as g, PendingSuiteMock as h, WorkerGlobalState as i, MockMap as j, RuntimeRPC as k, BenchmarkAPI as l, MockFactoryWithHelper as m, RuntimeConfig as n, UserConsoleLog as o, ModuleGraphData as p, Reporter as q, RawErrsMap as r, startVitest as s, TscErrorInfo as t, CollectLineNumbers as u, CollectLines as v, RootAndTarget as w, Context as x, BuiltinEnvironment as y, VitestEnvironment as z };
+export { Nullable as $, AfterSuiteRunMeta as A, BaseCoverageOptions as B, CoverageV8Options as C, DepsOptimizationOptions as D, Environment as E, FakeTimerInstallOpts as F, TypecheckConfig as G, HappyDOMOptions as H, InlineConfig as I, JSDOMOptions as J, RuntimeRPC as K, RunnerRPC as L, MockFactoryWithHelper as M, ContextTestEnvironment as N, ResolvedTestEnvironment as O, ProjectConfig as P, ContextRPC as Q, ResolvedConfig as R, WorkerContext as S, TestSequencer as T, UserConfig as U, VitestRunMode as V, WorkspaceSpec as W, ResolveIdFunction as X, WorkerRPC as Y, WorkerGlobalState as Z, Awaitable as _, ResolvedCoverageOptions as a, Arrayable as a0, ArgumentsType$1 as a1, MutableArray as a2, Constructable as a3, ModuleCache as a4, EnvironmentReturn as a5, VmEnvironmentReturn as a6, OnServerRestartHandler as a7, ReportContext as a8, CoverageReporter as a9, CoverageIstanbulOptions as aa, CustomProviderOptions as ab, BenchmarkUserOptions as ac, Benchmark as ad, BenchmarkResult as ae, BenchFunction as af, PendingSuiteMock as ag, MockFactory as ah, MockMap as ai, DefaultReporter as aj, BasicReporter as ak, DotReporter as al, JsonReporter$1 as am, VerboseReporter as an, TapReporter as ao, JUnitReporter as ap, TapFlatReporter as aq, HangingProcessReporter as ar, BaseReporter as as, ReportersMap as at, BuiltinReporters as au, BenchmarkReportsMap as av, BenchmarkBuiltinReporters as aw, Vitest as b, WorkspaceProject as c, TestSequencerConstructor as d, CoverageOptions as e, CoverageProvider as f, CoverageProviderModule as g, BenchmarkAPI as h, RuntimeConfig as i, UserConsoleLog as j, ModuleGraphData as k, Reporter as l, RawErrsMap as m, TscErrorInfo as n, CollectLineNumbers as o, CollectLines as p, RootAndTarget as q, Context as r, startVitest as s, BuiltinEnvironment as t, VitestEnvironment as u, VitestPool as v, CSSModuleScopeStrategy as w, ApiConfig as x, EnvironmentOptions as y, TransformModePatterns as z };

package/dist/reporters.d.ts

@@ -1,4 +1,4 @@
-export { as as BaseReporter, ak as BasicReporter, aw as BenchmarkBuiltinReporters, av as BenchmarkReportsMap, au as BuiltinReporters, aj as DefaultReporter, al as DotReporter, ar as HangingProcessReporter, ap as JUnitReporter, am as JsonReporter, q as Reporter, at as ReportersMap, aq as TapFlatReporter, ao as TapReporter, an as VerboseReporter } from './reporters-cb94c88b.js';
+export { as as BaseReporter, ak as BasicReporter, aw as BenchmarkBuiltinReporters, av as BenchmarkReportsMap, au as BuiltinReporters, aj as DefaultReporter, al as DotReporter, ar as HangingProcessReporter, ap as JUnitReporter, am as JsonReporter, l as Reporter, at as ReportersMap, aq as TapFlatReporter, ao as TapReporter, an as VerboseReporter } from './reporters-5f784f42.js';
 import 'vite';
 import '@vitest/runner';
 import 'vite-node';

package/dist/runners.d.ts

@@ -1,5 +1,5 @@
 import { VitestRunner, VitestRunnerImportSource, Suite, Test, CancelReason, TestContext } from '@vitest/runner';
-import { R as ResolvedConfig } from './reporters-cb94c88b.js';
+import { R as ResolvedConfig } from './reporters-5f784f42.js';
 import 'vite';
 import 'vite-node';
 import '@vitest/snapshot';

package/dist/runners.js

@@ -1,5 +1,5 @@
 import { setState, GLOBAL_EXPECT, getState } from '@vitest/expect';
-import { g as getSnapshotClient, c as createExpect, v as vi, a as getBenchOptions, b as getBenchFn } from './vendor-vi.befc11a6.js';
+import { g as getSnapshotClient, c as createExpect, v as vi, a as getBenchOptions, b as getBenchFn } from './vendor-vi.6873a1c1.js';
 import './vendor-index.29282562.js';
 import { a as rpc } from './vendor-rpc.cbd8e972.js';
 import { g as getFullName } from './vendor-tasks.f9d75aed.js';

package/dist/{vendor-environments.c9c96bf7.js → vendor-environments.7aba93d9.js}

@@ -1,6 +1,6 @@
-import { pathToFileURL } from 'node:url';
 import { resolve, normalize } from 'pathe';
 import { r as resolvePath } from './vendor-index.0b5b3600.js';
+import { ViteNodeRunner } from 'vite-node/client';
 import { Console } from 'node:console';
 import { importModule } from 'local-pkg';
 
@@ -350,8 +350,7 @@ const skipKeys = [
   "window",
   "self",
   "top",
-  "parent",
-  "URL"
+  "parent"
 ];
 function getWindowKeys(global, win) {
   const keys = new Set(KEYS.concat(Object.getOwnPropertyNames(win)).filter((k) => {
@@ -540,7 +539,12 @@ var happy = {
     const { Window } = await importModule("happy-dom");
     const win = new Window({
       ...happyDOM,
-      url: happyDOM.url || "http://localhost:3000"
+      console: console && globalThis.console ? globalThis.console : void 0,
+      url: happyDOM.url || "http://localhost:3000",
+      settings: {
+        ...happyDOM.settings,
+        disableErrorCapturing: true
+      }
     });
     win.Buffer = Buffer;
     if (typeof structuredClone !== "undefined" && !win.structuredClone)
@@ -559,7 +563,11 @@ var happy = {
     const win = new (GlobalWindow || Window)({
       ...happyDOM,
       console: console && global.console ? global.console : void 0,
-      url: happyDOM.url || "http://localhost:3000"
+      url: happyDOM.url || "http://localhost:3000",
+      settings: {
+        ...happyDOM.settings,
+        disableErrorCapturing: true
+      }
     });
     const { keys, originals } = populateGlobal(global, win, { bindFunctions: true });
     return {
@@ -636,11 +644,22 @@ function getEnvPackageName(env) {
     return envPackageNames[env];
   return `vitest-environment-${env}`;
 }
-async function loadEnvironment(name, root) {
+const _loaders = /* @__PURE__ */ new Map();
+async function createEnvironmentLoader(options) {
+  if (!_loaders.has(options.root)) {
+    const loader = new ViteNodeRunner(options);
+    await loader.executeId("/@vite/env");
+    _loaders.set(options.root, loader);
+  }
+  return _loaders.get(options.root);
+}
+async function loadEnvironment(name, options) {
   if (isBuiltinEnvironment(name))
     return environments[name];
+  const loader = await createEnvironmentLoader(options);
+  const root = loader.root;
   const packageId = name[0] === "." || name[0] === "/" ? resolve(root, name) : await resolvePath(`vitest-environment-${name}`, { url: [root] }) ?? resolve(root, name);
-  const pkg = await import(pathToFileURL(normalize(packageId)).href);
+  const pkg = await loader.executeId(normalize(packageId));
   if (!pkg || !pkg.default || typeof pkg.default !== "object") {
     throw new TypeError(
       `Environment "${name}" is not a valid environment. Path "${packageId}" should export default object with a "setup" or/and "setupVM" method.`

package/dist/{vendor-execute.a63e187f.js → vendor-execute.07d1a420.js}

@@ -337,6 +337,7 @@ ${c.green(`vi.mock("${mockpath}", async () => {
 }
 
 const _require = createRequire(import.meta.url);
+const requiresCache = /* @__PURE__ */ new WeakMap();
 class CommonjsExecutor {
   context;
   requireCache = /* @__PURE__ */ new Map();
@@ -354,7 +355,6 @@ class CommonjsExecutor {
     this.Module = class Module$1 {
       exports;
       isPreloading = false;
-      require;
       id;
       filename;
       loaded;
@@ -362,15 +362,22 @@ class CommonjsExecutor {
       children = [];
       path;
       paths = [];
-      constructor(id, parent) {
+      constructor(id = "", parent) {
         this.exports = primitives.Object.create(Object.prototype);
-        this.require = Module$1.createRequire(id);
         this.path = dirname(id);
         this.id = id;
         this.filename = id;
         this.loaded = false;
         this.parent = parent;
       }
+      get require() {
+        const require = requiresCache.get(this);
+        if (require)
+          return require;
+        const _require2 = Module$1.createRequire(this.id);
+        requiresCache.set(this, _require2);
+        return _require2;
+      }
       _compile(code, filename) {
         const cjsModule = Module$1.wrap(code);
         const script = new vm.Script(cjsModule, {

package/dist/{vendor-index.9378c9a4.js → vendor-index.3e351f42.js}

@@ -5,6 +5,7 @@ import { d as distDir } from './vendor-paths.84fc7a99.js';
 import { g as getWorkerState } from './vendor-global.97e4527c.js';
 import { a as rpc } from './vendor-rpc.cbd8e972.js';
 import { t as takeCoverageInsideWorker } from './vendor-coverage.78040316.js';
+import { loadDiffConfig } from './browser.js';
 
 function setupChaiConfig(config) {
   Object.assign(chai.config, config);
@@ -46,6 +47,7 @@ async function resolveTestRunner(config, executor) {
     testRunner.config = config;
   if (!testRunner.importFile)
     throw new Error('Runner must implement "importFile" method.');
+  testRunner.config.diffOptions = await loadDiffConfig(config, executor);
   const originalOnTaskUpdate = testRunner.onTaskUpdate;
   testRunner.onTaskUpdate = async (task) => {
     const p = rpc().onTaskUpdate(task);

package/dist/{vendor-index.e951dd92.js → vendor-index.7646b3af.js}

@@ -1,5 +1,5 @@
 import { afterAll, afterEach, beforeAll, beforeEach, describe, it, onTestFailed, suite, test } from '@vitest/runner';
-import { e as bench, c as createExpect, d as globalExpect, v as vi, f as vitest } from './vendor-vi.befc11a6.js';
+import { e as bench, c as createExpect, d as globalExpect, v as vi, f as vitest } from './vendor-vi.6873a1c1.js';
 import { i as isFirstRun, r as runOnce } from './vendor-run-once.3e5ef7d7.js';
 import * as chai from 'chai';
 import { assert, should } from 'chai';

package/dist/{vendor-index.1f85e5f1.js → vendor-index.85fc950a.js}

@@ -7,7 +7,7 @@ import require$$0$1 from 'child_process';
 import f from 'path';
 import $ from 'fs';
 import url from 'node:url';
-import os, { constants } from 'node:os';
+import nodeos__default, { constants } from 'node:os';
 import require$$0 from 'assert';
 import require$$2 from 'events';
 import { createWriteStream, createReadStream } from 'node:fs';
@@ -1626,7 +1626,7 @@ const setKillTimeout = (kill, signal, options, killResult) => {
 
 const shouldForceKill = (signal, {forceKillAfterTimeout}, killResult) => isSigterm(signal) && forceKillAfterTimeout !== false && killResult;
 
-const isSigterm = signal => signal === os.constants.signals.SIGTERM
+const isSigterm = signal => signal === nodeos__default.constants.signals.SIGTERM
 		|| (typeof signal === 'string' && signal.toUpperCase() === 'SIGTERM');
 
 const getForceKillAfterTimeout = ({forceKillAfterTimeout = true}) => {

package/dist/{vendor-node.b14cb9ad.js → vendor-node.a7c48fe1.js}

@@ -25,14 +25,15 @@ import { fork } from 'node:child_process';
 import { c as createBirpc } from './vendor-index.b271ebe4.js';
 import { g as groupBy, A as AggregateErrorPonyfill, s as slash$1, t as toArray, i as isPrimitive, d as deepMerge, n as noop$1, a as stdout } from './vendor-base.9c08bbd0.js';
 import { MessageChannel } from 'node:worker_threads';
-import { cpus, totalmem } from 'node:os';
+import * as nodeos from 'node:os';
+import { totalmem } from 'node:os';
 import Tinypool from 'tinypool';
 import { createDefer, shuffle, inspect, positionToOffset, lineSplitRE, notNullish } from '@vitest/utils';
 import { isPackageExists, resolveModule } from 'local-pkg';
 import { isCI } from 'std-env';
 import { R as ReportersMap, B as BenchmarkReportsMap, s as stringWidth, a as ansiStyles, b as stripAnsi, c as sliceAnsi, d as divider, F as F_POINTER, e as cliTruncate } from './vendor-reporters.f6975b8d.js';
 import crypto, { createHash } from 'node:crypto';
-import { o as onExit, e as execa } from './vendor-index.1f85e5f1.js';
+import { o as onExit, e as execa } from './vendor-index.85fc950a.js';
 import { TraceMap, generatedPositionFor, parseErrorStacktrace } from '@vitest/utils/source-map';
 import { writeFile, rm } from 'node:fs/promises';
 import ue from 'module';
@@ -41,7 +42,7 @@ import { ancestor, simple, findNodeAround } from 'acorn-walk';
 import { generateHash, calculateSuiteHash, someTasksAreOnly, interpretTaskModes, getTasks, hasFailed } from '@vitest/runner/utils';
 import MagicString from 'magic-string';
 import { stripLiteral } from 'strip-literal';
-import { g as getEnvPackageName } from './vendor-environments.c9c96bf7.js';
+import { g as getEnvPackageName } from './vendor-environments.7aba93d9.js';
 import readline from 'node:readline';
 import require$$0$2 from 'readline';
 
@@ -60,7 +61,7 @@ function _mergeNamespaces(n, m) {
   return Object.freeze(n);
 }
 
-var version$1 = "0.34.4";
+var version$1 = "0.34.6";
 
 const __dirname$1 = url.fileURLToPath(new URL(".", import.meta.url));
 async function ensurePackageInstalled(dependency, root) {
@@ -79,7 +80,7 @@ async function ensurePackageInstalled(dependency, root) {
     message: c.reset(`Do you want to install ${c.green(dependency)}?`)
   });
   if (install) {
-    await (await import('./chunk-install-pkg.b2bdbadc.js')).installPackage(dependency, { dev: true });
+    await (await import('./chunk-install-pkg.6c4f388a.js')).installPackage(dependency, { dev: true });
     process.stderr.write(c.yellow(`
 Package ${dependency} installed, re-run the command to start.
 `));
@@ -7286,7 +7287,8 @@ function createWorkerChannel$1(project) {
   return { workerPort, port };
 }
 function createThreadsPool(ctx, { execArgv, env }) {
-  const threadsCount = ctx.config.watch ? Math.max(Math.floor(cpus().length / 2), 1) : Math.max(cpus().length - 1, 1);
+  const numCpus = typeof nodeos.availableParallelism === "function" ? nodeos.availableParallelism() : nodeos.cpus().length;
+  const threadsCount = ctx.config.watch ? Math.max(Math.floor(numCpus / 2), 1) : Math.max(numCpus - 1, 1);
   const maxThreads = ctx.config.maxThreads ?? threadsCount;
   const minThreads = ctx.config.minThreads ?? threadsCount;
   const options = {
@@ -7503,7 +7505,8 @@ function createWorkerChannel(project) {
   return { workerPort, port };
 }
 function createVmThreadsPool(ctx, { execArgv, env }) {
-  const threadsCount = ctx.config.watch ? Math.max(Math.floor(cpus().length / 2), 1) : Math.max(cpus().length - 1, 1);
+  const numCpus = typeof nodeos.availableParallelism === "function" ? nodeos.availableParallelism() : nodeos.cpus().length;
+  const threadsCount = ctx.config.watch ? Math.max(Math.floor(numCpus / 2), 1) : Math.max(numCpus - 1, 1);
   const maxThreads = ctx.config.maxThreads ?? threadsCount;
   const minThreads = ctx.config.minThreads ?? threadsCount;
   const options = {
@@ -7967,7 +7970,8 @@ const config = {
 const configDefaults = Object.freeze(config);
 
 function getDefaultThreadsCount(config) {
-  return config.watch ? Math.max(Math.floor(cpus().length / 2), 1) : Math.max(cpus().length - 1, 1);
+  const numCpus = typeof nodeos.availableParallelism === "function" ? nodeos.availableParallelism() : nodeos.cpus().length;
+  return config.watch ? Math.max(Math.floor(numCpus / 2), 1) : Math.max(numCpus - 1, 1);
 }
 function getWorkerMemoryLimit(config) {
   if (config.experimentalVmWorkerMemoryLimit)
@@ -8403,6 +8407,12 @@ function resolveConfig(mode, options, viteConfig) {
     ...resolved.forceRerunTriggers,
     ...resolved.setupFiles
   ];
+  if (resolved.diff) {
+    resolved.diff = normalize(
+      resolveModule(resolved.diff, { paths: [resolved.root] }) ?? resolve(resolved.root, resolved.diff)
+    );
+    resolved.forceRerunTriggers.push(resolved.diff);
+  }
   resolved.api = resolveApiServerConfig(options);
   if (options.related)
     resolved.related = toArray(options.related).map((file) => resolve(resolved.root, file));
@@ -9011,7 +9021,7 @@ createLogUpdate(process$1.stdout);
 
 createLogUpdate(process$1.stderr);
 
-var version = "0.34.4";
+var version = "0.34.6";
 
 const A=r=>r!==null&&typeof r=="object",a=(r,t)=>Object.assign(new Error(`[${r}]: ${t}`),{code:r}),_$1="ERR_INVALID_PACKAGE_CONFIG",E="ERR_INVALID_PACKAGE_TARGET",I="ERR_PACKAGE_PATH_NOT_EXPORTED",R$1=/^\d+$/,O=/^(\.{1,2}|node_modules)$/i,w=/\/|\\/;var h=(r=>(r.Export="exports",r.Import="imports",r))(h||{});const f=(r,t,e,o,c)=>{if(t==null)return [];if(typeof t=="string"){const[n,...i]=t.split(w);if(n===".."||i.some(l=>O.test(l)))throw a(E,`Invalid "${r}" target "${t}" defined in the package config`);return [c?t.replace(/\*/g,c):t]}if(Array.isArray(t))return t.flatMap(n=>f(r,n,e,o,c));if(A(t)){for(const n of Object.keys(t)){if(R$1.test(n))throw a(_$1,"Cannot contain numeric property keys");if(n==="default"||o.includes(n))return f(r,t[n],e,o,c)}return []}throw a(E,`Invalid "${r}" target "${t}"`)},s="*",m=(r,t)=>{const e=r.indexOf(s),o=t.indexOf(s);return e===o?t.length>r.length:o>e};function d$1(r,t){if(!t.includes(s)&&r.hasOwnProperty(t))return [t];let e,o;for(const c of Object.keys(r))if(c.includes(s)){const[n,i,l]=c.split(s);if(l===void 0&&t.startsWith(n)&&t.endsWith(i)){const g=t.slice(n.length,-i.length||void 0);g&&(!e||m(e,c))&&(e=c,o=g);}}return [e,o]}const p=r=>Object.keys(r).reduce((t,e)=>{const o=e===""||e[0]!==".";if(t===void 0||t===o)return o;throw a(_$1,'"exports" cannot contain some keys starting with "." and some not')},void 0),u=/^\w+:/,v=(r,t,e)=>{if(!r)throw new Error('"exports" is required');t=t===""?".":`./${t}`,(typeof r=="string"||Array.isArray(r)||A(r)&&p(r))&&(r={".":r});const[o,c]=d$1(r,t),n=f(h.Export,r[o],t,e,c);if(n.length===0)throw a(I,t==="."?'No "exports" main defined':`Package subpath '${t}' is not defined by "exports"`);for(const i of n)if(!i.startsWith("./")&&!u.test(i))throw a(E,`Invalid "exports" target "${i}" defined in the package config`);return n};
 
@@ -10475,7 +10485,7 @@ function WorkspaceVitestPlugin(project, options) {
       },
       config(viteConfig) {
         var _a, _b, _c;
-        const env = deleteDefineConfig(viteConfig);
+        const defines = deleteDefineConfig(viteConfig);
         const testConfig = viteConfig.test || {};
         const root = testConfig.root || viteConfig.root || options.root;
         let name = testConfig.name;
@@ -10522,10 +10532,10 @@ function WorkspaceVitestPlugin(project, options) {
             }
           },
           test: {
-            env,
             name
           }
         };
+        config.test.defines = defines;
         const classNameStrategy = typeof testConfig.css !== "boolean" && ((_b = (_a = testConfig.css) == null ? void 0 : _a.modules) == null ? void 0 : _b.classNameStrategy) || "stable";
         if (classNameStrategy !== "scoped") {
           config.css ?? (config.css = {});
@@ -10622,6 +10632,12 @@ class WorkspaceProject {
   isCore() {
     return this.ctx.getCoreWorkspaceProject() === this;
   }
+  // it's possible that file path was imported with different queries (?raw, ?url, etc)
+  getModulesByFilepath(file) {
+    var _a;
+    const set = this.server.moduleGraph.getModulesByFile(file) || ((_a = this.browser) == null ? void 0 : _a.moduleGraph.getModulesByFile(file));
+    return set || /* @__PURE__ */ new Set();
+  }
   getModuleById(id) {
     var _a;
     return this.server.moduleGraph.getModuleById(id) || ((_a = this.browser) == null ? void 0 : _a.moduleGraph.getModuleById(id));
@@ -11134,7 +11150,7 @@ class Vitest {
   }
   async filterTestsBySource(specs) {
     if (this.config.changed && !this.config.related) {
-      const { VitestGit } = await import('./chunk-node-git.c410fed8.js');
+      const { VitestGit } = await import('./chunk-node-git.36288174.js');
       const vitestGit = new VitestGit(this.config.root);
       const related2 = await vitestGit.findChangedFiles({
         changedSince: this.config.changed
@@ -11287,7 +11303,7 @@ class Vitest {
   }
   getModuleProjects(id) {
     return this.projects.filter((project) => {
-      return project.getModuleById(id);
+      return project.getModulesByFilepath(id).size;
     });
   }
   unregisterWatcher = noop$1;
@@ -11295,9 +11311,12 @@ class Vitest {
     const updateLastChanged = (id) => {
       const projects = this.getModuleProjects(id);
       projects.forEach(({ server, browser }) => {
-        const mod = server.moduleGraph.getModuleById(id) || (browser == null ? void 0 : browser.moduleGraph.getModuleById(id));
-        if (mod)
-          server.moduleGraph.invalidateModule(mod);
+        const serverMods = server.moduleGraph.getModulesByFile(id);
+        serverMods == null ? void 0 : serverMods.forEach((mod) => server.moduleGraph.invalidateModule(mod));
+        if (browser) {
+          const browserMods = browser.moduleGraph.getModulesByFile(id);
+          browserMods == null ? void 0 : browserMods.forEach((mod) => browser.moduleGraph.invalidateModule(mod));
+        }
       });
     };
     const onChange = (id) => {
@@ -11361,21 +11380,10 @@ class Vitest {
       return [];
     const files = [];
     for (const project of projects) {
-      const { server, browser } = project;
-      const mod = server.moduleGraph.getModuleById(id) || (browser == null ? void 0 : browser.moduleGraph.getModuleById(id));
-      if (!mod) {
-        const mods = browser == null ? void 0 : browser.moduleGraph.getModulesByFile(id);
-        if (!(mods == null ? void 0 : mods.size))
-          return [];
-        let rerun2 = false;
-        mods.forEach((m) => {
-          if (m.id && this.handleFileChanged(m.id))
-            rerun2 = true;
-        });
-        if (rerun2)
-          files.push(id);
+      const { server } = project;
+      const mods = project.getModulesByFilepath(id);
+      if (!mods.size)
         continue;
-      }
       id = normalizeRequestId(id, server.config.base);
       this.invalidates.add(id);
       if (this.state.filesMap.has(id) || project.isTestFile(id)) {
@@ -11384,13 +11392,17 @@ class Vitest {
         continue;
       }
       let rerun = false;
-      mod.importers.forEach((i) => {
-        if (!i.id)
-          return;
-        const heedsRerun = this.handleFileChanged(i.id);
-        if (heedsRerun)
-          rerun = true;
-      });
+      for (const mod of mods) {
+        if (!mod.id)
+          continue;
+        mod.importers.forEach((i) => {
+          if (!i.id)
+            return;
+          const heedsRerun = this.handleFileChanged(i.id);
+          if (heedsRerun)
+            rerun = true;
+        });
+      }
       if (rerun)
         files.push(id);
     }

package/dist/{vendor-vi.befc11a6.js → vendor-vi.6873a1c1.js}

@@ -3168,6 +3168,9 @@ class FakeTimers {
   configure(config) {
     this._userConfig = config;
   }
+  isFakeTimers() {
+    return this._fakingTime;
+  }
   _checkFakeTimers() {
     if (!this._fakingTime) {
       throw new Error(
@@ -3178,6 +3181,124 @@ class FakeTimers {
   }
 }
 
+function copyStackTrace(target, source) {
+  if (source.stack !== void 0)
+    target.stack = source.stack.replace(source.message, target.message);
+  return target;
+}
+function waitFor(callback, options = {}) {
+  const { setTimeout, setInterval, clearTimeout, clearInterval } = getSafeTimers();
+  const { interval = 50, timeout = 1e3 } = typeof options === "number" ? { timeout: options } : options;
+  const STACK_TRACE_ERROR = new Error("STACK_TRACE_ERROR");
+  return new Promise((resolve, reject) => {
+    let lastError;
+    let promiseStatus = "idle";
+    let timeoutId;
+    let intervalId;
+    const onResolve = (result) => {
+      if (timeoutId)
+        clearTimeout(timeoutId);
+      if (intervalId)
+        clearInterval(intervalId);
+      resolve(result);
+    };
+    const handleTimeout = () => {
+      let error = lastError;
+      if (!error)
+        error = copyStackTrace(new Error("Timed out in waitFor!"), STACK_TRACE_ERROR);
+      reject(error);
+    };
+    const checkCallback = () => {
+      if (vi.isFakeTimers())
+        vi.advanceTimersByTime(interval);
+      if (promiseStatus === "pending")
+        return;
+      try {
+        const result = callback();
+        if (result !== null && typeof result === "object" && typeof result.then === "function") {
+          const thenable = result;
+          promiseStatus = "pending";
+          thenable.then(
+            (resolvedValue) => {
+              promiseStatus = "resolved";
+              onResolve(resolvedValue);
+            },
+            (rejectedValue) => {
+              promiseStatus = "rejected";
+              lastError = rejectedValue;
+            }
+          );
+        } else {
+          onResolve(result);
+          return true;
+        }
+      } catch (error) {
+        lastError = error;
+      }
+    };
+    if (checkCallback() === true)
+      return;
+    timeoutId = setTimeout(handleTimeout, timeout);
+    intervalId = setInterval(checkCallback, interval);
+  });
+}
+function waitUntil(callback, options = {}) {
+  const { setTimeout, setInterval, clearTimeout, clearInterval } = getSafeTimers();
+  const { interval = 50, timeout = 1e3 } = typeof options === "number" ? { timeout: options } : options;
+  const STACK_TRACE_ERROR = new Error("STACK_TRACE_ERROR");
+  return new Promise((resolve, reject) => {
+    let promiseStatus = "idle";
+    let timeoutId;
+    let intervalId;
+    const onReject = (error) => {
+      if (!error)
+        error = copyStackTrace(new Error("Timed out in waitUntil!"), STACK_TRACE_ERROR);
+      reject(error);
+    };
+    const onResolve = (result) => {
+      if (!result)
+        return;
+      if (timeoutId)
+        clearTimeout(timeoutId);
+      if (intervalId)
+        clearInterval(intervalId);
+      resolve(result);
+      return true;
+    };
+    const checkCallback = () => {
+      if (vi.isFakeTimers())
+        vi.advanceTimersByTime(interval);
+      if (promiseStatus === "pending")
+        return;
+      try {
+        const result = callback();
+        if (result !== null && typeof result === "object" && typeof result.then === "function") {
+          const thenable = result;
+          promiseStatus = "pending";
+          thenable.then(
+            (resolvedValue) => {
+              promiseStatus = "resolved";
+              onResolve(resolvedValue);
+            },
+            (rejectedValue) => {
+              promiseStatus = "rejected";
+              onReject(rejectedValue);
+            }
+          );
+        } else {
+          return onResolve(result);
+        }
+      } catch (error) {
+        onReject(error);
+      }
+    };
+    if (checkCallback() === true)
+      return;
+    timeoutId = setTimeout(onReject, timeout);
+    intervalId = setInterval(checkCallback, interval);
+  });
+}
+
 function createVitest() {
   const _mocker = typeof __vitest_mocker__ !== "undefined" ? __vitest_mocker__ : new Proxy({}, {
     get(_, name) {
@@ -3216,6 +3337,9 @@ function createVitest() {
       _timers.useFakeTimers();
       return utils;
     },
+    isFakeTimers() {
+      return _timers.isFakeTimers();
+    },
     useRealTimers() {
       _timers.useRealTimers();
       _mockedDate = null;
@@ -3279,6 +3403,8 @@ function createVitest() {
     // mocks
     spyOn,
     fn,
+    waitFor,
+    waitUntil,
     hoisted(factory) {
       assertTypes(factory, '"vi.hoisted" factory', ["function"]);
       return factory();

package/dist/vm.js

@@ -7,8 +7,8 @@ import { c as createBirpc } from './vendor-index.b271ebe4.js';
 import { resolve } from 'pathe';
 import { installSourcemapsSupport } from 'vite-node/source-map';
 import { d as distDir } from './vendor-paths.84fc7a99.js';
-import { l as loadEnvironment } from './vendor-environments.c9c96bf7.js';
-import { b as startVitestExecutor } from './vendor-execute.a63e187f.js';
+import { l as loadEnvironment } from './vendor-environments.7aba93d9.js';
+import { b as startVitestExecutor } from './vendor-execute.07d1a420.js';
 import { createCustomConsole } from './chunk-runtime-console.ea222ffb.js';
 import { c as createSafeRpc } from './vendor-rpc.cbd8e972.js';
 import './vendor-index.0b5b3600.js';
@@ -42,7 +42,7 @@ async function run(ctx) {
   const onCancel = new Promise((resolve2) => {
     setCancel = resolve2;
   });
-  const rpc = createBirpc(
+  const rpc = createSafeRpc(createBirpc(
     {
       onCancel: setCancel
     },
@@ -55,8 +55,12 @@ async function run(ctx) {
         port.addListener("message", fn);
       }
     }
-  );
-  const environment = await loadEnvironment(ctx.environment.name, ctx.config.root);
+  ));
+  const environment = await loadEnvironment(ctx.environment.name, {
+    root: ctx.config.root,
+    fetchModule: (id) => rpc.fetch(id, "ssr"),
+    resolveId: (id, importer) => rpc.resolveId(id, importer, "ssr")
+  });
   if (!environment.setupVM) {
     const envName = ctx.environment.name;
     const packageId = envName[0] === "." ? envName : `vitest-environment-${envName}`;
@@ -75,7 +79,7 @@ async function run(ctx) {
       environment: performance.now(),
       prepare: performance.now()
     },
-    rpc: createSafeRpc(rpc)
+    rpc
   };
   installSourcemapsSupport({
     getSourceMap: (source) => moduleCache.getSourceMap(source)

package/dist/worker.js

@@ -2,25 +2,25 @@ import { performance } from 'node:perf_hooks';
 import { c as createBirpc } from './vendor-index.b271ebe4.js';
 import { workerId } from 'tinypool';
 import { g as getWorkerState } from './vendor-global.97e4527c.js';
-import { l as loadEnvironment } from './vendor-environments.c9c96bf7.js';
-import { s as startViteNode, m as moduleCache, a as mockMap } from './vendor-execute.a63e187f.js';
+import { l as loadEnvironment } from './vendor-environments.7aba93d9.js';
+import { s as startViteNode, m as moduleCache, a as mockMap } from './vendor-execute.07d1a420.js';
 import { s as setupInspect } from './vendor-inspector.47fc8cbb.js';
 import { r as rpcDone, c as createSafeRpc } from './vendor-rpc.cbd8e972.js';
-import 'node:url';
 import 'pathe';
 import './vendor-index.0b5b3600.js';
 import 'acorn';
 import 'node:module';
 import 'node:fs';
+import 'node:url';
 import 'node:assert';
 import 'node:process';
 import 'node:path';
 import 'node:v8';
 import 'node:util';
+import 'vite-node/client';
 import 'node:console';
 import 'local-pkg';
 import 'node:vm';
-import 'vite-node/client';
 import 'vite-node/utils';
 import '@vitest/utils/error';
 import './vendor-paths.84fc7a99.js';
@@ -39,7 +39,7 @@ async function init(ctx) {
   const onCancel = new Promise((resolve) => {
     setCancel = resolve;
   });
-  const rpc = createBirpc(
+  const rpc = createSafeRpc(createBirpc(
     {
       onCancel: setCancel
     },
@@ -52,8 +52,12 @@ async function init(ctx) {
         port.addListener("message", fn);
       }
     }
-  );
-  const environment = await loadEnvironment(ctx.environment.name, ctx.config.root);
+  ));
+  const environment = await loadEnvironment(ctx.environment.name, {
+    root: ctx.config.root,
+    fetchModule: (id) => rpc.fetch(id, "ssr"),
+    resolveId: (id, importer) => rpc.resolveId(id, importer, "ssr")
+  });
   if (ctx.environment.transformMode)
     environment.transformMode = ctx.environment.transformMode;
   const state = {
@@ -67,7 +71,7 @@ async function init(ctx) {
       environment: 0,
       prepare: performance.now()
     },
-    rpc: createSafeRpc(rpc)
+    rpc
   };
   globalThis.__vitest_worker__ = state;
   if (ctx.invalidates) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vitest",
   "type": "module",
-  "version": "0.34.4",
+  "version": "0.34.6",
   "description": "A blazing fast unit test framework powered by Vite",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -143,7 +143,7 @@
     "acorn": "^8.9.0",
     "acorn-walk": "^8.2.0",
     "cac": "^6.7.14",
-    "chai": "^4.3.7",
+    "chai": "^4.3.10",
     "debug": "^4.3.4",
     "local-pkg": "^0.4.3",
     "magic-string": "^0.30.1",
@@ -155,12 +155,12 @@
     "tinypool": "^0.7.0",
     "vite": "^3.1.0 || ^4.0.0 || ^5.0.0-0",
     "why-is-node-running": "^2.2.2",
-    "@vitest/runner": "0.34.4",
-    "@vitest/snapshot": "0.34.4",
-    "vite-node": "0.34.4",
-    "@vitest/utils": "0.34.4",
-    "@vitest/expect": "0.34.4",
-    "@vitest/spy": "0.34.4"
+    "@vitest/runner": "0.34.6",
+    "@vitest/utils": "0.34.6",
+    "vite-node": "0.34.6",
+    "@vitest/expect": "0.34.6",
+    "@vitest/snapshot": "0.34.6",
+    "@vitest/spy": "0.34.6"
   },
   "devDependencies": {
     "@ampproject/remapping": "^2.2.1",