fix!: remove Node types from the main entry point, use vitest/node instead (#8200)

Author: sheremet-va

.gitignore

@@ -32,4 +32,5 @@ test/cli/fixtures/browser-multiple/basic-*
 # exclude static html reporter folder
 test/browser/html/
 test/core/html/
-.vitest-attachments
+.vitest-attachments
+explainFiles.txt

package.json

@@ -27,6 +27,7 @@
  "test:ci": "CI=true pnpm -r --reporter-hide-prefix --stream --sequential --filter '@vitest/test-*' --filter !test-browser run test",
  "test:examples": "CI=true pnpm -r --reporter-hide-prefix --stream --filter '@vitest/example-*' run test",
  "test:ecosystem-ci": "ECOSYSTEM_CI=true pnpm test:ci",
+ "typebuild": "tsx ./scripts/explain-types.ts",
  "typecheck": "tsc -p tsconfig.check.json --noEmit",
  "typecheck:why": "tsc -p tsconfig.check.json --noEmit --explainFiles > explainTypes.txt",
  "ui:build": "vite build packages/ui",

packages/browser/package.json

@@ -64,6 +64,8 @@
  "providers"
  ],
  "scripts": {
+ "typecheck": "tsc -p ./src/client/tsconfig.json --noEmit",
+ "typecheck:why": "tsc -p ./src/client/tsconfig.json --noEmit --explainFiles > explainTypes.txt",
  "build": "rimraf dist && pnpm build:node && pnpm build:client",
  "build:client": "vite build src/client",
  "build:node": "rollup -c",

packages/browser/src/client/client.ts

@@ -1,7 +1,7 @@
 import type { ModuleMocker } from '@vitest/mocker/browser'
 import type { CancelReason } from '@vitest/runner'
 import type { BirpcReturn } from 'birpc'
-import type { WebSocketBrowserEvents, WebSocketBrowserHandlers } from '../node/types'
+import type { WebSocketBrowserEvents, WebSocketBrowserHandlers } from '../types'
 import type { IframeOrchestrator } from './orchestrator'
 import { createBirpc } from 'birpc'
 import { parse, stringify } from 'flatted'

packages/browser/src/client/tester/context.ts

@@ -1,11 +1,14 @@
-import type { Options as TestingLibraryOptions, UserEvent as TestingLibraryUserEvent } from '@testing-library/user-event'
-import type { RunnerTask } from 'vitest'
+import type {
+ Options as TestingLibraryOptions,
+ UserEvent as TestingLibraryUserEvent,
+} from '@testing-library/user-event'
 import type {
  BrowserLocators,
  BrowserPage,
  Locator,
  UserEvent,
-} from '../../../context'
+} from '@vitest/browser/context'
+import type { RunnerTask } from 'vitest'
 import type { IframeViewportEvent } from '../client'
 import type { BrowserRunnerState } from '../utils'
 import type { Locator as LocatorAPI } from './locators/index'
@@ -289,12 +292,19 @@ export const page: BrowserPage = {
  const name
  = options.path || `${taskName.replace(/[^a-z0-9]/gi, '-')}-${number}.png`
 
- return ensureAwaited(error => triggerCommand('__vitest_screenshot', [name, processTimeoutOptions({
- ...options,
- element: options.element
- ? convertToSelector(options.element)
- : undefined,
- })], error))
+ return ensureAwaited(error => triggerCommand(
+ '__vitest_screenshot',
+ [
+ name,
+ processTimeoutOptions({
+ ...options,
+ element: options.element
+ ? convertToSelector(options.element)
+ : undefined,
+ } as any /** TODO */),
+ ],
+ error,
+ ))
  },
  getByRole() {
  throw new Error(`Method "getByRole" is not implemented in the "${provider}" provider.`)

packages/browser/src/client/tester/locators/playwright.ts

@@ -1,4 +1,12 @@
-import type { UserEventClearOptions, UserEventClickOptions, UserEventDragAndDropOptions, UserEventFillOptions, UserEventHoverOptions, UserEventSelectOptions, UserEventUploadOptions } from '@vitest/browser/context'
+import type {
+ UserEventClearOptions,
+ UserEventClickOptions,
+ UserEventDragAndDropOptions,
+ UserEventFillOptions,
+ UserEventHoverOptions,
+ UserEventSelectOptions,
+ UserEventUploadOptions,
+} from '@vitest/browser/context'
 import { page, server } from '@vitest/browser/context'
 import {
  getByAltTextSelector,

packages/browser/src/client/tester/locators/webdriverio.ts

@@ -1,4 +1,9 @@
-import type { UserEventClickOptions, UserEventDragAndDropOptions, UserEventHoverOptions, UserEventSelectOptions } from '@vitest/browser/context'
+import type {
+ UserEventClickOptions,
+ UserEventDragAndDropOptions,
+ UserEventHoverOptions,
+ UserEventSelectOptions,
+} from '@vitest/browser/context'
 import { page, server } from '@vitest/browser/context'
 import {
  getByAltTextSelector,

packages/browser/src/client/tester/runner.ts

@@ -1,6 +1,5 @@
 import type { CancelReason, File, Suite, Task, TaskEventPack, TaskResultPack, Test, TestAnnotation, VitestRunner } from '@vitest/runner'
 import type { SerializedConfig, TestExecutionMethod, WorkerGlobalState } from 'vitest'
-import type { VitestExecutor } from 'vitest/execute'
 import type { VitestBrowserClientMocker } from './mocker'
 import { globalChannel, onCancel } from '@vitest/browser/client'
 import { page, userEvent } from '@vitest/browser/context'
@@ -77,7 +76,7 @@ export function createBrowserRunner(
  if (this.config.browser.screenshotFailures && document.body.clientHeight > 0 && task.result?.state === 'fail') {
  const screenshot = await page.screenshot({
  timeout: this.config.browser.providerOptions?.actionTimeout ?? 5_000,
- }).catch((err) => {
+ } as any /** TODO */).catch((err) => {
  console.error('[vitest] Failed to take a screenshot', err)
  })
  if (screenshot) {
@@ -239,8 +238,8 @@ export async function initiateRunner(
  })
 
  const [diffOptions] = await Promise.all([
- loadDiffConfig(config, executor as unknown as VitestExecutor),
- loadSnapshotSerializers(config, executor as unknown as VitestExecutor),
+ loadDiffConfig(config, executor as any),
+ loadSnapshotSerializers(config, executor as any),
  ])
  runner.config.diffOptions = diffOptions
  getWorkerState().onFilterStackTrace = (stack: string) => {

packages/browser/src/client/tester/state.ts

@@ -32,6 +32,7 @@ const state: WorkerGlobalState = {
  },
  onCleanup: fn => getBrowserState().cleanups.push(fn),
  moduleCache: getBrowserState().moduleCache,
+ moduleExecutionInfo: new Map(),
  rpc: null as any,
  durations: {
  environment: 0,

packages/browser/src/client/tsconfig.json

@@ -0,0 +1,21 @@
+{
+ "extends": "../../../../tsconfig.base.json",
+ "compilerOptions": {
+ "lib": [
+ "dom",
+ "esnext",
+ "DOM.Iterable"
+ ],
+ "types": ["vite/client"],
+ "noEmit": true
+ },
+ "include": [
+ "./**/*.ts",
+ "../types.ts",
+ "../../matchers.d.ts",
+ "../../../vitest/src/integrations/chai/chai-subset.d.ts"
+ ],
+ "exclude": [
+ "./vite.config.ts"
+ ]
+}