react-router 0.0.0-experimental-7db49e8d4 → 0.0.0-experimental-bafa092e7

package/dist/development/{chunk-UKHDCHH6.mjs → chunk-Q2DCDB5W.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-7db49e8d4
+ * react-router v0.0.0-experimental-bafa092e7
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8796,7 +8796,7 @@ function mergeRefs(...refs) {
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 try {
   if (isBrowser) {
-    window.__reactRouterVersion = "0.0.0-experimental-7db49e8d4";
+    window.__reactRouterVersion = "0.0.0-experimental-bafa092e7";
   }
 } catch (e) {
 }
@@ -12091,24 +12091,10 @@ async function routeRSCServerRequest({
   hydrate: hydrate2 = true
 }) {
   const url = new URL(request.url);
-  let serverRequest = request;
   const isDataRequest = isReactServerRequest(url);
   const respondWithRSCPayload = isDataRequest || isManifestRequest(url) || request.headers.has("rsc-action-id");
-  if (isDataRequest) {
-    const serverURL = new URL(request.url);
-    serverURL.pathname = serverURL.pathname.replace(/(_root)?\.rsc$/, "");
-    let headers = new Headers(request.headers);
-    headers.set("X-React-Router-Data-Request", "true");
-    serverRequest = new Request(serverURL, {
-      body: request.body,
-      duplex: request.body ? "half" : void 0,
-      headers,
-      method: request.method,
-      signal: request.signal
-    });
-  }
-  const serverResponse = await callServer(serverRequest);
-  if (respondWithRSCPayload) {
+  const serverResponse = await callServer(request);
+  if (respondWithRSCPayload || serverResponse.headers.get("React-Router-Resource") === "true") {
     return serverResponse;
   }
   if (!serverResponse.body) {

package/dist/development/dom-export.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-7db49e8d4
+ * react-router v0.0.0-experimental-bafa092e7
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-7db49e8d4
+ * react-router v0.0.0-experimental-bafa092e7
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -26,7 +26,7 @@ import {
   invariant,
   mapRouteProperties,
   useFogOFWarDiscovery
-} from "./chunk-UKHDCHH6.mjs";
+} from "./chunk-Q2DCDB5W.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";

package/dist/development/index.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-7db49e8d4
+ * react-router v0.0.0-experimental-bafa092e7
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8955,7 +8955,7 @@ function mergeRefs(...refs) {
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 try {
   if (isBrowser) {
-    window.__reactRouterVersion = "0.0.0-experimental-7db49e8d4";
+    window.__reactRouterVersion = "0.0.0-experimental-bafa092e7";
   }
 } catch (e) {
 }
@@ -12250,24 +12250,10 @@ async function routeRSCServerRequest({
   hydrate: hydrate2 = true
 }) {
   const url = new URL(request.url);
-  let serverRequest = request;
   const isDataRequest = isReactServerRequest(url);
   const respondWithRSCPayload = isDataRequest || isManifestRequest(url) || request.headers.has("rsc-action-id");
-  if (isDataRequest) {
-    const serverURL = new URL(request.url);
-    serverURL.pathname = serverURL.pathname.replace(/(_root)?\.rsc$/, "");
-    let headers = new Headers(request.headers);
-    headers.set("X-React-Router-Data-Request", "true");
-    serverRequest = new Request(serverURL, {
-      body: request.body,
-      duplex: request.body ? "half" : void 0,
-      headers,
-      method: request.method,
-      signal: request.signal
-    });
-  }
-  const serverResponse = await callServer(serverRequest);
-  if (respondWithRSCPayload) {
+  const serverResponse = await callServer(request);
+  if (respondWithRSCPayload || serverResponse.headers.get("React-Router-Resource") === "true") {
     return serverResponse;
   }
   if (!serverResponse.body) {

package/dist/development/index.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-7db49e8d4
+ * react-router v0.0.0-experimental-bafa092e7
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -134,7 +134,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-UKHDCHH6.mjs";
+} from "./chunk-Q2DCDB5W.mjs";
 export {
   Await,
   BrowserRouter,

package/dist/development/lib/types/internal.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-7db49e8d4
+ * react-router v0.0.0-experimental-bafa092e7
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/types/internal.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-7db49e8d4
+ * react-router v0.0.0-experimental-bafa092e7
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/rsc-export.js

@@ -25,7 +25,7 @@ function _interopNamespace(e) {
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
 /**
- * react-router v0.0.0-experimental-7db49e8d4
+ * react-router v0.0.0-experimental-bafa092e7
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2453,8 +2453,8 @@ async function matchRSCServerRequest({
   routes,
   generateResponse
 }) {
-  const url = new URL(request.url);
-  if (isManifestRequest(url)) {
+  let requestUrl = new URL(request.url);
+  if (isManifestRequest(requestUrl)) {
     let response2 = await generateManifestResponse(
       routes,
       request,
@@ -2462,9 +2462,36 @@ async function matchRSCServerRequest({
     );
     return response2;
   }
+  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" : void 0
+    });
+  }
+  let matches = matchRoutes(routes, url.pathname);
+  if (matches) {
+    await Promise.all(matches.map((m) => explodeLazyRoute(m.route)));
+  }
+  const leafMatch = matches?.[matches.length - 1];
+  if (!isDataRequest && leafMatch && !leafMatch.route.Component && !leafMatch.route.ErrorBoundary) {
+    return generateResourceResponse(
+      routerRequest,
+      routes,
+      leafMatch.route.id,
+      onError
+    );
+  }
   let response = await generateRenderResponse(
-    request,
+    routerRequest,
     routes,
+    isDataRequest,
     decodeCallServer,
     decodeFormAction,
     onError,
@@ -2513,6 +2540,9 @@ async function processServerAction(request, decodeCallServer, decodeFormAction,
     headers: request.headers,
     signal: request.signal
   });
+  const isFormRequest = canDecodeWithFormData(
+    request.headers.get("Content-Type")
+  );
   const actionId = request.headers.get("rsc-action-id");
   if (actionId) {
     if (!decodeCallServer) {
@@ -2520,7 +2550,7 @@ async function processServerAction(request, decodeCallServer, decodeFormAction,
         "Cannot handle enhanced server action without a decodeCallServer function"
       );
     }
-    const reply = canDecodeWithFormData(request.headers.get("Content-Type")) ? await request.formData() : await request.text();
+    const reply = isFormRequest ? await request.formData() : await request.text();
     const serverAction = await decodeCallServer(actionId, reply);
     let actionResult = Promise.resolve(serverAction());
     try {
@@ -2535,10 +2565,8 @@ async function processServerAction(request, decodeCallServer, decodeFormAction,
       actionResult,
       revalidationRequest: getRevalidationRequest()
     };
-  }
-  if (request.method === "POST") {
-    const clone = request.clone();
-    const formData = await request.formData();
+  } else if (isFormRequest) {
+    const formData = await request.clone().formData();
     if (Array.from(formData.keys()).some((k) => k.startsWith("$ACTION_"))) {
       if (!decodeFormAction) {
         throw new Error(
@@ -2558,21 +2586,53 @@ async function processServerAction(request, decodeCallServer, decodeFormAction,
         revalidationRequest: getRevalidationRequest()
       };
     }
-    return {
-      revalidationRequest: clone
-    };
   }
 }
-async function generateRenderResponse(request, routes, decodeCallServer, decodeFormAction, onError, generateResponse) {
+async function generateResourceResponse(request, routes, routeId, onError) {
+  let result;
+  try {
+    const staticHandler = createStaticHandler(routes, {
+      // TODO: Support basename
+      // basename
+    });
+    let response = await staticHandler.queryRoute(request, {
+      routeId,
+      // TODO: Support loadContext
+      // requestContext: loadContext,
+      unstable_respond: (ctx) => ctx
+    });
+    if (isResponse(response)) {
+      result = response;
+    } else {
+      if (typeof response === "string") {
+        result = new Response(response);
+      } else {
+        result = Response.json(response);
+      }
+    }
+  } catch (error) {
+    if (isResponse(error)) {
+      result = error;
+    } else {
+      onError?.(error);
+      result = new Response("Internal Server Error", {
+        status: 500
+      });
+    }
+  }
+  const headers = new Headers(result.headers);
+  headers.set("React-Router-Resource", "true");
+  return new Response(result.body, {
+    status: result.status,
+    statusText: result.statusText,
+    headers
+  });
+}
+async function generateRenderResponse(request, routes, isDataRequest, decodeCallServer, decodeFormAction, onError, generateResponse) {
   let statusCode = 200;
   let url = new URL(request.url);
-  let isDataRequest = request.headers.has("X-React-Router-Data-Request");
   let isSubmission = isMutationMethod(request.method);
   let routeIdsToLoad = !isSubmission && url.searchParams.has("_routes") ? url.searchParams.get("_routes").split(",") : null;
-  let matches = matchRoutes(routes, url.pathname);
-  if (matches) {
-    await Promise.all(matches.map((m) => explodeLazyRoute(m.route)));
-  }
   const handler = createStaticHandler(routes, {
     mapRouteProperties: (r) => ({
       hasErrorBoundary: r.ErrorBoundary != null
@@ -2881,6 +2941,9 @@ async function getAdditionalRoutePatches(pathnames, routes, matchedRouteIds) {
   );
   return patches;
 }
+function isReactServerRequest(url) {
+  return url.pathname.endsWith(".rsc");
+}
 function isManifestRequest(url) {
   return url.pathname.endsWith(".manifest");
 }

package/dist/development/rsc-export.mjs

@@ -3,7 +3,7 @@ import * as React from 'react';
 import { splitCookiesString } from 'set-cookie-parser';
 
 /**
- * react-router v0.0.0-experimental-7db49e8d4
+ * react-router v0.0.0-experimental-bafa092e7
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2431,8 +2431,8 @@ async function matchRSCServerRequest({
   routes,
   generateResponse
 }) {
-  const url = new URL(request.url);
-  if (isManifestRequest(url)) {
+  let requestUrl = new URL(request.url);
+  if (isManifestRequest(requestUrl)) {
     let response2 = await generateManifestResponse(
       routes,
       request,
@@ -2440,9 +2440,36 @@ async function matchRSCServerRequest({
     );
     return response2;
   }
+  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" : void 0
+    });
+  }
+  let matches = matchRoutes(routes, url.pathname);
+  if (matches) {
+    await Promise.all(matches.map((m) => explodeLazyRoute(m.route)));
+  }
+  const leafMatch = matches?.[matches.length - 1];
+  if (!isDataRequest && leafMatch && !leafMatch.route.Component && !leafMatch.route.ErrorBoundary) {
+    return generateResourceResponse(
+      routerRequest,
+      routes,
+      leafMatch.route.id,
+      onError
+    );
+  }
   let response = await generateRenderResponse(
-    request,
+    routerRequest,
     routes,
+    isDataRequest,
     decodeCallServer,
     decodeFormAction,
     onError,
@@ -2491,6 +2518,9 @@ async function processServerAction(request, decodeCallServer, decodeFormAction,
     headers: request.headers,
     signal: request.signal
   });
+  const isFormRequest = canDecodeWithFormData(
+    request.headers.get("Content-Type")
+  );
   const actionId = request.headers.get("rsc-action-id");
   if (actionId) {
     if (!decodeCallServer) {
@@ -2498,7 +2528,7 @@ async function processServerAction(request, decodeCallServer, decodeFormAction,
         "Cannot handle enhanced server action without a decodeCallServer function"
       );
     }
-    const reply = canDecodeWithFormData(request.headers.get("Content-Type")) ? await request.formData() : await request.text();
+    const reply = isFormRequest ? await request.formData() : await request.text();
     const serverAction = await decodeCallServer(actionId, reply);
     let actionResult = Promise.resolve(serverAction());
     try {
@@ -2513,10 +2543,8 @@ async function processServerAction(request, decodeCallServer, decodeFormAction,
       actionResult,
       revalidationRequest: getRevalidationRequest()
     };
-  }
-  if (request.method === "POST") {
-    const clone = request.clone();
-    const formData = await request.formData();
+  } else if (isFormRequest) {
+    const formData = await request.clone().formData();
     if (Array.from(formData.keys()).some((k) => k.startsWith("$ACTION_"))) {
       if (!decodeFormAction) {
         throw new Error(
@@ -2536,21 +2564,53 @@ async function processServerAction(request, decodeCallServer, decodeFormAction,
         revalidationRequest: getRevalidationRequest()
       };
     }
-    return {
-      revalidationRequest: clone
-    };
   }
 }
-async function generateRenderResponse(request, routes, decodeCallServer, decodeFormAction, onError, generateResponse) {
+async function generateResourceResponse(request, routes, routeId, onError) {
+  let result;
+  try {
+    const staticHandler = createStaticHandler(routes, {
+      // TODO: Support basename
+      // basename
+    });
+    let response = await staticHandler.queryRoute(request, {
+      routeId,
+      // TODO: Support loadContext
+      // requestContext: loadContext,
+      unstable_respond: (ctx) => ctx
+    });
+    if (isResponse(response)) {
+      result = response;
+    } else {
+      if (typeof response === "string") {
+        result = new Response(response);
+      } else {
+        result = Response.json(response);
+      }
+    }
+  } catch (error) {
+    if (isResponse(error)) {
+      result = error;
+    } else {
+      onError?.(error);
+      result = new Response("Internal Server Error", {
+        status: 500
+      });
+    }
+  }
+  const headers = new Headers(result.headers);
+  headers.set("React-Router-Resource", "true");
+  return new Response(result.body, {
+    status: result.status,
+    statusText: result.statusText,
+    headers
+  });
+}
+async function generateRenderResponse(request, routes, isDataRequest, decodeCallServer, decodeFormAction, onError, generateResponse) {
   let statusCode = 200;
   let url = new URL(request.url);
-  let isDataRequest = request.headers.has("X-React-Router-Data-Request");
   let isSubmission = isMutationMethod(request.method);
   let routeIdsToLoad = !isSubmission && url.searchParams.has("_routes") ? url.searchParams.get("_routes").split(",") : null;
-  let matches = matchRoutes(routes, url.pathname);
-  if (matches) {
-    await Promise.all(matches.map((m) => explodeLazyRoute(m.route)));
-  }
   const handler = createStaticHandler(routes, {
     mapRouteProperties: (r) => ({
       hasErrorBoundary: r.ErrorBoundary != null
@@ -2859,6 +2919,9 @@ async function getAdditionalRoutePatches(pathnames, routes, matchedRouteIds) {
   );
   return patches;
 }
+function isReactServerRequest(url) {
+  return url.pathname.endsWith(".rsc");
+}
 function isManifestRequest(url) {
   return url.pathname.endsWith(".manifest");
 }

package/dist/production/{chunk-ZA7BCDUO.mjs → chunk-PBF6AAQR.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-7db49e8d4
+ * react-router v0.0.0-experimental-bafa092e7
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8796,7 +8796,7 @@ function mergeRefs(...refs) {
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 try {
   if (isBrowser) {
-    window.__reactRouterVersion = "0.0.0-experimental-7db49e8d4";
+    window.__reactRouterVersion = "0.0.0-experimental-bafa092e7";
   }
 } catch (e) {
 }
@@ -12091,24 +12091,10 @@ async function routeRSCServerRequest({
   hydrate: hydrate2 = true
 }) {
   const url = new URL(request.url);
-  let serverRequest = request;
   const isDataRequest = isReactServerRequest(url);
   const respondWithRSCPayload = isDataRequest || isManifestRequest(url) || request.headers.has("rsc-action-id");
-  if (isDataRequest) {
-    const serverURL = new URL(request.url);
-    serverURL.pathname = serverURL.pathname.replace(/(_root)?\.rsc$/, "");
-    let headers = new Headers(request.headers);
-    headers.set("X-React-Router-Data-Request", "true");
-    serverRequest = new Request(serverURL, {
-      body: request.body,
-      duplex: request.body ? "half" : void 0,
-      headers,
-      method: request.method,
-      signal: request.signal
-    });
-  }
-  const serverResponse = await callServer(serverRequest);
-  if (respondWithRSCPayload) {
+  const serverResponse = await callServer(request);
+  if (respondWithRSCPayload || serverResponse.headers.get("React-Router-Resource") === "true") {
     return serverResponse;
   }
   if (!serverResponse.body) {

package/dist/production/dom-export.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-7db49e8d4
+ * react-router v0.0.0-experimental-bafa092e7
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-7db49e8d4
+ * react-router v0.0.0-experimental-bafa092e7
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -26,7 +26,7 @@ import {
   invariant,
   mapRouteProperties,
   useFogOFWarDiscovery
-} from "./chunk-ZA7BCDUO.mjs";
+} from "./chunk-PBF6AAQR.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";

package/dist/production/index.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-7db49e8d4
+ * react-router v0.0.0-experimental-bafa092e7
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -8955,7 +8955,7 @@ function mergeRefs(...refs) {
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 try {
   if (isBrowser) {
-    window.__reactRouterVersion = "0.0.0-experimental-7db49e8d4";
+    window.__reactRouterVersion = "0.0.0-experimental-bafa092e7";
   }
 } catch (e) {
 }
@@ -12250,24 +12250,10 @@ async function routeRSCServerRequest({
   hydrate: hydrate2 = true
 }) {
   const url = new URL(request.url);
-  let serverRequest = request;
   const isDataRequest = isReactServerRequest(url);
   const respondWithRSCPayload = isDataRequest || isManifestRequest(url) || request.headers.has("rsc-action-id");
-  if (isDataRequest) {
-    const serverURL = new URL(request.url);
-    serverURL.pathname = serverURL.pathname.replace(/(_root)?\.rsc$/, "");
-    let headers = new Headers(request.headers);
-    headers.set("X-React-Router-Data-Request", "true");
-    serverRequest = new Request(serverURL, {
-      body: request.body,
-      duplex: request.body ? "half" : void 0,
-      headers,
-      method: request.method,
-      signal: request.signal
-    });
-  }
-  const serverResponse = await callServer(serverRequest);
-  if (respondWithRSCPayload) {
+  const serverResponse = await callServer(request);
+  if (respondWithRSCPayload || serverResponse.headers.get("React-Router-Resource") === "true") {
     return serverResponse;
   }
   if (!serverResponse.body) {

package/dist/production/index.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-7db49e8d4
+ * react-router v0.0.0-experimental-bafa092e7
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -134,7 +134,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-ZA7BCDUO.mjs";
+} from "./chunk-PBF6AAQR.mjs";
 export {
   Await,
   BrowserRouter,

package/dist/production/lib/types/internal.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-7db49e8d4
+ * react-router v0.0.0-experimental-bafa092e7
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/types/internal.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-7db49e8d4
+ * react-router v0.0.0-experimental-bafa092e7
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/rsc-export.js

@@ -25,7 +25,7 @@ function _interopNamespace(e) {
 var React__namespace = /*#__PURE__*/_interopNamespace(React);
 
 /**
- * react-router v0.0.0-experimental-7db49e8d4
+ * react-router v0.0.0-experimental-bafa092e7
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2453,8 +2453,8 @@ async function matchRSCServerRequest({
   routes,
   generateResponse
 }) {
-  const url = new URL(request.url);
-  if (isManifestRequest(url)) {
+  let requestUrl = new URL(request.url);
+  if (isManifestRequest(requestUrl)) {
     let response2 = await generateManifestResponse(
       routes,
       request,
@@ -2462,9 +2462,36 @@ async function matchRSCServerRequest({
     );
     return response2;
   }
+  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" : void 0
+    });
+  }
+  let matches = matchRoutes(routes, url.pathname);
+  if (matches) {
+    await Promise.all(matches.map((m) => explodeLazyRoute(m.route)));
+  }
+  const leafMatch = matches?.[matches.length - 1];
+  if (!isDataRequest && leafMatch && !leafMatch.route.Component && !leafMatch.route.ErrorBoundary) {
+    return generateResourceResponse(
+      routerRequest,
+      routes,
+      leafMatch.route.id,
+      onError
+    );
+  }
   let response = await generateRenderResponse(
-    request,
+    routerRequest,
     routes,
+    isDataRequest,
     decodeCallServer,
     decodeFormAction,
     onError,
@@ -2513,6 +2540,9 @@ async function processServerAction(request, decodeCallServer, decodeFormAction,
     headers: request.headers,
     signal: request.signal
   });
+  const isFormRequest = canDecodeWithFormData(
+    request.headers.get("Content-Type")
+  );
   const actionId = request.headers.get("rsc-action-id");
   if (actionId) {
     if (!decodeCallServer) {
@@ -2520,7 +2550,7 @@ async function processServerAction(request, decodeCallServer, decodeFormAction,
         "Cannot handle enhanced server action without a decodeCallServer function"
       );
     }
-    const reply = canDecodeWithFormData(request.headers.get("Content-Type")) ? await request.formData() : await request.text();
+    const reply = isFormRequest ? await request.formData() : await request.text();
     const serverAction = await decodeCallServer(actionId, reply);
     let actionResult = Promise.resolve(serverAction());
     try {
@@ -2535,10 +2565,8 @@ async function processServerAction(request, decodeCallServer, decodeFormAction,
       actionResult,
       revalidationRequest: getRevalidationRequest()
     };
-  }
-  if (request.method === "POST") {
-    const clone = request.clone();
-    const formData = await request.formData();
+  } else if (isFormRequest) {
+    const formData = await request.clone().formData();
     if (Array.from(formData.keys()).some((k) => k.startsWith("$ACTION_"))) {
       if (!decodeFormAction) {
         throw new Error(
@@ -2558,21 +2586,53 @@ async function processServerAction(request, decodeCallServer, decodeFormAction,
         revalidationRequest: getRevalidationRequest()
       };
     }
-    return {
-      revalidationRequest: clone
-    };
   }
 }
-async function generateRenderResponse(request, routes, decodeCallServer, decodeFormAction, onError, generateResponse) {
+async function generateResourceResponse(request, routes, routeId, onError) {
+  let result;
+  try {
+    const staticHandler = createStaticHandler(routes, {
+      // TODO: Support basename
+      // basename
+    });
+    let response = await staticHandler.queryRoute(request, {
+      routeId,
+      // TODO: Support loadContext
+      // requestContext: loadContext,
+      unstable_respond: (ctx) => ctx
+    });
+    if (isResponse(response)) {
+      result = response;
+    } else {
+      if (typeof response === "string") {
+        result = new Response(response);
+      } else {
+        result = Response.json(response);
+      }
+    }
+  } catch (error) {
+    if (isResponse(error)) {
+      result = error;
+    } else {
+      onError?.(error);
+      result = new Response("Internal Server Error", {
+        status: 500
+      });
+    }
+  }
+  const headers = new Headers(result.headers);
+  headers.set("React-Router-Resource", "true");
+  return new Response(result.body, {
+    status: result.status,
+    statusText: result.statusText,
+    headers
+  });
+}
+async function generateRenderResponse(request, routes, isDataRequest, decodeCallServer, decodeFormAction, onError, generateResponse) {
   let statusCode = 200;
   let url = new URL(request.url);
-  let isDataRequest = request.headers.has("X-React-Router-Data-Request");
   let isSubmission = isMutationMethod(request.method);
   let routeIdsToLoad = !isSubmission && url.searchParams.has("_routes") ? url.searchParams.get("_routes").split(",") : null;
-  let matches = matchRoutes(routes, url.pathname);
-  if (matches) {
-    await Promise.all(matches.map((m) => explodeLazyRoute(m.route)));
-  }
   const handler = createStaticHandler(routes, {
     mapRouteProperties: (r) => ({
       hasErrorBoundary: r.ErrorBoundary != null
@@ -2881,6 +2941,9 @@ async function getAdditionalRoutePatches(pathnames, routes, matchedRouteIds) {
   );
   return patches;
 }
+function isReactServerRequest(url) {
+  return url.pathname.endsWith(".rsc");
+}
 function isManifestRequest(url) {
   return url.pathname.endsWith(".manifest");
 }

package/dist/production/rsc-export.mjs

@@ -3,7 +3,7 @@ import * as React from 'react';
 import { splitCookiesString } from 'set-cookie-parser';
 
 /**
- * react-router v0.0.0-experimental-7db49e8d4
+ * react-router v0.0.0-experimental-bafa092e7
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2431,8 +2431,8 @@ async function matchRSCServerRequest({
   routes,
   generateResponse
 }) {
-  const url = new URL(request.url);
-  if (isManifestRequest(url)) {
+  let requestUrl = new URL(request.url);
+  if (isManifestRequest(requestUrl)) {
     let response2 = await generateManifestResponse(
       routes,
       request,
@@ -2440,9 +2440,36 @@ async function matchRSCServerRequest({
     );
     return response2;
   }
+  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" : void 0
+    });
+  }
+  let matches = matchRoutes(routes, url.pathname);
+  if (matches) {
+    await Promise.all(matches.map((m) => explodeLazyRoute(m.route)));
+  }
+  const leafMatch = matches?.[matches.length - 1];
+  if (!isDataRequest && leafMatch && !leafMatch.route.Component && !leafMatch.route.ErrorBoundary) {
+    return generateResourceResponse(
+      routerRequest,
+      routes,
+      leafMatch.route.id,
+      onError
+    );
+  }
   let response = await generateRenderResponse(
-    request,
+    routerRequest,
     routes,
+    isDataRequest,
     decodeCallServer,
     decodeFormAction,
     onError,
@@ -2491,6 +2518,9 @@ async function processServerAction(request, decodeCallServer, decodeFormAction,
     headers: request.headers,
     signal: request.signal
   });
+  const isFormRequest = canDecodeWithFormData(
+    request.headers.get("Content-Type")
+  );
   const actionId = request.headers.get("rsc-action-id");
   if (actionId) {
     if (!decodeCallServer) {
@@ -2498,7 +2528,7 @@ async function processServerAction(request, decodeCallServer, decodeFormAction,
         "Cannot handle enhanced server action without a decodeCallServer function"
       );
     }
-    const reply = canDecodeWithFormData(request.headers.get("Content-Type")) ? await request.formData() : await request.text();
+    const reply = isFormRequest ? await request.formData() : await request.text();
     const serverAction = await decodeCallServer(actionId, reply);
     let actionResult = Promise.resolve(serverAction());
     try {
@@ -2513,10 +2543,8 @@ async function processServerAction(request, decodeCallServer, decodeFormAction,
       actionResult,
       revalidationRequest: getRevalidationRequest()
     };
-  }
-  if (request.method === "POST") {
-    const clone = request.clone();
-    const formData = await request.formData();
+  } else if (isFormRequest) {
+    const formData = await request.clone().formData();
     if (Array.from(formData.keys()).some((k) => k.startsWith("$ACTION_"))) {
       if (!decodeFormAction) {
         throw new Error(
@@ -2536,21 +2564,53 @@ async function processServerAction(request, decodeCallServer, decodeFormAction,
         revalidationRequest: getRevalidationRequest()
       };
     }
-    return {
-      revalidationRequest: clone
-    };
   }
 }
-async function generateRenderResponse(request, routes, decodeCallServer, decodeFormAction, onError, generateResponse) {
+async function generateResourceResponse(request, routes, routeId, onError) {
+  let result;
+  try {
+    const staticHandler = createStaticHandler(routes, {
+      // TODO: Support basename
+      // basename
+    });
+    let response = await staticHandler.queryRoute(request, {
+      routeId,
+      // TODO: Support loadContext
+      // requestContext: loadContext,
+      unstable_respond: (ctx) => ctx
+    });
+    if (isResponse(response)) {
+      result = response;
+    } else {
+      if (typeof response === "string") {
+        result = new Response(response);
+      } else {
+        result = Response.json(response);
+      }
+    }
+  } catch (error) {
+    if (isResponse(error)) {
+      result = error;
+    } else {
+      onError?.(error);
+      result = new Response("Internal Server Error", {
+        status: 500
+      });
+    }
+  }
+  const headers = new Headers(result.headers);
+  headers.set("React-Router-Resource", "true");
+  return new Response(result.body, {
+    status: result.status,
+    statusText: result.statusText,
+    headers
+  });
+}
+async function generateRenderResponse(request, routes, isDataRequest, decodeCallServer, decodeFormAction, onError, generateResponse) {
   let statusCode = 200;
   let url = new URL(request.url);
-  let isDataRequest = request.headers.has("X-React-Router-Data-Request");
   let isSubmission = isMutationMethod(request.method);
   let routeIdsToLoad = !isSubmission && url.searchParams.has("_routes") ? url.searchParams.get("_routes").split(",") : null;
-  let matches = matchRoutes(routes, url.pathname);
-  if (matches) {
-    await Promise.all(matches.map((m) => explodeLazyRoute(m.route)));
-  }
   const handler = createStaticHandler(routes, {
     mapRouteProperties: (r) => ({
       hasErrorBoundary: r.ErrorBoundary != null
@@ -2859,6 +2919,9 @@ async function getAdditionalRoutePatches(pathnames, routes, matchedRouteIds) {
   );
   return patches;
 }
+function isReactServerRequest(url) {
+  return url.pathname.endsWith(".rsc");
+}
 function isManifestRequest(url) {
   return url.pathname.endsWith(".manifest");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router",
-  "version": "0.0.0-experimental-7db49e8d4",
+  "version": "0.0.0-experimental-bafa092e7",
   "description": "Declarative routing for React",
   "keywords": [
     "react",