chore: use relative path from appDirectory for collision files

Signed-off-by: Logan McAnsh <logan@mcan.sh>
remix-run · Mar 8, 2023 · 00d1682 · 00d1682
1 parent e78dbfb
commit 00d1682
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/packages/remix-dev/__tests__/flat-routes-test.ts b/packages/remix-dev/__tests__/flat-routes-test.ts
@@ -682,7 +682,10 @@ describe("flatRoutes", () => {
       // we had a collision as /route and /index are the same
       expect(routes).toHaveLength(1);
       expect(consoleError).toHaveBeenCalledWith(
-        getRouteIdConflictErrorMessage("routes/dashboard", testFiles)
+        getRouteIdConflictErrorMessage(
+          "routes/dashboard",
+          testFiles.map((file) => path.relative(APP_DIR, file))
+        )
       );
     });
 

diff --git a/packages/remix-dev/config/flat-routes.ts b/packages/remix-dev/config/flat-routes.ts
@@ -148,8 +148,10 @@ export function flatRoutesUniversal(
 
     let conflict = routeIds.get(routeId);
     if (conflict) {
-      let currentConflicts = routeIdConflicts.get(routeId) || [conflict];
-      currentConflicts.push(file);
+      let currentConflicts = routeIdConflicts.get(routeId) || [
+        path.relative(appDirectory, conflict),
+      ];
+      currentConflicts.push(path.relative(appDirectory, file));
       routeIdConflicts.set(routeId, currentConflicts);
       continue;
     }