fix: aovid resolveConfig twice at dev build

Author: underfin

packages/vite/src/node/cli.ts

@@ -187,24 +187,8 @@ cli
       filterDuplicateOptions(options)
       // output structure is preserved even after bundling so require()
       // is ok here
-      const { createServer } = await import('./server')
+      const { createServerWithResolvedConfig } = await import('./server')
       try {
-        const server = await createServer({
-          root,
-          base: options.base,
-          mode: options.mode,
-          configFile: options.config,
-          configLoader: options.configLoader,
-          logLevel: options.logLevel,
-          clearScreen: options.clearScreen,
-          server: cleanGlobalCLIOptions(options),
-          forceOptimizeDeps: options.force,
-        })
-
-        if (!server.httpServer) {
-          throw new Error('HTTP server not available')
-        }
-
         const { createBuilder } = await import('./build')
 
         const buildOptions: BuildEnvironmentOptions =
@@ -222,6 +206,13 @@ cli
           ...(options.app ? { builder: {} } : {}),
         }
         const builder = await createBuilder(inlineConfig, null, 'serve')
+
+        const server = await createServerWithResolvedConfig(builder.config)
+
+        if (!server.httpServer) {
+          throw new Error('HTTP server not available')
+        }
+
         await builder.buildApp(server)
 
         await server.listen()

packages/vite/src/node/server/index.ts

@@ -411,21 +411,26 @@ export interface ResolvedServerUrls {
   network: string[]
 }
 
-export function createServer(
+export async function createServer(
   inlineConfig: InlineConfig = {},
 ): Promise<ViteDevServer> {
-  return _createServer(inlineConfig, { listen: true })
+  const config = await resolveConfig(inlineConfig, 'serve')
+  return _createServer(config, { listen: true })
+}
+
+export function createServerWithResolvedConfig(
+  config: ResolvedConfig,
+): Promise<ViteDevServer> {
+  return _createServer(config, { listen: true })
 }
 
 export async function _createServer(
-  inlineConfig: InlineConfig = {},
+  config: ResolvedConfig,
   options: {
     listen: boolean
     previousEnvironments?: Record<string, DevEnvironment>
   },
 ): Promise<ViteDevServer> {
-  const config = await resolveConfig(inlineConfig, 'serve')
-
   const initPublicFilesPromise = initPublicFiles(config)
 
   const { root, server: serverConfig } = config
@@ -1190,7 +1195,8 @@ async function restartServer(server: ViteDevServer) {
     let newServer: ViteDevServer | null = null
     try {
       // delay ws server listen
-      newServer = await _createServer(inlineConfig, {
+      const config = await resolveConfig(inlineConfig, 'serve')
+      newServer = await _createServer(config, {
         listen: false,
         previousEnvironments: server.environments,
       })