diff --git a/npm/vite-dev-server/src/index.ts b/npm/vite-dev-server/src/index.ts index b198aaa85530..f841d4285dbc 100644 --- a/npm/vite-dev-server/src/index.ts +++ b/npm/vite-dev-server/src/index.ts @@ -1,15 +1,23 @@ import { debug as debugFn } from 'debug' -import { InlineConfig } from 'vite' -import { start as createDevServer, StartDevServerOptions } from './startServer' +import { createServer, InlineConfig } from 'vite' +import { resolveServerConfig, StartDevServerOptions } from './resolveServerConfig' const debug = debugFn('cypress:vite-dev-server:vite') export { StartDevServerOptions } export async function startDevServer (startDevServerArgs: StartDevServerOptions): Promise { - const viteDevServer = await createDevServer(startDevServerArgs) + if (!startDevServerArgs.viteConfig) { + debug('User did not pass in any Vite dev server configuration') + startDevServerArgs.viteConfig = {} + } - const app = await viteDevServer.listen() - const port = app.config.server.port! + debug('starting vite dev server') + const resolvedConfig = await resolveServerConfig(startDevServerArgs) + const port = resolvedConfig.server!.port! + + const viteDevServer = await createServer(resolvedConfig) + + await viteDevServer.listen() debug('Component testing vite server started on port', port) diff --git a/npm/vite-dev-server/src/startServer.ts b/npm/vite-dev-server/src/resolveServerConfig.ts similarity index 84% rename from npm/vite-dev-server/src/startServer.ts rename to npm/vite-dev-server/src/resolveServerConfig.ts index b4c7c2af23b5..9792a73807e2 100644 --- a/npm/vite-dev-server/src/startServer.ts +++ b/npm/vite-dev-server/src/resolveServerConfig.ts @@ -20,7 +20,7 @@ export interface StartDevServerOptions { viteConfig?: Omit } -const resolveServerConfig = async ({ viteConfig, options }: StartDevServerOptions): Promise => { +export const resolveServerConfig = async ({ viteConfig, options }: StartDevServerOptions): Promise => { const { projectRoot, supportFile } = options.config const requiredOptions: InlineConfig = { @@ -74,15 +74,3 @@ const resolveServerConfig = async ({ viteConfig, options }: StartDevServerOption return finalConfig } - -export async function start (devServerOptions: StartDevServerOptions): Promise { - if (!devServerOptions.viteConfig) { - debug('User did not pass in any Vite dev server configuration') - devServerOptions.viteConfig = {} - } - - debug('starting vite dev server') - const resolvedConfig = await resolveServerConfig(devServerOptions) - - return createServer(resolvedConfig) -}