relative route files in resolved config (#12300)

* ensure resolved config has `route.file` relative to app dir

* refactor: remove redundant checks for `route.file` being relative

Author: pcattori

packages/react-router-dev/config/config.ts

@@ -454,7 +454,7 @@ async function resolveConfig({
 
     routes = {
       ...routes,
-      ...configRoutesToRouteManifest(routeConfig),
+      ...configRoutesToRouteManifest(appDirectory, routeConfig),
     };
   } catch (error: any) {
     return err(

packages/react-router-dev/config/routes.ts

@@ -1,6 +1,7 @@
-import { resolve, win32 } from "node:path";
+import * as Path from "pathe";
 import * as v from "valibot";
 import pick from "lodash/pick";
+
 import invariant from "../invariant";
 
 declare global {
@@ -315,7 +316,7 @@ export function relative(directory: string): typeof helpers {
      * `relative` call that created this helper.
      */
     route: (path, file, ...rest) => {
-      return route(path, resolve(directory, file), ...(rest as any));
+      return route(path, Path.resolve(directory, file), ...(rest as any));
     },
     /**
      * Helper function for creating a route config entry for an index route, for
@@ -324,7 +325,7 @@ export function relative(directory: string): typeof helpers {
      * `relative` call that created this helper.
      */
     index: (file, ...rest) => {
-      return index(resolve(directory, file), ...(rest as any));
+      return index(Path.resolve(directory, file), ...(rest as any));
     },
     /**
      * Helper function for creating a route config entry for a layout route, for
@@ -333,7 +334,7 @@ export function relative(directory: string): typeof helpers {
      * `relative` call that created this helper.
      */
     layout: (file, ...rest) => {
-      return layout(resolve(directory, file), ...(rest as any));
+      return layout(Path.resolve(directory, file), ...(rest as any));
     },
 
     // Passthrough of helper functions that don't need relative scoping so that
@@ -343,6 +344,7 @@ export function relative(directory: string): typeof helpers {
 }
 
 export function configRoutesToRouteManifest(
+  appDirectory: string,
   routes: RouteConfigEntry[],
   rootId = "root"
 ): RouteManifest {
@@ -353,7 +355,9 @@ export function configRoutesToRouteManifest(
     let manifestItem: RouteManifestEntry = {
       id,
       parentId,
-      file: route.file,
+      file: Path.isAbsolute(route.file)
+        ? Path.relative(appDirectory, route.file)
+        : route.file,
       path: route.path,
       index: route.index,
       caseSensitive: route.caseSensitive,
@@ -381,11 +385,7 @@ export function configRoutesToRouteManifest(
 }
 
 function createRouteId(file: string) {
-  return normalizeSlashes(stripFileExtension(file));
-}
-
-function normalizeSlashes(file: string) {
-  return file.split(win32.sep).join("/");
+  return Path.normalize(stripFileExtension(file));
 }
 
 function stripFileExtension(file: string) {

packages/react-router-dev/typegen/paths.ts

@@ -9,14 +9,10 @@ export function getTypesDir(ctx: Context) {
 }
 
 export function getTypesPath(ctx: Context, route: RouteManifestEntry) {
-  const rel = Path.isAbsolute(route.file)
-    ? Path.relative(ctx.config.appDirectory, route.file)
-    : route.file;
-
   return Path.join(
     getTypesDir(ctx),
     Path.relative(ctx.rootDirectory, ctx.config.appDirectory),
-    Path.dirname(rel),
-    "+types/" + Pathe.filename(rel) + ".ts"
+    Path.dirname(route.file),
+    "+types/" + Pathe.filename(route.file) + ".ts"
   );
 }