Skip to content

Improve optimizeDeps in RSC Framework Mode #14271

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

Merged
markdalgleish merged 1 commit into from
Sep 2, 2025
Merged

Improve optimizeDeps in RSC Framework Mode #14271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
13 changes: 13 additions & 0 deletions packages/react-router-dev/vite/has-dependency.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
export function hasDependency({
name,
rootDirectory,
}: {
name: string;
rootDirectory: string;
}) {
try {
return Boolean(require.resolve(name, { paths: [rootDirectory] }));
} catch (err) {
return false;
}
}
14 changes: 5 additions & 9 deletions packages/react-router-dev/vite/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ import { resolveFileUrl } from "./resolve-file-url";
import { combineURLs } from "./combine-urls";
import { removeExports } from "./remove-exports";
import { ssrExternals } from "./ssr-externals";
import { hasDependency } from "./has-dependency";
import {
type RouteChunkName,
type RouteChunkExportName,
Expand Down Expand Up @@ -819,14 +820,6 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
return JSON.parse(manifestContents) as Vite.Manifest;
};

let hasDependency = (name: string) => {
try {
return Boolean(require.resolve(name, { paths: [ctx.rootDirectory] }));
} catch (err) {
return false;
}
};

let getViteManifestAssetPaths = (
viteManifest: Vite.Manifest,
): Set<string> => {
Expand Down Expand Up @@ -1293,7 +1286,10 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
"react-router",
"react-router/dom",
// Check to avoid "Failed to resolve dependency: react-router-dom, present in 'optimizeDeps.include'"
...(hasDependency("react-router-dom")
...(hasDependency({
name: "react-router-dom",
rootDirectory: ctx.rootDirectory,
})
? ["react-router-dom"]
: []),
],
Expand Down
6 changes: 5 additions & 1 deletion packages/react-router-dev/vite/rsc/plugin.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import {
type ResolvedReactRouterConfig,
createConfigLoader,
} from "../../config/config";
import { hasDependency } from "../has-dependency";
import { createVirtualRouteConfig } from "./virtual-route-config";
import {
transformVirtualRouteModules,
Expand Down Expand Up @@ -68,7 +69,9 @@ export function reactRouterRSCVitePlugin(): Vite.PluginOption[] {
// You must render this element inside a <Remix> element`.
"react-router",
"react-router/dom",
"react-router-dom",
...(hasDependency({ name: "react-router-dom", rootDirectory })
? ["react-router-dom"]
: []),
],
},
optimizeDeps: {
Expand All @@ -84,6 +87,7 @@ export function reactRouterRSCVitePlugin(): Vite.PluginOption[] {
"react/jsx-dev-runtime",
"react-dom",
"react-dom/client",
"react-router/internal/react-server-client",
],
},
esbuild: {
Expand Down
Loading