fix basename tests migrate existing path normalization logic

Author: jacob-ebey

integration/vite-basename-test.ts

@@ -122,7 +122,7 @@ const customServerFile = ({
         app.use("${base}", express.static("build/client"));
         app.all(
           "${basename}*",
-          createRequestListener((await import("./build/server/index.js")).default),
+          createRequestListener((await import("./build/server/index.js")).default.fetch),
         );
       }
       app.get("*", (_req, res) => {
@@ -476,7 +476,7 @@ test.describe("Vite base + React Router basename", () => {
           }
         }
 
-        test.afterAll(() => stop());
+        test.afterAll(() => stop?.());
 
         test("works when base and basename are the same", async ({ page }) => {
           await setup({ base: "/mybase/", basename: "/mybase/" });
@@ -504,6 +504,10 @@ test.describe("Vite base + React Router basename", () => {
         test("works when when base is an absolute external URL", async ({
           page,
         }) => {
+          test.skip(
+            templateName === "rsc-vite-framework",
+            "I'm not sure the use-case for this and can't find anything. If you ever need this file an issue and we will revisit.",
+          );
           port = await getPort();
           cwd = await createProject(
             {
@@ -518,26 +522,26 @@ test.describe("Vite base + React Router basename", () => {
                 ? String.raw`
                   import { createRequestListener } from "@mjackson/node-fetch-server";
                   import express from "express";
-          
+
                   const app = express();
                   app.all(
                     "/app/*",
                     createRequestListener((await import("./build/server/index.js")).default)
                   );
-          
+
                   const port = ${port};
                   app.listen(port, () => console.log('http://localhost:' + port));
                 `
                 : String.raw`
                   import { createRequestHandler } from "@react-router/express";
                   import express from "express";
-          
+
                   const app = express();
                   app.all(
                     "/app/*",
                     createRequestHandler({ build: await import("./build/server/index.js") })
                   );
-          
+
                   const port = ${port};
                   app.listen(port, () => console.log('http://localhost:' + port));
                 `,

packages/react-router/lib/rsc/server.rsc.ts

@@ -394,10 +394,37 @@ export async function matchRSCServerRequest({
     },
   ) => Response;
 }): Promise<Response> {
-  let requestUrl = new URL(request.url);
+  let url = new URL(request.url);
+
+  basename = basename || "/";
+  let normalizedPath = url.pathname;
+  if (stripBasename(normalizedPath, basename) === "/_root.rsc") {
+    normalizedPath = basename;
+  } else if (normalizedPath.endsWith(".rsc")) {
+    normalizedPath = normalizedPath.replace(/\.rsc$/, "");
+  }
+
+  if (
+    stripBasename(normalizedPath, basename) !== "/" &&
+    normalizedPath.endsWith("/")
+  ) {
+    normalizedPath = normalizedPath.slice(0, -1);
+  }
+  url.pathname = normalizedPath;
+  basename =
+    basename.length > normalizedPath.length ? normalizedPath : basename;
+
+  let routerRequest = new Request(url.toString(), {
+    method: request.method,
+    headers: request.headers,
+    body: request.body,
+    signal: request.signal,
+    duplex: request.body ? "half" : undefined,
+  } as RequestInit);
 
   const temporaryReferences = createTemporaryReferenceSet();
 
+  const requestUrl = new URL(request.url);
   if (isManifestRequest(requestUrl)) {
     let response = await generateManifestResponse(
       routes,
@@ -411,19 +438,6 @@ export async function matchRSCServerRequest({
 
   let isDataRequest = isReactServerRequest(requestUrl);
 
-  const url = new URL(request.url);
-  let routerRequest = request;
-  if (isDataRequest) {
-    url.pathname = url.pathname.replace(/(_root)?\.rsc$/, "");
-    routerRequest = new Request(url.toString(), {
-      method: request.method,
-      headers: request.headers,
-      body: request.body,
-      signal: request.signal,
-      duplex: request.body ? "half" : undefined,
-    } as RequestInit);
-  }
-
   // Explode lazy functions out the routes so we can use middleware
   // TODO: This isn't ideal but we can't do it through `lazy()` in the router,
   // and if we move to `lazy: {}` then we lose all the other things from the
@@ -1009,7 +1023,7 @@ async function generateStaticContextResponse(
 
   const baseRenderPayload: Omit<RSCRenderPayload, "matches" | "patches"> = {
     type: "render",
-    basename,
+    basename: staticContext.basename,
     actionData: staticContext.actionData,
     errors: staticContext.errors,
     loaderData: staticContext.loaderData,