vitest 0.28.5 → 0.29.0

package/dist/entry.js

@@ -1,34 +1,33 @@
-import { promises, existsSync } from 'node:fs';
-import { m as micromatch_1, t as takeCoverageInsideWorker } from './chunk-integrations-coverage.48e6286b.js';
 import { startTests } from '@vitest/runner';
 import { resolve } from 'pathe';
-import { g as getWorkerState, r as resetModules } from './chunk-utils-global.442d1d33.js';
-import { R as RealDate, g as globalExpect, a as vi } from './chunk-utils-import.847b4a2d.js';
-import { e as environments, a as envs } from './chunk-env-node.ffd1183b.js';
+import { g as getWorkerState, r as resetModules } from './chunk-utils-global.727b6d25.js';
+import { R as RealDate, g as globalExpect, a as vi } from './chunk-utils-import.ec15dcad.js';
 import { d as distDir } from './chunk-constants.797d3ebf.js';
+import { s as startCoverageInsideWorker, t as takeCoverageInsideWorker, a as stopCoverageInsideWorker } from './chunk-integrations-coverage.e0a6acd2.js';
 import { createRequire } from 'node:module';
 import c from 'picocolors';
 import { installSourcemapsSupport } from 'vite-node/source-map';
 import { setColors, getSafeTimers } from '@vitest/utils';
-import { i as index } from './chunk-integrations-utils.9717ad89.js';
+import { e as environments } from './chunk-env-node.affdd278.js';
+import { i as index } from './chunk-integrations-utils.233d6a3b.js';
 import { s as setupSnapshotEnvironment } from './chunk-snapshot-env.a347d647.js';
-import { r as rpc } from './chunk-runtime-rpc.9c0386cc.js';
-import { s as setupCommonEnv } from './chunk-runtime-setup.30ab0a4b.js';
-import 'local-pkg';
-import 'util';
-import 'path';
+import { promises, existsSync } from 'node:fs';
+import { r as rpc } from './chunk-runtime-rpc.971b3848.js';
+import { s as setupCommonEnv } from './chunk-runtime-setup.992bb661.js';
 import './chunk-utils-env.860d90c2.js';
 import 'std-env';
 import '@vitest/runner/utils';
 import 'chai';
 import './vendor-_commonjsHelpers.addc3445.js';
 import '@vitest/expect';
-import './chunk-utils-base.904102a8.js';
-import './chunk-utils-tasks.d07dcea9.js';
+import './chunk-utils-base.81f83dbd.js';
+import './chunk-utils-tasks.b41c8284.js';
+import 'util';
 import '@vitest/spy';
-import 'node:console';
 import 'node:url';
