refactor: rename ssrInvalidates to invalidates

packages/vite/src/module-runner/runner.ts

@@ -77,8 +77,11 @@ export class ModuleRunner {
           ? silentConsole
           : options.hmr.logger || console,
         options.hmr.connection,
-        ({ acceptedPath }) => {
-          this.moduleCache.invalidateDepTree([acceptedPath])
+        ({ acceptedPath, invalidates }) => {
+          this.moduleCache.invalidate(acceptedPath)
+          if (invalidates) {
+            this.invalidateFiles(invalidates)
+          }
           return this.import(acceptedPath)
         },
       )
@@ -125,6 +128,16 @@ export class ModuleRunner {
     return this._destroyed
   }
 
+  // map files to modules and invalidate them
+  private invalidateFiles(files: string[]) {
+    files.forEach((file) => {
+      const ids = this.fileToIdMap.get(file)
+      if (ids) {
+        ids.forEach((id) => this.moduleCache.invalidate(id))
+      }
+    })
+  }
+
   // we don't use moduleCache.normalize because this URL doesn't have to follow the same rules
   // this URL is something that user passes down manually, and is later resolved by fetchModule
   // moduleCache.normalize is used on resolved "file" property

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

@@ -398,6 +398,7 @@ export function updateModules(
               ? isExplicitImportRequired(acceptedVia.url)
               : false,
           isWithinCircularImport,
+          invalidates: getInvalidatedImporters(acceptedVia),
         }),
       ),
     )
@@ -435,6 +436,32 @@ export function updateModules(
   })
 }
 
+function populateImporters(
+  module: EnvironmentModuleNode,
+  timestamp: number,
+  seen: Set<EnvironmentModuleNode> = new Set(),
+) {
+  module.importedModules.forEach((importer) => {
+    if (seen.has(importer)) {
+      return
+    }
+    if (
+      importer.lastHMRTimestamp === timestamp ||
+      importer.lastInvalidationTimestamp === timestamp
+    ) {
+      seen.add(importer)
+      populateImporters(importer, timestamp, seen)
+    }
+  })
+  return seen
+}
+
+function getInvalidatedImporters(module: EnvironmentModuleNode) {
+  return [...populateImporters(module, module.lastHMRTimestamp)].map(
+    (m) => m.file!,
+  )
+}
+
 function areAllImportsAccepted(
   importedBindings: Set<string>,
   acceptedExports: Set<string>,

packages/vite/types/hmrPayload.d.ts

@@ -24,6 +24,8 @@ export interface Update {
   explicitImportRequired?: boolean
   /** @internal */
   isWithinCircularImport?: boolean
+  /** @internal */
+  invalidates?: string[]
 }
 
 export interface PrunePayload {