CR

vitejs · May 23, 2024 · 1314251 · 1314251
1 parent a88680c
commit 1314251
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
@@ -401,12 +401,12 @@ export interface ResolvedServerUrls {
 export function createServer(
   inlineConfig: InlineConfig = {},
 ): Promise<ViteDevServer> {
-  return _createServer(inlineConfig, { wsListen: true })
+  return _createServer(inlineConfig, { hotListen: true })
 }
 
 export async function _createServer(
   inlineConfig: InlineConfig = {},
-  options: { wsListen: boolean },
+  options: { hotListen: boolean },
 ): Promise<ViteDevServer> {
   const config = await resolveConfig(inlineConfig, 'serve')
 
@@ -945,7 +945,7 @@ export async function _createServer(
     httpServer.listen = (async (port: number, ...args: any[]) => {
       try {
         // ensure ws server started
-        ws.listen()
+        Object.values(environments).forEach((e) => e.hot.listen())
         await initServer()
       } catch (e) {
         httpServer.emit('error', e)
@@ -954,8 +954,8 @@ export async function _createServer(
       return listen(port, ...args)
     }) as any
   } else {
-    if (options.wsListen) {
-      ws.listen()
+    if (options.hotListen) {
+      Object.values(environments).forEach((e) => e.hot.listen())
     }
     await initServer()
   }
@@ -1128,7 +1128,7 @@ async function restartServer(server: ViteDevServer) {
     let newServer: ViteDevServer | null = null
     try {
       // delay ws server listen
-      newServer = await _createServer(inlineConfig, { wsListen: false })
+      newServer = await _createServer(inlineConfig, { hotListen: false })
     } catch (err: any) {
       server.config.logger.error(err.message, {
         timestamp: true,

diff --git a/packages/vite/types/hotPayload.d.ts b/packages/vite/types/hotPayload.d.ts
@@ -1,3 +1,5 @@
+/** @deprecated use HotPayload */
+export type HMRPayload = HotPayload
 export type HotPayload =
   | ConnectedPayload
   | UpdatePayload