-import './chunk-integrations-run-once.38756e30.js';
+import 'local-pkg';
+import 'node:console';
+import './chunk-integrations-run-once.9012f759.js';
 
 class NodeSnapshotEnvironment {
   resolvePath(filepath) {
@@ -200,14 +199,6 @@ async function withEnv(name, options, executor, fn) {
 }
 
 const runnersFile = resolve(distDir, "runners.js");
-function groupBy(collection, iteratee) {
-  return collection.reduce((acc, item) => {
-    const key = iteratee(item);
-    acc[key] || (acc[key] = []);
-    acc[key].push(item);
-    return acc;
-  }, {});
-}
 async function getTestRunnerConstructor(config, executor) {
   if (!config.runner) {
     const { VitestTestRunner, NodeBenchmarkRunner } = await executor.executeFile(runnersFile);
@@ -243,66 +234,32 @@ async function getTestRunner(config, executor) {
   };
   const originalOnAfterRun = testRunner.onAfterRun;
   testRunner.onAfterRun = async (files) => {
-    const coverage = await takeCoverageInsideWorker(config.coverage);
+    const coverage = await takeCoverageInsideWorker(config.coverage, executor);
     rpc().onAfterSuiteRun({ coverage });
     await (originalOnAfterRun == null ? void 0 : originalOnAfterRun.call(testRunner, files));
   };
   return testRunner;
 }
-async function run(files, config, executor) {
+async function run(files, config, environment, executor) {
   await setupGlobalEnv(config);
+  await startCoverageInsideWorker(config.coverage, executor);
   const workerState = getWorkerState();
   const runner = await getTestRunner(config, executor);
-  const filesWithEnv = await Promise.all(files.map(async (file) => {
-    var _a, _b;
-    const code = await promises.readFile(file, "utf-8");
-    let env = (_a = code.match(/@(?:vitest|jest)-environment\s+?([\w-]+)\b/)) == null ? void 0 : _a[1];
-    if (!env) {
-      for (const [glob, target] of config.environmentMatchGlobs || []) {
-        if (micromatch_1.isMatch(file, glob)) {
-          env = target;
-          break;
-        }
+  globalThis.__vitest_environment__ = environment;
+  await withEnv(environment.name, environment.options || config.environmentOptions || {}, executor, async () => {
+    for (const file of files) {
+      if (config.isolate) {
+        workerState.mockMap.clear();
+        resetModules(workerState.moduleCache, true);
       }
+      workerState.filepath = file;
+      await startTests([file], runner);
+      workerState.filepath = void 0;
+      vi.resetConfig();
+      vi.restoreAllMocks();
     }
-    env || (env = config.environment || "node");
-    const envOptions = JSON.parse(((_b = code.match(/@(?:vitest|jest)-environment-options\s+?(.+)/)) == null ? void 0 : _b[1]) || "null");
-    return {
-      file,
-      env,
-      envOptions: envOptions ? { [env]: envOptions } : null
-    };
-  }));
-  const filesByEnv = groupBy(filesWithEnv, ({ env }) => env);
-  const orderedEnvs = envs.concat(
-    Object.keys(filesByEnv).filter((env) => !envs.includes(env))
-  );
-  for (const env of orderedEnvs) {
-    const environment = env;
-    const files2 = filesByEnv[environment];
-    if (!files2 || !files2.length)
-      continue;
-    globalThis.__vitest_environment__ = environment;
-    const filesByOptions = groupBy(files2, ({ envOptions }) => JSON.stringify(envOptions));
-    for (const options of Object.keys(filesByOptions)) {
-      const files3 = filesByOptions[options];
-      if (!files3 || !files3.length)
-        continue;
-      await withEnv(environment, files3[0].envOptions || config.environmentOptions || {}, executor, async () => {
-        for (const { file } of files3) {
-          if (config.isolate) {
-            workerState.mockMap.clear();
-            resetModules(workerState.moduleCache, true);
-          }
-          workerState.filepath = file;
-          await startTests([file], runner);
-          workerState.filepath = void 0;
-          vi.resetConfig();
-          vi.restoreAllMocks();
-        }
-      });
-    }
-  }
+    await stopCoverageInsideWorker(config.coverage, executor);
+  });
 }
 
 export { run };

package/dist/environments.d.ts

@@ -1,4 +1,4 @@
-import { P as Environment } from './types-0373403c.js';
+import { X as Environment } from './types-7cd96283.js';
 import '@vitest/expect';
 import 'vite';
 import '@vitest/runner/types';
@@ -10,6 +10,7 @@ import 'vite-node/client';
 import 'vite-node/server';
 import 'node:worker_threads';
 import 'vite-node';
+import 'source-map';
 import 'node:fs';
 
 declare const environments: {

package/dist/environments.js

@@ -1,3 +1,3 @@
-export { e as builtinEnvironments, p as populateGlobal } from './chunk-env-node.ffd1183b.js';
+export { e as builtinEnvironments, p as populateGlobal } from './chunk-env-node.affdd278.js';
 import 'node:console';
 import 'local-pkg';

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { Test } from '@vitest/runner';
 export { afterAll, afterEach, beforeAll, beforeEach, describe, it, onTestFailed, suite, test } from '@vitest/runner';
-import { B as BenchmarkAPI, F as FakeTimerInstallOpts, M as MockFactoryWithHelper, R as RuntimeConfig, a as ResolvedConfig, b as ModuleGraphData, S as SnapshotResult, c as Reporter } from './types-0373403c.js';
-export { u as AfterSuiteRunMeta, A as ApiConfig, z as ArgumentsType, y as Arrayable, x as Awaitable, a2 as BaseCoverageOptions, a8 as BenchFunction, a6 as Benchmark, B as BenchmarkAPI, a7 as BenchmarkResult, a5 as BenchmarkUserOptions, h as BuiltinEnvironment, i as CSSModuleScopeStrategy, C as CollectLineNumbers, e as CollectLines, K as Constructable, g as Context, a4 as CoverageC8Options, a3 as CoverageIstanbulOptions, a0 as CoverageOptions, Y as CoverageProvider, _ as CoverageProviderModule, $ as CoverageReporter, G as DeepMerge, P as Environment, E as EnvironmentOptions, O as EnvironmentReturn, I as InlineConfig, J as JSDOMOptions, D as MergeInsertions, L as ModuleCache, b as ModuleGraphData, H as MutableArray, N as Nullable, X as OnServerRestartHandler, d as RawErrsMap, Z as ReportContext, c as Reporter, t as ResolveIdFunction, a as ResolvedConfig, a1 as ResolvedCoverageOptions, f as RootAndTarget, R as RuntimeConfig, j as SequenceHooks, n as SnapshotData, q as SnapshotMatchOptions, S as SnapshotResult, p as SnapshotStateOptions, s as SnapshotSummary, o as SnapshotUpdateState, T as TscErrorInfo, l as TypecheckConfig, r as UncheckedSnapshot, U as UserConfig, Q as UserConsoleLog, m as Vitest, V as VitestEnvironment, k as VitestRunMode, W as WorkerContext, w as WorkerGlobalState, v as WorkerRPC } from './types-0373403c.js';
+import { B as BenchmarkAPI, F as FakeTimerInstallOpts, M as MockFactoryWithHelper, R as RuntimeConfig, a as ResolvedConfig, b as ModuleGraphData, S as SnapshotResult, c as Reporter } from './types-7cd96283.js';
+export { x as AfterSuiteRunMeta, A as ApiConfig, G as ArgumentsType, D as Arrayable, z as Awaitable, a4 as BaseCoverageOptions, ab as BenchFunction, a9 as Benchmark, B as BenchmarkAPI, aa as BenchmarkResult, a8 as BenchmarkUserOptions, h as BuiltinEnvironment, i as CSSModuleScopeStrategy, C as CollectLineNumbers, e as CollectLines, O as Constructable, g as Context, o as ContextRPC, n as ContextTestEnvironment, a6 as CoverageC8Options, a5 as CoverageIstanbulOptions, a2 as CoverageOptions, _ as CoverageProvider, a0 as CoverageProviderModule, a1 as CoverageReporter, a7 as CustomProviderOptions, K as DeepMerge, X as Environment, E as EnvironmentOptions, Q as EnvironmentReturn, I as InlineConfig, J as JSDOMOptions, H as MergeInsertions, P as ModuleCache, b as ModuleGraphData, L as MutableArray, N as Nullable, Z as OnServerRestartHandler, d as RawErrsMap, $ as ReportContext, c as Reporter, w as ResolveIdFunction, a as ResolvedConfig, a3 as ResolvedCoverageOptions, f as RootAndTarget, R as RuntimeConfig, m as RuntimeRPC, j as SequenceHooks, q as SnapshotData, t as SnapshotMatchOptions, S as SnapshotResult, s as SnapshotStateOptions, v as SnapshotSummary, r as SnapshotUpdateState, T as TscErrorInfo, l as TypecheckConfig, u as UncheckedSnapshot, U as UserConfig, Y as UserConsoleLog, p as Vitest, V as VitestEnvironment, k as VitestRunMode, W as WorkerContext, y as WorkerGlobalState } from './types-7cd96283.js';
 import { spyOn, fn, MaybeMockedDeep, MaybeMocked, MaybePartiallyMocked, MaybePartiallyMockedDeep, EnhancedSpy } from '@vitest/spy';
 export { EnhancedSpy, Mock, MockContext, MockInstance, Mocked, MockedClass, MockedFunction, MockedObject, SpyInstance } from '@vitest/spy';
 export { S as SnapshotEnvironment } from './env-afee91f0.js';
@@ -19,6 +19,7 @@ import 'vite-node/client';
 import 'vite-node/server';
 import 'node:worker_threads';
 import 'vite-node';
+import 'source-map';
 import 'node:fs';
 
 declare type Not<T extends boolean> = T extends true ? false : true;

package/dist/index.js

@@ -1,23 +1,23 @@
 export { afterAll, afterEach, beforeAll, beforeEach, describe, it, onTestFailed, suite, test } from '@vitest/runner';
-export { b as bench, c as createExpect, g as expect, a as vi, v as vitest } from './chunk-utils-import.847b4a2d.js';
-export { i as isFirstRun, r as runOnce } from './chunk-integrations-run-once.38756e30.js';
-import { d as dist } from './chunk-integrations-utils.9717ad89.js';
-export { b as assertType, g as getRunningMode, a as isWatchMode } from './chunk-integrations-utils.9717ad89.js';
+export { b as bench, c as createExpect, g as expect, a as vi, v as vitest } from './chunk-utils-import.ec15dcad.js';
+export { i as isFirstRun, r as runOnce } from './chunk-integrations-run-once.9012f759.js';
+import { d as dist } from './chunk-integrations-utils.233d6a3b.js';
+export { b as assertType, g as getRunningMode, a as isWatchMode } from './chunk-integrations-utils.233d6a3b.js';
 import * as chai from 'chai';
 export { chai };
 export { assert, should } from 'chai';
 import '@vitest/runner/utils';
 import '@vitest/utils';
-import './chunk-utils-global.442d1d33.js';
+import './chunk-utils-global.727b6d25.js';
 import 'pathe';
 import './chunk-utils-env.860d90c2.js';
 import 'std-env';
 import './vendor-_commonjsHelpers.addc3445.js';
 import '@vitest/expect';
-import './chunk-runtime-rpc.9c0386cc.js';
+import './chunk-runtime-rpc.971b3848.js';
 import './chunk-snapshot-env.a347d647.js';
-import './chunk-utils-base.904102a8.js';
-import './chunk-utils-tasks.d07dcea9.js';
+import './chunk-utils-base.81f83dbd.js';
+import './chunk-utils-tasks.b41c8284.js';
 import 'util';
 import '@vitest/spy';
 

package/dist/loader.js

@@ -2,7 +2,7 @@ import { pathToFileURL, fileURLToPath } from 'node:url';
 import { readFile } from 'node:fs/promises';
 import { i as isNodeBuiltin, h as hasCJSSyntax } from './vendor-index.bdee400f.js';
 import { normalizeModuleId } from 'vite-node/utils';
-import { g as getWorkerState } from './chunk-utils-global.442d1d33.js';
+import { g as getWorkerState } from './chunk-utils-global.727b6d25.js';
 import 'acorn';
 import 'node:module';
 import 'node:fs';
@@ -56,7 +56,7 @@ const resolve = async (url, context, next) => {
     return next(url, context, next);
   const id = normalizeModuleId(url);
   const importer = normalizeModuleId(parentURL);
-  const resolved = await resolver(id, importer);
+  const resolved = await resolver(id, importer, state.ctx.environment.name);
   let result;
   let filepath;
   if (resolved) {

package/dist/node.d.ts

@@ -1,5 +1,5 @@
-import { k as VitestRunMode, U as UserConfig, m as Vitest, a9 as MockFactory, aa as MockMap, ab as TestSequencer } from './types-0373403c.js';
-export { ab as TestSequencer, ad as TestSequencerConstructor, m as Vitest, ac as startVitest } from './types-0373403c.js';
+import { k as VitestRunMode, U as UserConfig, p as Vitest, ac as MockFactory, ad as MockMap, ae as TestSequencer } from './types-7cd96283.js';
+export { ae as TestSequencer, ag as TestSequencerConstructor, p as Vitest, af as startVitest } from './types-7cd96283.js';
 import { UserConfig as UserConfig$1, Plugin } from 'vite';
 import { ViteNodeRunner } from 'vite-node/client';
 import { ViteNodeRunnerOptions } from 'vite-node';
@@ -11,6 +11,7 @@ import '@vitest/utils';
 import 'tinybench';
 import 'vite-node/server';
 import 'node:worker_threads';
+import 'source-map';
 import 'node:fs';
 
 declare function createVitest(mode: VitestRunMode, options: UserConfig, viteOverrides?: UserConfig$1): Promise<Vitest>;
@@ -27,6 +28,7 @@ declare class VitestMocker {
     private get base();
     private get mockMap();
     private get moduleCache();
+    private deleteCachedItem;
     getSuiteFilepath(): string;
     getMocks(): {
         [x: string]: string | MockFactory | null;
@@ -56,7 +58,7 @@ declare class VitestExecutor extends ViteNodeRunner {
     mocker: VitestMocker;
     constructor(options: ExecuteOptions);
     shouldResolveId(id: string, _importee?: string | undefined): boolean;
-    resolveUrl(id: string, importee?: string): Promise<[url: string, fsPath: string]>;
+    resolveUrl(id: string, importer?: string): Promise<[url: string, fsPath: string]>;
     dependencyRequest(id: string, fsPath: string, callstack: string[]): Promise<any>;
     prepareContext(context: Record<string, any>): Record<string, any>;
 }

package/dist/node.js

@@ -1,33 +1,33 @@
-export { B as BaseSequencer, V as VitestPlugin, c as createVitest, s as startVitest } from './chunk-node-pkg.9a107dfb.js';
-export { V as VitestExecutor } from './chunk-runtime-mocker.dafe0f77.js';
+export { B as BaseSequencer, V as VitestPlugin, c as createVitest, s as startVitest } from './chunk-node-pkg.88e7e848.js';
+export { V as VitestExecutor } from './chunk-runtime-mocker.a048e92d.js';
 import 'pathe';
 import './chunk-constants.797d3ebf.js';
 import 'node:url';
 import './chunk-utils-env.860d90c2.js';
 import 'std-env';
-import './chunk-integrations-coverage.48e6286b.js';
+import './chunk-integrations-coverage.e0a6acd2.js';
 import 'local-pkg';
-import 'util';
-import 'path';
-import './chunk-env-node.ffd1183b.js';
+import './chunk-env-node.affdd278.js';
 import 'node:console';
 import 'picocolors';
 import 'vite';
 import 'node:path';
 import 'node:process';
 import 'node:fs';
+import 'path';
 import 'os';
+import 'util';
 import 'stream';
 import 'events';
 import 'fs';
 import './vendor-_commonjsHelpers.addc3445.js';
 import 'vite-node/client';
 import 'vite-node/server';
-import './chunk-utils-global.442d1d33.js';
+import './chunk-utils-global.727b6d25.js';
 import '@vitest/runner/utils';
 import '@vitest/utils';
 import 'node:fs/promises';
-import './vendor-index.618ca5a1.js';
+import './vendor-index.2cbcdd1e.js';
 import 'node:buffer';
 import 'node:child_process';
 import 'child_process';
@@ -38,12 +38,13 @@ import 'source-map';
 import 'module';
 import 'acorn';
 import 'acorn-walk';
+import 'node:v8';
+import './vendor-index.783e7f3e.js';
+import './chunk-utils-base.81f83dbd.js';
 import 'node:worker_threads';
 import 'tinypool';
-import './vendor-index.783e7f3e.js';
 import 'perf_hooks';
-import './chunk-utils-base.904102a8.js';
-import './chunk-utils-tasks.d07dcea9.js';
+import './chunk-utils-tasks.b41c8284.js';
 import 'crypto';
 import 'vite-node/utils';
 import '@vitest/utils/diff';
@@ -54,6 +55,6 @@ import 'readline';
 import './vendor-index.bdee400f.js';
 import 'node:module';
 import 'node:assert';
-import 'node:v8';
 import 'node:util';
 import '@vitest/spy';
+import './chunk-runtime-rpc.971b3848.js';

package/dist/runners.d.ts

@@ -1,5 +1,5 @@
 import { VitestRunner, VitestRunnerImportSource, Suite, Test, TestContext } from '@vitest/runner';
-import { a as ResolvedConfig } from './types-0373403c.js';
+import { a as ResolvedConfig } from './types-7cd96283.js';
 import '@vitest/expect';
 import 'vite';
 import '@vitest/runner/types';
@@ -10,6 +10,7 @@ import 'vite-node/client';
 import 'vite-node/server';
 import 'node:worker_threads';
 import 'vite-node';
+import 'source-map';
 import 'node:fs';
 
 declare class VitestTestRunner implements VitestRunner {

package/dist/runners.js

@@ -1,16 +1,16 @@
 import { setState, GLOBAL_EXPECT, getState } from '@vitest/expect';
-import { d as getSnapshotClient, c as createExpect, a as vi, e as getBenchOptions, f as getBenchFn } from './chunk-utils-import.847b4a2d.js';
-import { g as getWorkerState } from './chunk-utils-global.442d1d33.js';
-import { g as getFullName } from './chunk-utils-tasks.d07dcea9.js';
+import { d as getSnapshotClient, c as createExpect, a as vi, e as getBenchOptions, f as getBenchFn } from './chunk-utils-import.ec15dcad.js';
+import { g as getWorkerState } from './chunk-utils-global.727b6d25.js';
+import { g as getFullName } from './chunk-utils-tasks.b41c8284.js';
 import { updateTask } from '@vitest/runner';
 import { createDefer, getSafeTimers } from '@vitest/utils';
 import '@vitest/runner/utils';
 import 'chai';
 import './vendor-_commonjsHelpers.addc3445.js';
-import './chunk-runtime-rpc.9c0386cc.js';
+import './chunk-runtime-rpc.971b3848.js';
 import 'pathe';
 import './chunk-snapshot-env.a347d647.js';
-import './chunk-utils-base.904102a8.js';
+import './chunk-utils-base.81f83dbd.js';
 import 'util';
 import '@vitest/spy';
 import './chunk-utils-env.860d90c2.js';