fix: use path.normalize to convert POSIX paths to OS-specific paths

Fixes remix-run#5324
haines · Jan 31, 2023 · 9c3a531 · 9c3a531
1 parent ebfa645
commit 9c3a531
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/.changeset/slimy-insects-greet.md b/.changeset/slimy-insects-greet.md
@@ -0,0 +1,5 @@
+---
+"@remix-run/dev": patch
+---
+
+Fixed issue with `v2_routeConvention` on Unix-based systems
diff --git a/contributors.yml b/contributors.yml
@@ -164,6 +164,7 @@
 - gunners6518
 - gyx1000
 - hadizz
+- haines
 - hardingmatt
 - helderburato
 - HenryVogt

diff --git a/packages/remix-dev/__tests__/flat-routes-test.ts b/packages/remix-dev/__tests__/flat-routes-test.ts
@@ -602,7 +602,7 @@ describe("flatRoutes", () => {
 
     let files: [string, Omit<ConfigRoute, "file">][] = testFiles.map(
       ([file, route]) => {
-        let filepath = file.split("/").join(path.sep);
+        let filepath = path.normalize(file);
         return [filepath, { ...route, file: filepath }];
       }
     );

diff --git a/packages/remix-dev/config/flat-routes.ts b/packages/remix-dev/config/flat-routes.ts
@@ -28,7 +28,7 @@ export function flatRoutes(
   // fast-glob will return posix paths even on windows
   // convert posix to os specific paths
   let routePathsForOS = routePaths.map((routePath) => {
-    return path.join(...routePath.split(path.posix.sep));
+    return path.normalize(routePath);
   });
 
   return flatRoutesUniversal(appDirectory, routePathsForOS);