wip: update

Author: sapphi-red

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

@@ -20,7 +20,11 @@ import { promiseWithResolvers } from '../../shared/utils'
 import type { ViteDevServer } from '../server'
 import { EnvironmentModuleGraph } from './moduleGraph'
 import type { EnvironmentModuleNode } from './moduleGraph'
-import type { HotChannel, NormalizedHotChannel } from './hmr'
+import type {
+  HotChannel,
+  NormalizedHotChannel,
+  NormalizedHotChannelClient,
+} from './hmr'
 import { getShortName, normalizeHotChannel, updateModules } from './hmr'
 import type {
   TransformOptionsInternal,
@@ -146,12 +150,15 @@ export class DevEnvironment extends BaseEnvironment {
 
     this.hot.on(
       'vite:invalidate',
-      async ({ path, message, firstInvalidatedBy }) => {
-        this.invalidateModule({
-          path,
-          message,
-          firstInvalidatedBy,
-        })
+      async ({ path, message, firstInvalidatedBy }, client) => {
+        this.invalidateModule(
+          {
+            path,
+            message,
+            firstInvalidatedBy,
+          },
+          client,
+        )
       },
     )
 
@@ -250,11 +257,14 @@ export class DevEnvironment extends BaseEnvironment {
     }
   }
 
-  protected invalidateModule(m: {
-    path: string
-    message?: string
-    firstInvalidatedBy: string
-  }): void {
+  protected invalidateModule(
+    m: {
+      path: string
+      message?: string
+      firstInvalidatedBy: string
+    },
+    _client: NormalizedHotChannelClient,
+  ): void {
     const mod = this.moduleGraph.urlToModuleMap.get(m.path)
     if (
       mod &&

packages/vite/src/node/server/environments/fullBundleEnvironment.ts

@@ -115,9 +115,6 @@ export class FullBundleDevEnvironment extends DevEnvironment {
         this.devEngine.removeClient(clientId)
       }
     })
-    this.hot.on('vite:invalidate', (payload, client) => {
-      this.handleInvalidateModule(client, payload)
-    })
 
     this.devEngine = await dev(rollupOptions, outputOptions, {
       onHmrUpdates: (result) => {
@@ -202,17 +199,13 @@ export class FullBundleDevEnvironment extends DevEnvironment {
     // no-op
   }
 
-  protected override invalidateModule(_m: unknown): void {
-    // no-op, handled via `server.ws` instead
-  }
-
-  private handleInvalidateModule(
-    client: NormalizedHotChannelClient,
+  protected override invalidateModule(
     m: {
       path: string
       message?: string
       firstInvalidatedBy: string
     },
+    client: NormalizedHotChannelClient,
   ): void {
     ;(async () => {
       const invalidateCalledModules = this.invalidateCalledModules.get(client)