fix(singlefetch): handle root path with basename

Alexandre Boucey · Alexandre Boucey · commit fa20f5139ad8 · 2025-05-26T11:00:53.000+02:00
diff --git a/packages/remix-react/single-fetch.tsx b/packages/remix-react/single-fetch.tsx
@@ -393,6 +393,8 @@ export function singleFetchUrl(reqUrl: URL | string) {
 
   if (url.pathname === "/") {
     url.pathname = "_root.data";
+  } else if (url.pathname === window.__remixContext.basename) {
+    url.pathname = window.__remixContext.basename.concat("_root.data");
   } else {
     url.pathname = `${url.pathname.replace(/\/$/, "")}.data`;
   }
diff --git a/packages/remix-server-runtime/server.ts b/packages/remix-server-runtime/server.ts
@@ -195,7 +195,7 @@ export const createRequestHandler: CreateRequestHandlerFunction = (
       let handlerUrl = new URL(request.url);
       handlerUrl.pathname = handlerUrl.pathname
         .replace(/\.data$/, "")
-        .replace(/^\/_root$/, "/");
+        .replace(_build.basename ? /\/_root$/ : /^\/_root$/, "/");
 
       let singleFetchMatches = matchServerRoutes(
         routes,

Original file line number	Diff line number	Diff line change
`@@ -393,6 +393,8 @@ export function singleFetchUrl(reqUrl: URL \| string) {`
`393`	`393`
`394`	`394`	`if (url.pathname === "/") {`
`395`	`395`	`url.pathname = "_root.data";`
	`396`	`+ } else if (url.pathname === window.__remixContext.basename) {`
	`397`	`+ url.pathname = window.__remixContext.basename.concat("_root.data");`
`396`	`398`	`} else {`
`397`	`399`	url.pathname = `${url.pathname.replace(/\/$/, "")}.data`;
`398`	`400`	`}`