react-router 0.0.0-experimental-3f68c7c20 → 0.0.0-experimental-e87ed2fd4

package/dist/production/{chunk-SAZGQ73S.mjs → chunk-FJS6IVQF.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-3f68c7c20
+ * react-router v0.0.0-experimental-e87ed2fd4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -5030,7 +5030,7 @@ function useRoutesImpl(routes, locationArg, dataRouterState, future) {
     // router loaded. We can help them understand how to avoid that.
     `useRoutes() may be used only in the context of a <Router> component.`
   );
-  let { navigator, static: isStatic } = React2.useContext(NavigationContext);
+  let { navigator } = React2.useContext(NavigationContext);
   let { matches: parentMatches } = React2.useContext(RouteContext);
   let routeMatch = parentMatches[parentMatches.length - 1];
   let parentParams = routeMatch ? routeMatch.params : {};
@@ -5066,7 +5066,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
     let segments = pathname.replace(/^\//, "").split("/");
     remainingPathname = "/" + segments.slice(parentSegments.length).join("/");
   }
-  let matches = !isStatic && dataRouterState && dataRouterState.matches && dataRouterState.matches.length > 0 ? dataRouterState.matches : matchRoutes(routes, { pathname: remainingPathname });
+  let matches = matchRoutes(routes, { pathname: remainingPathname });
   if (ENABLE_DEV_WARNINGS) {
     warning(
       parentRoute || matches != null,
@@ -5996,6 +5996,38 @@ var createRoutesFromElements = createRoutesFromChildren;
 function renderMatches(matches) {
   return _renderMatches(matches);
 }
+function withComponentProps(Component4) {
+  return function WithComponentProps() {
+    const props = {
+      params: useParams(),
+      loaderData: useLoaderData(),
+      actionData: useActionData(),
+      matches: useMatches()
+    };
+    return React3.createElement(Component4, props);
+  };
+}
+function withHydrateFallbackProps(HydrateFallback) {
+  return function WithHydrateFallbackProps() {
+    const props = {
+      params: useParams(),
+      loaderData: useLoaderData(),
+      actionData: useActionData()
+    };
+    return React3.createElement(HydrateFallback, props);
+  };
+}
+function withErrorBoundaryProps(ErrorBoundary) {
+  return function WithErrorBoundaryProps() {
+    const props = {
+      params: useParams(),
+      loaderData: useLoaderData(),
+      actionData: useActionData(),
+      error: useRouteError()
+    };
+    return React3.createElement(ErrorBoundary, props);
+  };
+}
 
 // lib/dom/lib.tsx
 import * as React10 from "react";
@@ -8761,7 +8793,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-3f68c7c20";
+    window.__reactRouterVersion = "0.0.0-experimental-e87ed2fd4";
   }
 } catch (e) {
 }
@@ -9958,37 +9990,6 @@ function createRoutesStub(routes, unstable_getContext) {
     return /* @__PURE__ */ React13.createElement(FrameworkContext.Provider, { value: remixContextRef.current }, /* @__PURE__ */ React13.createElement(RouterProvider, { router: routerRef.current }));
   };
 }
