fix: run only affected entry points for a full-reload

sheremet-va · Feb 13, 2024 · b660e27 · b660e27
1 parent 8a370d6
commit b660e27
Show file tree

Hide file tree

Showing 4 changed files with 55 additions and 8 deletions.
diff --git a/packages/vite/src/node/server/hmr.ts b/packages/vite/src/node/server/hmr.ts
@@ -166,6 +166,7 @@ export async function handleHMRUpdate(
     hot.send({
       type: 'full-reload',
       path: '*',
+      via: file,
     })
     return
   }
@@ -255,7 +256,7 @@ export function updateModules(
           isWithinCircularImport,
           // browser modules are invalidated by changing ?t= query,
           // but in ssr we control the module system, so we can directly remove them form cache
-          ssrInvalidates: getSSRInvalidatedImporters(acceptedVia),
+          ssrInvalidates: getSSRInvalidatedImporters(config.root, acceptedVia),
         }),
       ),
     )
@@ -272,6 +273,7 @@ export function updateModules(
     )
     hot.send({
       type: 'full-reload',
+      via: file,
     })
     return
   }
@@ -295,7 +297,7 @@ export function updateModules(
 function populateSSRImporters(
   module: ModuleNode,
   timestamp: number,
-  seen: Set<ModuleNode>,
+  seen: Set<ModuleNode> = new Set(),
 ) {
   module.ssrImportedModules.forEach((importer) => {
     if (seen.has(importer)) {
@@ -312,10 +314,10 @@ function populateSSRImporters(
   return seen
 }
 
-function getSSRInvalidatedImporters(module: ModuleNode) {
-  return [
-    ...populateSSRImporters(module, module.lastHMRTimestamp, new Set()),
-  ].map((m) => m.file!)
+function getSSRInvalidatedImporters(root: string, module: ModuleNode) {
+  return [...populateSSRImporters(module, module.lastHMRTimestamp)].map((m) =>
+    path.posix.relative(root, m.file!),
+  )
 }
 
 export async function handleFileAddUnlink(

diff --git a/packages/vite/src/node/ssr/runtime/hmrHandler.ts b/packages/vite/src/node/ssr/runtime/hmrHandler.ts
@@ -43,18 +43,28 @@ export async function handleHMRPayload(
       await hmrClient.notifyListeners(payload.event, payload.data)
       break
     }
-    case 'full-reload':
+    case 'full-reload': {
       hmrClient.logger.debug(`[vite] program reload`)
       await hmrClient.notifyListeners('vite:beforeFullReload', payload)
       Array.from(runtime.moduleCache.keys()).forEach((id) => {
         if (!id.includes('node_modules')) {
           runtime.moduleCache.deleteByModuleId(id)
         }
       })
-      for (const id of runtime.entrypoints) {
+      const { via } = payload
+      const clearEntrypoints = via
+        ? [...runtime.entrypoints].filter((entrypoint) =>
+            runtime.moduleCache.isImported({
+              importedId: via,
+              importedBy: entrypoint,
+            }),
+          )
+        : runtime.entrypoints
+      for (const id of clearEntrypoints) {
         await runtime.executeUrl(id)
       }
       break
+    }
     case 'prune':
       await hmrClient.notifyListeners('vite:beforePrune', payload)
       hmrClient.prunePaths(payload.paths)

diff --git a/packages/vite/src/node/ssr/runtime/moduleCache.ts b/packages/vite/src/node/ssr/runtime/moduleCache.ts
@@ -65,6 +65,40 @@ export class ModuleCacheMap extends Map<string, ModuleCache> {
     return this.deleteByModuleId(this.normalize(fsPath))
   }
 
+  isImported(
+    {
+      importedId,
+      importedBy,
+    }: {
+      importedId: string
+      importedBy: string
+    },
+    seen = new Set<string>(),
+  ): boolean {
+    importedId = this.normalize(importedId)
+    if (seen.has(importedId)) return false
+    seen.add(importedId)
+
+    const fileModule = this.getByModuleId(importedId)
+    const importers = fileModule?.importers
+    if (!importers) return false
+
+    importedBy = this.normalize(importedBy)
+
+    if (importers.has(importedBy)) return true
+
+    for (const importer of importers) {
+      if (
+        this.isImported({
+          importedBy: importedBy,
+          importedId: importer,
+        })
+      )
+        return true
+    }
+    return false
+  }
+
   /**
    * Invalidate modules that dependent on the given modules, up to the main entry
    */

diff --git a/packages/vite/types/hmrPayload.d.ts b/packages/vite/types/hmrPayload.d.ts
@@ -36,6 +36,7 @@ export interface PrunePayload {
 export interface FullReloadPayload {
   type: 'full-reload'
   path?: string
+  via?: string
 }
 
 export interface CustomPayload {