Merge branch 'main' into fix-diff-maxDepth

Author: hi-ogawa

packages/browser/src/client/channel.ts

@@ -40,12 +40,12 @@ export type IframeChannelEvent =
   | IframeChannelIncomingEvent
   | IframeChannelOutgoingEvent
 
-export const channel = new BroadcastChannel(
+export const channel: BroadcastChannel = new BroadcastChannel(
   `vitest:${getBrowserState().sessionId}`,
 )
-export const globalChannel = new BroadcastChannel('vitest:global')
+export const globalChannel: BroadcastChannel = new BroadcastChannel('vitest:global')
 
-export function waitForChannel(event: IframeChannelOutgoingEvent['type']) {
+export function waitForChannel(event: IframeChannelOutgoingEvent['type']): Promise<void> {
   return new Promise<void>((resolve) => {
     channel.addEventListener(
       'message',

packages/browser/src/client/client.ts

@@ -6,19 +6,19 @@ import { getBrowserState } from './utils'
 
 const PAGE_TYPE = getBrowserState().type
 
-export const PORT = location.port
-export const HOST = [location.hostname, PORT].filter(Boolean).join(':')
-export const RPC_ID
+export const PORT: string = location.port
+export const HOST: string = [location.hostname, PORT].filter(Boolean).join(':')
+export const RPC_ID: string
   = PAGE_TYPE === 'orchestrator'
     ? getBrowserState().sessionId
     : getBrowserState().testerId
 const METHOD = getBrowserState().method
-export const ENTRY_URL = `${
+export const ENTRY_URL: string = `${
   location.protocol === 'https:' ? 'wss:' : 'ws:'
 }//${HOST}/__vitest_browser_api__?type=${PAGE_TYPE}&rpcId=${RPC_ID}&sessionId=${getBrowserState().sessionId}&projectName=${getBrowserState().config.name || ''}&method=${METHOD}&token=${(window as any).VITEST_API_TOKEN}`
 
 let setCancel = (_: CancelReason) => {}
-export const onCancel = new Promise<CancelReason>((resolve) => {
+export const onCancel: Promise<CancelReason> = new Promise((resolve) => {
   setCancel = resolve
 })
 
@@ -135,6 +135,6 @@ function createClient() {
   return ctx
 }
 
-export const client = createClient()
+export const client: VitestBrowserClient = createClient()
 
 export * from './channel'

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

@@ -11,6 +11,7 @@ import type {
   UserEventTabOptions,
   UserEventTypeOptions,
 } from '../../../context'
+import type { BrowserRunnerState } from '../utils'
 import { convertElementToCssSelector, ensureAwaited, getBrowserState, getWorkerState } from '../utils'
 
 // this file should not import anything directly, only types and utils
@@ -238,7 +239,7 @@ function createPreviewUserEvent(userEventBase: TestingLibraryUserEvent, options:
   return vitestUserEvent
 }
 
-export function cdp() {
+export function cdp(): BrowserRunnerState['cdp'] {
   return getBrowserState().cdp!
 }
 

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

@@ -18,7 +18,7 @@ expect(${name}).toHaveBeenCalledWith(${formattedParams})
   }
 }
 
-export function setupDialogsSpy() {
+export function setupDialogsSpy(): void {
   globalThis.alert = showPopupWarning('alert', undefined)
   globalThis.confirm = showPopupWarning('confirm', false, true)
   globalThis.prompt = showPopupWarning('prompt', null, 'your value')

packages/browser/src/client/tester/expect-element.ts

@@ -3,7 +3,7 @@ import type { ExpectPollOptions } from 'vitest'
 import * as matchers from '@testing-library/jest-dom/matchers'
 import { chai, expect } from 'vitest'
 
-export async function setupExpectDom() {
+export async function setupExpectDom(): Promise<void> {
   expect.extend(matchers)
   expect.element = <T extends Element | Locator>(elementOrLocator: T, options?: ExpectPollOptions) => {
     if (!(elementOrLocator instanceof Element) && !('element' in elementOrLocator)) {

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

@@ -26,7 +26,7 @@ import { ensureAwaited, getBrowserState, getWorkerState } from '../../utils'
 import { getElementError } from '../public-utils'
 
 // we prefer using playwright locators because they are more powerful and support Shadow DOM
-export const selectorEngine = Ivya.create({
+export const selectorEngine: Ivya = Ivya.create({
   browser: ((name: string) => {
     switch (name) {
       case 'edge':
@@ -217,7 +217,7 @@ export abstract class Locator {
     return this.worker.rpc as any as BrowserRPC
   }
 
-  protected triggerCommand<T>(command: string, ...args: any[]) {
+  protected triggerCommand<T>(command: string, ...args: any[]): Promise<T> {
     const filepath = this.worker.filepath
       || this.worker.current?.file?.filepath
       || undefined

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

@@ -4,7 +4,7 @@ import { rpc } from './rpc'
 
 const { Date, console, performance } = globalThis
 
-export function setupConsoleLogSpy() {
+export function setupConsoleLogSpy(): void {
   const {
     log,
     info,

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

@@ -1,7 +1,7 @@
 import { ModuleMockerMSWInterceptor } from '@vitest/mocker/browser'
 import { getConfig } from '../utils'
 
-export function createModuleMockerInterceptor() {
+export function createModuleMockerInterceptor(): ModuleMockerMSWInterceptor {
   const debug = getConfig().env.VITEST_BROWSER_DEBUG
   return new ModuleMockerMSWInterceptor({
     globalThisAccessor: '"__vitest_mocker__"',

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

@@ -31,7 +31,7 @@ function withSafeTimers(getTimers: typeof getSafeTimers, fn: () => void) {
 
 const promises = new Set<Promise<unknown>>()
 
-export async function rpcDone() {
+export async function rpcDone(): Promise<unknown[] | undefined> {
   if (!promises.size) {
     return
   }

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

@@ -16,10 +16,7 @@ interface BrowserRunnerOptions {
   config: SerializedConfig
 }
 
-export const browserHashMap = new Map<
-  string,
-  string
->()
+export const browserHashMap: Map<string, string> = new Map()
 
 interface CoverageHandler {
   takeCoverage: () => Promise<unknown>
@@ -157,7 +154,7 @@ export async function initiateRunner(
   state: WorkerGlobalState,
   mocker: VitestBrowserClientMocker,
   config: SerializedConfig,
-) {
+): Promise<VitestRunner> {
   if (cachedRunner) {
     return cachedRunner
   }