-function withComponentProps(Component4) {
-  return function Wrapped() {
-    return React13.createElement(Component4, {
-      params: useParams(),
-      loaderData: useLoaderData(),
-      actionData: useActionData(),
-      matches: useMatches()
-    });
-  };
-}
-function withHydrateFallbackProps(HydrateFallback) {
-  return function Wrapped() {
-    const props = {
-      params: useParams(),
-      loaderData: useLoaderData(),
-      actionData: useActionData()
-    };
-    return React13.createElement(HydrateFallback, props);
-  };
-}
-function withErrorBoundaryProps(ErrorBoundary) {
-  return function Wrapped() {
-    const props = {
-      params: useParams(),
-      loaderData: useLoaderData(),
-      actionData: useActionData(),
-      error: useRouteError()
-    };
-    return React13.createElement(ErrorBoundary, props);
-  };
-}
 function processRoutes(routes, manifest, routeModules, parentId) {
   return routes.map((route) => {
     if (!route.id) {
@@ -10506,7 +10507,14 @@ function createServerHandoffString(serverHandoff) {
 
 // lib/server-runtime/headers.ts
 import { splitCookiesString } from "set-cookie-parser";
-function getDocumentHeaders(context, getRouteHeadersFn) {
+function getDocumentHeaders(context, build) {
+  return getDocumentHeadersImpl(context, (m) => {
+    let route = build.routes[m.route.id];
+    invariant3(route, `Route with id "${m.route.id}" not found in build`);
+    return route.module.headers;
+  });
+}
+function getDocumentHeadersImpl(context, getRouteHeadersFn) {
   let boundaryIdx = context.errors ? context.matches.findIndex((m) => context.errors[m.route.id]) : -1;
   let matches = boundaryIdx >= 0 ? context.matches.slice(0, boundaryIdx + 1) : context.matches;
   let errorHeaders;
@@ -10576,10 +10584,7 @@ var SERVER_NO_BODY_STATUS_CODES = /* @__PURE__ */ new Set([
 async function singleFetchAction(build, serverMode, staticHandler, request, handlerUrl, loadContext, handleError) {
   try {
     let respond2 = function(context) {
-      let headers = getDocumentHeaders(
-        context,
-        (m) => build.routes[m.route.id]?.module.headers
-      );
+      let headers = getDocumentHeaders(context, build);
       if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) {
         return generateSingleFetchResponse(request, build, serverMode, {
           result: getSingleFetchRedirect(
@@ -10654,10 +10659,7 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
 async function singleFetchLoaders(build, serverMode, staticHandler, request, handlerUrl, loadContext, handleError) {
   try {
     let respond2 = function(context) {
-      let headers = getDocumentHeaders(
-        context,
-        (m) => build.routes[m.route.id]?.module.headers
-      );
+      let headers = getDocumentHeaders(context, build);
       if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) {
         return generateSingleFetchResponse(request, build, serverMode, {
           result: {
@@ -11124,10 +11126,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
     if (isResponse(context)) {
       return context;
     }
-    let headers = getDocumentHeaders(
-      context,
-      (m) => build.routes[m.route.id]?.module.headers
-    );
+    let headers = getDocumentHeaders(context, build);
     if (SERVER_NO_BODY_STATUS_CODES.has(context.statusCode)) {
       return new Response(null, { status: context.statusCode, headers });
     }
@@ -11974,7 +11973,8 @@ async function routeRSCServerRequest({
   request,
   callServer,
   decode: decode2,
-  renderHTML
+  renderHTML,
+  hydrate: hydrate2 = true
 }) {
   const url = new URL(request.url);
   let serverRequest = request;
@@ -12000,9 +12000,9 @@ async function routeRSCServerRequest({
   if (!serverResponse.body) {
     throw new Error("Missing body in server response");
   }
-  const serverResponseB = serverResponse.clone();
-  if (!serverResponseB.body) {
-    throw new Error("Failed to clone server response");
+  let serverResponseB = null;
+  if (hydrate2) {
+    serverResponseB = serverResponse.clone();
   }
   const body = serverResponse.body;
   let payloadPromise;
@@ -12013,9 +12013,18 @@ async function routeRSCServerRequest({
   };
   try {
     const html = await renderHTML(getPayload);
-    const body2 = html.pipeThrough(injectRSCPayload(serverResponseB.body));
     const headers = new Headers(serverResponse.headers);
     headers.set("Content-Type", "text/html");
+    if (!hydrate2) {
+      return new Response(html, {
+        status: serverResponse.status,
+        headers
+      });
+    }
+    if (!serverResponseB?.body) {
+      throw new Error("Failed to clone server response");
+    }
+    const body2 = html.pipeThrough(injectRSCPayload(serverResponseB.body));
     return new Response(body2, {
       status: serverResponse.status,
       headers
@@ -12262,6 +12271,9 @@ export {
   createRoutesFromChildren,
   createRoutesFromElements,
   renderMatches,
+  withComponentProps,
+  withHydrateFallbackProps,
+  withErrorBoundaryProps,
   createSearchParams,
   SingleFetchRedirectSymbol,
   getTurboStreamSingleFetchDataStrategy,

package/dist/production/dom-export.d.mts

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { R as RouterProviderProps$1 } from './browser-BenyQgT4.mjs';
-import { R as RouterInit } from './route-data-CBHO1x2o.mjs';
+import { R as RouterProviderProps$1 } from './browser-C9OqCpRB.mjs';
+import { R as RouterInit } from './route-data-C-cmsWVs.mjs';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;
 declare function RouterProvider(props: Omit<RouterProviderProps, "flushSync">): React.JSX.Element;

package/dist/production/dom-export.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-3f68c7c20
+ * react-router v0.0.0-experimental-e87ed2fd4
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-3f68c7c20
+ * react-router v0.0.0-experimental-e87ed2fd4
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -25,7 +25,7 @@ import {
   invariant,
   mapRouteProperties,
   useFogOFWarDiscovery
-} from "./chunk-SAZGQ73S.mjs";
+} from "./chunk-FJS6IVQF.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";