Remove dataRedirect utility

Author: brophdawg11

.changeset/new-hornets-run.md

@@ -1,5 +1,9 @@
 ---
-"react-router": minor
+"react-router": patch
 ---
 
-Add a new `dataRedirect` utility for performing redirects on `.data` requests outside of the React Router handler
+Update Single Fetch to also handle the 204 redirects used in `?_data` requests in Remix v2
+
+- This allows applications to return a redirect on `.data` requests from outside the scope of React Router (i.e., an `express`/`hono` middleware)
+- ⚠️ Please note that doing so relies on implementation details that are subject to change without a SemVer major release
+- This is primarily done to ease upgrading to Single Fetch for existing Remix v2 applications, but the recommended way to handle this is redirecting from a route middleware

integration/single-fetch-test.ts

@@ -1482,13 +1482,9 @@ test.describe("single-fetch", () => {
         customLogic: js`
           app.use(async (req, res, next) => {
             if (req.url === "/page.data") {
-              let { dataRedirect } = await import("react-router");
-              let response = dataRedirect("/target");
-              res.statusMessage = response.statusText;
-              res.status(response.status);
-              for (let [key, value] of response.headers.entries()) {
-                res.append(key, value);
-              }
+              res.status(204);
+              res.append('X-Remix-Status', '302');
+              res.append('X-Remix-Redirect', '/target');
               res.end();
             } else {
               next();

packages/react-router/index.ts

@@ -65,7 +65,6 @@ export {
 } from "./lib/router/router";
 export {
   data,
-  dataRedirect,
   generatePath,
   isRouteErrorResponse,
   matchPath,

packages/react-router/lib/dom/ssr/single-fetch.tsx

@@ -551,7 +551,7 @@ async function fetchAndDecode(
     throw new ErrorResponseImpl(404, "Not Found", true);
   }
 
-  // Handle non-RR redirects (i.e., from express middleware via `dataRedirect`)
+  // Handle non-RR redirects (i.e., from express middleware)
   if (res.status === 204 && res.headers.has("X-Remix-Redirect")) {
     let data: SingleFetchRedirectResult = {
       redirect: res.headers.get("X-Remix-Redirect")!,

packages/react-router/lib/router/utils.ts

@@ -1605,37 +1605,6 @@ export const replace: RedirectFunction = (url, init) => {
   return response;
 };
 
-/**
- * A "soft" redirect response that can be returned from outside of React Router
- * in response to a `.data` request.  Options are available to set the status
- * and toggle the equivalent behaviors of the traditional redirect utilities
- * ()`redirect`/`replace`/`redirectDocument`)
- *
- * @category Utils
- */
-export function dataRedirect(
-  url: string,
-  {
-    status,
-    replace,
-    revalidate,
-    reload,
-  }: {
-    status?: number;
-    replace?: boolean;
-    revalidate?: boolean;
-    reload?: boolean;
-  } = {}
-) {
-  let headers = new Headers();
-  headers.set("X-Remix-Redirect", url);
-  if (status) headers.set("X-Remix-Status", String(status));
-  if (replace) headers.set("X-Remix-Replace", "true");
-  if (revalidate) headers.set("X-Remix-Revalidate", "true");
-  if (reload) headers.set("X-Remix-Reload-Document", "true");
-  return new Response(null, { status: 204, headers });
-}
-
 export type ErrorResponse = {
   status: number;
   statusText: string;