Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

perf(hmr): skip traversed modules when checking circular imports #15034

Merged
merged 2 commits into from
Nov 21, 2023
Merged

perf(hmr): skip traversed modules when checking circular imports #15034

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3cc24a0
fix(hmr): prevent infinite recursion
skovhus Nov 19, 2023
c9233eb
docs: update code documentation
skovhus Nov 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions packages/vite/src/node/server/hmr.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,11 +361,13 @@ function propagateUpdate(
* @param nodeChain The chain of nodes/imports that lead to the node.
* (The last node in the chain imports the `node` parameter)
* @param currentChain The current chain tracked from the `node` parameter
* @param traversedModules The set of modules that have traversed
*/
function isNodeWithinCircularImports(
node: ModuleNode,
nodeChain: ModuleNode[],
currentChain: ModuleNode[] = [node],
traversedModules = new Set<ModuleNode>(),
skovhus marked this conversation as resolved.
Show resolved Hide resolved
): HasDeadEnd {
// To help visualize how each parameters work, imagine this import graph:
//
Expand All @@ -383,6 +385,11 @@ function isNodeWithinCircularImports(
// It works by checking if any `node` importers are within `nodeChain`, which
// means there's an import loop with a HMR-accepted module in it.

if (traversedModules.has(node)) {
return false
}
traversedModules.add(node)

for (const importer of node.importers) {
// Node may import itself which is safe
if (importer === node) continue
Expand Down Expand Up @@ -416,6 +423,7 @@ function isNodeWithinCircularImports(
importer,
nodeChain,
currentChain.concat(importer),
traversedModules,
)
if (result) return result
}
Expand Down