chore: cleanup

sheremet-va · Jan 10, 2024 · f0df3e1 · f0df3e1
1 parent c209f01
commit f0df3e1
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 23 deletions.
diff --git a/packages/vite/src/node/server/hmr.ts b/packages/vite/src/node/server/hmr.ts
@@ -188,9 +188,7 @@ export function updateModules(
               ? isExplicitImportRequired(acceptedVia.url)
               : false,
           isWithinCircularImport,
-          ssrInvalidates: [
-            ...moduleGraph.getSSRInvalidatedImporters(acceptedVia),
-          ].map((m) => m.file!),
+          ssrInvalidates: getSSRInvalidatedImporters(acceptedVia),
         }),
       ),
     )
@@ -227,6 +225,32 @@ export function updateModules(
   })
 }
 
+function populateSSRImporters(
+  module: ModuleNode,
+  timestamp: number,
+  seen: Set<ModuleNode>,
+) {
+  module.ssrImportedModules.forEach((importer) => {
+    if (seen.has(importer)) {
+      return
+    }
+    if (
+      importer.lastHMRTimestamp === timestamp ||
+      importer.lastInvalidationTimestamp === timestamp
+    ) {
+      seen.add(importer)
+      populateSSRImporters(importer, timestamp, seen)
+    }
+  })
+  return seen
+}
+
+function getSSRInvalidatedImporters(module: ModuleNode) {
+  return [
+    ...populateSSRImporters(module, module.lastHMRTimestamp, new Set()),
+  ].map((m) => m.file!)
+}
+
 export async function handleFileAddUnlink(
   file: string,
   server: ViteDevServer,

diff --git a/packages/vite/src/node/server/moduleGraph.ts b/packages/vite/src/node/server/moduleGraph.ts
@@ -216,26 +216,6 @@ export class ModuleGraph {
     })
   }
 
-  getSSRInvalidatedImporters(
-    mod: ModuleNode,
-    timestamp = mod.lastHMRTimestamp,
-    seen: Set<ModuleNode> = new Set(),
-  ): Set<ModuleNode> {
-    mod.ssrImportedModules.forEach((importer) => {
-      if (seen.has(importer)) {
-        return
-      }
-      if (
-        importer.lastHMRTimestamp === timestamp ||
-        importer.lastInvalidationTimestamp === timestamp
-      ) {
-        seen.add(importer)
-        return this.getSSRInvalidatedImporters(importer, timestamp, seen)
-      }
-    })
-    return seen
-  }
-
   invalidateAll(): void {
     const timestamp = Date.now()
     const seen = new Set<ModuleNode>()