refactor: move side effect of restart server to the caller

vitejs · Jun 23, 2022 · d63cdb3 · d63cdb3
1 parent c8aab50
commit d63cdb3
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/packages/vite/src/node/server/hmr.ts b/packages/vite/src/node/server/hmr.ts
@@ -63,7 +63,17 @@ export async function handleHMRUpdate(
       { clear: true, timestamp: true }
     )
     try {
+      const { port: prevPort, host: prevHost } = config.server
       await server.restart()
+      const {
+        logger,
+        server: { port, host }
+      } = server.config
+      logger.info('server restarted.', { timestamp: true })
+      if (port !== prevPort || host !== prevHost) {
+        logger.info('')
+        server.printUrls()
+      }
     } catch (e) {
       config.logger.error(colors.red(e))
     }

diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
@@ -690,7 +690,6 @@ export function resolveServerOptions(
 async function restartServer(server: ViteDevServer) {
   // @ts-ignore
   global.__vite_start_time = performance.now()
-  const { port: prevPort, host: prevHost } = server.config.server
 
   await server.close()
 
@@ -724,19 +723,9 @@ async function restartServer(server: ViteDevServer) {
     }
   }
 
-  const {
-    logger,
-    server: { port, host, middlewareMode }
-  } = server.config
+  const { port, middlewareMode } = server.config.server
   if (!middlewareMode) {
     await server.listen(port, true)
-    logger.info('server restarted.', { timestamp: true })
-    if (port !== prevPort || host !== prevHost) {
-      logger.info('')
-      server.printUrls()
-    }
-  } else {
-    logger.info('server restarted.', { timestamp: true })
   }
 
   // new server (the current server) can restart now