vitest 1.1.1 → 1.1.2

package/dist/browser.d.ts

@@ -1,5 +1,5 @@
 export { processError, startTests } from '@vitest/runner';
-import { R as ResolvedConfig, b as CoverageOptions, c as CoverageProvider, d as CoverageProviderModule } from './reporters-O4LBziQ_.js';
+import { R as ResolvedConfig, b as CoverageOptions, c as CoverageProvider, d as CoverageProviderModule } from './reporters-xH8_lESK.js';
 import { VitestExecutor } from './execute.js';
 import 'vite';
 import 'vite-node';

package/dist/browser.js

@@ -13,7 +13,7 @@ async function setupCommonEnv(config) {
   globalSetup = true;
   setSafeTimers();
   if (config.globals)
-    (await import('./chunks/integrations-globals.nOa2-o57.js')).registerApiGlobally();
+    (await import('./chunks/integrations-globals.tnKXwyh5.js')).registerApiGlobally();
 }
 function setupDefines(defines) {
   for (const key in defines)

package/dist/child.js

@@ -4,7 +4,7 @@ import { c as createBirpc } from './vendor/index.cAUulNDf.js';
 import { parseRegexp } from '@vitest/utils';
 import { workerId } from 'tinypool';
 import { l as loadEnvironment } from './vendor/loader.L9CYwKn1.js';
-import { s as startViteNode, m as moduleCache, a as mockMap } from './vendor/execute.vStuEOaI.js';
+import { s as startViteNode, m as moduleCache, a as mockMap } from './vendor/execute.cedv4NLQ.js';
 import { r as rpcDone, c as createSafeRpc } from './vendor/rpc.Bl-ysZIr.js';
 import { s as setupInspect } from './vendor/inspector.lFAeuaAt.js';
 import 'pathe';

package/dist/chunks/{api-setup.jHV5vgr2.js → api-setup.mFKdEKxa.js}

@@ -12,6 +12,7 @@ import require$$3 from 'net';
 import require$$4 from 'tls';
 import require$$7 from 'url';
 import { g as getDefaultExportFromCjs } from '../vendor/_commonjsHelpers.jjO7Zipk.js';
+import { isFileServingAllowed } from 'vite';
 import { A as API_PATH } from '../vendor/constants.WSvnD_fn.js';
 import '../vendor/index.XU72Rmy8.js';
 import '@vitest/utils';
@@ -55,6 +56,19 @@ async function getModuleGraph(ctx, id) {
   };
 }
 
+function cloneByOwnProperties(value) {
+  return Object.getOwnPropertyNames(value).reduce((clone, prop) => ({
+    ...clone,
+    [prop]: value[prop]
+  }), {});
+}
+function stringifyReplace(key, value) {
+  if (value instanceof Error)
+    return cloneByOwnProperties(value);
+  else
+    return value;
+}
+
 /*! (c) 2020 Andrea Giammarchi */
 
 const {parse: $parse, stringify: $stringify} = JSON;
