diff --git a/packages/vitest/src/node/state.ts b/packages/vitest/src/node/state.ts index af5d2702a2b4..c1c01d7ece7b 100644 --- a/packages/vitest/src/node/state.ts +++ b/packages/vitest/src/node/state.ts @@ -1,15 +1,11 @@ import { relative } from 'pathe' -import type { File, Task, TaskResultPack, UserConsoleLog } from '../types' +import type { File, Task, TaskResultPack } from '@vitest/runner' // can't import actual functions from utils, because it's incompatible with @vitest/browsers -import type { AggregateError as AggregateErrorPonyfill } from '../utils' +import type { AggregateError as AggregateErrorPonyfill } from '../utils/base' +import type { UserConsoleLog } from '../types/general' import type { WorkspaceProject } from './workspace' -interface CollectingPromise { - promise: Promise - resolve: () => void -} - export function isAggregateError(err: unknown): err is AggregateErrorPonyfill { if (typeof AggregateError !== 'undefined' && err instanceof AggregateError) return true @@ -21,7 +17,6 @@ export function isAggregateError(err: unknown): err is AggregateErrorPonyfill { export class StateManager { filesMap = new Map() pathsSet: Set = new Set() - collectingPromise: CollectingPromise | undefined = undefined browserTestPromises = new Map void; reject: (v: unknown) => void }>() idMap = new Map() taskFileMap = new WeakMap() @@ -92,7 +87,9 @@ export class StateManager { }) } - clearFiles(project: WorkspaceProject, paths: string[] = []) { + // this file is reused by ws-client, and shoult not rely on heavy dependencies like workspace + clearFiles(_project: { config: { name: string } }, paths: string[] = []) { + const project = _project as WorkspaceProject paths.forEach((path) => { const files = this.filesMap.get(path) if (!files) diff --git a/packages/vitest/src/utils/base.ts b/packages/vitest/src/utils/base.ts index 151de2a8cdf8..0f049b0265e8 100644 --- a/packages/vitest/src/utils/base.ts +++ b/packages/vitest/src/utils/base.ts @@ -1,4 +1,4 @@ -import type { Arrayable, Nullable } from '../types' +import type { Arrayable, Nullable } from '../types/general' export { notNullish, getCallLastIndex } from '@vitest/utils' diff --git a/packages/vitest/src/utils/tasks.ts b/packages/vitest/src/utils/tasks.ts index 96620cd73127..54b613b76f73 100644 --- a/packages/vitest/src/utils/tasks.ts +++ b/packages/vitest/src/utils/tasks.ts @@ -1,5 +1,6 @@ import { getNames, getTests } from '@vitest/runner/utils' -import type { Arrayable, Suite, Task } from '../types' +import type { Suite, Task } from '@vitest/runner' +import type { Arrayable } from '../types/general' import { toArray } from './base' export { getTasks, getTests, getSuites, hasTests, hasFailed, getNames } from '@vitest/runner/utils'