react-router 0.0.0-experimental-e41ede670 → 0.0.0-experimental-7a19e47ea

package/dist/development/{chunk-H3OBLXFX.mjs → chunk-4Q4PRAMB.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-e41ede670
+ * react-router v0.0.0-experimental-7a19e47ea
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2581,7 +2581,9 @@ function createStaticHandler(routes, opts) {
   );
   async function query(request, {
     requestContext,
+    filterMatchesToLoad,
     skipLoaderErrorBubbling,
+    skipRevalidation,
     dataStrategy,
     respond
   } = {}) {
@@ -2624,6 +2626,8 @@ function createStaticHandler(routes, opts) {
       };
     } else if (respond) {
       try {
+        let tailIdx = [...matches].reverse().findIndex((m) => !filterMatchesToLoad || filterMatchesToLoad(m));
+        let lowestLoadingIdx = tailIdx < 0 ? 0 : matches.length - 1 - tailIdx;
         let response = await runMiddlewarePipeline(
           {
             request,
@@ -2631,7 +2635,7 @@ function createStaticHandler(routes, opts) {
             params: matches[0].params,
             context: requestContext
           },
-          matches.length - 1,
+          lowestLoadingIdx,
           true,
           async () => {
             let result = await callQueryHandlers(
@@ -2641,7 +2645,9 @@ function createStaticHandler(routes, opts) {
               requestContext,
               dataStrategy || defaultDataStrategyWithoutMiddleware,
               skipLoaderErrorBubbling === true,
-              null
+              null,
+              filterMatchesToLoad || null,
+              skipRevalidation === true
             );
             if (isResponse(result)) {
               return result;
@@ -2670,7 +2676,9 @@ function createStaticHandler(routes, opts) {
         requestContext,
         dataStrategy || null,
         skipLoaderErrorBubbling === true,
-        null
+        null,
+        filterMatchesToLoad || null,
+        skipRevalidation === true
       );
       if (isResponse(result)) {
         return result;
@@ -2729,7 +2737,9 @@ function createStaticHandler(routes, opts) {
             requestContext,
             dataStrategy || defaultDataStrategyWithoutMiddleware,
             false,
-            match
+            match,
+            null,
+            false
           );
           if (isResponse(result)) {
             return result;
@@ -2750,7 +2760,9 @@ function createStaticHandler(routes, opts) {
         requestContext,
         dataStrategy || null,
         false,
-        match
+        match,
+        null,
+        false
       );
       if (isResponse(result)) {
         return result;
@@ -2768,7 +2780,7 @@ function createStaticHandler(routes, opts) {
       return void 0;
     }
   }
-  async function callQueryHandlers(request, location, matches, requestContext, dataStrategy, skipLoaderErrorBubbling, routeMatch) {
+  async function callQueryHandlers(request, location, matches, requestContext, dataStrategy, skipLoaderErrorBubbling, routeMatch, filterMatchesToLoad, skipRevalidation) {
     invariant(
       request.signal,
       "query()/queryRoute() requests must contain an AbortController signal"
@@ -2782,7 +2794,9 @@ function createStaticHandler(routes, opts) {
           requestContext,
           dataStrategy,
           skipLoaderErrorBubbling,
-          routeMatch != null
+          routeMatch != null,
+          filterMatchesToLoad,
+          skipRevalidation
         );
         return result2;
       }
@@ -2792,7 +2806,8 @@ function createStaticHandler(routes, opts) {
         requestContext,
         dataStrategy,
         skipLoaderErrorBubbling,
-        routeMatch
+        routeMatch,
+        filterMatchesToLoad
       );
       return isResponse(result) ? result : {
         ...result,
@@ -2812,7 +2827,7 @@ function createStaticHandler(routes, opts) {
       throw e;
     }
   }
-  async function submit(request, matches, actionMatch, requestContext, dataStrategy, skipLoaderErrorBubbling, isRouteRequest) {
+  async function submit(request, matches, actionMatch, requestContext, dataStrategy, skipLoaderErrorBubbling, isRouteRequest, filterMatchesToLoad, skipRevalidation) {
     let result;
     if (!actionMatch.route.action && !actionMatch.route.lazy) {
       let error = getInternalRouterError(405, {
@@ -2866,6 +2881,36 @@ function createStaticHandler(routes, opts) {
         actionHeaders: {}
       };
     }
+    if (skipRevalidation) {
+      if (isErrorResult(result)) {
+        let boundaryMatch = skipLoaderErrorBubbling ? actionMatch : findNearestBoundary(matches, actionMatch.route.id);
+        return {
+          matches,
+          loaderData: {},
+          actionData: null,
+          errors: {
+            [boundaryMatch.route.id]: result.error
+          },
+          statusCode: isRouteErrorResponse(result.error) ? result.error.status : result.statusCode != null ? result.statusCode : 500,
+          loaderHeaders: {},
+          actionHeaders: {
+            ...result.headers ? { [actionMatch.route.id]: result.headers } : {}
+          }
+        };
+      } else {
+        return {
+          matches,
+          loaderData: {},
+          actionData: {
+            [actionMatch.route.id]: result.data
+          },
+          errors: null,
+          statusCode: result.statusCode || 200,
+          loaderHeaders: {},
+          actionHeaders: result.headers ? { [actionMatch.route.id]: result.headers } : {}
+        };
+      }
+    }
     let loaderRequest = new Request(request.url, {
       headers: request.headers,
       redirect: request.redirect,
@@ -2880,6 +2925,7 @@ function createStaticHandler(routes, opts) {
         dataStrategy,
         skipLoaderErrorBubbling,
         null,
+        filterMatchesToLoad,
         [boundaryMatch.route.id, result]
       );
       return {
@@ -2897,7 +2943,8 @@ function createStaticHandler(routes, opts) {
       requestContext,
       dataStrategy,
       skipLoaderErrorBubbling,
-      null
+      null,
+      filterMatchesToLoad
     );
     return {
       ...handlerContext,
@@ -2909,7 +2956,7 @@ function createStaticHandler(routes, opts) {
       actionHeaders: result.headers ? { [actionMatch.route.id]: result.headers } : {}
     };
   }
-  async function loadRouteData(request, matches, requestContext, dataStrategy, skipLoaderErrorBubbling, routeMatch, pendingActionResult) {
+  async function loadRouteData(request, matches, requestContext, dataStrategy, skipLoaderErrorBubbling, routeMatch, filterMatchesToLoad, pendingActionResult) {
     let isRouteRequest = routeMatch != null;
     if (isRouteRequest && !routeMatch?.route.loader && !routeMatch?.route.lazy) {
       throw getInternalRouterError(400, {
@@ -2920,7 +2967,7 @@ function createStaticHandler(routes, opts) {
     }
     let requestMatches = routeMatch ? [routeMatch] : pendingActionResult && isErrorResult(pendingActionResult[1]) ? getLoaderMatchesUntilBoundary(matches, pendingActionResult[0]) : matches;
     let matchesToLoad = requestMatches.filter(
-      (m) => m.route.loader || m.route.lazy
+      (m) => (m.route.loader || m.route.lazy) && (!filterMatchesToLoad || filterMatchesToLoad(m))
     );
     if (matchesToLoad.length === 0) {
       return {
@@ -7240,7 +7287,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-e41ede670";
+    window.__reactRouterVersion = "0.0.0-experimental-7a19e47ea";
   }
 } catch (e) {
 }
@@ -8982,6 +9029,7 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
     let result = await staticHandler.query(handlerRequest, {
       requestContext: loadContext,
       skipLoaderErrorBubbling: true,
+      skipRevalidation: true,
       async respond(context) {
         let headers = getDocumentHeaders(build, context);
         if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) {
@@ -9046,9 +9094,11 @@ async function singleFetchLoaders(build, serverMode, staticHandler, request, han
       headers: request.headers,
       signal: request.signal
     });
-    let loadRouteIds = new URL(request.url).searchParams.get("_routes")?.split(",") || void 0;
+    let routesParam = new URL(request.url).searchParams.get("_routes");
+    let loadRouteIds = routesParam ? new Set(routesParam.split(",")) : null;
     let result = await staticHandler.query(handlerRequest, {
       requestContext: loadContext,
+      filterMatchesToLoad: (m) => !loadRouteIds || loadRouteIds.has(m.route.id),
       skipLoaderErrorBubbling: true,
       async respond(context) {
         let headers = getDocumentHeaders(build, context);
@@ -9074,9 +9124,9 @@ async function singleFetchLoaders(build, serverMode, staticHandler, request, han
           context.errors = sanitizeErrors(context.errors, serverMode);
         }
         let results = {};
-        let loadedMatches = loadRouteIds ? context.matches.filter(
-          (m) => m.route.loader && loadRouteIds.includes(m.route.id)
-        ) : context.matches;
+        let loadedMatches = context.matches.filter(
+          (m) => m.route.loader && (!loadRouteIds || loadRouteIds.has(m.route.id))
+        );
         loadedMatches.forEach((m) => {
           let { id } = m.route;
           if (context.errors && context.errors.hasOwnProperty(id)) {

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { R as RouterProviderProps$1 } from './fog-of-war-Dz4n-TU-.mjs';
-import { D as DefaultRouterContext } from './route-data-C96IyGKo.mjs';
+import { R as RouterProviderProps$1 } from './fog-of-war-CwUW4KXx.mjs';
+import { D as DefaultRouterContext } from './route-data-DjQzWkWv.mjs';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;
 declare function RouterProvider(props: Omit<RouterProviderProps, "flushSync">): React.JSX.Element;

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { R as RouterProviderProps$1 } from './fog-of-war-Bt7PejVF.js';
-import { D as DefaultRouterContext } from './route-data-C96IyGKo.js';
+import { R as RouterProviderProps$1 } from './fog-of-war-DyaXlex4.js';
+import { D as DefaultRouterContext } from './route-data-DjQzWkWv.js';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;
 declare function RouterProvider(props: Omit<RouterProviderProps, "flushSync">): React.JSX.Element;

package/dist/development/dom-export.js

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

package/dist/development/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-e41ede670
+ * react-router v0.0.0-experimental-7a19e47ea
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -25,7 +25,7 @@ import {
   matchRoutes,
   shouldHydrateRouteLoader,
   useFogOFWarDiscovery
-} from "./chunk-H3OBLXFX.mjs";
+} from "./chunk-4Q4PRAMB.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";

package/dist/development/{fog-of-war-Dz4n-TU-.d.mts → fog-of-war-CwUW4KXx.d.mts}

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { q as RouteObject, D as DefaultRouterContext, F as FutureConfig$1, H as HydrationState, I as InitialEntry, b as DataStrategyFunction, ap as PatchRoutesOnNavigationFunction, a as Router$1, T as To, j as RelativeRoutingType, y as NonIndexRouteObject, a3 as LazyRouteFunction, x as IndexRouteObject, k as Location, l as Action, ao as Navigator, ar as RouteMatch, u as StaticHandlerContext, g as RouteManifest, R as RouteModules, an as DataRouteObject, aK as RouteModule, a2 as HTMLFormMethod, a0 as FormEncType, aw as PageLinkDescriptor, aL as History, E as GetScrollRestorationKeyFunction, N as NavigateOptions, J as Fetcher, S as SerializeFrom, B as BlockerFunction } from './route-data-C96IyGKo.mjs';
+import { q as RouteObject, D as DefaultRouterContext, F as FutureConfig$1, H as HydrationState, I as InitialEntry, b as DataStrategyFunction, ap as PatchRoutesOnNavigationFunction, a as Router$1, T as To, j as RelativeRoutingType, y as NonIndexRouteObject, a3 as LazyRouteFunction, x as IndexRouteObject, k as Location, l as Action, ao as Navigator, ar as RouteMatch, u as StaticHandlerContext, g as RouteManifest, R as RouteModules, an as DataRouteObject, aK as RouteModule, a2 as HTMLFormMethod, a0 as FormEncType, aw as PageLinkDescriptor, aL as History, E as GetScrollRestorationKeyFunction, N as NavigateOptions, J as Fetcher, S as SerializeFrom, B as BlockerFunction } from './route-data-DjQzWkWv.mjs';
 
 /**
  * @private

package/dist/{production/fog-of-war-Bt7PejVF.d.ts → development/fog-of-war-DyaXlex4.d.ts}

@@ -1,5 +1,5 @@
 import * as React from 'react';
-import { q as RouteObject, D as DefaultRouterContext, F as FutureConfig$1, H as HydrationState, I as InitialEntry, b as DataStrategyFunction, ap as PatchRoutesOnNavigationFunction, a as Router$1, T as To, j as RelativeRoutingType, y as NonIndexRouteObject, a3 as LazyRouteFunction, x as IndexRouteObject, k as Location, l as Action, ao as Navigator, ar as RouteMatch, u as StaticHandlerContext, g as RouteManifest, R as RouteModules, an as DataRouteObject, aK as RouteModule, a2 as HTMLFormMethod, a0 as FormEncType, aw as PageLinkDescriptor, aL as History, E as GetScrollRestorationKeyFunction, N as NavigateOptions, J as Fetcher, S as SerializeFrom, B as BlockerFunction } from './route-data-C96IyGKo.js';
+import { q as RouteObject, D as DefaultRouterContext, F as FutureConfig$1, H as HydrationState, I as InitialEntry, b as DataStrategyFunction, ap as PatchRoutesOnNavigationFunction, a as Router$1, T as To, j as RelativeRoutingType, y as NonIndexRouteObject, a3 as LazyRouteFunction, x as IndexRouteObject, k as Location, l as Action, ao as Navigator, ar as RouteMatch, u as StaticHandlerContext, g as RouteManifest, R as RouteModules, an as DataRouteObject, aK as RouteModule, a2 as HTMLFormMethod, a0 as FormEncType, aw as PageLinkDescriptor, aL as History, E as GetScrollRestorationKeyFunction, N as NavigateOptions, J as Fetcher, S as SerializeFrom, B as BlockerFunction } from './route-data-DjQzWkWv.js';
 
 /**
  * @private

package/dist/development/index.d.mts

@@ -1,7 +1,7 @@
-import { R as RouteModules, a as Router, b as DataStrategyFunction, A as ActionFunction, L as LoaderFunction, M as MiddlewareFunction, C as ClientActionFunction, c as ClientLoaderFunction, d as ClientMiddlewareFunction, e as LinksFunction, f as MetaFunction, g as RouteManifest, h as LoaderFunctionArgs, i as ActionFunctionArgs, T as To, j as RelativeRoutingType, k as Location, l as Action, P as ParamParseKey, m as Path, n as PathPattern, o as PathMatch, N as NavigateOptions, p as Params, q as RouteObject, r as Navigation, s as RevalidationState, U as UIMatch, S as SerializeFrom, B as BlockerFunction, t as Blocker, u as StaticHandlerContext, v as StaticHandler, F as FutureConfig$1, w as CreateStaticHandlerOptions$1, I as InitialEntry, H as HydrationState, x as IndexRouteObject, y as NonIndexRouteObject, z as RouterState } from './route-data-C96IyGKo.mjs';
-export { as as ClientActionFunctionArgs, at as ClientLoaderFunctionArgs, am as DataRouteMatch, an as DataRouteObject, X as DataStrategyFunctionArgs, Y as DataStrategyMatch, Z as DataStrategyResult, $ as ErrorResponse, J as Fetcher, a0 as FormEncType, a1 as FormMethod, G as GetScrollPositionFunction, E as GetScrollRestorationKeyFunction, a2 as HTMLFormMethod, ax as HtmlLinkDescriptor, ac as IDLE_BLOCKER, ab as IDLE_FETCHER, aa as IDLE_NAVIGATION, a3 as LazyRouteFunction, ay as LinkDescriptor, au as MetaArgs, av as MetaDescriptor, K as NavigationStates, ao as Navigator, aw as PageLinkDescriptor, ap as PatchRoutesOnNavigationFunction, aq as PatchRoutesOnNavigationFunctionArgs, a4 as PathParam, a5 as RedirectFunction, ar as RouteMatch, W as RouterFetchOptions, O as RouterInit, V as RouterNavigateOptions, Q as RouterSubscriber, a6 as ShouldRevalidateFunction, a7 as ShouldRevalidateFunctionArgs, aD as UNSAFE_DataRouterContext, aE as UNSAFE_DataRouterStateContext, _ as UNSAFE_DataWithResponseInit, aC as UNSAFE_ErrorResponseImpl, aF as UNSAFE_FetchersContext, aG as UNSAFE_LocationContext, aH as UNSAFE_NavigationContext, aI as UNSAFE_RouteContext, aJ as UNSAFE_ViewTransitionContext, az as UNSAFE_createBrowserHistory, aB as UNSAFE_createRouter, aA as UNSAFE_invariant, a8 as createPath, ad as data, ae as generatePath, af as isRouteErrorResponse, ag as matchPath, ah as matchRoutes, a9 as parsePath, ai as redirect, aj as redirectDocument, ak as replace, al as resolvePath } from './route-data-C96IyGKo.mjs';
-import { A as AssetsManifest, a as Route, F as FutureConfig, E as EntryContext } from './fog-of-war-Dz4n-TU-.mjs';
-export { g as Await, b as AwaitProps, Q as BrowserRouter, B as BrowserRouterProps, D as DOMRouterOpts, w as FetcherFormProps, C as FetcherSubmitFunction, a6 as FetcherSubmitOptions, G as FetcherWithComponents, X as Form, x as FormProps, T as HashRouter, H as HashRouterProps, s as HistoryRouterProps, I as IndexRouteProps, L as LayoutRouteProps, U as Link, t as LinkProps, ad as Links, h as MemoryRouter, M as MemoryRouterOpts, c as MemoryRouterProps, ac as Meta, W as NavLink, u as NavLinkProps, v as NavLinkRenderProps, i as Navigate, N as NavigateProps, j as Outlet, O as OutletProps, a7 as ParamKeyValuePair, P as PathRouteProps, af as PrefetchPageLinks, k as Route, d as RouteProps, l as Router, e as RouterProps, m as RouterProvider, R as RouterProviderProps, n as Routes, f as RoutesProps, ae as Scripts, ag as ScriptsProps, Y as ScrollRestoration, S as ScrollRestorationProps, y as SetURLSearchParams, z as SubmitFunction, a8 as SubmitOptions, aa as SubmitTarget, ai as UNSAFE_FrameworkContext, al as UNSAFE_createClientRoutes, am as UNSAFE_createClientRoutesWithHMRRevalidationOptOut, aj as UNSAFE_getPatchRoutesOnNavigationFunction, ah as UNSAFE_mapRouteProperties, an as UNSAFE_shouldHydrateRouteLoader, ak as UNSAFE_useFogOFWarDiscovery, ao as UNSAFE_useScrollRestoration, a9 as URLSearchParamsInit, J as createBrowserRouter, K as createHashRouter, o as createMemoryRouter, p as createRoutesFromChildren, q as createRoutesFromElements, ab as createSearchParams, r as renderMatches, V as unstable_HistoryRouter, a4 as unstable_usePrompt, a3 as useBeforeUnload, a1 as useFetcher, a2 as useFetchers, a0 as useFormAction, Z as useLinkClickHandler, _ as useSearchParams, $ as useSubmit, a5 as useViewTransitionState } from './fog-of-war-Dz4n-TU-.mjs';
+import { R as RouteModules, a as Router, b as DataStrategyFunction, A as ActionFunction, L as LoaderFunction, M as MiddlewareFunction, C as ClientActionFunction, c as ClientLoaderFunction, d as ClientMiddlewareFunction, e as LinksFunction, f as MetaFunction, g as RouteManifest, h as LoaderFunctionArgs, i as ActionFunctionArgs, T as To, j as RelativeRoutingType, k as Location, l as Action, P as ParamParseKey, m as Path, n as PathPattern, o as PathMatch, N as NavigateOptions, p as Params, q as RouteObject, r as Navigation, s as RevalidationState, U as UIMatch, S as SerializeFrom, B as BlockerFunction, t as Blocker, u as StaticHandlerContext, v as StaticHandler, F as FutureConfig$1, w as CreateStaticHandlerOptions$1, I as InitialEntry, H as HydrationState, x as IndexRouteObject, y as NonIndexRouteObject, z as RouterState } from './route-data-DjQzWkWv.mjs';
+export { as as ClientActionFunctionArgs, at as ClientLoaderFunctionArgs, am as DataRouteMatch, an as DataRouteObject, X as DataStrategyFunctionArgs, Y as DataStrategyMatch, Z as DataStrategyResult, $ as ErrorResponse, J as Fetcher, a0 as FormEncType, a1 as FormMethod, G as GetScrollPositionFunction, E as GetScrollRestorationKeyFunction, a2 as HTMLFormMethod, ax as HtmlLinkDescriptor, ac as IDLE_BLOCKER, ab as IDLE_FETCHER, aa as IDLE_NAVIGATION, a3 as LazyRouteFunction, ay as LinkDescriptor, au as MetaArgs, av as MetaDescriptor, K as NavigationStates, ao as Navigator, aw as PageLinkDescriptor, ap as PatchRoutesOnNavigationFunction, aq as PatchRoutesOnNavigationFunctionArgs, a4 as PathParam, a5 as RedirectFunction, ar as RouteMatch, W as RouterFetchOptions, O as RouterInit, V as RouterNavigateOptions, Q as RouterSubscriber, a6 as ShouldRevalidateFunction, a7 as ShouldRevalidateFunctionArgs, aD as UNSAFE_DataRouterContext, aE as UNSAFE_DataRouterStateContext, _ as UNSAFE_DataWithResponseInit, aC as UNSAFE_ErrorResponseImpl, aF as UNSAFE_FetchersContext, aG as UNSAFE_LocationContext, aH as UNSAFE_NavigationContext, aI as UNSAFE_RouteContext, aJ as UNSAFE_ViewTransitionContext, az as UNSAFE_createBrowserHistory, aB as UNSAFE_createRouter, aA as UNSAFE_invariant, a8 as createPath, ad as data, ae as generatePath, af as isRouteErrorResponse, ag as matchPath, ah as matchRoutes, a9 as parsePath, ai as redirect, aj as redirectDocument, ak as replace, al as resolvePath } from './route-data-DjQzWkWv.mjs';
+import { A as AssetsManifest, a as Route, F as FutureConfig, E as EntryContext } from './fog-of-war-CwUW4KXx.mjs';
+export { g as Await, b as AwaitProps, Q as BrowserRouter, B as BrowserRouterProps, D as DOMRouterOpts, w as FetcherFormProps, C as FetcherSubmitFunction, a6 as FetcherSubmitOptions, G as FetcherWithComponents, X as Form, x as FormProps, T as HashRouter, H as HashRouterProps, s as HistoryRouterProps, I as IndexRouteProps, L as LayoutRouteProps, U as Link, t as LinkProps, ad as Links, h as MemoryRouter, M as MemoryRouterOpts, c as MemoryRouterProps, ac as Meta, W as NavLink, u as NavLinkProps, v as NavLinkRenderProps, i as Navigate, N as NavigateProps, j as Outlet, O as OutletProps, a7 as ParamKeyValuePair, P as PathRouteProps, af as PrefetchPageLinks, k as Route, d as RouteProps, l as Router, e as RouterProps, m as RouterProvider, R as RouterProviderProps, n as Routes, f as RoutesProps, ae as Scripts, ag as ScriptsProps, Y as ScrollRestoration, S as ScrollRestorationProps, y as SetURLSearchParams, z as SubmitFunction, a8 as SubmitOptions, aa as SubmitTarget, ai as UNSAFE_FrameworkContext, al as UNSAFE_createClientRoutes, am as UNSAFE_createClientRoutesWithHMRRevalidationOptOut, aj as UNSAFE_getPatchRoutesOnNavigationFunction, ah as UNSAFE_mapRouteProperties, an as UNSAFE_shouldHydrateRouteLoader, ak as UNSAFE_useFogOFWarDiscovery, ao as UNSAFE_useScrollRestoration, a9 as URLSearchParamsInit, J as createBrowserRouter, K as createHashRouter, o as createMemoryRouter, p as createRoutesFromChildren, q as createRoutesFromElements, ab as createSearchParams, r as renderMatches, V as unstable_HistoryRouter, a4 as unstable_usePrompt, a3 as useBeforeUnload, a1 as useFetcher, a2 as useFetchers, a0 as useFormAction, Z as useLinkClickHandler, _ as useSearchParams, $ as useSubmit, a5 as useViewTransitionState } from './fog-of-war-CwUW4KXx.mjs';
 import * as React from 'react';
 import { ReactElement } from 'react';
 import { A as AppLoadContext } from './data-CQbyyGzl.mjs';

package/dist/development/index.d.ts

@@ -1,7 +1,7 @@
-import { R as RouteModules, a as Router, b as DataStrategyFunction, A as ActionFunction, L as LoaderFunction, M as MiddlewareFunction, C as ClientActionFunction, c as ClientLoaderFunction, d as ClientMiddlewareFunction, e as LinksFunction, f as MetaFunction, g as RouteManifest, h as LoaderFunctionArgs, i as ActionFunctionArgs, T as To, j as RelativeRoutingType, k as Location, l as Action, P as ParamParseKey, m as Path, n as PathPattern, o as PathMatch, N as NavigateOptions, p as Params, q as RouteObject, r as Navigation, s as RevalidationState, U as UIMatch, S as SerializeFrom, B as BlockerFunction, t as Blocker, u as StaticHandlerContext, v as StaticHandler, F as FutureConfig$1, w as CreateStaticHandlerOptions$1, I as InitialEntry, H as HydrationState, x as IndexRouteObject, y as NonIndexRouteObject, z as RouterState } from './route-data-C96IyGKo.js';
-export { as as ClientActionFunctionArgs, at as ClientLoaderFunctionArgs, am as DataRouteMatch, an as DataRouteObject, X as DataStrategyFunctionArgs, Y as DataStrategyMatch, Z as DataStrategyResult, $ as ErrorResponse, J as Fetcher, a0 as FormEncType, a1 as FormMethod, G as GetScrollPositionFunction, E as GetScrollRestorationKeyFunction, a2 as HTMLFormMethod, ax as HtmlLinkDescriptor, ac as IDLE_BLOCKER, ab as IDLE_FETCHER, aa as IDLE_NAVIGATION, a3 as LazyRouteFunction, ay as LinkDescriptor, au as MetaArgs, av as MetaDescriptor, K as NavigationStates, ao as Navigator, aw as PageLinkDescriptor, ap as PatchRoutesOnNavigationFunction, aq as PatchRoutesOnNavigationFunctionArgs, a4 as PathParam, a5 as RedirectFunction, ar as RouteMatch, W as RouterFetchOptions, O as RouterInit, V as RouterNavigateOptions, Q as RouterSubscriber, a6 as ShouldRevalidateFunction, a7 as ShouldRevalidateFunctionArgs, aD as UNSAFE_DataRouterContext, aE as UNSAFE_DataRouterStateContext, _ as UNSAFE_DataWithResponseInit, aC as UNSAFE_ErrorResponseImpl, aF as UNSAFE_FetchersContext, aG as UNSAFE_LocationContext, aH as UNSAFE_NavigationContext, aI as UNSAFE_RouteContext, aJ as UNSAFE_ViewTransitionContext, az as UNSAFE_createBrowserHistory, aB as UNSAFE_createRouter, aA as UNSAFE_invariant, a8 as createPath, ad as data, ae as generatePath, af as isRouteErrorResponse, ag as matchPath, ah as matchRoutes, a9 as parsePath, ai as redirect, aj as redirectDocument, ak as replace, al as resolvePath } from './route-data-C96IyGKo.js';
-import { A as AssetsManifest, a as Route, F as FutureConfig, E as EntryContext } from './fog-of-war-Bt7PejVF.js';
-export { g as Await, b as AwaitProps, Q as BrowserRouter, B as BrowserRouterProps, D as DOMRouterOpts, w as FetcherFormProps, C as FetcherSubmitFunction, a6 as FetcherSubmitOptions, G as FetcherWithComponents, X as Form, x as FormProps, T as HashRouter, H as HashRouterProps, s as HistoryRouterProps, I as IndexRouteProps, L as LayoutRouteProps, U as Link, t as LinkProps, ad as Links, h as MemoryRouter, M as MemoryRouterOpts, c as MemoryRouterProps, ac as Meta, W as NavLink, u as NavLinkProps, v as NavLinkRenderProps, i as Navigate, N as NavigateProps, j as Outlet, O as OutletProps, a7 as ParamKeyValuePair, P as PathRouteProps, af as PrefetchPageLinks, k as Route, d as RouteProps, l as Router, e as RouterProps, m as RouterProvider, R as RouterProviderProps, n as Routes, f as RoutesProps, ae as Scripts, ag as ScriptsProps, Y as ScrollRestoration, S as ScrollRestorationProps, y as SetURLSearchParams, z as SubmitFunction, a8 as SubmitOptions, aa as SubmitTarget, ai as UNSAFE_FrameworkContext, al as UNSAFE_createClientRoutes, am as UNSAFE_createClientRoutesWithHMRRevalidationOptOut, aj as UNSAFE_getPatchRoutesOnNavigationFunction, ah as UNSAFE_mapRouteProperties, an as UNSAFE_shouldHydrateRouteLoader, ak as UNSAFE_useFogOFWarDiscovery, ao as UNSAFE_useScrollRestoration, a9 as URLSearchParamsInit, J as createBrowserRouter, K as createHashRouter, o as createMemoryRouter, p as createRoutesFromChildren, q as createRoutesFromElements, ab as createSearchParams, r as renderMatches, V as unstable_HistoryRouter, a4 as unstable_usePrompt, a3 as useBeforeUnload, a1 as useFetcher, a2 as useFetchers, a0 as useFormAction, Z as useLinkClickHandler, _ as useSearchParams, $ as useSubmit, a5 as useViewTransitionState } from './fog-of-war-Bt7PejVF.js';
+import { R as RouteModules, a as Router, b as DataStrategyFunction, A as ActionFunction, L as LoaderFunction, M as MiddlewareFunction, C as ClientActionFunction, c as ClientLoaderFunction, d as ClientMiddlewareFunction, e as LinksFunction, f as MetaFunction, g as RouteManifest, h as LoaderFunctionArgs, i as ActionFunctionArgs, T as To, j as RelativeRoutingType, k as Location, l as Action, P as ParamParseKey, m as Path, n as PathPattern, o as PathMatch, N as NavigateOptions, p as Params, q as RouteObject, r as Navigation, s as RevalidationState, U as UIMatch, S as SerializeFrom, B as BlockerFunction, t as Blocker, u as StaticHandlerContext, v as StaticHandler, F as FutureConfig$1, w as CreateStaticHandlerOptions$1, I as InitialEntry, H as HydrationState, x as IndexRouteObject, y as NonIndexRouteObject, z as RouterState } from './route-data-DjQzWkWv.js';
+export { as as ClientActionFunctionArgs, at as ClientLoaderFunctionArgs, am as DataRouteMatch, an as DataRouteObject, X as DataStrategyFunctionArgs, Y as DataStrategyMatch, Z as DataStrategyResult, $ as ErrorResponse, J as Fetcher, a0 as FormEncType, a1 as FormMethod, G as GetScrollPositionFunction, E as GetScrollRestorationKeyFunction, a2 as HTMLFormMethod, ax as HtmlLinkDescriptor, ac as IDLE_BLOCKER, ab as IDLE_FETCHER, aa as IDLE_NAVIGATION, a3 as LazyRouteFunction, ay as LinkDescriptor, au as MetaArgs, av as MetaDescriptor, K as NavigationStates, ao as Navigator, aw as PageLinkDescriptor, ap as PatchRoutesOnNavigationFunction, aq as PatchRoutesOnNavigationFunctionArgs, a4 as PathParam, a5 as RedirectFunction, ar as RouteMatch, W as RouterFetchOptions, O as RouterInit, V as RouterNavigateOptions, Q as RouterSubscriber, a6 as ShouldRevalidateFunction, a7 as ShouldRevalidateFunctionArgs, aD as UNSAFE_DataRouterContext, aE as UNSAFE_DataRouterStateContext, _ as UNSAFE_DataWithResponseInit, aC as UNSAFE_ErrorResponseImpl, aF as UNSAFE_FetchersContext, aG as UNSAFE_LocationContext, aH as UNSAFE_NavigationContext, aI as UNSAFE_RouteContext, aJ as UNSAFE_ViewTransitionContext, az as UNSAFE_createBrowserHistory, aB as UNSAFE_createRouter, aA as UNSAFE_invariant, a8 as createPath, ad as data, ae as generatePath, af as isRouteErrorResponse, ag as matchPath, ah as matchRoutes, a9 as parsePath, ai as redirect, aj as redirectDocument, ak as replace, al as resolvePath } from './route-data-DjQzWkWv.js';
+import { A as AssetsManifest, a as Route, F as FutureConfig, E as EntryContext } from './fog-of-war-DyaXlex4.js';
+export { g as Await, b as AwaitProps, Q as BrowserRouter, B as BrowserRouterProps, D as DOMRouterOpts, w as FetcherFormProps, C as FetcherSubmitFunction, a6 as FetcherSubmitOptions, G as FetcherWithComponents, X as Form, x as FormProps, T as HashRouter, H as HashRouterProps, s as HistoryRouterProps, I as IndexRouteProps, L as LayoutRouteProps, U as Link, t as LinkProps, ad as Links, h as MemoryRouter, M as MemoryRouterOpts, c as MemoryRouterProps, ac as Meta, W as NavLink, u as NavLinkProps, v as NavLinkRenderProps, i as Navigate, N as NavigateProps, j as Outlet, O as OutletProps, a7 as ParamKeyValuePair, P as PathRouteProps, af as PrefetchPageLinks, k as Route, d as RouteProps, l as Router, e as RouterProps, m as RouterProvider, R as RouterProviderProps, n as Routes, f as RoutesProps, ae as Scripts, ag as ScriptsProps, Y as ScrollRestoration, S as ScrollRestorationProps, y as SetURLSearchParams, z as SubmitFunction, a8 as SubmitOptions, aa as SubmitTarget, ai as UNSAFE_FrameworkContext, al as UNSAFE_createClientRoutes, am as UNSAFE_createClientRoutesWithHMRRevalidationOptOut, aj as UNSAFE_getPatchRoutesOnNavigationFunction, ah as UNSAFE_mapRouteProperties, an as UNSAFE_shouldHydrateRouteLoader, ak as UNSAFE_useFogOFWarDiscovery, ao as UNSAFE_useScrollRestoration, a9 as URLSearchParamsInit, J as createBrowserRouter, K as createHashRouter, o as createMemoryRouter, p as createRoutesFromChildren, q as createRoutesFromElements, ab as createSearchParams, r as renderMatches, V as unstable_HistoryRouter, a4 as unstable_usePrompt, a3 as useBeforeUnload, a1 as useFetcher, a2 as useFetchers, a0 as useFormAction, Z as useLinkClickHandler, _ as useSearchParams, $ as useSubmit, a5 as useViewTransitionState } from './fog-of-war-DyaXlex4.js';
 import * as React from 'react';
 import { ReactElement } from 'react';
 import { A as AppLoadContext } from './data-CQbyyGzl.js';

package/dist/development/index.js

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-e41ede670
+ * react-router v0.0.0-experimental-7a19e47ea
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2726,7 +2726,9 @@ function createStaticHandler(routes, opts) {
   );
   async function query(request, {
     requestContext,
+    filterMatchesToLoad,
     skipLoaderErrorBubbling,
+    skipRevalidation,
     dataStrategy,
     respond
   } = {}) {
@@ -2769,6 +2771,8 @@ function createStaticHandler(routes, opts) {
       };
     } else if (respond) {
       try {
+        let tailIdx = [...matches].reverse().findIndex((m) => !filterMatchesToLoad || filterMatchesToLoad(m));
+        let lowestLoadingIdx = tailIdx < 0 ? 0 : matches.length - 1 - tailIdx;
         let response = await runMiddlewarePipeline(
           {
             request,
@@ -2776,7 +2780,7 @@ function createStaticHandler(routes, opts) {
             params: matches[0].params,
             context: requestContext
           },
-          matches.length - 1,
+          lowestLoadingIdx,
           true,
           async () => {
             let result = await callQueryHandlers(
@@ -2786,7 +2790,9 @@ function createStaticHandler(routes, opts) {
               requestContext,
               dataStrategy || defaultDataStrategyWithoutMiddleware,
               skipLoaderErrorBubbling === true,
-              null
+              null,
+              filterMatchesToLoad || null,
+              skipRevalidation === true
             );
             if (isResponse(result)) {
               return result;
@@ -2815,7 +2821,9 @@ function createStaticHandler(routes, opts) {
         requestContext,
         dataStrategy || null,
         skipLoaderErrorBubbling === true,
-        null
+        null,
+        filterMatchesToLoad || null,
+        skipRevalidation === true
       );
       if (isResponse(result)) {
         return result;
@@ -2874,7 +2882,9 @@ function createStaticHandler(routes, opts) {
             requestContext,
             dataStrategy || defaultDataStrategyWithoutMiddleware,
             false,
-            match
+            match,
+            null,
+            false
           );
           if (isResponse(result)) {
             return result;
@@ -2895,7 +2905,9 @@ function createStaticHandler(routes, opts) {
         requestContext,
         dataStrategy || null,
         false,
-        match
+        match,
+        null,
+        false
       );
       if (isResponse(result)) {
         return result;
@@ -2913,7 +2925,7 @@ function createStaticHandler(routes, opts) {
       return void 0;
     }
   }
-  async function callQueryHandlers(request, location, matches, requestContext, dataStrategy, skipLoaderErrorBubbling, routeMatch) {
+  async function callQueryHandlers(request, location, matches, requestContext, dataStrategy, skipLoaderErrorBubbling, routeMatch, filterMatchesToLoad, skipRevalidation) {
     invariant(
       request.signal,
       "query()/queryRoute() requests must contain an AbortController signal"
@@ -2927,7 +2939,9 @@ function createStaticHandler(routes, opts) {
           requestContext,
           dataStrategy,
           skipLoaderErrorBubbling,
-          routeMatch != null
+          routeMatch != null,
+          filterMatchesToLoad,
+          skipRevalidation
         );
         return result2;
       }
@@ -2937,7 +2951,8 @@ function createStaticHandler(routes, opts) {
         requestContext,
         dataStrategy,
         skipLoaderErrorBubbling,
-        routeMatch
+        routeMatch,
+        filterMatchesToLoad
       );
       return isResponse(result) ? result : {
         ...result,
@@ -2957,7 +2972,7 @@ function createStaticHandler(routes, opts) {
       throw e;
     }
   }
-  async function submit(request, matches, actionMatch, requestContext, dataStrategy, skipLoaderErrorBubbling, isRouteRequest) {
+  async function submit(request, matches, actionMatch, requestContext, dataStrategy, skipLoaderErrorBubbling, isRouteRequest, filterMatchesToLoad, skipRevalidation) {
     let result;
     if (!actionMatch.route.action && !actionMatch.route.lazy) {
       let error = getInternalRouterError(405, {
@@ -3011,6 +3026,36 @@ function createStaticHandler(routes, opts) {
         actionHeaders: {}
       };
     }
+    if (skipRevalidation) {
+      if (isErrorResult(result)) {
+        let boundaryMatch = skipLoaderErrorBubbling ? actionMatch : findNearestBoundary(matches, actionMatch.route.id);
+        return {
+          matches,
+          loaderData: {},
+          actionData: null,
+          errors: {
+            [boundaryMatch.route.id]: result.error
+          },
+          statusCode: isRouteErrorResponse(result.error) ? result.error.status : result.statusCode != null ? result.statusCode : 500,
+          loaderHeaders: {},
+          actionHeaders: {
+            ...result.headers ? { [actionMatch.route.id]: result.headers } : {}
+          }
+        };
+      } else {
+        return {
+          matches,
+          loaderData: {},
+          actionData: {
+            [actionMatch.route.id]: result.data
+          },
+          errors: null,
+          statusCode: result.statusCode || 200,
+          loaderHeaders: {},
+          actionHeaders: result.headers ? { [actionMatch.route.id]: result.headers } : {}
+        };
+      }
+    }
     let loaderRequest = new Request(request.url, {
       headers: request.headers,
       redirect: request.redirect,
@@ -3025,6 +3070,7 @@ function createStaticHandler(routes, opts) {
         dataStrategy,
         skipLoaderErrorBubbling,
         null,
+        filterMatchesToLoad,
         [boundaryMatch.route.id, result]
       );
       return {
@@ -3042,7 +3088,8 @@ function createStaticHandler(routes, opts) {
       requestContext,
       dataStrategy,
       skipLoaderErrorBubbling,
-      null
+      null,
+      filterMatchesToLoad
     );
     return {
       ...handlerContext,
@@ -3054,7 +3101,7 @@ function createStaticHandler(routes, opts) {
       actionHeaders: result.headers ? { [actionMatch.route.id]: result.headers } : {}
     };
   }
-  async function loadRouteData(request, matches, requestContext, dataStrategy, skipLoaderErrorBubbling, routeMatch, pendingActionResult) {
+  async function loadRouteData(request, matches, requestContext, dataStrategy, skipLoaderErrorBubbling, routeMatch, filterMatchesToLoad, pendingActionResult) {
     let isRouteRequest = routeMatch != null;
     if (isRouteRequest && !routeMatch?.route.loader && !routeMatch?.route.lazy) {
       throw getInternalRouterError(400, {
@@ -3065,7 +3112,7 @@ function createStaticHandler(routes, opts) {
     }
     let requestMatches = routeMatch ? [routeMatch] : pendingActionResult && isErrorResult(pendingActionResult[1]) ? getLoaderMatchesUntilBoundary(matches, pendingActionResult[0]) : matches;
     let matchesToLoad = requestMatches.filter(
-      (m) => m.route.loader || m.route.lazy
+      (m) => (m.route.loader || m.route.lazy) && (!filterMatchesToLoad || filterMatchesToLoad(m))
     );
     if (matchesToLoad.length === 0) {
       return {
@@ -7385,7 +7432,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-e41ede670";
+    window.__reactRouterVersion = "0.0.0-experimental-7a19e47ea";
   }
 } catch (e) {
 }
@@ -9127,6 +9174,7 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
     let result = await staticHandler.query(handlerRequest, {
       requestContext: loadContext,
       skipLoaderErrorBubbling: true,
+      skipRevalidation: true,
       async respond(context) {
         let headers = getDocumentHeaders(build, context);
         if (isRedirectStatusCode(context.statusCode) && headers.has("Location")) {
@@ -9191,9 +9239,11 @@ async function singleFetchLoaders(build, serverMode, staticHandler, request, han
       headers: request.headers,
       signal: request.signal
     });
-    let loadRouteIds = new URL(request.url).searchParams.get("_routes")?.split(",") || void 0;
+    let routesParam = new URL(request.url).searchParams.get("_routes");
+    let loadRouteIds = routesParam ? new Set(routesParam.split(",")) : null;
     let result = await staticHandler.query(handlerRequest, {
       requestContext: loadContext,
+      filterMatchesToLoad: (m) => !loadRouteIds || loadRouteIds.has(m.route.id),
       skipLoaderErrorBubbling: true,
       async respond(context) {
         let headers = getDocumentHeaders(build, context);
@@ -9219,9 +9269,9 @@ async function singleFetchLoaders(build, serverMode, staticHandler, request, han
           context.errors = sanitizeErrors(context.errors, serverMode);
         }
         let results = {};
-        let loadedMatches = loadRouteIds ? context.matches.filter(
-          (m) => m.route.loader && loadRouteIds.includes(m.route.id)
-        ) : context.matches;
+        let loadedMatches = context.matches.filter(
+          (m) => m.route.loader && (!loadRouteIds || loadRouteIds.has(m.route.id))
+        );
         loadedMatches.forEach((m) => {
           let { id } = m.route;
           if (context.errors && context.errors.hasOwnProperty(id)) {

package/dist/development/index.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v0.0.0-experimental-e41ede670
+ * react-router v0.0.0-experimental-7a19e47ea
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -120,7 +120,7 @@ import {
   useSearchParams,
   useSubmit,
   useViewTransitionState
-} from "./chunk-H3OBLXFX.mjs";
+} from "./chunk-4Q4PRAMB.mjs";
 export {
   Await,
   BrowserRouter,

package/dist/development/lib/types/route-module.d.mts

@@ -1,4 +1,4 @@
-import { ay as LinkDescriptor, av as MetaDescriptor, aM as ServerDataFrom, aN as ClientDataFrom, aO as Func, M as MiddlewareFunction, d as ClientMiddlewareFunction, aP as Equal, aQ as Pretty } from '../../route-data-C96IyGKo.mjs';
+import { ay as LinkDescriptor, av as MetaDescriptor, aM as ServerDataFrom, aN as ClientDataFrom, aO as Func, M as MiddlewareFunction, d as ClientMiddlewareFunction, aP as Equal, aQ as Pretty } from '../../route-data-DjQzWkWv.mjs';
 import { A as AppLoadContext } from '../../data-CQbyyGzl.mjs';
 import 'react';
 

package/dist/development/lib/types/route-module.d.ts

@@ -1,4 +1,4 @@
-import { ay as LinkDescriptor, av as MetaDescriptor, aM as ServerDataFrom, aN as ClientDataFrom, aO as Func, M as MiddlewareFunction, d as ClientMiddlewareFunction, aP as Equal, aQ as Pretty } from '../../route-data-C96IyGKo.js';
+import { ay as LinkDescriptor, av as MetaDescriptor, aM as ServerDataFrom, aN as ClientDataFrom, aO as Func, M as MiddlewareFunction, d as ClientMiddlewareFunction, aP as Equal, aQ as Pretty } from '../../route-data-DjQzWkWv.js';
 import { A as AppLoadContext } from '../../data-CQbyyGzl.js';
 import 'react';
 

package/dist/development/lib/types/route-module.js

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

package/dist/development/lib/types/route-module.mjs

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

package/dist/development/{route-data-C96IyGKo.d.ts → route-data-DjQzWkWv.d.mts}

@@ -914,7 +914,9 @@ interface StaticHandler {
     dataRoutes: AgnosticDataRouteObject[];
     query(request: Request, opts?: {
         requestContext?: unknown;
+        filterMatchesToLoad?: (match: AgnosticDataRouteMatch) => boolean;
         skipLoaderErrorBubbling?: boolean;
+        skipRevalidation?: boolean;
         dataStrategy?: DataStrategyFunction;
         respond?: (staticContext: StaticHandlerContext) => Promise<Response>;
     }): Promise<StaticHandlerContext | Response>;

package/dist/{production/route-data-C96IyGKo.d.mts → development/route-data-DjQzWkWv.d.ts}

@@ -914,7 +914,9 @@ interface StaticHandler {
     dataRoutes: AgnosticDataRouteObject[];
     query(request: Request, opts?: {
         requestContext?: unknown;
+        filterMatchesToLoad?: (match: AgnosticDataRouteMatch) => boolean;
         skipLoaderErrorBubbling?: boolean;
+        skipRevalidation?: boolean;
         dataStrategy?: DataStrategyFunction;
         respond?: (staticContext: StaticHandlerContext) => Promise<Response>;
     }): Promise<StaticHandlerContext | Response>;