refactor: environment.reloadModule()

vitejs · Sep 3, 2024 · 6d128aa · 6d128aa
1 parent 6443e48
commit 6d128aa
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 18 deletions.
diff --git a/packages/vite/src/node/server/environment.ts b/packages/vite/src/node/server/environment.ts
@@ -20,6 +20,7 @@ import {
 } from '../optimizer/optimizer'
 import { resolveEnvironmentPlugins } from '../plugin'
 import { EnvironmentModuleGraph } from './moduleGraph'
+import type { EnvironmentModuleNode } from './moduleGraph'
 import type { HotChannel } from './hmr'
 import { createNoopHotChannel, getShortName, updateModules } from './hmr'
 import type { TransformResult } from './transformRequest'
@@ -176,6 +177,12 @@ export class DevEnvironment extends BaseEnvironment {
     })
   }
 
+  async reloadModule(module: EnvironmentModuleNode): Promise<void> {
+    if (this.config.server.hmr !== false && module.file) {
+      updateModules(this, module.file, [module], Date.now())
+    }
+  }
+
   transformRequest(url: string): Promise<TransformResult | null> {
     return transformRequest(this, url)
   }

diff --git a/packages/vite/src/node/server/index.ts b/packages/vite/src/node/server/index.ts
@@ -76,7 +76,6 @@ import {
   serveStaticMiddleware,
 } from './middlewares/static'
 import { timeMiddleware } from './middlewares/time'
-import type { EnvironmentModuleNode } from './moduleGraph'
 import { ModuleGraph } from './mixedModuleGraph'
 import type { ModuleNode } from './mixedModuleGraph'
 import { notFoundMiddleware } from './middlewares/notFound'
@@ -338,11 +337,6 @@ export interface ViteDevServer {
    * API to retrieve the module to be reloaded. If `hmr` is false, this is a no-op.
    */
   reloadModule(module: ModuleNode): Promise<void>
-  /**
-   * Triggers HMR for an environment module in the module graph.
-   * If `hmr` is false, this is a no-op.
-   */
-  reloadEnvironmentModule(module: EnvironmentModuleNode): Promise<void>
   /**
    * Start the server.
    */
@@ -602,16 +596,6 @@ export async function _createServer(
         )
       }
     },
-    async reloadEnvironmentModule(module) {
-      if (serverConfig.hmr !== false && module.file) {
-        updateModules(
-          environments[module.environment]!,
-          module.file,
-          [module],
-          Date.now(),
-        )
-      }
-    },
     async listen(port?: number, isRestart?: boolean) {
       await startServer(server, port)
       if (httpServer) {

diff --git a/playground/hmr-ssr/vite.config.ts b/playground/hmr-ssr/vite.config.ts
@@ -55,7 +55,7 @@ export const virtual = _virtual + '${num}';`
           )
         if (mod) {
           num++
-          server.reloadEnvironmentModule(mod)
+          server.environments.ssr.reloadModule(mod)
         }
       })
     },

diff --git a/playground/hmr/vite.config.ts b/playground/hmr/vite.config.ts
@@ -57,7 +57,7 @@ export const virtual = _virtual + '${num}';`
           )
         if (mod) {
           num++
-          server.reloadEnvironmentModule(mod)
+          server.environments.client.reloadModule(mod)
         }
       })
     },