react-router 0.0.0-experimental-8c9575952 → 0.0.0-experimental-e7eb25a7b

package/dist/development/{browser-BhRqpkqg.d.mts → browser-BM9EKN98.d.mts}

@@ -2170,7 +2170,6 @@ type ServerRenderPayload = {
 };
 type ServerManifestPayload = {
     type: "manifest";
-    matches: RenderedRoute[];
     patches: RenderedRoute[];
 };
 type ServerActionPayload = {
@@ -2200,9 +2199,10 @@ declare function createCallServer({ decode, encodeAction, }: {
     decode: DecodeServerResponseFunction;
     encodeAction: EncodeActionFunction;
 }): (id: string, args: unknown[]) => Promise<unknown>;
-declare function RSCHydratedRouter({ decode, payload, }: {
+declare function RSCHydratedRouter({ decode, payload, routeDiscovery, }: {
     decode: DecodeServerResponseFunction;
     payload: ServerPayload;
+    routeDiscovery?: "eager" | "lazy";
 }): React.JSX.Element;
 
 declare global {

package/dist/development/{chunk-4SZKM7GJ.mjs → chunk-SHQJZRZ7.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-8c9575952
+ * react-router v0.0.0-experimental-e7eb25a7b
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -7197,7 +7197,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();
@@ -7220,7 +7220,8 @@ function getSingleFetchDataStrategyImpl(getRouter, getRouteInfo, fetchAndDecode,
       getRouteInfo,
       fetchAndDecode,
       ssr,
-      basename
+      basename,
+      shouldAllowOptOut
     );
   };
 }
@@ -7272,7 +7273,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());
@@ -7292,7 +7293,7 @@ async function singleFetchLoaderNavigationStrategy(args, router, getRouteInfo, f
           hasShouldRevalidate === true);
           return;
         }
-        if (hasClientLoader) {
+        if (shouldAllowOptOut(m) && hasClientLoader) {
           if (hasLoader) {
             foundOptOutRoute = true;
           }
@@ -8793,7 +8794,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-8c9575952";
+    window.__reactRouterVersion = "0.0.0-experimental-e7eb25a7b";
   }
 } catch (e) {
 }
@@ -11619,23 +11620,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(
@@ -11676,23 +11665,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;
@@ -11751,7 +11752,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(
@@ -11765,6 +11767,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
@@ -11794,7 +11839,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,
@@ -11876,6 +11926,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
 import * as React15 from "react";

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

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { R as RouterProviderProps$1 } from './browser-BhRqpkqg.mjs';
+import { R as RouterProviderProps$1 } from './browser-BM9EKN98.mjs';
 import { R as RouterInit } from './route-data-B3YkvRuy.mjs';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;

package/dist/development/dom-export.js

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

package/dist/development/dom-export.mjs

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

package/dist/development/index.d.mts

@@ -1,7 +1,7 @@
 import { a as Router, b as RouteModules, D as DataStrategyFunction, L as Location, S as StaticHandlerContext, c as RouteObject, C as CreateStaticHandlerOptions$1, d as StaticHandler, F as FutureConfig, I as InitialEntry, H as HydrationState, e as IndexRouteObject, f as LoaderFunction, A as ActionFunction, M as MetaFunction, g as LinksFunction, N as NonIndexRouteObject, u as unstable_InitialContext, h as MiddlewareEnabled, i as AppLoadContext, E as Equal, j as RouterState, P as PatchRoutesOnNavigationFunction, k as DataRouteObject, l as ClientLoaderFunction, m as Path } from './route-data-B3YkvRuy.mjs';
 export { y as ActionFunctionArgs, B as Blocker, s as BlockerFunction, au as ClientActionFunction, av as ClientActionFunctionArgs, aw as ClientLoaderFunctionArgs, ap as DataRouteMatch, z as DataStrategyFunctionArgs, J as DataStrategyMatch, K as DataStrategyResult, Q as ErrorResponse, o as Fetcher, U as FormEncType, V as FormMethod, aE as Future, G as GetScrollPositionFunction, n as GetScrollRestorationKeyFunction, W as HTMLFormMethod, ax as HeadersArgs, ay as HeadersFunction, aC as HtmlLinkDescriptor, af as IDLE_BLOCKER, ae as IDLE_FETCHER, ad as IDLE_NAVIGATION, X as LazyRouteFunction, aD as LinkDescriptor, Y as LoaderFunctionArgs, az as MetaArgs, aA as MetaDescriptor, aq as NavigateOptions, p as Navigation, q as NavigationStates, aa as NavigationType, ar as Navigator, aB as PageLinkDescriptor, _ as ParamParseKey, $ as Params, as as PatchRoutesOnNavigationFunctionArgs, a0 as PathMatch, a1 as PathParam, a2 as PathPattern, a3 as RedirectFunction, r as RelativeRoutingType, x as RevalidationState, at as RouteMatch, w as RouterFetchOptions, R as RouterInit, v as RouterNavigateOptions, t as RouterSubscriber, a5 as ShouldRevalidateFunction, a6 as ShouldRevalidateFunctionArgs, T as To, a7 as UIMatch, aK as UNSAFE_DataRouterContext, aL as UNSAFE_DataRouterStateContext, O as UNSAFE_DataWithResponseInit, aJ as UNSAFE_ErrorResponseImpl, aM as UNSAFE_FetchersContext, aN as UNSAFE_LocationContext, aO as UNSAFE_NavigationContext, aP as UNSAFE_RouteContext, aQ as UNSAFE_ViewTransitionContext, aG as UNSAFE_createBrowserHistory, aI as UNSAFE_createRouter, aH as UNSAFE_invariant, ab as createPath, ag as data, ah as generatePath, ai as isRouteErrorResponse, aj as matchPath, ak as matchRoutes, ac as parsePath, al as redirect, am as redirectDocument, an as replace, ao as resolvePath, Z as unstable_MiddlewareFunction, a4 as unstable_RouterContext, a9 as unstable_RouterContextProvider, aF as unstable_SerializesTo, a8 as unstable_createContext } from './route-data-B3YkvRuy.mjs';
-import { A as AssetsManifest, E as EntryContext, F as FutureConfig$1, a as RouteComponentType, H as HydrateFallbackType, b as ErrorBoundaryType, S as ServerBuild, c as ServerPayload } from './browser-BhRqpkqg.mjs';
-export { i as Await, d as AwaitProps, ag as BrowserRouter, a0 as BrowserRouterProps, a1 as DOMRouterOpts, a7 as FetcherFormProps, ac as FetcherSubmitFunction, aw as FetcherSubmitOptions, ad as FetcherWithComponents, al as Form, a8 as FormProps, aH as HandleDataRequestFunction, aI as HandleDocumentRequestFunction, aJ as HandleErrorFunction, ah as HashRouter, a2 as HashRouterProps, a3 as HistoryRouterProps, I as IndexRouteProps, L as LayoutRouteProps, ai as Link, a4 as LinkProps, aD as Links, j as MemoryRouter, M as MemoryRouterOpts, e as MemoryRouterProps, aC as Meta, ak as NavLink, a5 as NavLinkProps, a6 as NavLinkRenderProps, k as Navigate, u as NavigateFunction, N as NavigateProps, l as Outlet, O as OutletProps, ax as ParamKeyValuePair, P as PathRouteProps, aF as PrefetchPageLinks, m as Route, f as RouteProps, n as Router, g as RouterProps, o as RouterProvider, R as RouterProviderProps, p as Routes, h as RoutesProps, aE as Scripts, aG as ScriptsProps, am as ScrollRestoration, a9 as ScrollRestorationProps, aK as ServerEntryModule, aa as SetURLSearchParams, ab as SubmitFunction, ay as SubmitOptions, aA as SubmitTarget, aV as UNSAFE_FrameworkContext, aW as UNSAFE_createClientRoutes, aX as UNSAFE_createClientRoutesWithHMRRevalidationOptOut, aQ as UNSAFE_hydrationRouteProperties, aR as UNSAFE_mapRouteProperties, aY as UNSAFE_shouldHydrateRouteLoader, aZ as UNSAFE_useScrollRestoration, aS as UNSAFE_withComponentProps, aU as UNSAFE_withErrorBoundaryProps, aT as UNSAFE_withHydrateFallbackProps, az as URLSearchParamsInit, ae as createBrowserRouter, af as createHashRouter, q as createMemoryRouter, r as createRoutesFromChildren, s as createRoutesFromElements, aB as createSearchParams, t as renderMatches, aL as unstable_DecodeServerResponseFunction, aM as unstable_EncodeActionFunction, aj as unstable_HistoryRouter, aO as unstable_RSCHydratedRouter, aN as unstable_createCallServer, aP as unstable_getServerStream, au as unstable_usePrompt, w as useActionData, x as useAsyncError, y as useAsyncValue, at as useBeforeUnload, v as useBlocker, ar as useFetcher, as as useFetchers, aq as useFormAction, z as useHref, B as useInRouterContext, an as useLinkClickHandler, C as useLoaderData, D as useLocation, G as useMatch, J as useMatches, K as useNavigate, Q as useNavigation, T as useNavigationType, U as useOutlet, V as useOutletContext, W as useParams, X as useResolvedPath, Y as useRevalidator, Z as useRouteError, _ as useRouteLoaderData, $ as useRoutes, ao as useSearchParams, ap as useSubmit, av as useViewTransitionState } from './browser-BhRqpkqg.mjs';
+import { A as AssetsManifest, E as EntryContext, F as FutureConfig$1, a as RouteComponentType, H as HydrateFallbackType, b as ErrorBoundaryType, S as ServerBuild, c as ServerPayload } from './browser-BM9EKN98.mjs';
+export { i as Await, d as AwaitProps, ag as BrowserRouter, a0 as BrowserRouterProps, a1 as DOMRouterOpts, a7 as FetcherFormProps, ac as FetcherSubmitFunction, aw as FetcherSubmitOptions, ad as FetcherWithComponents, al as Form, a8 as FormProps, aH as HandleDataRequestFunction, aI as HandleDocumentRequestFunction, aJ as HandleErrorFunction, ah as HashRouter, a2 as HashRouterProps, a3 as HistoryRouterProps, I as IndexRouteProps, L as LayoutRouteProps, ai as Link, a4 as LinkProps, aD as Links, j as MemoryRouter, M as MemoryRouterOpts, e as MemoryRouterProps, aC as Meta, ak as NavLink, a5 as NavLinkProps, a6 as NavLinkRenderProps, k as Navigate, u as NavigateFunction, N as NavigateProps, l as Outlet, O as OutletProps, ax as ParamKeyValuePair, P as PathRouteProps, aF as PrefetchPageLinks, m as Route, f as RouteProps, n as Router, g as RouterProps, o as RouterProvider, R as RouterProviderProps, p as Routes, h as RoutesProps, aE as Scripts, aG as ScriptsProps, am as ScrollRestoration, a9 as ScrollRestorationProps, aK as ServerEntryModule, aa as SetURLSearchParams, ab as SubmitFunction, ay as SubmitOptions, aA as SubmitTarget, aV as UNSAFE_FrameworkContext, aW as UNSAFE_createClientRoutes, aX as UNSAFE_createClientRoutesWithHMRRevalidationOptOut, aQ as UNSAFE_hydrationRouteProperties, aR as UNSAFE_mapRouteProperties, aY as UNSAFE_shouldHydrateRouteLoader, aZ as UNSAFE_useScrollRestoration, aS as UNSAFE_withComponentProps, aU as UNSAFE_withErrorBoundaryProps, aT as UNSAFE_withHydrateFallbackProps, az as URLSearchParamsInit, ae as createBrowserRouter, af as createHashRouter, q as createMemoryRouter, r as createRoutesFromChildren, s as createRoutesFromElements, aB as createSearchParams, t as renderMatches, aL as unstable_DecodeServerResponseFunction, aM as unstable_EncodeActionFunction, aj as unstable_HistoryRouter, aO as unstable_RSCHydratedRouter, aN as unstable_createCallServer, aP as unstable_getServerStream, au as unstable_usePrompt, w as useActionData, x as useAsyncError, y as useAsyncValue, at as useBeforeUnload, v as useBlocker, ar as useFetcher, as as useFetchers, aq as useFormAction, z as useHref, B as useInRouterContext, an as useLinkClickHandler, C as useLoaderData, D as useLocation, G as useMatch, J as useMatches, K as useNavigate, Q as useNavigation, T as useNavigationType, U as useOutlet, V as useOutletContext, W as useParams, X as useResolvedPath, Y as useRevalidator, Z as useRouteError, _ as useRouteLoaderData, $ as useRoutes, ao as useSearchParams, ap as useSubmit, av as useViewTransitionState } from './browser-BM9EKN98.mjs';
 import * as React from 'react';
 import { ReactElement } from 'react';
 import { ParseOptions, SerializeOptions } from 'cookie';

package/dist/development/index.d.ts

@@ -2548,7 +2548,6 @@ type ServerRenderPayload = {
 };
 type ServerManifestPayload = {
     type: "manifest";
-    matches: RenderedRoute[];
     patches: RenderedRoute[];
 };
 type ServerActionPayload = {
@@ -2578,9 +2577,10 @@ declare function createCallServer({ decode, encodeAction, }: {
     decode: DecodeServerResponseFunction;
     encodeAction: EncodeActionFunction;
 }): (id: string, args: unknown[]) => Promise<unknown>;
-declare function RSCHydratedRouter({ decode, payload, }: {
+declare function RSCHydratedRouter({ decode, payload, routeDiscovery, }: {
     decode: DecodeServerResponseFunction;
     payload: ServerPayload;
+    routeDiscovery?: "eager" | "lazy";
 }): React.JSX.Element;
 
 declare function routeRSCServerRequest({ request, callServer, decode, renderHTML, hydrate, }: {

package/dist/development/index.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-8c9575952
+ * react-router v0.0.0-experimental-e7eb25a7b
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -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-8c9575952";
+    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"));

package/dist/development/index.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-8c9575952
+ * react-router v0.0.0-experimental-e7eb25a7b
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -134,7 +134,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-4SZKM7GJ.mjs";
+} from "./chunk-SHQJZRZ7.mjs";
 export {
   Await,
   BrowserRouter,

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

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-8c9575952
+ * 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-8c9575952
+ * react-router v0.0.0-experimental-e7eb25a7b
  *
  * Copyright (c) Remix Software Inc.
  *

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

@@ -1763,7 +1763,6 @@ type ServerRenderPayload = {
 };
 type ServerManifestPayload = {
     type: "manifest";
-    matches: RenderedRoute[];
     patches: RenderedRoute[];
 };
 type ServerActionPayload = {

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

@@ -1763,7 +1763,6 @@ type ServerRenderPayload = {
 };
 type ServerManifestPayload = {
     type: "manifest";
-    matches: RenderedRoute[];
     patches: RenderedRoute[];
 };
 type ServerActionPayload = {