Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
5 changes: 5 additions & 0 deletions .changeset/early-moles-drum.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"@react-router/dev": patch
---

properly handle cyclic imports in `getParentClientNodes` while getting unique nodes
1 change: 1 addition & 0 deletions contributors.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@
- bhbs
- bilalk711
- bjohn465
- BlankParticle
- bmsuseluda
- bobziroll
- bravo-kernel
Expand Down
28 changes: 8 additions & 20 deletions packages/react-router-dev/vite/plugin.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2408,10 +2408,8 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
return;
}

let clientModules = uniqueNodes(
modules.flatMap((mod) =>
getParentClientNodes(server.environments.client.moduleGraph, mod),
),
let clientModules = modules.flatMap((mod) =>
getParentClientNodes(server.environments.client.moduleGraph, mod),
);

for (let clientModule of clientModules) {
Expand All @@ -2427,36 +2425,26 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
function getParentClientNodes(
clientModuleGraph: Vite.EnvironmentModuleGraph,
module: Vite.EnvironmentModuleNode,
seenNodes: Set<string> = new Set(),
): Vite.EnvironmentModuleNode[] {
if (!module.id) {
return [];
}
if (seenNodes.has(module.url)) {
return [];
}
seenNodes.add(module.url);

let clientModule = clientModuleGraph.getModuleById(module.id);
if (clientModule) {
return [clientModule];
}

return [...module.importers].flatMap((importer) =>
getParentClientNodes(clientModuleGraph, importer),
getParentClientNodes(clientModuleGraph, importer, seenNodes),
);
}

function uniqueNodes(
nodes: Vite.EnvironmentModuleNode[],
): Vite.EnvironmentModuleNode[] {
let nodeUrls = new Set<string>();
let unique: Vite.EnvironmentModuleNode[] = [];
for (let node of nodes) {
if (nodeUrls.has(node.url)) {
continue;
}
nodeUrls.add(node.url);
unique.push(node);
}
return unique;
}

function addRefreshWrapper(
reactRouterConfig: ResolvedReactRouterConfig,
code: string,
Expand Down