Revert "fix: normalize RSC server redirects (#15421)" (#15434)

This reverts commit b137cab.

Author: brophdawg11

packages/react-router/.changes/unstable.normalize-rsc-server-redirects.md

@@ -3,29 +3,9 @@ import {
   type RSCMatch,
   type RSCRouteConfigEntry,
 } from "../../lib/rsc/server.rsc";
-import { routeRSCServerRequest } from "../../lib/rsc/server.ssr";
 import { URL_LIMIT } from "../../lib/dom/ssr/fog-of-war";
 
 describe("RSC server", () => {
-  test("normalizes redirect locations", async () => {
-    let response = await routeRSCServerRequest({
-      request: new Request("https://remix.run/"),
-      serverResponse: new Response("RSC payload", { status: 202 }),
-      createFromReadableStream: async () => ({
-        type: "redirect",
-        location: "//example/path?search=value#hash",
-        status: 302,
-      }),
-      async renderHTML() {
-        throw new Error("Unexpected HTML render");
-      },
-    });
-
-    expect(response.headers.get("Location")).toBe(
-      "/example/path?search=value#hash",
-    );
-  });
-
   describe("manifest requests", () => {
     test("rejects manifest requests over the URL limit", async () => {
       let path = `/${"a".repeat(URL_LIMIT)}.manifest`;

packages/react-router/__tests__/rsc/server-test.ts

@@ -24,7 +24,8 @@ import type {
   DataStrategyFunctionArgs,
   RouterContextProvider,
 } from "../router/utils";
-import { ErrorResponseImpl, createContext } from "../router/utils";
+import { ErrorResponseImpl, createContext, resolvePath } from "../router/utils";
+import { PROTOCOL_RELATIVE_URL_REGEX } from "../router/url";
 import type {
   DecodedSingleFetchResults,
   FetchAndDecodeFunction,
@@ -44,7 +45,6 @@ import { RSCRouterGlobalErrorBoundary } from "./errorBoundaries";
 import type { RouteModules } from "../dom/ssr/routeModules";
 import { populateRSCRouteModules } from "./route-modules";
 import { URL_LIMIT, getPathsWithAncestors } from "../dom/ssr/fog-of-war";
-import { normalizeRedirectLocation } from "./redirect";
 
 const defaultManifestPath = "/__manifest";
 
@@ -1111,6 +1111,15 @@ function isExternalLocation(location: string) {
   return newLocation.origin !== window.location.origin;
 }
 
+function normalizeRedirectLocation(location: string): string {
+  if (PROTOCOL_RELATIVE_URL_REGEX.test(location)) {
+    let path = resolvePath(location);
+    return path.pathname + path.search + path.hash;
+  }
+
+  return location;
+}
+
 function cloneRoutes(routes: DataRouteObject[] | undefined): DataRouteObject[] {
   if (!routes) return undefined as any;
   return routes.map((route) => ({

packages/react-router/lib/rsc/browser.tsx

@@ -16,7 +16,6 @@ import {
   decodeRouteErrorResponseDigest,
 } from "../errors";
 import { escapeHtml } from "../dom/ssr/markup";
-import { normalizeRedirectLocation } from "./redirect";
 
 const defaultManifestPath = "/__manifest";
 
@@ -204,8 +203,7 @@ export async function routeRSCServerRequest({
       serverResponse.status === SINGLE_FETCH_REDIRECT_STATUS &&
       payload.type === "redirect"
     ) {
-      let location = normalizeRedirectLocation(payload.location);
-      if (hasInvalidProtocol(location)) {
+      if (hasInvalidProtocol(payload.location)) {
         throw new Error("Invalid redirect location");
       }
 
@@ -214,7 +212,7 @@ export async function routeRSCServerRequest({
       headers.delete("Content-Length");
       headers.delete("Content-Type");
       headers.delete("X-Remix-Response");
-      headers.set("Location", location);
+      headers.set("Location", payload.location);
 
       return new Response(serverResponseB?.body || "", {
         headers,
@@ -262,12 +260,11 @@ export async function routeRSCServerRequest({
     headers.set("Content-Type", "text/html; charset=utf-8");
 
     if (renderRedirect) {
-      let location = normalizeRedirectLocation(renderRedirect.location);
-      if (hasInvalidProtocol(location)) {
+      if (hasInvalidProtocol(renderRedirect.location)) {
         throw new Error("Invalid redirect location");
       }
 
-      headers.set("Location", location);
+      headers.set("Location", renderRedirect.location);
       return new Response(html, {
         status: renderRedirect.status,
         headers,
@@ -277,14 +274,13 @@ export async function routeRSCServerRequest({
     const redirectTransform = new TransformStream({
       flush(controller) {
         if (renderRedirect) {
-          let location = normalizeRedirectLocation(renderRedirect.location);
-          if (hasInvalidProtocol(location)) {
+          if (hasInvalidProtocol(renderRedirect.location)) {
             return;
           }
 
           controller.enqueue(
             new TextEncoder().encode(
-              `<meta http-equiv="refresh" content="0;url=${escapeHtml(location)}"/>`,
+              `<meta http-equiv="refresh" content="0;url=${escapeHtml(renderRedirect.location)}"/>`,
             ),
           );
         }
@@ -317,15 +313,14 @@ export async function routeRSCServerRequest({
     }
 
     if (renderRedirect) {
-      let location = normalizeRedirectLocation(renderRedirect.location);
-      if (hasInvalidProtocol(location)) {
+      if (hasInvalidProtocol(renderRedirect.location)) {
         throw new Error("Invalid redirect location");
       }
 
-      return new Response(`Redirect: ${location}`, {
+      return new Response(`Redirect: ${renderRedirect.location}`, {
         status: renderRedirect.status,
         headers: {
-          Location: location,
+          Location: renderRedirect.location,
         },
       });
     }
@@ -410,12 +405,11 @@ export async function routeRSCServerRequest({
       headers.set("Content-Type", "text/html; charset=utf-8");
 
       if (retryRedirect) {
-        let location = normalizeRedirectLocation(retryRedirect.location);
-        if (hasInvalidProtocol(location)) {
+        if (hasInvalidProtocol(retryRedirect.location)) {
           throw new Error("Invalid redirect location");
         }
 
-        headers.set("Location", location);
+        headers.set("Location", retryRedirect.location);
         return new Response(html, {
           status: retryRedirect.status,
           headers,
@@ -425,14 +419,13 @@ export async function routeRSCServerRequest({
       const retryRedirectTransform = new TransformStream({
         flush(controller) {
           if (retryRedirect) {
-            let location = normalizeRedirectLocation(retryRedirect.location);
-            if (hasInvalidProtocol(location)) {
+            if (hasInvalidProtocol(retryRedirect.location)) {
               return;
             }
 
             controller.enqueue(
               new TextEncoder().encode(
-                `<meta http-equiv="refresh" content="0;url=${escapeHtml(location)}"/>`,
+                `<meta http-equiv="refresh" content="0;url=${escapeHtml(retryRedirect.location)}"/>`,
               ),
             );
           }
@@ -527,15 +520,14 @@ export function RSCStaticRouter({ getPayload }: RSCStaticRouterProps) {
   const payload = useSafe(decoded);
 
   if (payload.type === "redirect") {
-    let location = normalizeRedirectLocation(payload.location);
-    if (hasInvalidProtocol(location)) {
+    if (hasInvalidProtocol(payload.location)) {
       throw new Error("Invalid redirect location");
     }
 
     throw new Response(null, {
       status: payload.status,
       headers: {
-        Location: location,
+        Location: payload.location,
       },
     });
   }