react-router 7.8.1-pre.0 → 7.8.1

package/dist/development/{chunk-CXAO7FY7.js → chunk-TGXCWGPT.js}

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }/**
- * react-router v7.8.1-pre.0
+ * react-router v7.8.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2823,9 +2823,23 @@ function createStaticHandler(routes, opts) {
             return res;
           },
           async (error, routeId) => {
-            if (isResponse(error)) {
+            if (isRedirectResponse(error)) {
               return error;
             }
+            if (isResponse(error)) {
+              try {
+                error = new ErrorResponseImpl(
+                  error.status,
+                  error.statusText,
+                  await parseResponseBody(error)
+                );
+              } catch (e) {
+                error = e;
+              }
+            }
+            if (isDataWithResponseInit(error)) {
+              error = dataWithResponseInitToErrorResponse(error);
+            }
             if (renderedStaticContext) {
               if (routeId in renderedStaticContext.loaderData) {
                 renderedStaticContext.loaderData[routeId] = void 0;
@@ -2951,8 +2965,8 @@ function createStaticHandler(routes, opts) {
           return res;
         },
         (error) => {
-          if (isRouteErrorResponse(error)) {
-            return Promise.resolve(errorResponseToResponse(error));
+          if (isDataWithResponseInit(error)) {
+            return Promise.resolve(dataWithResponseInitToResponse(error));
           }
           if (isResponse(error)) {
             return Promise.resolve(error);
@@ -4022,11 +4036,7 @@ async function callServerRouteMiddleware(args, middlewares, handler, errorHandle
       nextResult = result;
       return nextResult;
     } catch (e) {
-      nextResult = await errorHandler(
-        // Convert thrown data() values to ErrorResponses
-        isDataWithResponseInit(e) ? dataWithResponseInitToErrorResponse(e) : e,
-        routeId
-      );
+      nextResult = await errorHandler(e, routeId);
       return nextResult;
     }
   };
@@ -4051,11 +4061,7 @@ async function callServerRouteMiddleware(args, middlewares, handler, errorHandle
       return nextResult;
     }
   } catch (e) {
-    let response = await errorHandler(
-      // Convert thrown data() values to ErrorResponses
-      isDataWithResponseInit(e) ? dataWithResponseInitToErrorResponse(e) : e,
-      routeId
-    );
+    let response = await errorHandler(e, routeId);
     return response;
   }
 }
@@ -4381,21 +4387,19 @@ async function callLoaderOrAction({
   }
   return result;
 }
+async function parseResponseBody(response) {
+  let contentType = response.headers.get("Content-Type");
+  if (contentType && /\bapplication\/json\b/.test(contentType)) {
+    return response.body == null ? null : response.json();
+  }
+  return response.text();
+}
 async function convertDataStrategyResultToDataResult(dataStrategyResult) {
   let { result, type } = dataStrategyResult;
   if (isResponse(result)) {
     let data2;
     try {
-      let contentType = result.headers.get("Content-Type");
-      if (contentType && /\bapplication\/json\b/.test(contentType)) {
-        if (result.body == null) {
-          data2 = null;
-        } else {
-          data2 = await result.json();
-        }
-      } else {
-        data2 = await result.text();
-      }
+      data2 = await parseResponseBody(result);
     } catch (e) {
       return { type: "error" /* error */, error: e };
     }
