fix(dev): resolve optimizeDeps entries properly on Windows (#12637)

* fix(dev): resolve optimizeDeps entries properly on Windows * Add changeset * Sign CLA
remix-run · Jan 22, 2025 · 90d6e43 · 90d6e43
1 parent b6c2ad1
commit 90d6e43
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/.changeset/gentle-carrots-appear.md b/.changeset/gentle-carrots-appear.md
@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+Properly resolve Windows file paths to scan for Vite's dependency optimization when using the `unstable_optimizeDeps` future flag.
diff --git a/contributors.yml b/contributors.yml
@@ -330,6 +330,7 @@
 - willemarcel
 - williamsdyyz
 - willsawyerrrr
+- wkovacs64
 - xavier-lc
 - xcsnowcity
 - yionr

diff --git a/packages/react-router-dev/vite/plugin.ts b/packages/react-router-dev/vite/plugin.ts
@@ -800,9 +800,9 @@ export const reactRouterVitePlugin: ReactRouterVitePlugin = () => {
           optimizeDeps: {
             entries: ctx.reactRouterConfig.future.unstable_optimizeDeps
               ? [
-                  ctx.entryClientFilePath,
+                  vite.normalizePath(ctx.entryClientFilePath),
                   ...Object.values(ctx.reactRouterConfig.routes).map((route) =>
-                    path.join(ctx.reactRouterConfig.appDirectory, route.file)
+                    resolveRelativeRouteFilePath(route, ctx.reactRouterConfig)
                   ),
                 ]
               : [],