Skip to content

Escape optimizeDeps.entries paths in ssr environment #14414

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Escape optimizeDeps.entries paths in ssr environment #14414

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
10 changes: 6 additions & 4 deletions packages/react-router-dev/vite/optimize-deps-entries.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,21 +4,23 @@ import { resolveRelativeRouteFilePath } from "./resolve-relative-route-file-path
import { getVite } from "./vite";

export function getOptimizeDepsEntries({
entryClientFilePath,
entryFilePath,
reactRouterConfig,
isClientEnvironment,
}: {
entryClientFilePath: string;
entryFilePath: string;
reactRouterConfig: ResolvedReactRouterConfig;
isClientEnvironment: boolean;
}) {
if (!reactRouterConfig.future.unstable_optimizeDeps) {
if (isClientEnvironment && !reactRouterConfig.future.unstable_optimizeDeps) {
return [];
}

const vite = getVite();
const viteMajorVersion = parseInt(vite.version.split(".")[0], 10);

return [
vite.normalizePath(entryClientFilePath),
vite.normalizePath(entryFilePath),
...Object.values(reactRouterConfig.routes).map((route) =>
resolveRelativeRouteFilePath(route, reactRouterConfig),
),
Expand Down
20 changes: 7 additions & 13 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 @@ -1247,8 +1247,9 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
},
optimizeDeps: {
entries: getOptimizeDepsEntries({
entryClientFilePath: ctx.entryClientFilePath,
entryFilePath: ctx.entryClientFilePath,
reactRouterConfig: ctx.reactRouterConfig,
isClientEnvironment: true,
}),
include: [
// Pre-bundle React dependencies to avoid React duplicates,
Expand Down Expand Up @@ -1363,8 +1364,6 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
? isSsrBundleEnvironmentName(name)
: name === "ssr")
) {
const vite = getVite();

return {
resolve: {
external:
Expand All @@ -1379,16 +1378,11 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
optimizeDeps:
options.optimizeDeps?.noDiscovery === false
? {
entries: [
vite.normalizePath(ctx.entryServerFilePath),
...Object.values(ctx.reactRouterConfig.routes).map(
(route) =>
resolveRelativeRouteFilePath(
route,
ctx.reactRouterConfig,
),
),
],
entries: getOptimizeDepsEntries({
entryFilePath: ctx.entryServerFilePath,
reactRouterConfig: ctx.reactRouterConfig,
isClientEnvironment: false,
}),
include: [
"react",
"react/jsx-dev-runtime",
Expand Down
3 changes: 2 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 @@ -132,8 +132,9 @@ export function reactRouterRSCVitePlugin(): Vite.PluginOption[] {
},
optimizeDeps: {
entries: getOptimizeDepsEntries({
entryClientFilePath: defaultEntries.client,
entryFilePath: defaultEntries.client,
reactRouterConfig: config,
isClientEnvironment: true,
}),
esbuildOptions: {
jsx: "automatic",
Expand Down