@@ -4725,10 +4729,7 @@ function isHashChangeOnly(a, b) {
   return false;
 }
 function dataWithResponseInitToResponse(data2) {
-  return new Response(
-    typeof data2.data === "string" ? data2.data : JSON.stringify(data2.data),
-    data2.init || void 0
-  );
+  return Response.json(data2.data, _nullishCoalesce(data2.init, () => ( void 0)));
 }
 function dataWithResponseInitToErrorResponse(data2) {
   return new ErrorResponseImpl(
@@ -4737,15 +4738,6 @@ function dataWithResponseInitToErrorResponse(data2) {
     data2.data
   );
 }
-function errorResponseToResponse(error) {
-  return new Response(
-    typeof error.data === "string" ? error.data : JSON.stringify(error.data),
-    {
-      status: error.status,
-      statusText: error.statusText
-    }
-  );
-}
 function isDataStrategyResult(result) {
   return result != null && typeof result === "object" && "type" in result && "result" in result && (result.type === "data" /* data */ || result.type === "error" /* error */);
 }

package/dist/development/{chunk-WKLBIS42.mjs → chunk-UH6JLGW7.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.8.1-pre.0
+ * react-router v7.8.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2823,9 +2823,23 @@ function createStaticHandler(routes, opts) {
             return res;
           },
           async (error, routeId) => {
-            if (isResponse(error)) {
+            if (isRedirectResponse(error)) {
               return error;
             }
+            if (isResponse(error)) {
+              try {
+                error = new ErrorResponseImpl(
+                  error.status,
+                  error.statusText,
+                  await parseResponseBody(error)
+                );
+              } catch (e) {
+                error = e;
+              }
+            }
+            if (isDataWithResponseInit(error)) {
+              error = dataWithResponseInitToErrorResponse(error);
+            }
             if (renderedStaticContext) {
               if (routeId in renderedStaticContext.loaderData) {
                 renderedStaticContext.loaderData[routeId] = void 0;
@@ -2951,8 +2965,8 @@ function createStaticHandler(routes, opts) {
           return res;
         },
         (error) => {
-          if (isRouteErrorResponse(error)) {
-            return Promise.resolve(errorResponseToResponse(error));
+          if (isDataWithResponseInit(error)) {
+            return Promise.resolve(dataWithResponseInitToResponse(error));
           }
           if (isResponse(error)) {
             return Promise.resolve(error);
@@ -4022,11 +4036,7 @@ async function callServerRouteMiddleware(args, middlewares, handler, errorHandle
       nextResult = result;
       return nextResult;
     } catch (e) {
-      nextResult = await errorHandler(
-        // Convert thrown data() values to ErrorResponses
-        isDataWithResponseInit(e) ? dataWithResponseInitToErrorResponse(e) : e,
-        routeId
-      );
+      nextResult = await errorHandler(e, routeId);
       return nextResult;
     }
   };
@@ -4051,11 +4061,7 @@ async function callServerRouteMiddleware(args, middlewares, handler, errorHandle
       return nextResult;
     }
   } catch (e) {
-    let response = await errorHandler(
-      // Convert thrown data() values to ErrorResponses
-      isDataWithResponseInit(e) ? dataWithResponseInitToErrorResponse(e) : e,
-      routeId
-    );
+    let response = await errorHandler(e, routeId);
     return response;
   }
 }
@@ -4381,21 +4387,19 @@ async function callLoaderOrAction({
   }
   return result;
 }
+async function parseResponseBody(response) {
+  let contentType = response.headers.get("Content-Type");
+  if (contentType && /\bapplication\/json\b/.test(contentType)) {
+    return response.body == null ? null : response.json();
+  }
+  return response.text();
+}
 async function convertDataStrategyResultToDataResult(dataStrategyResult) {
   let { result, type } = dataStrategyResult;
   if (isResponse(result)) {
     let data2;
     try {
-      let contentType = result.headers.get("Content-Type");
-      if (contentType && /\bapplication\/json\b/.test(contentType)) {
-        if (result.body == null) {
-          data2 = null;
-        } else {
-          data2 = await result.json();
-        }
-      } else {
-        data2 = await result.text();
-      }
+      data2 = await parseResponseBody(result);
     } catch (e) {
       return { type: "error" /* error */, error: e };
     }
@@ -4725,10 +4729,7 @@ function isHashChangeOnly(a, b) {
   return false;
 }
 function dataWithResponseInitToResponse(data2) {
-  return new Response(
-    typeof data2.data === "string" ? data2.data : JSON.stringify(data2.data),
-    data2.init || void 0
-  );
+  return Response.json(data2.data, data2.init ?? void 0);
 }
 function dataWithResponseInitToErrorResponse(data2) {
   return new ErrorResponseImpl(
@@ -4737,15 +4738,6 @@ function dataWithResponseInitToErrorResponse(data2) {
     data2.data
   );
 }
-function errorResponseToResponse(error) {
-  return new Response(
-    typeof error.data === "string" ? error.data : JSON.stringify(error.data),
-    {
-      status: error.status,
-      statusText: error.statusText
-    }
-  );
-}
 function isDataStrategyResult(result) {
   return result != null && typeof result === "object" && "type" in result && "result" in result && (result.type === "data" /* data */ || result.type === "error" /* error */);
 }
@@ -8994,7 +8986,7 @@ var isBrowser = typeof window !== "undefined" && typeof window.document !== "und
 try {
   if (isBrowser) {
     window.__reactRouterVersion = // @ts-expect-error
-    "7.8.1-pre.0";
+    "7.8.1";
   }
 } catch (e) {
 }

package/dist/development/dom-export.js

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }/**
- * react-router v7.8.1-pre.0
+ * react-router v7.8.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -11,7 +11,7 @@
 "use client";
 
 
-var _chunkCXAO7FY7js = require('./chunk-CXAO7FY7.js');
+var _chunkTGXCWGPTjs = require('./chunk-TGXCWGPT.js');
 
 // lib/dom-export/dom-router-provider.tsx
 var _react = require('react'); var React = _interopRequireWildcard(_react); var React2 = _interopRequireWildcard(_react);
@@ -180,7 +180,7 @@ function HydratedRouter(props) {
   }, []);
   React2.useEffect(() => {
     if (process.env.NODE_ENV === "development" && criticalCss === void 0) {
-      document.querySelectorAll(`[${_chunkCXAO7FY7js.CRITICAL_CSS_DATA_ATTRIBUTE}]`).forEach((element) => element.remove());
+      document.querySelectorAll(`[${_chunkTGXCWGPTjs.CRITICAL_CSS_DATA_ATTRIBUTE}]`).forEach((element) => element.remove());
     }
   }, [criticalCss]);
   let [location, setLocation] = React2.useState(router.state.location);

package/dist/development/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.8.1-pre.0
+ * react-router v7.8.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -12,7 +12,7 @@
 import {
   deserializeErrors,
   getHydrationData
-} from "./chunk-V2P3SFSY.mjs";
+} from "./chunk-IFMMFE4R.mjs";
 import {
   CRITICAL_CSS_DATA_ATTRIBUTE,
   FrameworkContext,
@@ -29,7 +29,7 @@ import {
   invariant,
   mapRouteProperties,
   useFogOFWarDiscovery
-} from "./chunk-WKLBIS42.mjs";
+} from "./chunk-UH6JLGW7.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";

package/dist/development/index-react-server-client.js

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});/**
- * react-router v7.8.1-pre.0
+ * react-router v7.8.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -30,11 +30,11 @@
 
 
 
-var _chunk3JLHOGU7js = require('./chunk-3JLHOGU7.js');
+var _chunkIIA3TUI2js = require('./chunk-IIA3TUI2.js');
 
 
 
-var _chunkCXAO7FY7js = require('./chunk-CXAO7FY7.js');
+var _chunkTGXCWGPTjs = require('./chunk-TGXCWGPT.js');
 
 
 
@@ -58,4 +58,4 @@ var _chunkCXAO7FY7js = require('./chunk-CXAO7FY7.js');
 
 
 
-exports.Await = _chunk3JLHOGU7js.Await; exports.BrowserRouter = _chunk3JLHOGU7js.BrowserRouter; exports.Form = _chunk3JLHOGU7js.Form; exports.HashRouter = _chunk3JLHOGU7js.HashRouter; exports.Link = _chunk3JLHOGU7js.Link; exports.Links = _chunkCXAO7FY7js.Links; exports.MemoryRouter = _chunk3JLHOGU7js.MemoryRouter; exports.Meta = _chunkCXAO7FY7js.Meta; exports.NavLink = _chunk3JLHOGU7js.NavLink; exports.Navigate = _chunk3JLHOGU7js.Navigate; exports.Outlet = _chunk3JLHOGU7js.Outlet; exports.Route = _chunk3JLHOGU7js.Route; exports.Router = _chunk3JLHOGU7js.Router; exports.RouterProvider = _chunk3JLHOGU7js.RouterProvider; exports.Routes = _chunk3JLHOGU7js.Routes; exports.ScrollRestoration = _chunk3JLHOGU7js.ScrollRestoration; exports.StaticRouter = _chunk3JLHOGU7js.StaticRouter; exports.StaticRouterProvider = _chunk3JLHOGU7js.StaticRouterProvider; exports.UNSAFE_WithComponentProps = _chunk3JLHOGU7js.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunk3JLHOGU7js.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunk3JLHOGU7js.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunk3JLHOGU7js.HistoryRouter;
+exports.Await = _chunkIIA3TUI2js.Await; exports.BrowserRouter = _chunkIIA3TUI2js.BrowserRouter; exports.Form = _chunkIIA3TUI2js.Form; exports.HashRouter = _chunkIIA3TUI2js.HashRouter; exports.Link = _chunkIIA3TUI2js.Link; exports.Links = _chunkTGXCWGPTjs.Links; exports.MemoryRouter = _chunkIIA3TUI2js.MemoryRouter; exports.Meta = _chunkTGXCWGPTjs.Meta; exports.NavLink = _chunkIIA3TUI2js.NavLink; exports.Navigate = _chunkIIA3TUI2js.Navigate; exports.Outlet = _chunkIIA3TUI2js.Outlet; exports.Route = _chunkIIA3TUI2js.Route; exports.Router = _chunkIIA3TUI2js.Router; exports.RouterProvider = _chunkIIA3TUI2js.RouterProvider; exports.Routes = _chunkIIA3TUI2js.Routes; exports.ScrollRestoration = _chunkIIA3TUI2js.ScrollRestoration; exports.StaticRouter = _chunkIIA3TUI2js.StaticRouter; exports.StaticRouterProvider = _chunkIIA3TUI2js.StaticRouterProvider; exports.UNSAFE_WithComponentProps = _chunkIIA3TUI2js.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunkIIA3TUI2js.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunkIIA3TUI2js.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunkIIA3TUI2js.HistoryRouter;

package/dist/development/index-react-server-client.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.8.1-pre.0
+ * react-router v7.8.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -32,7 +32,7 @@ import {
   WithComponentProps,
   WithErrorBoundaryProps,
   WithHydrateFallbackProps
-} from "./chunk-WKLBIS42.mjs";
+} from "./chunk-UH6JLGW7.mjs";
 export {
   Await,
   BrowserRouter,

package/dist/development/index-react-server.js

@@ -27,7 +27,7 @@ function _interopNamespace(e) {
 var React2__namespace = /*#__PURE__*/_interopNamespace(React2);
 
 /**
- * react-router v7.8.1-pre.0
+ * react-router v7.8.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -782,9 +782,23 @@ function createStaticHandler(routes, opts) {
             return res;
           },
           async (error, routeId) => {
-            if (isResponse(error)) {
+            if (isRedirectResponse(error)) {
               return error;
             }
+            if (isResponse(error)) {
+              try {
+                error = new ErrorResponseImpl(
+                  error.status,
+                  error.statusText,
+                  await parseResponseBody(error)
+                );
+              } catch (e) {
+                error = e;
+              }
+            }
+            if (isDataWithResponseInit(error)) {
+              error = dataWithResponseInitToErrorResponse(error);
+            }
             if (renderedStaticContext) {
               if (routeId in renderedStaticContext.loaderData) {
                 renderedStaticContext.loaderData[routeId] = void 0;
@@ -910,8 +924,8 @@ function createStaticHandler(routes, opts) {
           return res;
         },
         (error) => {
-          if (isRouteErrorResponse(error)) {
-            return Promise.resolve(errorResponseToResponse(error));
+          if (isDataWithResponseInit(error)) {
+            return Promise.resolve(dataWithResponseInitToResponse(error));
           }
           if (isResponse(error)) {
             return Promise.resolve(error);
@@ -1552,11 +1566,7 @@ async function callServerRouteMiddleware(args, middlewares, handler, errorHandle
       nextResult = result;
       return nextResult;
     } catch (e) {
-      nextResult = await errorHandler(
-        // Convert thrown data() values to ErrorResponses
-        isDataWithResponseInit(e) ? dataWithResponseInitToErrorResponse(e) : e,
-        routeId
-      );
+      nextResult = await errorHandler(e, routeId);
       return nextResult;
     }
   };
@@ -1581,11 +1591,7 @@ async function callServerRouteMiddleware(args, middlewares, handler, errorHandle
       return nextResult;
     }
   } catch (e) {
-    let response = await errorHandler(
-      // Convert thrown data() values to ErrorResponses
-      isDataWithResponseInit(e) ? dataWithResponseInitToErrorResponse(e) : e,
-      routeId
-    );
+    let response = await errorHandler(e, routeId);
     return response;
   }
 }
@@ -1811,21 +1817,19 @@ async function callLoaderOrAction({
   }
   return result;
 }
+async function parseResponseBody(response) {
+  let contentType = response.headers.get("Content-Type");
+  if (contentType && /\bapplication\/json\b/.test(contentType)) {
+    return response.body == null ? null : response.json();
+  }
+  return response.text();
+}
 async function convertDataStrategyResultToDataResult(dataStrategyResult) {
   let { result, type } = dataStrategyResult;
   if (isResponse(result)) {
     let data2;
     try {
-      let contentType = result.headers.get("Content-Type");
-      if (contentType && /\bapplication\/json\b/.test(contentType)) {
-        if (result.body == null) {
-          data2 = null;
-        } else {
-          data2 = await result.json();
-        }
-      } else {
-        data2 = await result.text();
-      }
+      data2 = await parseResponseBody(result);
     } catch (e) {
       return { type: "error" /* error */, error: e };
     }
@@ -2025,10 +2029,7 @@ function getInternalRouterError(status, {
   );
 }
 function dataWithResponseInitToResponse(data2) {
-  return new Response(
-    typeof data2.data === "string" ? data2.data : JSON.stringify(data2.data),
-    data2.init || void 0
-  );
+  return Response.json(data2.data, data2.init ?? void 0);
 }
 function dataWithResponseInitToErrorResponse(data2) {
   return new ErrorResponseImpl(
@@ -2037,15 +2038,6 @@ function dataWithResponseInitToErrorResponse(data2) {
     data2.data
   );
 }
-function errorResponseToResponse(error) {
-  return new Response(
-    typeof error.data === "string" ? error.data : JSON.stringify(error.data),
-    {
-      status: error.status,
-      statusText: error.statusText
-    }
-  );
-}
 function isDataStrategyResult(result) {
   return result != null && typeof result === "object" && "type" in result && "result" in result && (result.type === "data" /* data */ || result.type === "error" /* error */);
 }

package/dist/development/index-react-server.mjs

@@ -6,7 +6,7 @@ export { Await, BrowserRouter, Form, HashRouter, Link, Links, MemoryRouter, Meta
 import { serialize, parse } from 'cookie';
 
 /**
- * react-router v7.8.1-pre.0
+ * react-router v7.8.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -761,9 +761,23 @@ function createStaticHandler(routes, opts) {
             return res;
           },
           async (error, routeId) => {
-            if (isResponse(error)) {
+            if (isRedirectResponse(error)) {
               return error;
             }
+            if (isResponse(error)) {
+              try {
+                error = new ErrorResponseImpl(
+                  error.status,
+                  error.statusText,
+                  await parseResponseBody(error)
+                );
+              } catch (e) {
+                error = e;
+              }
+            }
+            if (isDataWithResponseInit(error)) {
+              error = dataWithResponseInitToErrorResponse(error);
+            }
             if (renderedStaticContext) {
               if (routeId in renderedStaticContext.loaderData) {
                 renderedStaticContext.loaderData[routeId] = void 0;
@@ -889,8 +903,8 @@ function createStaticHandler(routes, opts) {
           return res;
         },
         (error) => {
-          if (isRouteErrorResponse(error)) {
-            return Promise.resolve(errorResponseToResponse(error));
+          if (isDataWithResponseInit(error)) {
+            return Promise.resolve(dataWithResponseInitToResponse(error));
           }
           if (isResponse(error)) {
             return Promise.resolve(error);
@@ -1531,11 +1545,7 @@ async function callServerRouteMiddleware(args, middlewares, handler, errorHandle
       nextResult = result;
       return nextResult;
     } catch (e) {
-      nextResult = await errorHandler(
-        // Convert thrown data() values to ErrorResponses
-        isDataWithResponseInit(e) ? dataWithResponseInitToErrorResponse(e) : e,
-        routeId
-      );
+      nextResult = await errorHandler(e, routeId);
       return nextResult;
     }
   };
@@ -1560,11 +1570,7 @@ async function callServerRouteMiddleware(args, middlewares, handler, errorHandle
       return nextResult;
     }
   } catch (e) {
-    let response = await errorHandler(
-      // Convert thrown data() values to ErrorResponses
-      isDataWithResponseInit(e) ? dataWithResponseInitToErrorResponse(e) : e,
-      routeId
-    );
+    let response = await errorHandler(e, routeId);
     return response;
   }
 }
@@ -1790,21 +1796,19 @@ async function callLoaderOrAction({
   }
   return result;
 }
+async function parseResponseBody(response) {
+  let contentType = response.headers.get("Content-Type");
+  if (contentType && /\bapplication\/json\b/.test(contentType)) {
+    return response.body == null ? null : response.json();
+  }
+  return response.text();
+}
 async function convertDataStrategyResultToDataResult(dataStrategyResult) {
   let { result, type } = dataStrategyResult;
   if (isResponse(result)) {
     let data2;
     try {
-      let contentType = result.headers.get("Content-Type");
-      if (contentType && /\bapplication\/json\b/.test(contentType)) {
-        if (result.body == null) {
-          data2 = null;
-        } else {
-          data2 = await result.json();
-        }
-      } else {
-        data2 = await result.text();
-      }
+      data2 = await parseResponseBody(result);
     } catch (e) {
       return { type: "error" /* error */, error: e };
     }
@@ -2004,10 +2008,7 @@ function getInternalRouterError(status, {
   );
 }
 function dataWithResponseInitToResponse(data2) {
-  return new Response(
-    typeof data2.data === "string" ? data2.data : JSON.stringify(data2.data),
-    data2.init || void 0
-  );
+  return Response.json(data2.data, data2.init ?? void 0);
 }
 function dataWithResponseInitToErrorResponse(data2) {
   return new ErrorResponseImpl(
@@ -2016,15 +2017,6 @@ function dataWithResponseInitToErrorResponse(data2) {
     data2.data
   );
 }
-function errorResponseToResponse(error) {
-  return new Response(
-    typeof error.data === "string" ? error.data : JSON.stringify(error.data),
-    {
-      status: error.status,
-      statusText: error.statusText
-    }
-  );
-}
 function isDataStrategyResult(result) {
   return result != null && typeof result === "object" && "type" in result && "result" in result && (result.type === "data" /* data */ || result.type === "error" /* error */);
 }