refactor: add SerializedConfig instead of ResolvedConfig

docs/guide/browser/context.md

@@ -67,7 +67,7 @@ export const page: {
   /**
    * Serialized test config.
    */
-  config: ResolvedConfig
+  config: SerializedConfig
   /**
    * Change the size of iframe's viewport.
    */

packages/browser/context.d.ts

@@ -1,4 +1,4 @@
-import type { ResolvedConfig } from 'vitest'
+import type { SerializedConfig } from 'vitest'
 
 export type BufferEncoding =
   | 'ascii'
@@ -253,7 +253,7 @@ export interface BrowserPage {
   /**
    * Serialized test config.
    */
-  config: ResolvedConfig
+  config: SerializedConfig
   /**
    * Change the size of iframe's viewport.
    */

packages/browser/src/client/orchestrator.ts

@@ -1,8 +1,8 @@
-import type { ResolvedConfig } from 'vitest'
 import { channel, client } from '@vitest/browser/client'
 import { generateHash } from '@vitest/runner/utils'
 import { type GlobalChannelIncomingEvent, type IframeChannelEvent, type IframeChannelIncomingEvent, globalChannel } from '@vitest/browser/client'
 import { relative } from 'pathe'
+import type { SerializedConfig } from 'vitest/src/runtime/config.js'
 import { getBrowserState, getConfig } from './utils'
 import { getUiAPI } from './ui'
 import { createModuleMocker } from './tester/msw'
@@ -230,7 +230,7 @@ async function done() {
   await client.rpc.finishBrowserTests(getBrowserState().contextId)
 }
 
-async function getContainer(config: ResolvedConfig): Promise<HTMLDivElement> {
+async function getContainer(config: SerializedConfig): Promise<HTMLDivElement> {
   if (config.browser.ui) {
     const element = document.querySelector('#tester-ui')
     if (!element) {

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

@@ -1,5 +1,5 @@
 import type { CancelReason, File, Suite, Task, TaskResultPack, VitestRunner } from '@vitest/runner'
-import type { ResolvedConfig, WorkerGlobalState } from 'vitest'
+import type { SerializedConfig, WorkerGlobalState } from 'vitest'
 import type { VitestExecutor } from 'vitest/execute'
 import { NodeBenchmarkRunner, VitestTestRunner } from 'vitest/runners'
 import { loadDiffConfig, loadSnapshotSerializers, takeCoverageInsideWorker } from 'vitest/browser'
@@ -12,7 +12,7 @@ import { rpc } from './rpc'
 import type { VitestBrowserClientMocker } from './mocker'
 
 interface BrowserRunnerOptions {
-  config: ResolvedConfig
+  config: SerializedConfig
 }
 
 export const browserHashMap = new Map<
@@ -25,13 +25,13 @@ interface CoverageHandler {
 }
 
 export function createBrowserRunner(
-  runnerClass: { new (config: ResolvedConfig): VitestRunner },
+  runnerClass: { new (config: SerializedConfig): VitestRunner },
   mocker: VitestBrowserClientMocker,
   state: WorkerGlobalState,
   coverageModule: CoverageHandler | null,
 ): { new (options: BrowserRunnerOptions): VitestRunner } {
   return class BrowserTestRunner extends runnerClass implements VitestRunner {
-    public config: ResolvedConfig
+    public config: SerializedConfig
     hashMap = browserHashMap
     public sourceMapCache = new Map<string, any>()
 
@@ -140,7 +140,7 @@ let cachedRunner: VitestRunner | null = null
 export async function initiateRunner(
   state: WorkerGlobalState,
   mocker: VitestBrowserClientMocker,
-  config: ResolvedConfig,
+  config: SerializedConfig,
 ) {
   if (cachedRunner) {
     return cachedRunner

packages/browser/src/client/utils.ts

@@ -1,4 +1,4 @@
-import type { ResolvedConfig, WorkerGlobalState } from 'vitest'
+import type { SerializedConfig, WorkerGlobalState } from 'vitest'
 
 export async function importId(id: string) {
   const name = `/@id/${id}`.replace(/\\/g, '/')
@@ -10,15 +10,15 @@ export async function importFs(id: string) {
   return getBrowserState().wrapModule(() => import(/* @vite-ignore */ name))
 }
 
-export function getConfig(): ResolvedConfig {
+export function getConfig(): SerializedConfig {
   return getBrowserState().config
 }
 
 export interface BrowserRunnerState {
   files: string[]
   runningFiles: string[]
   moduleCache: WorkerGlobalState['moduleCache']
-  config: ResolvedConfig
+  config: SerializedConfig
   provider: string
   viteConfig: {
     root: string

packages/browser/src/node/commands/screenshot.ts

@@ -1,8 +1,7 @@
 import { mkdir } from 'node:fs/promises'
 import { normalize } from 'node:path'
-import type { BrowserCommand } from 'vitest/node'
+import type { BrowserCommand, ResolvedConfig } from 'vitest/node'
 import { basename, dirname, relative, resolve } from 'pathe'
-import type { ResolvedConfig } from 'vitest'
 import type { ScreenshotOptions } from '../../../context'
 import { PlaywrightBrowserProvider } from '../providers/playwright'
 import { WebdriverBrowserProvider } from '../providers/webdriver'

packages/browser/src/node/resolveMock.ts

@@ -2,9 +2,8 @@ import { existsSync, readFileSync, readdirSync } from 'node:fs'
 import { builtinModules } from 'node:module'
 import { basename, dirname, extname, isAbsolute, join, resolve } from 'pathe'
 import type { PartialResolvedId } from 'rollup'
-import type { ResolvedConfig } from 'vitest'
+import type { ResolvedConfig, WorkspaceProject } from 'vitest/node'
 import type { ResolvedConfig as ViteConfig } from 'vite'
-import type { WorkspaceProject } from 'vitest/node'
 
 export async function resolveMock(
   project: WorkspaceProject,

packages/browser/src/node/server.ts

@@ -11,8 +11,8 @@ import type {
 import { join, resolve } from 'pathe'
 import type { ErrorWithDiff } from '@vitest/utils'
 import { slash } from '@vitest/utils'
-import type { ResolvedConfig } from 'vitest'
 import { type StackTraceParserOptions, parseErrorStacktrace, parseStacktrace } from '@vitest/utils/source-map'
+import type { SerializedConfig } from 'vitest'
 import { BrowserServerState } from './state'
 import { getBrowserProvider } from './utils'
 import { BrowserServerCDPHandler } from './cdp'
@@ -224,7 +224,7 @@ export class BrowserServer implements IBrowserServer {
   }
 }
 
-function wrapConfig(config: ResolvedConfig): ResolvedConfig {
+function wrapConfig(config: SerializedConfig): SerializedConfig {
   return {
     ...config,
     // workaround RegExp serialization

packages/browser/src/node/serverOrchestrator.ts

@@ -17,14 +17,13 @@ export async function resolveOrchestrator(
 
   const files = server.state.getContext(contextId!)?.files ?? []
 
-  const config = server.getSerializableConfig()
   const injectorJs = typeof server.injectorJs === 'string'
     ? server.injectorJs
     : await server.injectorJs
 
   const injector = replacer(injectorJs, {
     __VITEST_PROVIDER__: JSON.stringify(server.provider.name),
-    __VITEST_CONFIG__: JSON.stringify(config),
+    __VITEST_CONFIG__: JSON.stringify(server.getSerializableConfig()),
     __VITEST_VITE_CONFIG__: JSON.stringify({
       root: server.vite.config.root,
     }),

packages/browser/src/node/serverTester.ts

@@ -38,11 +38,9 @@ export async function resolveTester(
     ? server.injectorJs
     : await server.injectorJs
 
-  const config = server.getSerializableConfig()
-
   const injector = replacer(injectorJs, {
     __VITEST_PROVIDER__: JSON.stringify(server.provider.name),
-    __VITEST_CONFIG__: JSON.stringify(config),
+    __VITEST_CONFIG__: JSON.stringify(server.getSerializableConfig()),
     __VITEST_FILES__: JSON.stringify(files),
     __VITEST_VITE_CONFIG__: JSON.stringify({
       root: server.vite.config.root,
@@ -57,7 +55,7 @@ export async function resolveTester(
     const testerScripts = await server.formatScripts(
       project.config.browser.testerScripts,
     )
-    const clientScript = `<script type="module" src="${config.base || '/'}@vite/client"></script>`
+    const clientScript = `<script type="module" src="${server.project.config.base || '/'}@vite/client"></script>`
     const stateJs = typeof server.stateJs === 'string'
       ? server.stateJs
       : await server.stateJs

packages/runner/src/types/runner.ts

@@ -14,8 +14,8 @@ import type {
 
 export interface VitestRunnerConfig {
   root: string
-  setupFiles: string[] | string
-  name: string
+  setupFiles: string[]
+  name?: string
   passWithNoTests: boolean
   testNamePattern?: RegExp
   allowOnly?: boolean

packages/runner/src/utils/collect.ts

@@ -117,7 +117,7 @@ export function calculateSuiteHash(parent: Suite): void {
 export function createFileTask(
   filepath: string,
   root: string,
-  projectName: string,
+  projectName: string | undefined,
   pool?: string,
 ): File {
   const path = relative(root, filepath)

packages/ui/client/composables/client/index.ts

@@ -1,6 +1,6 @@
 import { createClient, getTasks } from '@vitest/ws-client'
 import type { WebSocketStatus } from '@vueuse/core'
-import type { File, ResolvedConfig, TaskResultPack } from 'vitest'
+import type { File, SerializedConfig, TaskResultPack } from 'vitest'
 import { reactive as reactiveVue } from 'vue'
 import { createFileTask } from '@vitest/runner/utils'
 import type { BrowserRunnerState } from '../../../types'
@@ -45,7 +45,7 @@ export const client = (function createVitestClient() {
   }
 })()
 
-export const config = shallowRef<ResolvedConfig>({} as any)
+export const config = shallowRef<SerializedConfig>({} as any)
 export const status = ref<WebSocketStatus>('CONNECTING')
 
 export const current = computed(() => {

packages/ui/node/reporter.ts

@@ -10,10 +10,9 @@ import type {
   File,
   ModuleGraphData,
   Reporter,
-  ResolvedConfig,
   Vitest,
 } from 'vitest'
-import type { HTMLOptions } from 'vitest/node'
+import type { HTMLOptions, ResolvedConfig } from 'vitest/node'
 import { getModuleGraph } from '../../vitest/src/utils/graph'
 
 interface PotentialConfig {

packages/ui/types.ts

@@ -1,4 +1,4 @@
-import type { ResolvedConfig } from 'vitest'
+import type { SerializedConfig } from 'vitest'
 
 export interface WSMessage {
   /**
@@ -16,7 +16,7 @@ export type RunState = 'idle' | 'running'
 
 export interface BrowserRunnerState {
   files: string[]
-  config: ResolvedConfig
+  config: SerializedConfig
   type: 'orchestrator'
   wrapModule: <T>(module: () => T) => T
 }

packages/vitest/src/api/types.ts

@@ -4,7 +4,8 @@ import type {
   File,
   ModuleGraphData,
   Reporter,
-  ResolvedConfig,
+  SerializableSpec,
+  SerializedConfig,
   TaskResultPack,
 } from '../types'
 
@@ -16,9 +17,9 @@ export interface WebSocketHandlers {
   onCollected: (files?: File[]) => Promise<void>
   onTaskUpdate: (packs: TaskResultPack[]) => void
   getFiles: () => File[]
-  getTestFiles: () => Promise<[{ name: string; root: string }, file: string][]>
+  getTestFiles: () => Promise<SerializableSpec[]>
   getPaths: () => string[]
-  getConfig: () => ResolvedConfig
+  getConfig: () => SerializedConfig
   getModuleGraph: (
     projectName: string,
     id: string,

packages/vitest/src/integrations/coverage.ts

@@ -1,5 +1,5 @@
+import type { SerializedCoverageConfig } from '../runtime/config'
 import type {
-  CoverageOptions,
   CoverageProvider,
   CoverageProviderModule,
 } from '../types'
@@ -14,7 +14,7 @@ export const CoverageProviderMap: Record<string, string> = {
 }
 
 async function resolveCoverageProviderModule(
-  options: CoverageOptions | undefined,
+  options: SerializedCoverageConfig | undefined,
   loader: Loader,
 ) {
   if (!options?.enabled || !options.provider) {
@@ -40,7 +40,7 @@ async function resolveCoverageProviderModule(
   let customProviderModule
 
   try {
-    customProviderModule = await loader.executeId(options.customProviderModule)
+    customProviderModule = await loader.executeId(options.customProviderModule!)
   }
   catch (error) {
     throw new Error(
@@ -59,7 +59,7 @@ async function resolveCoverageProviderModule(
 }
 
 export async function getCoverageProvider(
-  options: CoverageOptions | undefined,
+  options: SerializedCoverageConfig | undefined,
   loader: Loader,
 ): Promise<CoverageProvider | null> {
   const coverageModule = await resolveCoverageProviderModule(options, loader)
@@ -72,7 +72,7 @@ export async function getCoverageProvider(
 }
 
 export async function startCoverageInsideWorker(
-  options: CoverageOptions | undefined,
+  options: SerializedCoverageConfig | undefined,
   loader: Loader,
 ) {
   const coverageModule = await resolveCoverageProviderModule(options, loader)
@@ -85,7 +85,7 @@ export async function startCoverageInsideWorker(
 }
 
 export async function takeCoverageInsideWorker(
-  options: CoverageOptions | undefined,
+  options: SerializedCoverageConfig | undefined,
   loader: Loader,
 ) {
   const coverageModule = await resolveCoverageProviderModule(options, loader)
@@ -98,7 +98,7 @@ export async function takeCoverageInsideWorker(
 }
 
 export async function stopCoverageInsideWorker(
-  options: CoverageOptions | undefined,
+  options: SerializedCoverageConfig | undefined,
   loader: Loader,
 ) {
   const coverageModule = await resolveCoverageProviderModule(options, loader)

packages/vitest/src/integrations/snapshot/environments/resolveSnapshotEnvironment.ts

@@ -1,9 +1,9 @@
 import type { SnapshotEnvironment } from '@vitest/snapshot/environment'
 import type { VitestExecutor } from '../../../runtime/execute'
-import type { ResolvedConfig } from '../../../types'
+import type { SerializedConfig } from '../../../runtime/config'
 
 export async function resolveSnapshotEnvironment(
-  config: ResolvedConfig,
+  config: SerializedConfig,
   executor: VitestExecutor,
 ): Promise<SnapshotEnvironment> {
   if (!config.snapshotEnvironment) {

packages/vitest/src/integrations/vi.ts

@@ -2,7 +2,7 @@ import type { FakeTimerInstallOpts } from '@sinonjs/fake-timers'
 import { assertTypes, createSimpleStackTrace } from '@vitest/utils'
 import { parseSingleStack } from '../utils/source-map'
 import type { VitestMocker } from '../runtime/mocker'
-import type { ResolvedConfig, RuntimeConfig } from '../types'
+import type { RuntimeConfig, SerializedConfig } from '../runtime/config'
 import type { MockFactoryWithHelper } from '../types/mocker'
 import { getWorkerState } from '../utils/global'
 import { resetModules, waitForImportsToResolve } from '../utils/modules'
@@ -383,7 +383,7 @@ export interface VitestUtils {
 
 function createVitest(): VitestUtils {
   let _mockedDate: Date | null = null
-  let _config: null | ResolvedConfig = null
+  let _config: null | SerializedConfig = null
 
   function _mocker(): VitestMocker {
     // @ts-expect-error injected by vite-nide

packages/vitest/src/node/cache/results.ts

@@ -1,6 +1,7 @@
 import fs from 'node:fs'
 import { dirname, relative, resolve } from 'pathe'
-import type { File, ResolvedConfig } from '../../types'
+import type { File } from '../../types'
+import type { ResolvedConfig } from '../../types/config'
 
 export interface SuiteResultCache {
   failed: boolean