refactor: move function "start" from resolveConfig

cypress-io · Jan 5, 2022 · 7341f81 · 7341f81
1 parent 40e0b43
commit 7341f81
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 18 deletions.
diff --git 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<Cypress.ResolvedDevServerConfig> {
-  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 → ...ite-dev-server/src/resolveServerConfig.ts b/npm/vite-dev-server/src/startServer.ts → ...ite-dev-server/src/resolveServerConfig.ts
@@ -20,7 +20,7 @@ export interface StartDevServerOptions {
   viteConfig?: Omit<InlineConfig, 'base' | 'root'>
 }
 
-const resolveServerConfig = async ({ viteConfig, options }: StartDevServerOptions): Promise<InlineConfig> => {
+export const resolveServerConfig = async ({ viteConfig, options }: StartDevServerOptions): Promise<InlineConfig> => {
   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<ViteDevServer> {
-  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)
-}