react-router 0.0.0-experimental-e87ed2fd4 → 0.0.0-experimental-e7eb25a7b

package/dist/development/index.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-e87ed2fd4
+ * react-router v0.0.0-experimental-e7eb25a7b
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -63,8 +63,6 @@ __export(react_router_exports, {
   NavigationType: () => Action,
   Outlet: () => Outlet,
   PrefetchPageLinks: () => PrefetchPageLinks,
-  RSCHydratedRouter: () => RSCHydratedRouter,
-  RSCStaticRouter: () => RSCStaticRouter,
   Route: () => Route,
   Router: () => Router,
   RouterProvider: () => RouterProvider,
@@ -105,7 +103,6 @@ __export(react_router_exports, {
   UNSAFE_withErrorBoundaryProps: () => withErrorBoundaryProps,
   UNSAFE_withHydrateFallbackProps: () => withHydrateFallbackProps,
   createBrowserRouter: () => createBrowserRouter,
-  createCallServer: () => createCallServer,
   createCookie: () => createCookie,
   createCookieSessionStorage: () => createCookieSessionStorage,
   createHashRouter: () => createHashRouter,
@@ -123,7 +120,6 @@ __export(react_router_exports, {
   createStaticRouter: () => createStaticRouter,
   data: () => data,
   generatePath: () => generatePath,
-  getServerStream: () => getServerStream,
   href: () => href,
   isCookie: () => isCookie,
   isRouteErrorResponse: () => isRouteErrorResponse,
@@ -136,10 +132,14 @@ __export(react_router_exports, {
   renderMatches: () => renderMatches,
   replace: () => replace,
   resolvePath: () => resolvePath,
-  routeRSCServerRequest: () => routeRSCServerRequest,
   unstable_HistoryRouter: () => HistoryRouter,
+  unstable_RSCHydratedRouter: () => RSCHydratedRouter,
+  unstable_RSCStaticRouter: () => RSCStaticRouter,
   unstable_RouterContextProvider: () => unstable_RouterContextProvider,
+  unstable_createCallServer: () => createCallServer,
   unstable_createContext: () => unstable_createContext,
+  unstable_getServerStream: () => getServerStream,
+  unstable_routeRSCServerRequest: () => routeRSCServerRequest,
   unstable_setDevServerHooks: () => setDevServerHooks,
   unstable_usePrompt: () => usePrompt,
   useActionData: () => useActionData,
@@ -7356,7 +7356,7 @@ function getTurboStreamSingleFetchDataStrategy(getRouter, manifest, routeModules
   );
   return async (args) => args.unstable_runClientMiddleware(dataStrategy);
 }
-function getSingleFetchDataStrategyImpl(getRouter, getRouteInfo, fetchAndDecode, ssr, basename) {
+function getSingleFetchDataStrategyImpl(getRouter, getRouteInfo, fetchAndDecode, ssr, basename, shouldAllowOptOut = () => true) {
   return async (args) => {
     let { request, matches, fetcherKey } = args;
     let router = getRouter();
@@ -7379,7 +7379,8 @@ function getSingleFetchDataStrategyImpl(getRouter, getRouteInfo, fetchAndDecode,
       getRouteInfo,
       fetchAndDecode,
       ssr,
-      basename
+      basename,
+      shouldAllowOptOut
     );
   };
 }
@@ -7431,7 +7432,7 @@ async function nonSsrStrategy(args, getRouteInfo, fetchAndDecode, basename) {
   );
   return results;
 }
-async function singleFetchLoaderNavigationStrategy(args, router, getRouteInfo, fetchAndDecode, ssr, basename) {
+async function singleFetchLoaderNavigationStrategy(args, router, getRouteInfo, fetchAndDecode, ssr, basename, shouldAllowOptOut = () => true) {
   let routesParams = /* @__PURE__ */ new Set();
   let foundOptOutRoute = false;
   let routeDfds = args.matches.map(() => createDeferred2());
@@ -7451,7 +7452,7 @@ async function singleFetchLoaderNavigationStrategy(args, router, getRouteInfo, f
           hasShouldRevalidate === true);
           return;
         }
-        if (hasClientLoader) {
+        if (shouldAllowOptOut(m) && hasClientLoader) {
           if (hasLoader) {
             foundOptOutRoute = true;
           }
@@ -8952,7 +8953,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-e87ed2fd4";
+    window.__reactRouterVersion = "0.0.0-experimental-e7eb25a7b";
   }
 } catch (e) {
 }
@@ -11778,23 +11779,11 @@ function createRouterFromPayload({
       void 0,
       false
     ),
-    async patchRoutesOnNavigation({ patch, path, signal }) {
-      let response = await fetch(`${path}.manifest`, { signal });
-      if (!response.body || response.status < 200 || response.status >= 300) {
-        throw new Error("Unable to fetch new route matches from the server");
-      }
-      let payload2 = await decode2(response.body);
-      if (payload2.type !== "manifest") {
-        throw new Error("Failed to patch routes on navigation");
-      }
-      payload2.matches.forEach(
-        (match, i) => patch(payload2.matches[i - 1]?.id ?? null, [
-          createRouteFromServerManifest(match)
-        ])
-      );
-      payload2.patches.forEach((p) => {
-        patch(p.parentId ?? null, [createRouteFromServerManifest(p)]);
-      });
+    async patchRoutesOnNavigation({ path, signal }) {
+      if (discoveredPaths2.has(path)) {
+        return;
+      }
+      await fetchAndApplyManifestPatches2([path], decode2, signal);
     },
     // FIXME: Pass `build.ssr` and `build.basename` into this function
     dataStrategy: getRSCSingleFetchDataStrategy(
@@ -11835,23 +11824,35 @@ function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, decode2) {
     // pass map into fetchAndDecode so it can add payloads
     getFetchAndDecodeViaRSC(decode2),
     ssr,
-    basename
+    basename,
+    // If we don't have an element, we need to hit the server loader flow
+    // regardless of whether the client loader calls `serverLoader` or not,
+    // otherwise we'll have nothing to render.
+    // TODO: Do we need to account for API routes? Do we need a
+    // `match.hasComponent` flag?
+    (match) => match.route.element != null
   );
   return async (args) => args.unstable_runClientMiddleware(async () => {
     let context = args.context;
     context.set(renderedRoutesContext, []);
     let results = await dataStrategy(args);
-    const renderedRouteById = new Map(
-      context.get(renderedRoutesContext).map((r) => [r.id, r])
-    );
+    const renderedRoutesById = /* @__PURE__ */ new Map();
+    for (const route of context.get(renderedRoutesContext)) {
+      if (!renderedRoutesById.has(route.id)) {
+        renderedRoutesById.set(route.id, []);
+      }
+      renderedRoutesById.get(route.id).push(route);
+    }
     for (const match of args.matches) {
-      const rendered = renderedRouteById.get(match.route.id);
-      if (rendered) {
-        window.__router.patchRoutes(
-          rendered.parentId ?? null,
-          [createRouteFromServerManifest(rendered)],
-          true
-        );
+      const renderedRoutes = renderedRoutesById.get(match.route.id);
+      if (renderedRoutes) {
+        for (const rendered of renderedRoutes) {
+          window.__router.patchRoutes(
+            rendered.parentId ?? null,
+            [createRouteFromServerManifest(rendered)],
+            true
+          );
+        }
       }
     }
     return results;
@@ -11910,7 +11911,8 @@ function getFetchAndDecodeViaRSC(decode2) {
 }
 function RSCHydratedRouter({
   decode: decode2,
-  payload
+  payload,
+  routeDiscovery = "eager"
 }) {
   if (payload.type !== "render") throw new Error("Invalid payload type");
   let router = React14.useMemo(
@@ -11924,6 +11926,49 @@ function RSCHydratedRouter({
       window.__router.initialize();
     }
   }, []);
+  React14.useEffect(() => {
+    if (routeDiscovery === "lazy" || // @ts-expect-error - TS doesn't know about this yet
+    window.navigator?.connection?.saveData === true) {
+      return;
+    }
+    function registerElement(el) {
+      let path = el.tagName === "FORM" ? el.getAttribute("action") : el.getAttribute("href");
+      if (!path) {
+        return;
+      }
+      let pathname = el.tagName === "A" ? el.pathname : new URL(path, window.location.origin).pathname;
+      if (!discoveredPaths2.has(pathname)) {
+        nextPaths2.add(pathname);
+      }
+    }
+    async function fetchPatches() {
+      document.querySelectorAll("a[data-discover], form[data-discover]").forEach(registerElement);
+      let paths = Array.from(nextPaths2.keys()).filter((path) => {
+        if (discoveredPaths2.has(path)) {
+          nextPaths2.delete(path);
+          return false;
+        }
+        return true;
+      });
+      if (paths.length === 0) {
+        return;
+      }
+      try {
+        await fetchAndApplyManifestPatches2(paths, decode2);
+      } catch (e) {
+        console.error("Failed to fetch manifest patches", e);
+      }
+    }
+    let debouncedFetchPatches = debounce2(fetchPatches, 100);
+    fetchPatches();
+    let observer = new MutationObserver(() => debouncedFetchPatches());
+    observer.observe(document.documentElement, {
+      subtree: true,
+      childList: true,
+      attributes: true,
+      attributeFilter: ["data-discover", "href", "action"]
+    });
+  }, [routeDiscovery, decode2]);
   const frameworkContext = {
     future: {
       // These flags have no runtime impact so can always be false.  If we add
@@ -11953,7 +11998,12 @@ function createRouteFromServerManifest(match, payload) {
   let initialData = payload?.loaderData[match.id];
   let hasInitialError = payload?.errors && match.id in payload.errors;
   let initialError = payload?.errors?.[match.id];
-  let isHydrationRequest = match.clientLoader?.hydrate === true || !match.hasLoader;
+  let isHydrationRequest = match.clientLoader?.hydrate === true || !match.hasLoader || // If we don't have an element, we need to hit the server loader flow
+  // regardless of whether the client loader calls `serverLoader` or not,
+  // otherwise we'll have nothing to render.
+  // TODO: Do we need to account for API routes? Do we need a
+  // `match.hasComponent` flag?
+  !match.element;
   let dataRoute = {
     id: match.id,
     element: match.element,
@@ -12035,6 +12085,47 @@ function preventInvalidServerHandlerCall2(type, routeId, hasHandler) {
     throw new ErrorResponseImpl(400, "Bad Request", new Error(msg), true);
   }
 }
+var nextPaths2 = /* @__PURE__ */ new Set();
+var discoveredPathsMaxSize2 = 1e3;
+var discoveredPaths2 = /* @__PURE__ */ new Set();
+var URL_LIMIT2 = 7680;
+async function fetchAndApplyManifestPatches2(paths, decode2, signal) {
+  let basename = (window.__router.basename ?? "").replace(/^\/|\/$/g, "");
+  let url = new URL(`${basename}/.manifest`, window.location.origin);
+  paths.sort().forEach((path) => url.searchParams.append("p", path));
+  if (url.toString().length > URL_LIMIT2) {
+    nextPaths2.clear();
+    return;
+  }
+  let response = await fetch(url, { signal });
+  if (!response.body || response.status < 200 || response.status >= 300) {
+    throw new Error("Unable to fetch new route matches from the server");
+  }
+  let payload = await decode2(response.body);
+  if (payload.type !== "manifest") {
+    throw new Error("Failed to patch routes");
+  }
+  paths.forEach((p) => addToFifoQueue2(p, discoveredPaths2));
+  payload.patches.forEach((p) => {
+    window.__router.patchRoutes(p.parentId ?? null, [
+      createRouteFromServerManifest(p)
+    ]);
+  });
+}
+function addToFifoQueue2(path, queue) {
+  if (queue.size >= discoveredPathsMaxSize2) {
+    let first = queue.values().next().value;
+    queue.delete(first);
+  }
+  queue.add(path);
+}
+function debounce2(callback, wait) {
+  let timeoutId;
+  return (...args) => {
+    window.clearTimeout(timeoutId);
+    timeoutId = window.setTimeout(() => callback(...args), wait);
+  };
+}
 
 // lib/rsc/server.ssr.tsx
 var React15 = __toESM(require("react"));
@@ -12383,8 +12474,6 @@ function deserializeErrors2(errors) {
   NavigationType,
   Outlet,
   PrefetchPageLinks,
-  RSCHydratedRouter,
-  RSCStaticRouter,
   Route,
   Router,
   RouterProvider,
@@ -12425,7 +12514,6 @@ function deserializeErrors2(errors) {
   UNSAFE_withErrorBoundaryProps,
   UNSAFE_withHydrateFallbackProps,
   createBrowserRouter,
-  createCallServer,
   createCookie,
   createCookieSessionStorage,
   createHashRouter,
@@ -12443,7 +12531,6 @@ function deserializeErrors2(errors) {
   createStaticRouter,
   data,
   generatePath,
-  getServerStream,
   href,
   isCookie,
   isRouteErrorResponse,
@@ -12456,10 +12543,14 @@ function deserializeErrors2(errors) {
   renderMatches,
   replace,
   resolvePath,
-  routeRSCServerRequest,
   unstable_HistoryRouter,
+  unstable_RSCHydratedRouter,
+  unstable_RSCStaticRouter,
   unstable_RouterContextProvider,
+  unstable_createCallServer,
   unstable_createContext,
+  unstable_getServerStream,
+  unstable_routeRSCServerRequest,
   unstable_setDevServerHooks,
   unstable_usePrompt,
   useActionData,

package/dist/development/index.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-e87ed2fd4
+ * react-router v0.0.0-experimental-e7eb25a7b
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -134,7 +134,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-PVJCBITV.mjs";
+} from "./chunk-SHQJZRZ7.mjs";
 export {
   Await,
   BrowserRouter,
@@ -152,8 +152,6 @@ export {
   Action as NavigationType,
   Outlet,
   PrefetchPageLinks,
-  RSCHydratedRouter,
-  RSCStaticRouter,
   Route,
   Router,
   RouterProvider,
@@ -194,7 +192,6 @@ export {
   withErrorBoundaryProps as UNSAFE_withErrorBoundaryProps,
   withHydrateFallbackProps as UNSAFE_withHydrateFallbackProps,
   createBrowserRouter,
-  createCallServer,
   createCookie,
   createCookieSessionStorage,
   createHashRouter,
@@ -212,7 +209,6 @@ export {
   createStaticRouter,
   data,
   generatePath,
-  getServerStream,
   href,
   isCookie,
   isRouteErrorResponse,
@@ -225,10 +221,14 @@ export {
   renderMatches,
   replace,
   resolvePath,
-  routeRSCServerRequest,
   HistoryRouter as unstable_HistoryRouter,
+  RSCHydratedRouter as unstable_RSCHydratedRouter,
+  RSCStaticRouter as unstable_RSCStaticRouter,
   unstable_RouterContextProvider,
+  createCallServer as unstable_createCallServer,
   unstable_createContext,
+  getServerStream as unstable_getServerStream,
+  routeRSCServerRequest as unstable_routeRSCServerRequest,
   setDevServerHooks as unstable_setDevServerHooks,
   usePrompt as unstable_usePrompt,
   useActionData,

package/dist/development/lib/types/internal.d.mts

@@ -1,4 +1,4 @@
-import { aD as LinkDescriptor, aV as RouteModule, L as Location, aA as MetaDescriptor, aW as unstable_MiddlewareNextFunction, aX as ServerDataFrom, a9 as unstable_RouterContextProvider, h as MiddlewareEnabled, i as AppLoadContext, aY as Pretty, aZ as GetLoaderData, a_ as Normalize, a$ as GetActionData } from '../../route-data-C-cmsWVs.mjs';
+import { aV as RouteModule, aD as LinkDescriptor, L as Location, aW as Pretty, aA as MetaDescriptor, aX as GetLoaderData, h as MiddlewareEnabled, a9 as unstable_RouterContextProvider, i as AppLoadContext, aY as unstable_MiddlewareNextFunction, aZ as ServerDataFrom, a_ as Normalize, a$ as GetActionData } from '../../route-data-B3YkvRuy.mjs';
 import { a as RouteFiles, P as Pages } from '../../register-DeIo2iHO.mjs';
 import 'react';
 

package/dist/development/lib/types/internal.d.ts

@@ -1,4 +1,4 @@
-import { aI as LinkDescriptor, aX as RouteModule, g as Location, aG as MetaDescriptor, aY as unstable_MiddlewareNextFunction, aZ as ServerDataFrom, u as unstable_RouterContextProvider, M as MiddlewareEnabled, A as AppLoadContext, a_ as Pretty, a$ as GetLoaderData, b0 as RouteFiles, b1 as Normalize, _ as Pages, b2 as GetActionData } from '../../register-zy84znbA.js';
+import { aX as RouteModule, aI as LinkDescriptor, i as Location, aY as Pretty, aG as MetaDescriptor, aZ as GetLoaderData, M as MiddlewareEnabled, u as unstable_RouterContextProvider, A as AppLoadContext, a_ as unstable_MiddlewareNextFunction, a$ as ServerDataFrom, b0 as RouteFiles, b1 as Normalize, _ as Pages, b2 as GetActionData } from '../../register-B0EYMBux.js';
 import 'react';
 
 type MaybePromise<T> = T | Promise<T>;

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

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

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

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

package/dist/{production/register-zy84znbA.d.ts → development/register-B0EYMBux.d.ts}

@@ -1824,4 +1824,4 @@ type RouteFiles = Register extends {
     routeFiles: infer Registered extends AnyRouteFiles;
 } ? Registered : AnyRouteFiles;
 
-export { type Equal as $, type AppLoadContext as A, type BlockerFunction as B, type ClientLoaderFunction as C, type DataRouteObject as D, type PageLinkDescriptor as E, type FutureConfig as F, type History as G, type HydrationState as H, type InitialEntry as I, type GetScrollRestorationKeyFunction as J, type Fetcher as K, type LoaderFunctionArgs as L, type MiddlewareEnabled as M, type NavigateOptions as N, type StaticHandler as O, type ParamParseKey as P, type CreateStaticHandlerOptions as Q, type RouteManifest as R, type ServerRouteModule as S, type To as T, type UIMatch as U, type unstable_InitialContext as V, type LoaderFunction as W, type ActionFunction as X, type MetaFunction as Y, type LinksFunction as Z, type Pages as _, type ActionFunctionArgs as a, type GetLoaderData as a$, type ClientActionFunction as a0, type ShouldRevalidateFunction as a1, type RouterState as a2, type GetScrollPositionFunction as a3, type NavigationStates as a4, type RouterSubscriber as a5, type RouterNavigateOptions as a6, type RouterFetchOptions as a7, type RevalidationState as a8, type DataStrategyFunctionArgs as a9, type PatchRoutesOnNavigationFunctionArgs as aA, type ClientActionFunctionArgs as aB, type ClientLoaderFunctionArgs as aC, type HeadersArgs as aD, type HeadersFunction as aE, type MetaArgs as aF, type MetaDescriptor as aG, type HtmlLinkDescriptor as aH, type LinkDescriptor as aI, type Future as aJ, type unstable_SerializesTo as aK, type Register as aL, createBrowserHistory as aM, invariant as aN, createRouter as aO, ErrorResponseImpl as aP, DataRouterContext as aQ, DataRouterStateContext as aR, FetchersContext as aS, LocationContext as aT, NavigationContext as aU, RouteContext as aV, ViewTransitionContext as aW, type RouteModule as aX, type unstable_MiddlewareNextFunction as aY, type ServerDataFrom as aZ, type Pretty as a_, type DataStrategyMatch as aa, type DataStrategyResult as ab, DataWithResponseInit as ac, type ErrorResponse as ad, type FormMethod as ae, type unstable_MiddlewareFunction as af, type PathParam as ag, type RedirectFunction as ah, type unstable_RouterContext as ai, type ShouldRevalidateFunctionArgs as aj, unstable_createContext as ak, createPath as al, parsePath as am, IDLE_NAVIGATION as an, IDLE_FETCHER as ao, IDLE_BLOCKER as ap, data as aq, generatePath as ar, isRouteErrorResponse as as, matchPath as at, matchRoutes as au, redirect as av, redirectDocument as aw, replace as ax, resolvePath as ay, type DataRouteMatch as az, type StaticHandlerContext as b, type RouteFiles as b0, type Normalize as b1, type GetActionData as b2, type RouteModules as c, type Router as d, type DataStrategyFunction as e, type RelativeRoutingType as f, type Location as g, Action as h, type Path as i, type PathPattern as j, type PathMatch as k, type Params as l, type RouteObject as m, type Navigation as n, type SerializeFrom as o, type Blocker as p, type RouterInit as q, type PatchRoutesOnNavigationFunction as r, type NonIndexRouteObject as s, type LazyRouteFunction as t, unstable_RouterContextProvider as u, type IndexRouteObject as v, type Navigator as w, type RouteMatch as x, type HTMLFormMethod as y, type FormEncType as z };
+export { type Equal as $, type AppLoadContext as A, type BlockerFunction as B, type ClientLoaderFunction as C, type DataRouteObject as D, type PageLinkDescriptor as E, type FutureConfig as F, type History as G, type HydrationState as H, type IndexRouteObject as I, type GetScrollRestorationKeyFunction as J, type Fetcher as K, type LoaderFunctionArgs as L, type MiddlewareEnabled as M, type NavigateOptions as N, type CreateStaticHandlerOptions as O, type ParamParseKey as P, type StaticHandler as Q, type RouteManifest as R, type ServerRouteModule as S, type To as T, type UIMatch as U, type LoaderFunction as V, type ActionFunction as W, type MetaFunction as X, type LinksFunction as Y, type unstable_InitialContext as Z, type Pages as _, type ActionFunctionArgs as a, type ServerDataFrom as a$, type ClientActionFunction as a0, type ShouldRevalidateFunction as a1, type RouterState as a2, type GetScrollPositionFunction as a3, type NavigationStates as a4, type RouterSubscriber as a5, type RouterNavigateOptions as a6, type RouterFetchOptions as a7, type RevalidationState as a8, type DataStrategyFunctionArgs as a9, type PatchRoutesOnNavigationFunctionArgs as aA, type ClientActionFunctionArgs as aB, type ClientLoaderFunctionArgs as aC, type HeadersArgs as aD, type HeadersFunction as aE, type MetaArgs as aF, type MetaDescriptor as aG, type HtmlLinkDescriptor as aH, type LinkDescriptor as aI, type Future as aJ, type unstable_SerializesTo as aK, type Register as aL, createBrowserHistory as aM, invariant as aN, createRouter as aO, ErrorResponseImpl as aP, DataRouterContext as aQ, DataRouterStateContext as aR, FetchersContext as aS, LocationContext as aT, NavigationContext as aU, RouteContext as aV, ViewTransitionContext as aW, type RouteModule as aX, type Pretty as aY, type GetLoaderData as aZ, type unstable_MiddlewareNextFunction as a_, type DataStrategyMatch as aa, type DataStrategyResult as ab, DataWithResponseInit as ac, type ErrorResponse as ad, type FormMethod as ae, type unstable_MiddlewareFunction as af, type PathParam as ag, type RedirectFunction as ah, type unstable_RouterContext as ai, type ShouldRevalidateFunctionArgs as aj, unstable_createContext as ak, createPath as al, parsePath as am, IDLE_NAVIGATION as an, IDLE_FETCHER as ao, IDLE_BLOCKER as ap, data as aq, generatePath as ar, isRouteErrorResponse as as, matchPath as at, matchRoutes as au, redirect as av, redirectDocument as aw, replace as ax, resolvePath as ay, type DataRouteMatch as az, type RouteModules as b, type RouteFiles as b0, type Normalize as b1, type GetActionData as b2, type StaticHandlerContext as c, type Router as d, type DataStrategyFunction as e, type Blocker as f, type SerializeFrom as g, type RelativeRoutingType as h, type Location as i, type Path as j, type PathPattern as k, type PathMatch as l, type Navigation as m, Action as n, type Params as o, type RouteObject as p, type LazyRouteFunction as q, type NonIndexRouteObject as r, type RouterInit as s, type InitialEntry as t, unstable_RouterContextProvider as u, type PatchRoutesOnNavigationFunction as v, type Navigator as w, type RouteMatch as x, type HTMLFormMethod as y, type FormEncType as z };

package/dist/{production/route-data-C-cmsWVs.d.mts → development/route-data-B3YkvRuy.d.mts}

@@ -1801,4 +1801,4 @@ type _DataActionData<ServerActionData, ClientActionData> = Awaited<[
     IsDefined<ClientActionData>
 ] extends [true, true] ? ServerActionData | ClientActionData : IsDefined<ClientActionData> extends true ? ClientActionData : IsDefined<ServerActionData> extends true ? ServerActionData : undefined>;
 
-export { type Params as $, type ActionFunction as A, type Blocker as B, type CreateStaticHandlerOptions as C, type DataStrategyFunction as D, type Equal as E, type FutureConfig as F, type GetScrollPositionFunction as G, type HydrationState as H, type InitialEntry as I, type DataStrategyMatch as J, type DataStrategyResult as K, type Location as L, type MetaFunction as M, type NonIndexRouteObject as N, DataWithResponseInit as O, type PatchRoutesOnNavigationFunction as P, type ErrorResponse as Q, type RouterInit as R, type StaticHandlerContext as S, type To as T, type FormEncType as U, type FormMethod as V, type HTMLFormMethod as W, type LazyRouteFunction as X, type LoaderFunctionArgs as Y, type unstable_MiddlewareFunction as Z, type ParamParseKey as _, type Router as a, type GetActionData as a$, type PathMatch as a0, type PathParam as a1, type PathPattern as a2, type RedirectFunction as a3, type unstable_RouterContext as a4, type ShouldRevalidateFunction as a5, type ShouldRevalidateFunctionArgs as a6, type UIMatch as a7, unstable_createContext as a8, unstable_RouterContextProvider as a9, type MetaDescriptor as aA, type PageLinkDescriptor as aB, type HtmlLinkDescriptor as aC, type LinkDescriptor as aD, type Future as aE, type unstable_SerializesTo as aF, createBrowserHistory as aG, invariant as aH, createRouter as aI, ErrorResponseImpl as aJ, DataRouterContext as aK, DataRouterStateContext as aL, FetchersContext as aM, LocationContext as aN, NavigationContext as aO, RouteContext as aP, ViewTransitionContext as aQ, type RouteManifest as aR, type ServerRouteModule as aS, type SerializeFrom as aT, type History as aU, type RouteModule as aV, type unstable_MiddlewareNextFunction as aW, type ServerDataFrom as aX, type Pretty as aY, type GetLoaderData as aZ, type Normalize as a_, Action as aa, createPath as ab, parsePath as ac, IDLE_NAVIGATION as ad, IDLE_FETCHER as ae, IDLE_BLOCKER as af, data as ag, generatePath as ah, isRouteErrorResponse as ai, matchPath as aj, matchRoutes as ak, redirect as al, redirectDocument as am, replace as an, resolvePath as ao, type DataRouteMatch as ap, type NavigateOptions as aq, type Navigator as ar, type PatchRoutesOnNavigationFunctionArgs as as, type RouteMatch as at, type ClientActionFunction as au, type ClientActionFunctionArgs as av, type ClientLoaderFunctionArgs as aw, type HeadersArgs as ax, type HeadersFunction as ay, type MetaArgs as az, type RouteModules as b, type RouteObject as c, type StaticHandler as d, type IndexRouteObject as e, type LoaderFunction as f, type LinksFunction as g, type MiddlewareEnabled as h, type AppLoadContext as i, type RouterState as j, type DataRouteObject as k, type ClientLoaderFunction as l, type Path as m, type GetScrollRestorationKeyFunction as n, type Fetcher as o, type Navigation as p, type NavigationStates as q, type RelativeRoutingType as r, type BlockerFunction as s, type RouterSubscriber as t, type unstable_InitialContext as u, type RouterNavigateOptions as v, type RouterFetchOptions as w, type RevalidationState as x, type ActionFunctionArgs as y, type DataStrategyFunctionArgs as z };
+export { type Params as $, type ActionFunction as A, type Blocker as B, type CreateStaticHandlerOptions as C, type DataStrategyFunction as D, type Equal as E, type FutureConfig as F, type GetScrollPositionFunction as G, type HydrationState as H, type InitialEntry as I, type DataStrategyMatch as J, type DataStrategyResult as K, type Location as L, type MetaFunction as M, type NonIndexRouteObject as N, DataWithResponseInit as O, type PatchRoutesOnNavigationFunction as P, type ErrorResponse as Q, type RouterInit as R, type StaticHandlerContext as S, type To as T, type FormEncType as U, type FormMethod as V, type HTMLFormMethod as W, type LazyRouteFunction as X, type LoaderFunctionArgs as Y, type unstable_MiddlewareFunction as Z, type ParamParseKey as _, type Router as a, type GetActionData as a$, type PathMatch as a0, type PathParam as a1, type PathPattern as a2, type RedirectFunction as a3, type unstable_RouterContext as a4, type ShouldRevalidateFunction as a5, type ShouldRevalidateFunctionArgs as a6, type UIMatch as a7, unstable_createContext as a8, unstable_RouterContextProvider as a9, type MetaDescriptor as aA, type PageLinkDescriptor as aB, type HtmlLinkDescriptor as aC, type LinkDescriptor as aD, type Future as aE, type unstable_SerializesTo as aF, createBrowserHistory as aG, invariant as aH, createRouter as aI, ErrorResponseImpl as aJ, DataRouterContext as aK, DataRouterStateContext as aL, FetchersContext as aM, LocationContext as aN, NavigationContext as aO, RouteContext as aP, ViewTransitionContext as aQ, type RouteManifest as aR, type ServerRouteModule as aS, type SerializeFrom as aT, type History as aU, type RouteModule as aV, type Pretty as aW, type GetLoaderData as aX, type unstable_MiddlewareNextFunction as aY, type ServerDataFrom as aZ, type Normalize as a_, Action as aa, createPath as ab, parsePath as ac, IDLE_NAVIGATION as ad, IDLE_FETCHER as ae, IDLE_BLOCKER as af, data as ag, generatePath as ah, isRouteErrorResponse as ai, matchPath as aj, matchRoutes as ak, redirect as al, redirectDocument as am, replace as an, resolvePath as ao, type DataRouteMatch as ap, type NavigateOptions as aq, type Navigator as ar, type PatchRoutesOnNavigationFunctionArgs as as, type RouteMatch as at, type ClientActionFunction as au, type ClientActionFunctionArgs as av, type ClientLoaderFunctionArgs as aw, type HeadersArgs as ax, type HeadersFunction as ay, type MetaArgs as az, type RouteModules as b, type RouteObject as c, type StaticHandler as d, type IndexRouteObject as e, type LoaderFunction as f, type LinksFunction as g, type MiddlewareEnabled as h, type AppLoadContext as i, type RouterState as j, type DataRouteObject as k, type ClientLoaderFunction as l, type Path as m, type GetScrollRestorationKeyFunction as n, type Fetcher as o, type Navigation as p, type NavigationStates as q, type RelativeRoutingType as r, type BlockerFunction as s, type RouterSubscriber as t, type unstable_InitialContext as u, type RouterNavigateOptions as v, type RouterFetchOptions as w, type RevalidationState as x, type ActionFunctionArgs as y, type DataStrategyFunctionArgs as z };

package/dist/development/rsc-export.d.mts

@@ -1763,7 +1763,6 @@ type ServerRenderPayload = {
 };
 type ServerManifestPayload = {
     type: "manifest";
-    matches: RenderedRoute[];
     patches: RenderedRoute[];
 };
 type ServerActionPayload = {
@@ -1795,4 +1794,4 @@ declare function matchRSCServerRequest({ decodeCallServer, decodeFormAction, onE
     generateResponse: (match: ServerMatch) => Response;
 }): Promise<Response>;
 
-export { type Cookie, type CookieOptions, type CookieSignatureOptions, type DecodeCallServerFunction, type DecodeFormActionFunction, type FlashSessionData, type IsCookieFunction, type IsSessionFunction, type ServerManifestPayload, type ServerMatch, type ServerPayload, type ServerRenderPayload, type RenderedRoute as ServerRouteManifest, type ServerRouteMatch, type ServerRouteObject, type Session, type SessionData, type SessionIdStorageStrategy, type SessionStorage, createCookie, createCookieSessionStorage, createMemorySessionStorage, createSession, createSessionStorage, createStaticHandler, data, isCookie, isSession, matchRSCServerRequest, matchRoutes, redirect, redirectDocument, replace, type unstable_MiddlewareFunction, type unstable_MiddlewareNextFunction, type unstable_RouterContext, unstable_RouterContextProvider, unstable_createContext };
+export { type Cookie, type CookieOptions, type CookieSignatureOptions, type FlashSessionData, type IsCookieFunction, type IsSessionFunction, type RenderedRoute as ServerRouteManifest, type Session, type SessionData, type SessionIdStorageStrategy, type SessionStorage, createCookie, createCookieSessionStorage, createMemorySessionStorage, createSession, createSessionStorage, createStaticHandler, data, isCookie, isSession, matchRoutes, redirect, redirectDocument, replace, type DecodeCallServerFunction as unstable_DecodeCallServerFunction, type DecodeFormActionFunction as unstable_DecodeFormActionFunction, type unstable_MiddlewareFunction, type unstable_MiddlewareNextFunction, type unstable_RouterContext, unstable_RouterContextProvider, type ServerManifestPayload as unstable_ServerManifestPayload, type ServerMatch as unstable_ServerMatch, type ServerPayload as unstable_ServerPayload, type ServerRenderPayload as unstable_ServerRenderPayload, type ServerRouteMatch as unstable_ServerRouteMatch, type ServerRouteObject as unstable_ServerRouteObject, unstable_createContext, matchRSCServerRequest as unstable_matchRSCServerRequest };

package/dist/development/rsc-export.d.ts

@@ -1763,7 +1763,6 @@ type ServerRenderPayload = {
 };
 type ServerManifestPayload = {
     type: "manifest";
-    matches: RenderedRoute[];
     patches: RenderedRoute[];
 };
 type ServerActionPayload = {
@@ -1795,4 +1794,4 @@ declare function matchRSCServerRequest({ decodeCallServer, decodeFormAction, onE
     generateResponse: (match: ServerMatch) => Response;
 }): Promise<Response>;
 
-export { type Cookie, type CookieOptions, type CookieSignatureOptions, type DecodeCallServerFunction, type DecodeFormActionFunction, type FlashSessionData, type IsCookieFunction, type IsSessionFunction, type ServerManifestPayload, type ServerMatch, type ServerPayload, type ServerRenderPayload, type RenderedRoute as ServerRouteManifest, type ServerRouteMatch, type ServerRouteObject, type Session, type SessionData, type SessionIdStorageStrategy, type SessionStorage, createCookie, createCookieSessionStorage, createMemorySessionStorage, createSession, createSessionStorage, createStaticHandler, data, isCookie, isSession, matchRSCServerRequest, matchRoutes, redirect, redirectDocument, replace, type unstable_MiddlewareFunction, type unstable_MiddlewareNextFunction, type unstable_RouterContext, unstable_RouterContextProvider, unstable_createContext };
+export { type Cookie, type CookieOptions, type CookieSignatureOptions, type FlashSessionData, type IsCookieFunction, type IsSessionFunction, type RenderedRoute as ServerRouteManifest, type Session, type SessionData, type SessionIdStorageStrategy, type SessionStorage, createCookie, createCookieSessionStorage, createMemorySessionStorage, createSession, createSessionStorage, createStaticHandler, data, isCookie, isSession, matchRoutes, redirect, redirectDocument, replace, type DecodeCallServerFunction as unstable_DecodeCallServerFunction, type DecodeFormActionFunction as unstable_DecodeFormActionFunction, type unstable_MiddlewareFunction, type unstable_MiddlewareNextFunction, type unstable_RouterContext, unstable_RouterContextProvider, type ServerManifestPayload as unstable_ServerManifestPayload, type ServerMatch as unstable_ServerMatch, type ServerPayload as unstable_ServerPayload, type ServerRenderPayload as unstable_ServerRenderPayload, type ServerRouteMatch as unstable_ServerRouteMatch, type ServerRouteObject as unstable_ServerRouteObject, unstable_createContext, matchRSCServerRequest as unstable_matchRSCServerRequest };

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-e87ed2fd4
+ * react-router v0.0.0-experimental-e7eb25a7b
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -61,7 +61,7 @@ function createKey() {
 }
 function createLocation(current, to, state = null, key) {
   let location = {
-    pathname: typeof current === "string" ? current : current.pathname,
+    pathname: "string" === "string" ? current : current.pathname,
     search: "",
     hash: "",
     ...typeof to === "string" ? parsePath(to) : to,
@@ -1506,10 +1506,9 @@ async function runMiddlewarePipeline(args, propagateResult, handler, errorHandle
       middlewareState.middlewareError.error,
       middlewareState.middlewareError.routeId
     );
-    if (propagateResult || !middlewareState.handlerResult) {
+    {
       return result;
     }
-    return Object.assign(middlewareState.handlerResult, result);
   }
 }
 async function callRouteMiddleware(args, middlewares, propagateResult, middlewareState, handler, idx = 0) {
@@ -1543,7 +1542,7 @@ async function callRouteMiddleware(args, middlewares, propagateResult, middlewar
       handler,
       idx + 1
     );
-    if (propagateResult) {
+    {
       nextResult = result;
       return nextResult;
     }
@@ -2476,19 +2475,28 @@ async function matchRSCServerRequest({
 }
 async function generateManifestResponse(routes, request, generateResponse) {
   let url = new URL(request.url);
-  let matches = matchRoutes(routes, url.pathname.replace(/\.manifest$/, ""));
+  let pathnameParams = url.searchParams.getAll("p");
+  let pathnames = pathnameParams.length ? pathnameParams : [url.pathname.replace(/\.manifest$/, "")];
+  let routeIds = /* @__PURE__ */ new Set();
+  let matchedRoutes = pathnames.flatMap((pathname) => {
+    let pathnameMatches = matchRoutes(routes, pathname);
+    return pathnameMatches?.map((m, i) => ({
+      ...m.route,
+      parentId: pathnameMatches[i - 1]?.route.id
+    })) ?? [];
+  }).filter((route) => {
+    if (!routeIds.has(route.id)) {
+      routeIds.add(route.id);
+      return true;
+    }
+    return false;
+  });
   let payload = {
     type: "manifest",
-    matches: await Promise.all(
-      matches?.map(
-        (m, i) => getManifestRoute(m.route, matches[i - 1]?.route.id)
-      ) ?? []
-    ),
-    patches: await getAdditionalRoutePatches(
-      url.pathname,
-      routes,
-      matches?.map((m) => m.route.id) ?? []
-    )
+    patches: (await Promise.all([
+      ...matchedRoutes.map((route) => getManifestRoute(route)),
+      getAdditionalRoutePatches(pathnames, routes, Array.from(routeIds))
+    ])).flat(1)
   };
   return generateResponse({
     statusCode: 200,
@@ -2555,7 +2563,11 @@ async function generateRenderResponse(request, routes, decodeCallServer, decodeF
   if (matches) {
     await Promise.all(matches.map((m) => explodeLazyRoute(m.route)));
   }
-  const handler = createStaticHandler(routes);
+  const handler = createStaticHandler(routes, {
+    mapRouteProperties: (r) => ({
+      hasErrorBoundary: r.ErrorBoundary != null
+    })
+  });
   const result = await handler.query(request, {
     skipLoaderErrorBubbling: isDataRequest,
     skipRevalidation: isSubmission,
@@ -2693,7 +2705,7 @@ async function getRenderPayload(baseRenderPayload, routes, routeIdsToLoad, isDat
     })
   );
   let patchesPromise = !isDataRequest ? getAdditionalRoutePatches(
-    staticContext.location.pathname,
+    [staticContext.location.pathname],
     routes,
     staticContext.matches.map((m) => m.route.id)
   ) : void 0;
@@ -2789,7 +2801,7 @@ async function getServerRouteMatch(staticContext, match, shouldRenderComponent,
     shouldRevalidate: match.route.shouldRevalidate
   };
 }
-async function getManifestRoute(route, parentId) {
+async function getManifestRoute(route) {
   await explodeLazyRoute(route);
   const Layout = route.Layout || React__namespace.Fragment;
   const errorElement = route.ErrorBoundary ? React__namespace.createElement(
@@ -2806,7 +2818,7 @@ async function getManifestRoute(route, parentId) {
     errorElement,
     hasLoader: !!route.loader,
     id: route.id,
-    parentId,
+    parentId: route.parentId,
     path: route.path,
     index: "index" in route ? route.index : void 0,
     links: route.links,
@@ -2822,26 +2834,36 @@ async function explodeLazyRoute(route) {
     route.lazy = void 0;
   }
 }
-async function getAdditionalRoutePatches(pathname, routes, matchedRouteIds) {
+async function getAdditionalRoutePatches(pathnames, routes, matchedRouteIds) {
   let patchRouteMatches = /* @__PURE__ */ new Map();
-  let segments = pathname.split("/").filter(Boolean);
-  let paths = ["/"];
-  segments.pop();
-  while (segments.length > 0) {
-    paths.push(`/${segments.join("/")}`);
+  let matchedPaths = /* @__PURE__ */ new Set();
+  for (const pathname of pathnames) {
+    let segments = pathname.split("/").filter(Boolean);
+    let paths = ["/"];
     segments.pop();
+    while (segments.length > 0) {
+      paths.push(`/${segments.join("/")}`);
+      segments.pop();
+    }
+    paths.forEach((path) => {
+      if (matchedPaths.has(path)) {
+        return;
+      }
+      matchedPaths.add(path);
+      let matches = matchRoutes(routes, path) || [];
+      matches.forEach((m, i) => {
+        if (patchRouteMatches.get(m.route.id)) {
+          return;
+        }
+        patchRouteMatches.set(m.route.id, {
+          ...m.route,
+          parentId: matches[i - 1]?.route.id
+        });
+      });
+    });
   }
-  paths.forEach((path) => {
-    let matches = matchRoutes(routes, path) || [];
-    matches.forEach(
-      (m, i) => patchRouteMatches.set(m.route.id, {
-        ...m.route,
-        parentId: matches[i - 1]?.route.id
-      })
-    );
-  });
   let patches = await Promise.all(
-    [...patchRouteMatches.values()].filter((route) => !matchedRouteIds.some((id) => id === route.id)).map((route) => getManifestRoute(route, route.parentId))
+    [...patchRouteMatches.values()].filter((route) => !matchedRouteIds.some((id) => id === route.id)).map((route) => getManifestRoute(route))
   );
   return patches;
 }
@@ -2862,9 +2884,9 @@ exports.createStaticHandler = createStaticHandler;
 exports.data = data;
 exports.isCookie = isCookie;
 exports.isSession = isSession;
-exports.matchRSCServerRequest = matchRSCServerRequest;
 exports.matchRoutes = matchRoutes;
 exports.redirect = redirect;
 exports.redirectDocument = redirectDocument;
 exports.replace = replace;
 exports.unstable_createContext = unstable_createContext;
+exports.unstable_matchRSCServerRequest = matchRSCServerRequest;