From 7f7ff11c6c40a4c6793c3597f4a5a79d9795f4a4 Mon Sep 17 00:00:00 2001
From: Bill Collins <bill@bill.works>
Date: Thu, 27 Feb 2025 12:44:35 +0000
Subject: [PATCH] fix: remove vestigial spy stub, import directly from
 `@vitest/spy` (#7575)

---
 packages/vitest/src/integrations/vi.ts | 10 +++++-----
 packages/vitest/src/public/browser.ts  |  3 ++-
 packages/vitest/src/public/index.ts    | 19 ++++++++++---------
 3 files changed, 17 insertions(+), 15 deletions(-)

diff --git a/packages/vitest/src/integrations/vi.ts b/packages/vitest/src/integrations/vi.ts
index 3cb30894e5e6..60ea80149489 100644
--- a/packages/vitest/src/integrations/vi.ts
+++ b/packages/vitest/src/integrations/vi.ts
@@ -1,19 +1,19 @@
 import type { FakeTimerInstallOpts } from '@sinonjs/fake-timers'
-import type { RuntimeOptions, SerializedConfig } from '../runtime/config'
-import type { VitestMocker } from '../runtime/mocker'
-import type { MockFactoryWithHelper, MockOptions } from '../types/mocker'
 import type {
   MaybeMocked,
   MaybeMockedDeep,
   MaybePartiallyMocked,
   MaybePartiallyMockedDeep,
   MockInstance,
-} from './spy'
+} from '@vitest/spy'
+import type { RuntimeOptions, SerializedConfig } from '../runtime/config'
+import type { VitestMocker } from '../runtime/mocker'
+import type { MockFactoryWithHelper, MockOptions } from '../types/mocker'
+import { fn, isMockFunction, mocks, spyOn } from '@vitest/spy'
 import { assertTypes, createSimpleStackTrace } from '@vitest/utils'
 import { getWorkerState, isChildProcess, resetModules, waitForImportsToResolve } from '../runtime/utils'
 import { parseSingleStack } from '../utils/source-map'
 import { FakeTimers } from './mock/timers'
-import { fn, isMockFunction, mocks, spyOn } from './spy'
 import { waitFor, waitUntil } from './wait'
 
 type ESModuleExports = Record<string, unknown>
diff --git a/packages/vitest/src/public/browser.ts b/packages/vitest/src/public/browser.ts
index 9961f2a139fa..db82652010e5 100644
--- a/packages/vitest/src/public/browser.ts
+++ b/packages/vitest/src/public/browser.ts
@@ -4,10 +4,11 @@ export {
   stopCoverageInsideWorker,
   takeCoverageInsideWorker,
 } from '../integrations/coverage'
-export * as SpyModule from '../integrations/spy'
+
 export {
   loadDiffConfig,
   loadSnapshotSerializers,
   setupCommonEnv,
 } from '../runtime/setup-common'
 export { collectTests, processError, startTests } from '@vitest/runner'
+export * as SpyModule from '@vitest/spy'
diff --git a/packages/vitest/src/public/index.ts b/packages/vitest/src/public/index.ts
index f5b6ec05947d..56d2d302f354 100644
--- a/packages/vitest/src/public/index.ts
+++ b/packages/vitest/src/public/index.ts
@@ -109,15 +109,6 @@ export { assert, chai, createExpect, expect, should } from '../integrations/chai
 export { inject } from '../integrations/inject'
 export { isFirstRun, runOnce } from '../integrations/run-once'
 
-export type {
-  Mock,
-  MockContext,
-  Mocked,
-  MockedClass,
-  MockedFunction,
-  MockedObject,
-  MockInstance,
-} from '../integrations/spy'
 export { getRunningMode, isWatchMode } from '../integrations/utils'
 export { vi, vitest } from '../integrations/vi'
 export type { VitestUtils } from '../integrations/vi'
@@ -319,6 +310,16 @@ export type {
   UncheckedSnapshot,
 } from '@vitest/snapshot'
 
+export type {
+  Mock,
+  MockContext,
+  Mocked,
+  MockedClass,
+  MockedFunction,
+  MockedObject,
+  MockInstance,
+} from '@vitest/spy'
+
 /** @deprecated import from `vitest/node` instead */
 export type BrowserScript = BrowserScript_
 /** @deprecated import from `vitest/node` instead */