Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions packages/vitest/src/integrations/vi.ts
Original file line number Diff line number Diff line change
@@ -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>
Expand Down
3 changes: 2 additions & 1 deletion packages/vitest/src/public/browser.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
19 changes: 10 additions & 9 deletions packages/vitest/src/public/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down Expand Up @@ -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 */
Expand Down