Use getOptimizeDepsEntries for server environment

Author: jamesopstad

packages/react-router-dev/vite/optimize-deps-entries.ts

@@ -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),
     ),

packages/react-router-dev/vite/plugin.ts

@@ -1321,8 +1321,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,
@@ -1437,8 +1438,6 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
             ? isSsrBundleEnvironmentName(name)
             : name === "ssr")
         ) {
-          const vite = getVite();
-
           return {
             resolve: {
               external:
@@ -1453,16 +1452,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",

packages/react-router-dev/vite/rsc/plugin.ts

@@ -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",