@@ -4551,12 +4565,13 @@ function abortHandshakeOrEmitwsClientError(server, req, socket, code, message) {
 
 var WebSocketServer$1 = /*@__PURE__*/getDefaultExportFromCjs(websocketServer);
 
-function setup(vitestOrWorkspace, server) {
+function setup(vitestOrWorkspace, _server) {
   var _a;
   const ctx = "ctx" in vitestOrWorkspace ? vitestOrWorkspace.ctx : vitestOrWorkspace;
   const wss = new WebSocketServer$1({ noServer: true });
   const clients = /* @__PURE__ */ new Map();
-  (_a = (server || ctx.server).httpServer) == null ? void 0 : _a.on("upgrade", (request, socket, head) => {
+  const server = _server || ctx.server;
+  (_a = server.httpServer) == null ? void 0 : _a.on("upgrade", (request, socket, head) => {
     if (!request.url)
       return;
     const { pathname } = new URL(request.url, "http://localhost");
@@ -4567,6 +4582,10 @@ function setup(vitestOrWorkspace, server) {
       setupClient(ws);
     });
   });
+  function checkFileAccess(path) {
+    if (!isFileServingAllowed(path, server))
+      throw new Error(`Access denied to "${path}". See Vite config documentation for "server.fs": https://vitejs.dev/config/server-options.html#server-fs-strict.`);
+  }
   function setupClient(ws) {
     const rpc = createBirpc(
       {
@@ -4605,7 +4624,8 @@ function setup(vitestOrWorkspace, server) {
           return ctx.snapshot.resolveRawPath(testPath, rawPath);
         },
         async readSnapshotFile(snapshotPath) {
-          if (!ctx.snapshot.resolvedPaths.has(snapshotPath) || !existsSync(snapshotPath))
+          checkFileAccess(snapshotPath);
+          if (!existsSync(snapshotPath))
             return null;
           return promises.readFile(snapshotPath, "utf-8");
         },
@@ -4620,13 +4640,13 @@ function setup(vitestOrWorkspace, server) {
           return promises.writeFile(id, content, "utf-8");
         },
         async saveSnapshotFile(id, content) {
-          if (!ctx.snapshot.resolvedPaths.has(id))
-            throw new Error(`Snapshot file "${id}" does not exist.`);
+          checkFileAccess(id);
           await promises.mkdir(dirname(id), { recursive: true });
           return promises.writeFile(id, content, "utf-8");
         },
         async removeSnapshotFile(id) {
-          if (!ctx.snapshot.resolvedPaths.has(id) || !existsSync(id))
+          checkFileAccess(id);
+          if (!existsSync(id))
             throw new Error(`Snapshot file "${id}" does not exist.`);
           return promises.unlink(id);
         },
@@ -4672,7 +4692,7 @@ function setup(vitestOrWorkspace, server) {
         post: (msg) => ws.send(msg),
         on: (fn) => ws.on("message", fn),
         eventNames: ["onUserConsoleLog", "onFinished", "onCollected", "onCancel"],
-        serialize: stringify,
+        serialize: (data) => stringify(data, stringifyReplace),
         deserialize: parse$3
       }
     );

package/dist/chunks/{integrations-globals.nOa2-o57.js → integrations-globals.tnKXwyh5.js}

@@ -1,5 +1,5 @@
 import { g as globalApis } from '../vendor/constants.WSvnD_fn.js';
-import { i as index } from '../vendor/index.n6c6aC2Y.js';
+import { i as index } from '../vendor/index.IhksUGLR.js';
 import '@vitest/runner';
 import '../vendor/benchmark.WVm6DARl.js';
 import '@vitest/runner/utils';
@@ -9,7 +9,7 @@ import 'pathe';
 import 'std-env';
 import '../vendor/global.L7JRz1qU.js';
 import '../vendor/run-once.X3E7xx3F.js';
-import '../vendor/vi.ciwVQ0al.js';
+import '../vendor/vi.DTC--YO5.js';
 import 'chai';
 import '../vendor/_commonjsHelpers.jjO7Zipk.js';
 import '@vitest/expect';

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.d5m7SYoI.js';
+import { v as version, s as startVitest } from './vendor/node.UBNKMR9Y.js';
 import './vendor/index.XU72Rmy8.js';
 import { d as divider } from './vendor/reporters.oUR9etwS.js';
 import { t as toArray } from './vendor/base._79unx2z.js';
@@ -45,6 +45,7 @@ import '@vitest/runner/utils';
 import 'node:crypto';
 import 'assert';
 import 'magic-string';
+import '@vitest/utils/ast';
 import 'strip-literal';
 import './vendor/environments.QJtma9XQ.js';
 import 'node:console';

package/dist/config.d.ts

@@ -1,6 +1,6 @@
 import { UserConfig, ConfigEnv } from 'vite';
 export { ConfigEnv, UserConfig, mergeConfig } from 'vite';
-import { a as ResolvedCoverageOptions, C as CoverageV8Options, P as ProjectConfig } from './reporters-O4LBziQ_.js';
+import { a as ResolvedCoverageOptions, C as CoverageV8Options, P as ProjectConfig } from './reporters-xH8_lESK.js';
 import '@vitest/runner';
 import 'vite-node';
 import '@vitest/snapshot';

package/dist/coverage.d.ts

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

package/dist/entry-vm.js

@@ -8,7 +8,7 @@ import { setupColors, createColors } from '@vitest/utils';
 import { V as VitestSnapshotEnvironment, s as setupChaiConfig, r as resolveTestRunner } from './vendor/index.h0j9y5vy.js';
 import { s as startCoverageInsideWorker, a as stopCoverageInsideWorker } from './vendor/coverage.v6aD8iAh.js';
 import { g as getWorkerState } from './vendor/global.L7JRz1qU.js';
-import { i as index } from './vendor/index.n6c6aC2Y.js';
+import { i as index } from './vendor/index.IhksUGLR.js';
 import { setupCommonEnv } from './browser.js';
 import 'chai';
 import '@vitest/snapshot/environment';
@@ -21,7 +21,7 @@ import '@vitest/runner/utils';
 import './vendor/index.XU72Rmy8.js';
 import 'std-env';
 import './vendor/run-once.X3E7xx3F.js';
-import './vendor/vi.ciwVQ0al.js';
+import './vendor/vi.DTC--YO5.js';
 import './vendor/_commonjsHelpers.jjO7Zipk.js';
 import '@vitest/expect';
 import '@vitest/snapshot';

package/dist/entry.js

@@ -1,7 +1,7 @@
 import { performance } from 'node:perf_hooks';
 import { startTests } from '@vitest/runner';
 import './vendor/index.XU72Rmy8.js';
-import { a as globalExpect, r as resetModules, v as vi } from './vendor/vi.ciwVQ0al.js';
+import { a as globalExpect, r as resetModules, v as vi } from './vendor/vi.DTC--YO5.js';
 import { s as startCoverageInsideWorker, a as stopCoverageInsideWorker } from './vendor/coverage.v6aD8iAh.js';
 import { V as VitestSnapshotEnvironment, s as setupChaiConfig, r as resolveTestRunner } from './vendor/index.h0j9y5vy.js';
 import { createRequire } from 'node:module';
@@ -10,7 +10,7 @@ import timers from 'node:timers';
 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.n6c6aC2Y.js';
+import { i as index } from './vendor/index.IhksUGLR.js';
 import { setupCommonEnv } from './browser.js';
 import { g as getWorkerState } from './vendor/global.L7JRz1qU.js';
 import 'pathe';

package/dist/environments.d.ts

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

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 { am as PendingSuiteMock, an as MockFactory, ao as MockMap, a2 as WorkerGlobalState, g as RuntimeRPC } from './reporters-O4LBziQ_.js';
+import { am as PendingSuiteMock, an as MockFactory, ao as MockMap, a2 as WorkerGlobalState, g as RuntimeRPC } from './reporters-xH8_lESK.js';
 import 'vite';
 import '@vitest/runner';
 import '@vitest/snapshot';
@@ -53,12 +53,12 @@ declare class VitestMocker {
     resolveMockPath(mockPath: string, external: string | null): string | null;
     mockObject(object: Record<Key, any>, mockExports?: Record<Key, any>): Record<Key, any>;
     unmockPath(path: string): void;
-    mockPath(originalId: string, path: string, external: string | null, factory?: MockFactory): void;
+    mockPath(originalId: string, path: string, external: string | null, factory: MockFactory | undefined, throwIfExists: boolean): void;
     importActual<T>(rawId: string, importer: string, callstack?: string[] | null): Promise<T>;
     importMock(rawId: string, importee: string): Promise<any>;
     requestWithMock(url: string, callstack: string[]): Promise<any>;
-    queueMock(id: string, importer: string, factory?: MockFactory): void;
-    queueUnmock(id: string, importer: string): void;
+    queueMock(id: string, importer: string, factory?: MockFactory, throwIfCached?: boolean): void;
+    queueUnmock(id: string, importer: string, throwIfCached?: boolean): void;
 }
 
 interface ModuleEvaluateOptions {

package/dist/execute.js

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

package/dist/index.d.ts

@@ -1,10 +1,10 @@
 import { TaskPopulated, File, TaskResultPack, CancelReason } from '@vitest/runner';
 export { Custom, DoneCallback, ExtendedContext, File, HookCleanupCallback, HookListener, OnTestFailedHandler, RunMode, RuntimeContext, SequenceHooks, SequenceSetupFiles, Suite, SuiteAPI, SuiteCollector, SuiteFactory, SuiteHooks, Task, TaskBase, TaskContext, TaskCustomOptions, TaskMeta, TaskResult, TaskResultPack, TaskState, Test, TestAPI, TestContext, TestFunction, TestOptions, afterAll, afterEach, beforeAll, beforeEach, describe, it, onTestFailed, suite, test } from '@vitest/runner';
-export { b as bench } from './suite-dF4WyktM.js';
+export { b as bench } from './suite-GoqTeX8s.js';
 import { ExpectStatic } from '@vitest/expect';
 export { Assertion, AsymmetricMatchersContaining, ExpectStatic, JestAssertion } from '@vitest/expect';
-import { F as FakeTimerInstallOpts, M as MockFactoryWithHelper, n as RuntimeConfig, f as ProvidedContext, A as AfterSuiteRunMeta, o as UserConsoleLog, R as ResolvedConfig, p as ModuleGraphData, q as Reporter } from './reporters-O4LBziQ_.js';
-export { K as ApiConfig, a6 as ArgumentsType, a5 as Arrayable, a3 as Awaitable, B as BaseCoverageOptions, ak as BenchFunction, ai as Benchmark, al as BenchmarkAPI, aj as BenchmarkResult, ah as BenchmarkUserOptions, D as BuiltinEnvironment, I as CSSModuleScopeStrategy, u as CollectLineNumbers, v as CollectLines, a8 as Constructable, x as Context, _ as ContextRPC, Y as ContextTestEnvironment, af as CoverageIstanbulOptions, b as CoverageOptions, c as CoverageProvider, d as CoverageProviderModule, ae as CoverageReporter, C as CoverageV8Options, ag as CustomProviderOptions, N as DepsOptimizationOptions, E as Environment, L as EnvironmentOptions, aa as EnvironmentReturn, H as HappyDOMOptions, Q as InlineConfig, J as JSDOMOptions, a9 as ModuleCache, a7 as MutableArray, a4 as Nullable, ac as OnServerRestartHandler, y as Pool, z as PoolOptions, P as ProjectConfig, r as RawErrsMap, ad as ReportContext, a0 as ResolveIdFunction, a as ResolvedCoverageOptions, Z as ResolvedTestEnvironment, w as RootAndTarget, X as RunnerRPC, g as RuntimeRPC, O as TransformModePatterns, t as TscErrorInfo, S as TypecheckConfig, U as UserConfig, e as Vitest, G as VitestEnvironment, V as VitestRunMode, ab as VmEnvironmentReturn, $ as WorkerContext, a2 as WorkerGlobalState, a1 as WorkerRPC } from './reporters-O4LBziQ_.js';
+import { F as FakeTimerInstallOpts, M as MockFactoryWithHelper, n as RuntimeConfig, f as ProvidedContext, A as AfterSuiteRunMeta, o as UserConsoleLog, R as ResolvedConfig, p as ModuleGraphData, q as Reporter } from './reporters-xH8_lESK.js';
+export { K as ApiConfig, a6 as ArgumentsType, a5 as Arrayable, a3 as Awaitable, B as BaseCoverageOptions, ak as BenchFunction, ai as Benchmark, al as BenchmarkAPI, aj as BenchmarkResult, ah as BenchmarkUserOptions, D as BuiltinEnvironment, I as CSSModuleScopeStrategy, u as CollectLineNumbers, v as CollectLines, a8 as Constructable, x as Context, _ as ContextRPC, Y as ContextTestEnvironment, af as CoverageIstanbulOptions, b as CoverageOptions, c as CoverageProvider, d as CoverageProviderModule, ae as CoverageReporter, C as CoverageV8Options, ag as CustomProviderOptions, N as DepsOptimizationOptions, E as Environment, L as EnvironmentOptions, aa as EnvironmentReturn, H as HappyDOMOptions, Q as InlineConfig, J as JSDOMOptions, a9 as ModuleCache, a7 as MutableArray, a4 as Nullable, ac as OnServerRestartHandler, y as Pool, z as PoolOptions, P as ProjectConfig, r as RawErrsMap, ad as ReportContext, a0 as ResolveIdFunction, a as ResolvedCoverageOptions, Z as ResolvedTestEnvironment, w as RootAndTarget, X as RunnerRPC, g as RuntimeRPC, O as TransformModePatterns, t as TscErrorInfo, S as TypecheckConfig, U as UserConfig, e as Vitest, G as VitestEnvironment, V as VitestRunMode, ab as VmEnvironmentReturn, $ as WorkerContext, a2 as WorkerGlobalState, a1 as WorkerRPC } from './reporters-xH8_lESK.js';
 import { spyOn, fn, MaybeMockedDeep, MaybeMocked, MaybePartiallyMocked, MaybePartiallyMockedDeep, MockInstance } from '@vitest/spy';
 export { Mock, MockContext, MockInstance, Mocked, MockedClass, MockedFunction, MockedObject, SpyInstance } from '@vitest/spy';
 export { SnapshotEnvironment } from '@vitest/snapshot/environment';

package/dist/index.js

@@ -1,9 +1,9 @@
 export { afterAll, afterEach, beforeAll, beforeEach, describe, it, onTestFailed, suite, test } from '@vitest/runner';
 export { b as bench } from './vendor/benchmark.WVm6DARl.js';
 export { i as isFirstRun, r as runOnce } from './vendor/run-once.X3E7xx3F.js';
-export { c as createExpect, a as expect, v as vi, b as vitest } from './vendor/vi.ciwVQ0al.js';
-import { d as dist } from './vendor/index.n6c6aC2Y.js';
-export { c as assertType, g as getRunningMode, a as inject, b as isWatchMode } from './vendor/index.n6c6aC2Y.js';
+export { c as createExpect, a as expect, v as vi, b as vitest } from './vendor/vi.DTC--YO5.js';
+import { d as dist } from './vendor/index.IhksUGLR.js';
+export { c as assertType, g as getRunningMode, a as inject, b as isWatchMode } from './vendor/index.IhksUGLR.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, R as ResolvedConfig, f as ProvidedContext, W as WorkspaceProject, g as RuntimeRPC, T as TestSequencer, h as WorkspaceSpec } from './reporters-O4LBziQ_.js';
-export { l as BrowserProvider, k as BrowserProviderInitializationOptions, m as BrowserProviderOptions, i as ProcessPool, j as TestSequencerConstructor, s as startVitest } from './reporters-O4LBziQ_.js';
+import { V as VitestRunMode, U as UserConfig, e as Vitest, R as ResolvedConfig, f as ProvidedContext, W as WorkspaceProject, g as RuntimeRPC, T as TestSequencer, h as WorkspaceSpec } from './reporters-xH8_lESK.js';
+export { l as BrowserProvider, k as BrowserProviderInitializationOptions, m as BrowserProviderOptions, i as ProcessPool, j as TestSequencerConstructor, s as startVitest } from './reporters-xH8_lESK.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, a as createMethodsRPC, c as createVitest, r as registerConsoleShortcuts, s as startVitest } from './vendor/node.d5m7SYoI.js';
+export { B as BaseSequencer, V as VitestPlugin, a as createMethodsRPC, c as createVitest, r as registerConsoleShortcuts, s as startVitest } from './vendor/node.UBNKMR9Y.js';
 import 'pathe';
 import 'vite';
 import 'node:path';
@@ -50,6 +50,7 @@ import './vendor/tasks.IknbGB2n.js';
 import 'node:crypto';
 import 'assert';
 import 'magic-string';
+import '@vitest/utils/ast';
 import 'strip-literal';
 import './vendor/environments.QJtma9XQ.js';
 import 'node:readline';

package/dist/{reporters-O4LBziQ_.d.ts → reporters-xH8_lESK.d.ts}

@@ -1223,6 +1223,7 @@ interface PendingSuiteMock {
     id: string;
     importer: string;
     type: 'mock' | 'unmock';
+    throwIfCached: boolean;
     factory?: MockFactory;
 }
 
@@ -2057,7 +2058,6 @@ interface InlineConfig {
     api?: boolean | number | ApiConfig;
     /**
      * Enable Vitest UI
-     * @internal
      */
     ui?: boolean;
     /**

package/dist/reporters.d.ts

@@ -1,4 +1,4 @@
-export { ay as BaseReporter, aq as BasicReporter, aC as BenchmarkBuiltinReporters, aB as BenchmarkReportsMap, aA as BuiltinReporters, ap as DefaultReporter, ar as DotReporter, ax as HangingProcessReporter, av as JUnitReporter, as as JsonReporter, q as Reporter, az as ReportersMap, aw as TapFlatReporter, au as TapReporter, at as VerboseReporter } from './reporters-O4LBziQ_.js';
+export { ay as BaseReporter, aq as BasicReporter, aC as BenchmarkBuiltinReporters, aB as BenchmarkReportsMap, aA as BuiltinReporters, ap as DefaultReporter, ar as DotReporter, ax as HangingProcessReporter, av as JUnitReporter, as as JsonReporter, q as Reporter, az as ReportersMap, aw as TapFlatReporter, au as TapReporter, at as VerboseReporter } from './reporters-xH8_lESK.js';
 import 'vite';
 import '@vitest/runner';
 import 'vite-node';

package/dist/runners.d.ts

@@ -1,5 +1,5 @@
 import { VitestRunner, VitestRunnerImportSource, Suite, Test, CancelReason, Custom, TaskContext, ExtendedContext } from '@vitest/runner';
-import { R as ResolvedConfig } from './reporters-O4LBziQ_.js';
+import { R as ResolvedConfig } from './reporters-xH8_lESK.js';
 import * as tinybench from 'tinybench';
 import 'vite';
 import 'vite-node';

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 } from './vendor/vi.ciwVQ0al.js';
+import { g as getSnapshotClient, c as createExpect, v as vi } from './vendor/vi.DTC--YO5.js';
 import './vendor/index.XU72Rmy8.js';
 import { a as rpc } from './vendor/rpc.Bl-ysZIr.js';
 import { g as getFullName } from './vendor/tasks.IknbGB2n.js';

package/dist/{suite-dF4WyktM.d.ts → suite-GoqTeX8s.d.ts}

@@ -1,6 +1,6 @@
 import { Custom } from '@vitest/runner';
 import '@vitest/runner/utils';
-import { ak as BenchFunction, al as BenchmarkAPI } from './reporters-O4LBziQ_.js';
+import { ak as BenchFunction, al as BenchmarkAPI } from './reporters-xH8_lESK.js';
 import { Options } from 'tinybench';
 
 declare function getBenchOptions(key: Custom): Options;

package/dist/suite.d.ts

@@ -1,7 +1,7 @@
 export { createTaskCollector, getCurrentSuite, getFn, setFn } from '@vitest/runner';
 export { createChainable } from '@vitest/runner/utils';
-export { g as getBenchFn, a as getBenchOptions } from './suite-dF4WyktM.js';
-import './reporters-O4LBziQ_.js';
+export { g as getBenchFn, a as getBenchOptions } from './suite-GoqTeX8s.js';
+import './reporters-xH8_lESK.js';
 import 'vite';
 import 'vite-node';
 import '@vitest/snapshot';

package/dist/vendor/{execute.vStuEOaI.js → execute.cedv4NLQ.js}

@@ -119,7 +119,7 @@ class VitestMocker {
       if (mock.type === "unmock")
         this.unmockPath(fsPath);
       if (mock.type === "mock")
-        this.mockPath(mock.id, fsPath, external, mock.factory);
+        this.mockPath(mock.id, fsPath, external, mock.factory, mock.throwIfCached);
     }));
     VitestMocker.pendingIds = [];
   }
@@ -298,9 +298,13 @@ ${c.green(`vi.mock("${mockpath}", async (importOriginal) => {
       delete mock[id];
     this.deleteCachedItem(id);
   }
-  mockPath(originalId, path, external, factory) {
-    const suitefile = this.getSuiteFilepath();
+  mockPath(originalId, path, external, factory, throwIfExists) {
     const id = this.normalizePath(path);
+    if (throwIfExists && this.moduleCache.has(id))
+      throw new Error(`[vitest] Cannot mock "${originalId}" because it is already loaded. Did you import it in a setup file?
+
+Please, remove the import if you want static imports to be mocked, or clear module cache by calling "vi.resetModules()" before mocking if you are going to import the file again. See: https://vitest.dev/guide/common-errors.html#cannot-mock-mocked-file.js-because-it-is-already-loaded`);
+    const suitefile = this.getSuiteFilepath();
     const mocks = this.mockMap.get(suitefile) || {};
     const resolves = this.resolveCache.get(suitefile) || {};
     mocks[id] = factory || this.resolveMockPath(path, external);
@@ -356,11 +360,11 @@ ${c.green(`vi.mock("${mockpath}", async (importOriginal) => {
     if (typeof mock === "string" && !callstack.includes(mock))
       return mock;
   }
-  queueMock(id, importer, factory) {
-    VitestMocker.pendingIds.push({ type: "mock", id, importer, factory });
+  queueMock(id, importer, factory, throwIfCached = false) {
+    VitestMocker.pendingIds.push({ type: "mock", id, importer, factory, throwIfCached });
   }
-  queueUnmock(id, importer) {
-    VitestMocker.pendingIds.push({ type: "unmock", id, importer });
+  queueUnmock(id, importer, throwIfCached = false) {
+    VitestMocker.pendingIds.push({ type: "unmock", id, importer, throwIfCached });
   }
 }
 

package/dist/vendor/{index.n6c6aC2Y.js → index.IhksUGLR.js}

@@ -1,7 +1,7 @@
 import { afterAll, afterEach, beforeAll, beforeEach, describe, it, onTestFailed, suite, test } from '@vitest/runner';
 import { b as bench } from './benchmark.WVm6DARl.js';
 import { i as isFirstRun, r as runOnce } from './run-once.X3E7xx3F.js';
-import { c as createExpect, a as globalExpect, v as vi, b as vitest } from './vi.ciwVQ0al.js';
+import { c as createExpect, a as globalExpect, v as vi, b as vitest } from './vi.DTC--YO5.js';
 import { g as getWorkerState } from './global.L7JRz1qU.js';
 import * as chai from 'chai';
 import { assert, should } from 'chai';

package/dist/vendor/{node.d5m7SYoI.js → node.UBNKMR9Y.js}

@@ -37,12 +37,13 @@ import { createRequire } from 'node:module';
 import { isPackageExists, resolveModule } from 'local-pkg';
 import { isCI, provider as provider$1 } from 'std-env';
 import ge from 'module';
-import { ancestor, simple, findNodeAround } from 'acorn-walk';
+import { ancestor, findNodeAround } from 'acorn-walk';
 import { generateHash, calculateSuiteHash, someTasksAreOnly, interpretTaskModes, getTasks, hasFailed } from '@vitest/runner/utils';
 import { R as ReportersMap, B as BenchmarkReportsMap, s as stripAnsi, a as ansiStyles, b as sliceAnsi, d as divider, F as F_POINTER, c as cliTruncate } from './reporters.oUR9etwS.js';
 import crypto, { createHash } from 'node:crypto';
 import require$$0$3 from 'assert';
 import MagicString from 'magic-string';
+import { esmWalker } from '@vitest/utils/ast';
 import { stripLiteral } from 'strip-literal';
 import { g as getEnvPackageName } from './environments.QJtma9XQ.js';
 import readline from 'node:readline';
@@ -63,7 +64,7 @@ function _mergeNamespaces(n, m) {
   return Object.freeze(n);
 }
 
-var version$1 = "1.1.1";
+var version$1 = "1.1.2";
 
 const __dirname$1 = url.fileURLToPath(new URL(".", import.meta.url));
 async function ensurePackageInstalled(dependency, root) {
@@ -3612,7 +3613,7 @@ function getWorkerMemoryLimit(config) {
   var _a, _b, _c, _d;
   const memoryLimit = (_b = (_a = config.poolOptions) == null ? void 0 : _a.vmThreads) == null ? void 0 : _b.memoryLimit;
   if (memoryLimit)
-    return stringToBytes(memoryLimit);
+    return memoryLimit;
   return 1 / (((_d = (_c = config.poolOptions) == null ? void 0 : _c.vmThreads) == null ? void 0 : _d.maxThreads) ?? getDefaultThreadsCount(config));
 }
 function stringToBytes(input, percentageReference) {
@@ -3661,7 +3662,7 @@ function stringToBytes(input, percentageReference) {
     } else if (input > 1) {
       return Math.floor(input);
     } else {
-      throw new Error('Unexpected numerical input for "experimentalVmWorkerMemoryLimit"');
+      throw new Error('Unexpected numerical input for "memoryLimit"');
     }
   }
   return null;
@@ -3787,7 +3788,7 @@ function getMemoryLimit(config) {
       config.watch ? memory / 2 : memory
     );
   }
-  if (limit && limit > 1)
+  if (typeof limit === "number" && limit > 1 || typeof limit === "string" && limit.at(-1) !== "%")
     return stringToBytes(limit);
   return null;
 }
@@ -6479,7 +6480,7 @@ createLogUpdate(process$2.stdout);
 
 createLogUpdate(process$2.stderr);
 
-var version = "1.1.1";
+var version = "1.1.2";
 
 async function printError(error, project, options) {
   const { showCodeFrame = true, fullStack = false, type } = options;
@@ -6884,6 +6885,14 @@ function transformImportSpecifiers(node) {
     return "";
   return `{ ${dynamicImports} }`;
 }
+function getBetterEnd(code, node) {
+  let end = node.end;
+  if (code[node.end] === ";")
+    end += 1;
+  if (code[node.end + 1] === "\n")
+    end += 1;
+  return end;
+}
 const regexpHoistable = /^[ \t]*\b(vi|vitest)\s*\.\s*(mock|unmock|hoisted)\(/m;
 const regexpAssignedHoisted = /=[ \t]*(\bawait|)[ \t]*\b(vi|vitest)\s*\.\s*hoisted\(/;
 const hashbangRE = /^#!.*\n/;
@@ -6904,52 +6913,85 @@ ${err.message}`);
   const hoistIndex = ((_a = code.match(hashbangRE)) == null ? void 0 : _a[0].length) ?? 0;
   let hoistedCode = "";
   let hoistedVitestImports = "";
+  let uid = 0;
+  const idToImportMap = /* @__PURE__ */ new Map();
   const transformImportDeclaration = (node) => {
     const source = node.source.value;
-    const namespace = node.specifiers.find((specifier) => specifier.type === "ImportNamespaceSpecifier");
-    let code2 = "";
-    if (namespace)
-      code2 += `const ${namespace.local.name} = await import('${source}')
-`;
-    const specifiers = transformImportSpecifiers(node);
-    if (specifiers) {
-      if (namespace)
-        code2 += `const ${specifiers} = ${namespace.local.name}
-`;
-      else
-        code2 += `const ${specifiers} = await import('${source}')
+    const importId = `__vi_import_${uid++}__`;
+    const hasSpecifiers = node.specifiers.length > 0;
+    const code2 = hasSpecifiers ? `const ${importId} = await import('${source}')
+` : `await import('${source}')
 `;
-    } else if (!namespace) {
-      code2 += `await import('${source}')
-`;
-    }
-    return code2;
+    return {
+      code: code2,
+      id: importId
+    };
   };
-  function hoistImport(node) {
-    s.remove(node.start, node.end);
+  function defineImport(node) {
     if (node.source.value === "vitest") {
-      const code3 = `const ${transformImportSpecifiers(node)} = await import('vitest')
+      const code2 = `const ${transformImportSpecifiers(node)} = await import('vitest')
 `;
-      hoistedVitestImports += code3;
+      hoistedVitestImports += code2;
+      s.remove(node.start, getBetterEnd(code2, node));
       return;
     }
-    const code2 = transformImportDeclaration(node);
-    s.appendLeft(hoistIndex, code2);
+    const declaration = transformImportDeclaration(node);
+    if (!declaration)
+      return null;
+    s.appendLeft(hoistIndex, declaration.code);
+    return declaration.id;
   }
   for (const node of ast.body) {
-    if (node.type === "ImportDeclaration")
-      hoistImport(node);
+    if (node.type === "ImportDeclaration") {
+      const importId = defineImport(node);
+      if (!importId)
+        continue;
+      s.remove(node.start, getBetterEnd(code, node));
+      for (const spec of node.specifiers) {
+        if (spec.type === "ImportSpecifier") {
+          idToImportMap.set(
+            spec.local.name,
+            `${importId}.${spec.imported.name}`
+          );
+        } else if (spec.type === "ImportDefaultSpecifier") {
+          idToImportMap.set(spec.local.name, `${importId}.default`);
+        } else {
+          idToImportMap.set(spec.local.name, importId);
+        }
+      }
+    }
   }
-  simple(ast, {
-    CallExpression(_node) {
+  const declaredConst = /* @__PURE__ */ new Set();
+  esmWalker(ast, {
+    onIdentifier(id2, info, parentStack) {
+      const binding = idToImportMap.get(id2.name);
+      if (!binding)
+        return;
+      if (info.hasBindingShortcut) {
+        s.appendLeft(id2.end, `: ${binding}`);
+      } else if (info.classDeclaration) {
+        if (!declaredConst.has(id2.name)) {
+          declaredConst.add(id2.name);
+          const topNode = parentStack[parentStack.length - 2];
+          s.prependRight(topNode.start, `const ${id2.name} = ${binding};
+`);
+        }
+      } else if (
+        // don't transform class name identifier
+        !info.classExpression
+      ) {
+        s.update(id2.start, id2.end, binding);
+      }
+    },
+    onCallExpression(node) {
       var _a2, _b;
-      const node = _node;
       if (node.callee.type === "MemberExpression" && isIdentifier(node.callee.object) && (node.callee.object.name === "vi" || node.callee.object.name === "vitest") && isIdentifier(node.callee.property)) {
         const methodName = node.callee.property.name;
         if (methodName === "mock" || methodName === "unmock") {
-          hoistedCode += `${code.slice(node.start, node.end)}
-`;
-          s.remove(node.start, node.end);
+          const end = getBetterEnd(code, node);
+          const nodeCode = code.slice(node.start, end);
+          hoistedCode += `${nodeCode}${nodeCode.endsWith("\n") ? "" : "\n"}`;
+          s.remove(node.start, end);
         }
         if (methodName === "hoisted") {
           const declarationNode = (_a2 = findNodeAround(ast, node.start, "VariableDeclaration")) == null ? void 0 : _a2.node;
@@ -6959,13 +7001,15 @@ ${err.message}`);
           };
           const canMoveDeclaration = init && init.type === "CallExpression" && isViHoisted(init) || init && init.type === "AwaitExpression" && init.argument.type === "CallExpression" && isViHoisted(init.argument);
           if (canMoveDeclaration) {
-            hoistedCode += `${code.slice(declarationNode.start, declarationNode.end)}
-`;
-            s.remove(declarationNode.start, declarationNode.end);
+            const end = getBetterEnd(code, declarationNode);
+            const nodeCode = code.slice(declarationNode.start, end);
+            hoistedCode += `${nodeCode}${nodeCode.endsWith("\n") ? "" : "\n"}`;
+            s.remove(declarationNode.start, end);
           } else {
-            hoistedCode += `${code.slice(node.start, node.end)}
-`;
-            s.remove(node.start, node.end);
+            const end = getBetterEnd(code, node);
+            const nodeCode = code.slice(node.start, end);
+            hoistedCode += `${nodeCode}${nodeCode.endsWith("\n") ? "" : "\n"}`;
+            s.remove(node.start, end);
           }
         }
       }
@@ -7136,7 +7180,7 @@ async function createBrowserServer(project, configFile) {
     ]
   });
   await server.listen();
-  (await import('../chunks/api-setup.jHV5vgr2.js')).setup(project, server);
+  (await import('../chunks/api-setup.mFKdEKxa.js')).setup(project, server);
   return server;
 }
 
@@ -7843,7 +7887,9 @@ class Vitest {
       const serverRestart = server.restart;
       server.restart = async (...args) => {
         await Promise.all(this._onRestartListeners.map((fn) => fn()));
-        return await serverRestart(...args);
+        await serverRestart(...args);
+        this.unregisterWatcher();
+        this.registerWatcher();
       };
       server.watcher.on("change", async (file) => {
         file = normalize(file);
@@ -7851,6 +7897,8 @@ class Vitest {
         if (isConfig) {
           await Promise.all(this._onRestartListeners.map((fn) => fn("config")));
           await serverRestart();
+          this.unregisterWatcher();
+          this.registerWatcher();
         }
       });
     }
@@ -8300,8 +8348,13 @@ class Vitest {
       return [id];
     }
     const projects = this.getModuleProjects(id);
-    if (!projects.length)
+    if (!projects.length) {
+      if (this.state.filesMap.has(id) || this.projects.some((project) => project.isTestFile(id))) {
+        this.changedTests.add(id);
+        return [id];
+      }
       return [];
+    }
     const files = [];
     for (const project of projects) {
       const { server } = project;
@@ -8547,7 +8600,7 @@ async function VitestPlugin(options = {}, ctx = new Vitest("test")) {
         try {
           await ctx.setServer(options, server, userConfig);
           if (options.api && options.watch)
-            (await import('../chunks/api-setup.jHV5vgr2.js')).setup(ctx);
+            (await import('../chunks/api-setup.mFKdEKxa.js')).setup(ctx);
         } catch (err) {
           await ctx.logger.printError(err, { fullStack: true });
           process.exit(1);

package/dist/vendor/{vi.ciwVQ0al.js → vi.DTC--YO5.js}

@@ -3406,7 +3406,8 @@ function createVitest() {
       _mocker.queueMock(
         path,
         importer,
-        factory ? () => factory(() => _mocker.importActual(path, importer, _mocker.getMockContext().callstack)) : void 0
+        factory ? () => factory(() => _mocker.importActual(path, importer, _mocker.getMockContext().callstack)) : void 0,
+        true
       );
     },
     unmock(path) {
@@ -3417,7 +3418,8 @@ function createVitest() {
       _mocker.queueMock(
         path,
         importer,
-        factory ? () => factory(() => _mocker.importActual(path, importer, _mocker.getMockContext().callstack)) : void 0
+        factory ? () => factory(() => _mocker.importActual(path, importer, _mocker.getMockContext().callstack)) : void 0,
+        false
       );
     },
     doUnmock(path) {

package/dist/vm.js

@@ -8,7 +8,7 @@ import { resolve } from 'pathe';
 import { installSourcemapsSupport } from 'vite-node/source-map';
 import { distDir } from './paths.js';
 import { l as loadEnvironment } from './vendor/loader.L9CYwKn1.js';
-import { b as startVitestExecutor } from './vendor/execute.vStuEOaI.js';
+import { b as startVitestExecutor } from './vendor/execute.cedv4NLQ.js';
 import { createCustomConsole } from './chunks/runtime-console.hf2msWA9.js';
 import { c as createSafeRpc } from './vendor/rpc.Bl-ysZIr.js';
 import './vendor/environments.QJtma9XQ.js';

package/dist/worker.js

@@ -3,7 +3,7 @@ import { c as createBirpc } from './vendor/index.cAUulNDf.js';
 import { workerId } from 'tinypool';
 import { g as getWorkerState } from './vendor/global.L7JRz1qU.js';
 import { l as loadEnvironment } from './vendor/loader.L9CYwKn1.js';
-import { s as startViteNode, m as moduleCache, a as mockMap } from './vendor/execute.vStuEOaI.js';
+import { s as startViteNode, m as moduleCache, a as mockMap } from './vendor/execute.cedv4NLQ.js';
 import { s as setupInspect } from './vendor/inspector.lFAeuaAt.js';
 import { r as rpcDone, c as createSafeRpc } from './vendor/rpc.Bl-ysZIr.js';
 import 'pathe';

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "vitest",
   "type": "module",
-  "version": "1.1.1",
+  "version": "1.1.2",
   "description": "Next generation testing framework powered by Vite",
   "author": "Anthony Fu <anthonyfu117@hotmail.com>",
   "license": "MIT",
@@ -132,7 +132,7 @@
     }
   },
   "dependencies": {
-    "acorn-walk": "^8.3.0",
+    "acorn-walk": "^8.3.1",
     "cac": "^6.7.14",
     "chai": "^4.3.10",
     "debug": "^4.3.4",
@@ -147,12 +147,12 @@
     "tinypool": "^0.8.1",
     "vite": "^5.0.0",
     "why-is-node-running": "^2.2.2",
-    "@vitest/snapshot": "1.1.1",
-    "@vitest/spy": "1.1.1",
-    "@vitest/utils": "1.1.1",
-    "@vitest/runner": "1.1.1",
-    "@vitest/expect": "1.1.1",
-    "vite-node": "1.1.1"
+    "@vitest/expect": "1.1.2",
+    "@vitest/runner": "1.1.2",
+    "@vitest/spy": "1.1.2",
+    "@vitest/utils": "1.1.2",
+    "@vitest/snapshot": "1.1.2",
+    "vite-node": "1.1.2"
   },
   "devDependencies": {
     "@ampproject/remapping": "^2.2.1",