react-router 7.15.0 → 7.15.1

package/dist/development/{chunk-RMD3H4O3.mjs → chunk-RJYABSBD.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.15.0
+ * react-router v7.15.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -37,6 +37,7 @@ import {
   getStaticContextFromError,
   instrumentHandler,
   isDataWithResponseInit,
+  isMutationMethod,
   isRedirectResponse,
   isRedirectStatusCode,
   isResponse,
@@ -53,7 +54,7 @@ import {
   withComponentProps,
   withErrorBoundaryProps,
   withHydrateFallbackProps
-} from "./chunk-5KNZJZUH.mjs";
+} from "./chunk-4N6VE7H7.mjs";
 
 // lib/dom/ssr/server.tsx
 import * as React from "react";
@@ -266,7 +267,7 @@ var unsign = async (cookie, secret) => {
     let signature = byteStringToUint8Array(atob(hash));
     let valid = await crypto.subtle.verify("HMAC", key, signature, data2);
     return valid ? value : false;
-  } catch (error) {
+  } catch (e) {
     return false;
   }
 };
@@ -358,7 +359,7 @@ function encodeData(value) {
 function decodeData(value) {
   try {
     return JSON.parse(decodeURIComponent(myEscape(atob(value))));
-  } catch (error) {
+  } catch (e) {
     return {};
   }
 }
@@ -1443,7 +1444,7 @@ async function handleManifestRequest(build, dataRoutes, branches, url) {
 async function handleSingleFetchRequest(serverMode, build, staticHandler, request, normalizedPath, loadContext, handleError) {
   let handlerUrl = new URL(request.url);
   handlerUrl.pathname = normalizedPath;
-  let response = request.method !== "GET" ? await singleFetchAction(
+  let response = isMutationMethod(request.method) ? await singleFetchAction(
     build,
     serverMode,
     staticHandler,
@@ -1464,7 +1465,7 @@ async function handleSingleFetchRequest(serverMode, build, staticHandler, reques
 }
 async function handleDocumentRequest(serverMode, build, staticHandler, request, loadContext, handleError, isSpaMode, criticalCss) {
   try {
-    if (request.method === "POST") {
+    if (isMutationMethod(request.method)) {
       try {
         throwIfPotentialCSRFAttack(
           request.headers,
@@ -1927,7 +1928,7 @@ async function writeRSCStream(rscStream, controller) {
           JSON.stringify(decoder.decode(chunk, { stream: true })),
           controller
         );
-      } catch (err) {
+      } catch (e) {
         let base64 = JSON.stringify(btoa(String.fromCodePoint(...chunk)));
         writeChunk(
           `Uint8Array.from(atob(${base64}), m => m.codePointAt(0))`,
@@ -2253,9 +2254,9 @@ async function routeRSCServerRequest({
       statusText,
       headers
     });
-  } catch (reason) {
-    if (reason instanceof Response) {
-      return reason;
+  } catch (error) {
+    if (error instanceof Response) {
+      return error;
     }
     if (renderRedirect) {
       return new Response(`Redirect: ${renderRedirect.location}`, {
@@ -2266,8 +2267,8 @@ async function routeRSCServerRequest({
       });
     }
     try {
-      reason = renderError ?? reason;
-      let [status, statusText] = isRouteErrorResponse(reason) ? [reason.status, reason.statusText] : [500, ""];
+      let normalizedError = renderError ?? error;
+      let [status, statusText] = isRouteErrorResponse(normalizedError) ? [normalizedError.status, normalizedError.statusText] : [500, ""];
       let retryRedirect;
       let reactHeaders = new Headers();
       const html = await renderHTML(
@@ -2279,7 +2280,7 @@ async function routeRSCServerRequest({
             (payload) => Object.assign(payload, {
               status,
               errors: deepestRenderedBoundaryId ? {
-                [deepestRenderedBoundaryId]: reason
+                [deepestRenderedBoundaryId]: normalizedError
               } : {}
             })
           );
@@ -2302,19 +2303,19 @@ async function routeRSCServerRequest({
           });
         },
         {
-          onError(error) {
-            if (typeof error === "object" && error && "digest" in error && typeof error.digest === "string") {
-              retryRedirect = decodeRedirectErrorDigest(error.digest);
+          onError(error2) {
+            if (typeof error2 === "object" && error2 && "digest" in error2 && typeof error2.digest === "string") {
+              retryRedirect = decodeRedirectErrorDigest(error2.digest);
               if (retryRedirect) {
-                return error.digest;
+                return error2.digest;
               }
               let routeErrorResponse = decodeRouteErrorResponseDigest(
-                error.digest
+                error2.digest
               );
               if (routeErrorResponse) {
                 status = routeErrorResponse.status;
                 statusText = routeErrorResponse.statusText;
-                return error.digest;
+                return error2.digest;
               }
             }
           },
@@ -2364,9 +2365,9 @@ async function routeRSCServerRequest({
         statusText,
         headers
       });
-    } catch {
+    } catch (error2) {
     }
-    throw reason;
+    throw error;
   }
 }
 function RSCStaticRouter({ getPayload }) {

package/dist/{production/context-BQs41HrG.d.mts → development/context-ByvtofY2.d.mts}

@@ -563,6 +563,8 @@ type NavigationStates = {
     Idle: {
         state: "idle";
         location: undefined;
+        matches: undefined;
+        historyAction: undefined;
         formMethod: undefined;
         formAction: undefined;
         formEncType: undefined;
@@ -573,6 +575,8 @@ type NavigationStates = {
     Loading: {
         state: "loading";
         location: Location;
+        matches: DataRouteMatch[];
+        historyAction: Action;
         formMethod: Submission["formMethod"] | undefined;
         formAction: Submission["formAction"] | undefined;
         formEncType: Submission["formEncType"] | undefined;
@@ -583,6 +587,8 @@ type NavigationStates = {
     Submitting: {
         state: "submitting";
         location: Location;
+        matches: DataRouteMatch[];
+        historyAction: Action;
         formMethod: Submission["formMethod"];
         formAction: Submission["formAction"];
         formEncType: Submission["formEncType"];
@@ -1762,4 +1768,4 @@ interface RouteContextObject {
 }
 declare const RouteContext: React.Context<RouteContextObject>;
 
-export { createRoutesFromElements as $, AwaitContextProvider as A, type BlockerFunction as B, type ClientInstrumentation as C, type RouteProps as D, type RouterProps as E, type Fetcher as F, type GetScrollPositionFunction as G, type HydrationState as H, type InstrumentRequestHandlerFunction as I, type RoutesProps as J, Await as K, type LayoutRouteProps as L, type MemoryRouterOpts as M, type NavigateOptions as N, type OutletProps as O, type PathRouteProps as P, MemoryRouter as Q, type RouterInit as R, type StaticHandler as S, Navigate as T, Outlet as U, Route as V, Router as W, RouterProvider as X, Routes as Y, createMemoryRouter as Z, createRoutesFromChildren as _, type RouterProviderProps as a, renderMatches as a0, createRouter as a1, DataRouterContext as a2, DataRouterStateContext as a3, FetchersContext as a4, LocationContext as a5, NavigationContext as a6, RouteContext as a7, ViewTransitionContext as a8, hydrationRouteProperties as a9, mapRouteProperties as aa, WithComponentProps as ab, withComponentProps as ac, WithHydrateFallbackProps as ad, withHydrateFallbackProps as ae, WithErrorBoundaryProps as af, withErrorBoundaryProps as ag, type FutureConfig as ah, type CreateStaticHandlerOptions as ai, type ClientOnErrorFunction as b, type Router$1 as c, type Blocker as d, type RelativeRoutingType as e, type Navigation as f, type RouterState as g, type GetScrollRestorationKeyFunction as h, type StaticHandlerContext as i, type NavigationStates as j, type RouterSubscriber as k, type RouterNavigateOptions as l, type RouterFetchOptions as m, type RevalidationState as n, type ServerInstrumentation as o, type InstrumentRouterFunction as p, type InstrumentRouteFunction as q, type InstrumentationHandlerResult as r, IDLE_NAVIGATION as s, IDLE_FETCHER as t, IDLE_BLOCKER as u, type Navigator as v, type AwaitProps as w, type IndexRouteProps as x, type MemoryRouterProps as y, type NavigateProps as z };
+export { createRoutesFromElements as $, AwaitContextProvider as A, type BlockerFunction as B, type ClientInstrumentation as C, type RouteProps as D, type RouterProps as E, type Fetcher as F, type GetScrollPositionFunction as G, type HydrationState as H, type InstrumentRequestHandlerFunction as I, type RoutesProps as J, Await as K, type LayoutRouteProps as L, type MemoryRouterOpts as M, type NavigateOptions as N, type OutletProps as O, type PathRouteProps as P, MemoryRouter as Q, type RouterInit as R, type StaticHandler as S, Navigate as T, Outlet as U, Route as V, Router as W, RouterProvider as X, Routes as Y, createMemoryRouter as Z, createRoutesFromChildren as _, type RouterProviderProps as a, renderMatches as a0, createRouter as a1, DataRouterContext as a2, DataRouterStateContext as a3, FetchersContext as a4, LocationContext as a5, NavigationContext as a6, RouteContext as a7, ViewTransitionContext as a8, hydrationRouteProperties as a9, mapRouteProperties as aa, WithComponentProps as ab, withComponentProps as ac, WithHydrateFallbackProps as ad, withHydrateFallbackProps as ae, WithErrorBoundaryProps as af, withErrorBoundaryProps as ag, type FutureConfig as ah, type CreateStaticHandlerOptions as ai, type ClientOnErrorFunction as b, type Router$1 as c, type NavigationStates as d, type Blocker as e, type RelativeRoutingType as f, type Navigation as g, type RouterState as h, type GetScrollRestorationKeyFunction as i, type StaticHandlerContext as j, type RouterSubscriber as k, type RouterNavigateOptions as l, type RouterFetchOptions as m, type RevalidationState as n, type ServerInstrumentation as o, type InstrumentRouterFunction as p, type InstrumentRouteFunction as q, type InstrumentationHandlerResult as r, IDLE_NAVIGATION as s, IDLE_FETCHER as t, IDLE_BLOCKER as u, type Navigator as v, type AwaitProps as w, type IndexRouteProps as x, type MemoryRouterProps as y, type NavigateProps as z };

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { a as RouterProviderProps$1, R as RouterInit, C as ClientInstrumentation, b as ClientOnErrorFunction } from './context-BQs41HrG.mjs';
-export { D as unstable_DecodeActionFunction, a as unstable_DecodeFormStateFunction, b as unstable_DecodeReplyFunction, R as unstable_RSCHydratedRouter, d as unstable_RSCManifestPayload, e as unstable_RSCPayload, f as unstable_RSCRenderPayload, c as unstable_createCallServer } from './browser-CRsXgNrY.mjs';
+import { a as RouterProviderProps$1, R as RouterInit, C as ClientInstrumentation, b as ClientOnErrorFunction } from './context-ByvtofY2.mjs';
+export { D as unstable_DecodeActionFunction, a as unstable_DecodeFormStateFunction, b as unstable_DecodeReplyFunction, R as unstable_RSCHydratedRouter, d as unstable_RSCManifestPayload, e as unstable_RSCPayload, f as unstable_RSCRenderPayload, c as unstable_createCallServer } from './browser-3AnU12UI.mjs';
 import './data-BVUf681J.mjs';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;

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

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { RouterProviderProps as RouterProviderProps$1, RouterInit, ClientOnErrorFunction } from 'react-router';
-import { C as ClientInstrumentation } from './instrumentation-DlJ2QV7d.js';
-export { D as unstable_DecodeActionFunction, a as unstable_DecodeFormStateFunction, b as unstable_DecodeReplyFunction, R as unstable_RSCHydratedRouter, d as unstable_RSCManifestPayload, e as unstable_RSCPayload, f as unstable_RSCRenderPayload, c as unstable_createCallServer } from './browser-wDl1FZEL.js';
+import { C as ClientInstrumentation } from './instrumentation-cRWWLfsU.js';
+export { D as unstable_DecodeActionFunction, a as unstable_DecodeFormStateFunction, b as unstable_DecodeReplyFunction, R as unstable_RSCHydratedRouter, d as unstable_RSCManifestPayload, e as unstable_RSCPayload, f as unstable_RSCRenderPayload, c as unstable_createCallServer } from './browser-BOdXz9dK.js';
 import './data-BqZ2x964.js';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;

package/dist/development/dom-export.js

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }/**
- * react-router v7.15.0
+ * react-router v7.15.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -13,7 +13,7 @@
 
 
 
-var _chunk2D5H3HU3js = require('./chunk-2D5H3HU3.js');
+var _chunk4YRVXM2Ujs = require('./chunk-4YRVXM2U.js');
 
 
 
@@ -34,7 +34,7 @@ var _chunk2D5H3HU3js = require('./chunk-2D5H3HU3.js');
 
 
 
-var _chunkAM3XM4LSjs = require('./chunk-AM3XM4LS.js');
+var _chunkD6LUOGOQjs = require('./chunk-D6LUOGOQ.js');
 
 // lib/dom-export/dom-router-provider.tsx
 var _react = require('react'); var React = _interopRequireWildcard(_react); var React2 = _interopRequireWildcard(_react); var React3 = _interopRequireWildcard(_react);
@@ -214,7 +214,7 @@ function HydratedRouter(props) {
   }, []);
   React2.useEffect(() => {
     if (process.env.NODE_ENV === "development" && criticalCss === void 0) {
-      document.querySelectorAll(`[${_chunkAM3XM4LSjs.CRITICAL_CSS_DATA_ATTRIBUTE}]`).forEach((element) => element.remove());
+      document.querySelectorAll(`[${_chunkD6LUOGOQjs.CRITICAL_CSS_DATA_ATTRIBUTE}]`).forEach((element) => element.remove());
     }
   }, [criticalCss]);
   let [location2, setLocation] = React2.useState(router.state.location);
@@ -393,7 +393,7 @@ function createRouterFromPayload({
     };
   if (payload.type !== "render") throw new Error("Invalid payload type");
   globalVar.__reactRouterRouteModules = _nullishCoalesce(globalVar.__reactRouterRouteModules, () => ( {}));
-  _chunk2D5H3HU3js.populateRSCRouteModules.call(void 0, globalVar.__reactRouterRouteModules, payload.matches);
+  _chunk4YRVXM2Ujs.populateRSCRouteModules.call(void 0, globalVar.__reactRouterRouteModules, payload.matches);
   let routes = payload.matches.reduceRight((previous, match) => {
     const route = createRouteFromServerManifest(
       match,
@@ -407,12 +407,12 @@ function createRouterFromPayload({
     return [route];
   }, []);
   let applyPatchesPromise;
-  globalVar.__reactRouterDataRouter = _chunkAM3XM4LSjs.createRouter.call(void 0, {
+  globalVar.__reactRouterDataRouter = _chunkD6LUOGOQjs.createRouter.call(void 0, {
     routes,
     getContext,
     basename: payload.basename,
-    history: _chunkAM3XM4LSjs.createBrowserHistory.call(void 0, ),
-    hydrationData: _chunk2D5H3HU3js.getHydrationData.call(void 0, {
+    history: _chunkD6LUOGOQjs.createBrowserHistory.call(void 0, ),
+    hydrationData: _chunk4YRVXM2Ujs.getHydrationData.call(void 0, {
       state: {
         loaderData: payload.loaderData,
         actionData: payload.actionData,
@@ -421,7 +421,7 @@ function createRouterFromPayload({
       routes,
       getRouteInfo: (routeId) => {
         let match = payload.matches.find((m) => m.id === routeId);
-        _chunkAM3XM4LSjs.invariant.call(void 0, match, "Route not found in payload");
+        _chunkD6LUOGOQjs.invariant.call(void 0, match, "Route not found in payload");
         return {
           clientLoader: match.clientLoader,
           hasLoader: match.hasLoader,
@@ -536,9 +536,9 @@ function createRouterFromPayload({
     routeModules: globalVar.__reactRouterRouteModules
   };
 }
-var renderedRoutesContext = _chunkAM3XM4LSjs.createContext.call(void 0, );
+var renderedRoutesContext = _chunkD6LUOGOQjs.createContext.call(void 0, );
 function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, createFromReadableStream, fetchImplementation) {
-  let dataStrategy = _chunkAM3XM4LSjs.getSingleFetchDataStrategyImpl.call(void 0, 
+  let dataStrategy = _chunkD6LUOGOQjs.getSingleFetchDataStrategyImpl.call(void 0, 
     getRouter,
     (match) => {
       let M = match;
@@ -595,20 +595,20 @@ function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, createFromReada
 function getFetchAndDecodeViaRSC(createFromReadableStream, fetchImplementation) {
   return async (args, basename, trailingSlashAware, targetRoutes) => {
     let { request, context } = args;
-    let url = _chunkAM3XM4LSjs.singleFetchUrl.call(void 0, request.url, basename, trailingSlashAware, "rsc");
+    let url = _chunkD6LUOGOQjs.singleFetchUrl.call(void 0, request.url, basename, trailingSlashAware, "rsc");
     if (request.method === "GET") {
-      url = _chunkAM3XM4LSjs.stripIndexParam.call(void 0, url);
+      url = _chunkD6LUOGOQjs.stripIndexParam.call(void 0, url);
       if (targetRoutes) {
         url.searchParams.set("_routes", targetRoutes.join(","));
       }
     }
     let res = await fetchImplementation(
-      new Request(url, await _chunkAM3XM4LSjs.createRequestInit.call(void 0, request))
+      new Request(url, await _chunkD6LUOGOQjs.createRequestInit.call(void 0, request))
     );
     if (res.status >= 400 && !res.headers.has("X-Remix-Response")) {
-      throw new (0, _chunkAM3XM4LSjs.ErrorResponseImpl)(res.status, res.statusText, await res.text());
+      throw new (0, _chunkD6LUOGOQjs.ErrorResponseImpl)(res.status, res.statusText, await res.text());
     }
-    _chunkAM3XM4LSjs.invariant.call(void 0, res.body, "No response body to decode");
+    _chunkD6LUOGOQjs.invariant.call(void 0, res.body, "No response body to decode");
     try {
       const payload = await createFromReadableStream(res.body, {
         temporaryReferences: void 0
@@ -632,7 +632,7 @@ function getFetchAndDecodeViaRSC(createFromReadableStream, fetchImplementation)
       }
       context.get(renderedRoutesContext).push(...payload.matches);
       let results = { routes: {} };
-      const dataKey = _chunkAM3XM4LSjs.isMutationMethod.call(void 0, request.method) ? "actionData" : "loaderData";
+      const dataKey = _chunkD6LUOGOQjs.isMutationMethod.call(void 0, request.method) ? "actionData" : "loaderData";
       for (let [routeId, data] of Object.entries(payload[dataKey] || {})) {
         results.routes[routeId] = { data };
       }
@@ -665,7 +665,7 @@ function RSCHydratedRouter({
     [createFromReadableStream, payload, fetchImplementation, getContext]
   );
   React3.useEffect(() => {
-    _chunkAM3XM4LSjs.setIsHydrated.call(void 0, );
+    _chunkD6LUOGOQjs.setIsHydrated.call(void 0, );
   }, []);
   React3.useLayoutEffect(() => {
     const globalVar = window;
@@ -773,8 +773,8 @@ function RSCHydratedRouter({
     },
     routeModules
   };
-  return /* @__PURE__ */ React3.createElement(_chunkAM3XM4LSjs.RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React3.createElement(_chunk2D5H3HU3js.RSCRouterGlobalErrorBoundary, { location: state.location }, /* @__PURE__ */ React3.createElement(_chunkAM3XM4LSjs.FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React3.createElement(
-    _chunkAM3XM4LSjs.RouterProvider,
+  return /* @__PURE__ */ React3.createElement(_chunkD6LUOGOQjs.RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React3.createElement(_chunk4YRVXM2Ujs.RSCRouterGlobalErrorBoundary, { location: state.location }, /* @__PURE__ */ React3.createElement(_chunkD6LUOGOQjs.FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React3.createElement(
+    _chunkD6LUOGOQjs.RouterProvider,
     {
       router: transitionEnabledRouter,
       flushSync: ReactDOM2.flushSync
@@ -790,8 +790,8 @@ function createRouteFromServerManifest(match, payload) {
   // the server loader flow regardless of whether the client loader calls
   // `serverLoader` or not, otherwise we'll have nothing to render.
   match.hasComponent && !match.element;
-  _chunkAM3XM4LSjs.invariant.call(void 0, window.__reactRouterRouteModules);
-  _chunk2D5H3HU3js.populateRSCRouteModules.call(void 0, window.__reactRouterRouteModules, match);
+  _chunkD6LUOGOQjs.invariant.call(void 0, window.__reactRouterRouteModules);
+  _chunk4YRVXM2Ujs.populateRSCRouteModules.call(void 0, window.__reactRouterRouteModules, match);
   let dataRoute = {
     id: match.id,
     element: match.element,
@@ -801,30 +801,28 @@ function createRouteFromServerManifest(match, payload) {
     hydrateFallbackElement: match.hydrateFallbackElement,
     index: match.index,
     loader: match.clientLoader ? async (args, singleFetch) => {
-      try {
-        let result = await match.clientLoader({
-          ...args,
-          serverLoader: () => {
-            preventInvalidServerHandlerCall(
-              "loader",
-              match.id,
-              match.hasLoader
-            );
-            if (isHydrationRequest) {
-              if (hasInitialData) {
-                return initialData;
-              }
-              if (hasInitialError) {
-                throw initialError;
-              }
+      let _isHydrationRequest = isHydrationRequest;
+      isHydrationRequest = false;
+      let result = await match.clientLoader({
+        ...args,
+        serverLoader: () => {
+          preventInvalidServerHandlerCall(
+            "loader",
+            match.id,
+            match.hasLoader
+          );
+          if (_isHydrationRequest) {
+            if (hasInitialData) {
+              return initialData;
+            }
+            if (hasInitialError) {
+              throw initialError;
             }
-            return callSingleFetch(singleFetch);
           }
-        });
-        return result;
-      } finally {
-        isHydrationRequest = false;
-      }
+          return callSingleFetch(singleFetch);
+        }
+      });
+      return result;
     } : (
       // We always make the call in this RSC world since even if we don't
       // have a `loader` we may need to get the `element` implementation
@@ -841,7 +839,7 @@ function createRouteFromServerManifest(match, payload) {
         return await callSingleFetch(singleFetch);
       }
     }) : match.hasAction ? (_, singleFetch) => callSingleFetch(singleFetch) : () => {
-      throw _chunkAM3XM4LSjs.noActionDefinedError.call(void 0, "action", match.id);
+      throw _chunkD6LUOGOQjs.noActionDefinedError.call(void 0, "action", match.id);
     },
     path: match.path,
     shouldRevalidate: match.shouldRevalidate,
@@ -853,7 +851,7 @@ function createRouteFromServerManifest(match, payload) {
     hasClientAction: match.clientAction != null
   };
   if (typeof dataRoute.loader === "function") {
-    dataRoute.loader.hydrate = _chunkAM3XM4LSjs.shouldHydrateRouteLoader.call(void 0, 
+    dataRoute.loader.hydrate = _chunkD6LUOGOQjs.shouldHydrateRouteLoader.call(void 0, 
       match.id,
       match.clientLoader,
       match.hasLoader,
@@ -863,7 +861,7 @@ function createRouteFromServerManifest(match, payload) {
   return dataRoute;
 }
 function callSingleFetch(singleFetch) {
-  _chunkAM3XM4LSjs.invariant.call(void 0, typeof singleFetch === "function", "Invalid singleFetch parameter");
+  _chunkD6LUOGOQjs.invariant.call(void 0, typeof singleFetch === "function", "Invalid singleFetch parameter");
   return singleFetch();
 }
 function preventInvalidServerHandlerCall(type, routeId, hasHandler) {
@@ -871,7 +869,7 @@ function preventInvalidServerHandlerCall(type, routeId, hasHandler) {
     let fn = type === "action" ? "serverAction()" : "serverLoader()";
     let msg = `You are trying to call ${fn} on a route that does not have a server ${type} (routeId: "${routeId}")`;
     console.error(msg);
-    throw new (0, _chunkAM3XM4LSjs.ErrorResponseImpl)(400, "Bad Request", new Error(msg), true);
+    throw new (0, _chunkD6LUOGOQjs.ErrorResponseImpl)(400, "Bad Request", new Error(msg), true);
   }
 }
 var nextPaths = /* @__PURE__ */ new Set();
@@ -898,7 +896,7 @@ async function fetchAndApplyManifestPatches(paths, createFromReadableStream, fet
   if (url == null) {
     return;
   }
-  if (url.toString().length > _chunkAM3XM4LSjs.URL_LIMIT) {
+  if (url.toString().length > _chunkD6LUOGOQjs.URL_LIMIT) {
     nextPaths.clear();
     return;
   }
@@ -943,7 +941,7 @@ function isExternalLocation(location2) {
 }
 function hasInvalidProtocol(location2) {
   try {
-    return _chunkAM3XM4LSjs.invalidProtocols.includes(new URL(location2).protocol);
+    return _chunkD6LUOGOQjs.invalidProtocols.includes(new URL(location2).protocol);
   } catch (e2) {
     return false;
   }

package/dist/development/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.15.0
+ * react-router v7.15.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -14,7 +14,7 @@ import {
   deserializeErrors,
   getHydrationData,
   populateRSCRouteModules
-} from "./chunk-RMD3H4O3.mjs";
+} from "./chunk-RJYABSBD.mjs";
 import {
   CRITICAL_CSS_DATA_ATTRIBUTE,
   ErrorResponseImpl,
@@ -44,7 +44,7 @@ import {
   singleFetchUrl,
   stripIndexParam,
   useFogOFWarDiscovery
-} from "./chunk-5KNZJZUH.mjs";
+} from "./chunk-4N6VE7H7.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";
@@ -793,30 +793,28 @@ function createRouteFromServerManifest(match, payload) {
     hydrateFallbackElement: match.hydrateFallbackElement,
     index: match.index,
     loader: match.clientLoader ? async (args, singleFetch) => {
-      try {
-        let result = await match.clientLoader({
-          ...args,
-          serverLoader: () => {
-            preventInvalidServerHandlerCall(
-              "loader",
-              match.id,
-              match.hasLoader
-            );
-            if (isHydrationRequest) {
-              if (hasInitialData) {
-                return initialData;
-              }
-              if (hasInitialError) {
-                throw initialError;
-              }
+      let _isHydrationRequest = isHydrationRequest;
+      isHydrationRequest = false;
+      let result = await match.clientLoader({
+        ...args,
+        serverLoader: () => {
+          preventInvalidServerHandlerCall(
+            "loader",
+            match.id,
+            match.hasLoader
+          );
+          if (_isHydrationRequest) {
+            if (hasInitialData) {
+              return initialData;
+            }
+            if (hasInitialError) {
+              throw initialError;
             }
-            return callSingleFetch(singleFetch);
           }
-        });
-        return result;
-      } finally {
-        isHydrationRequest = false;
-      }
+          return callSingleFetch(singleFetch);
+        }
+      });
+      return result;
     } : (
       // We always make the call in this RSC world since even if we don't
       // have a `loader` we may need to get the `element` implementation

package/dist/{production/index-react-server-client-CSv-KZBk.d.ts → development/index-react-server-client-BS5F89FR.d.ts}

@@ -1,4 +1,4 @@
-import { l as ServerInstrumentation, H as HydrationState, f as StaticHandlerContext, c as RelativeRoutingType, a as Router$1, d as RouterState, R as RouterInit, t as FutureConfig$1, C as ClientInstrumentation, e as GetScrollRestorationKeyFunction, F as Fetcher, B as BlockerFunction, u as CreateStaticHandlerOptions$1, S as StaticHandler } from './instrumentation-DlJ2QV7d.js';
+import { l as ServerInstrumentation, H as HydrationState, g as StaticHandlerContext, c as RelativeRoutingType, a as Router$1, e as RouterState, R as RouterInit, t as FutureConfig$1, C as ClientInstrumentation, f as GetScrollRestorationKeyFunction, F as Fetcher, B as BlockerFunction, u as CreateStaticHandlerOptions$1, S as StaticHandler } from './instrumentation-cRWWLfsU.js';
 import * as React from 'react';
 import { p as RouteManifest, aE as ServerRouteModule, t as MiddlewareEnabled, c as RouterContextProvider, u as AppLoadContext, s as LoaderFunctionArgs, a0 as ActionFunctionArgs, O as RouteModules, n as DataRouteObject, a as ClientLoaderFunction, o as RouteBranch, aF as TrackedPromise, f as History, T as To, L as Location, i as Action, ac as RouteMatch, Y as InitialEntry, _ as NonIndexRouteObject, a7 as LazyRouteFunction, Z as IndexRouteObject, P as Params, l as DataStrategyFunction, m as PatchRoutesOnNavigationFunction, e as RouteObject, U as UIMatch, q as HTMLFormMethod, F as FormEncType, av as PageLinkDescriptor, Q as SerializeFrom } from './data-BqZ2x964.js';
 
@@ -3146,7 +3146,7 @@ declare function useSubmit(): SubmitFunction;
  * This is used internally by {@link Form} to resolve the `action` to the closest
  * route, but can be used generically as well.
  *
- * @example
+ * ```ts
  * import { useFormAction } from "react-router";
  *
  * function SomeComponent() {
@@ -3156,6 +3156,14 @@ declare function useSubmit(): SubmitFunction;
  *   // closest route URL + "destroy"
  *   let destroyAction = useFormAction("destroy");
  * }
+ * ```
+ *
+ * <docs-info>This hook adds a `basename` if your app specifies one, so that it
+ * can be used with raw `<form>` elements in a progressively enhanced way.  If
+ * you are using this to provide an `action` to `<Form>` or `fetcher.submit`, you
+ * will need to remove the `basename` since both of those will prepend it
+ * internally.</docs-info>
+ *
  *
  * @public
  * @category Hooks

package/dist/{production/index-react-server-client-Ck_yZ1qL.d.mts → development/index-react-server-client-DY04-103.d.mts}

@@ -1,4 +1,4 @@
-import { o as ServerInstrumentation, H as HydrationState, i as StaticHandlerContext, e as RelativeRoutingType, h as GetScrollRestorationKeyFunction, R as RouterInit, ah as FutureConfig$1, C as ClientInstrumentation, N as NavigateOptions, F as Fetcher, c as Router, B as BlockerFunction, ai as CreateStaticHandlerOptions$1, S as StaticHandler } from './context-BQs41HrG.mjs';
+import { o as ServerInstrumentation, H as HydrationState, j as StaticHandlerContext, f as RelativeRoutingType, i as GetScrollRestorationKeyFunction, R as RouterInit, ah as FutureConfig$1, C as ClientInstrumentation, N as NavigateOptions, F as Fetcher, c as Router, B as BlockerFunction, ai as CreateStaticHandlerOptions$1, S as StaticHandler } from './context-ByvtofY2.mjs';
 import * as React from 'react';
 import { J as RouteManifest, aF as ServerRouteModule, p as MiddlewareEnabled, c as RouterContextProvider, q as AppLoadContext, o as LoaderFunctionArgs, a3 as ActionFunctionArgs, Z as RouteModules, E as DataRouteObject, a as ClientLoaderFunction, I as RouteBranch, m as HTMLFormMethod, n as FormEncType, aw as PageLinkDescriptor, T as To, s as History, z as DataStrategyFunction, B as PatchRoutesOnNavigationFunction, r as RouteObject, _ as SerializeFrom, L as Location } from './data-BVUf681J.mjs';
 
@@ -2091,7 +2091,7 @@ declare function useSubmit(): SubmitFunction;
  * This is used internally by {@link Form} to resolve the `action` to the closest
  * route, but can be used generically as well.
  *
- * @example
+ * ```ts
  * import { useFormAction } from "react-router";
  *
  * function SomeComponent() {
@@ -2101,6 +2101,14 @@ declare function useSubmit(): SubmitFunction;
  *   // closest route URL + "destroy"
  *   let destroyAction = useFormAction("destroy");
  * }
+ * ```
+ *
+ * <docs-info>This hook adds a `basename` if your app specifies one, so that it
+ * can be used with raw `<form>` elements in a progressively enhanced way.  If
+ * you are using this to provide an `action` to `<Form>` or `fetcher.submit`, you
+ * will need to remove the `basename` since both of those will prepend it
+ * internally.</docs-info>
+ *
  *
  * @public
  * @category Hooks

package/dist/development/index-react-server-client.d.mts

@@ -1,4 +1,4 @@
-export { Q as MemoryRouter, T as Navigate, U as Outlet, V as Route, W as Router, X as RouterProvider, Y as Routes, A as UNSAFE_AwaitContextProvider, ab as UNSAFE_WithComponentProps, af as UNSAFE_WithErrorBoundaryProps, ad as UNSAFE_WithHydrateFallbackProps } from './context-BQs41HrG.mjs';
-export { l as BrowserRouter, q as Form, m as HashRouter, n as Link, X as Links, W as Meta, p as NavLink, r as ScrollRestoration, T as StaticRouter, V as StaticRouterProvider, o as unstable_HistoryRouter } from './index-react-server-client-Ck_yZ1qL.mjs';
+export { Q as MemoryRouter, T as Navigate, U as Outlet, V as Route, W as Router, X as RouterProvider, Y as Routes, A as UNSAFE_AwaitContextProvider, ab as UNSAFE_WithComponentProps, af as UNSAFE_WithErrorBoundaryProps, ad as UNSAFE_WithHydrateFallbackProps } from './context-ByvtofY2.mjs';
+export { l as BrowserRouter, q as Form, m as HashRouter, n as Link, X as Links, W as Meta, p as NavLink, r as ScrollRestoration, T as StaticRouter, V as StaticRouterProvider, o as unstable_HistoryRouter } from './index-react-server-client-DY04-103.mjs';
 import './data-BVUf681J.mjs';
 import 'react';

package/dist/development/index-react-server-client.d.ts

@@ -1,4 +1,4 @@
-export { W as BrowserRouter, $ as Form, X as HashRouter, Y as Link, an as Links, j as MemoryRouter, am as Meta, _ as NavLink, k as Navigate, l as Outlet, m as Route, n as Router, o as RouterProvider, p as Routes, a0 as ScrollRestoration, ak as StaticRouter, al as StaticRouterProvider, b as UNSAFE_AwaitContextProvider, aH as UNSAFE_WithComponentProps, aL as UNSAFE_WithErrorBoundaryProps, aJ as UNSAFE_WithHydrateFallbackProps, Z as unstable_HistoryRouter } from './index-react-server-client-CSv-KZBk.js';
-import './instrumentation-DlJ2QV7d.js';
+export { W as BrowserRouter, $ as Form, X as HashRouter, Y as Link, an as Links, j as MemoryRouter, am as Meta, _ as NavLink, k as Navigate, l as Outlet, m as Route, n as Router, o as RouterProvider, p as Routes, a0 as ScrollRestoration, ak as StaticRouter, al as StaticRouterProvider, b as UNSAFE_AwaitContextProvider, aH as UNSAFE_WithComponentProps, aL as UNSAFE_WithErrorBoundaryProps, aJ as UNSAFE_WithHydrateFallbackProps, Z as unstable_HistoryRouter } from './index-react-server-client-BS5F89FR.js';
+import './instrumentation-cRWWLfsU.js';
 import './data-BqZ2x964.js';
 import 'react';

package/dist/development/index-react-server-client.js

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});/**
- * react-router v7.15.0
+ * react-router v7.15.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -19,7 +19,7 @@
 
 
 
-var _chunkZ5YQYACEjs = require('./chunk-Z5YQYACE.js');
+var _chunk66UKHEGQjs = require('./chunk-66UKHEGQ.js');
 
 
 
@@ -34,7 +34,7 @@ var _chunkZ5YQYACEjs = require('./chunk-Z5YQYACE.js');
 
 
 
-var _chunkAM3XM4LSjs = require('./chunk-AM3XM4LS.js');
+var _chunkD6LUOGOQjs = require('./chunk-D6LUOGOQ.js');
 
 
 
@@ -58,4 +58,4 @@ var _chunkAM3XM4LSjs = require('./chunk-AM3XM4LS.js');
 
 
 
-exports.BrowserRouter = _chunkZ5YQYACEjs.BrowserRouter; exports.Form = _chunkZ5YQYACEjs.Form; exports.HashRouter = _chunkZ5YQYACEjs.HashRouter; exports.Link = _chunkZ5YQYACEjs.Link; exports.Links = _chunkAM3XM4LSjs.Links; exports.MemoryRouter = _chunkAM3XM4LSjs.MemoryRouter; exports.Meta = _chunkAM3XM4LSjs.Meta; exports.NavLink = _chunkZ5YQYACEjs.NavLink; exports.Navigate = _chunkAM3XM4LSjs.Navigate; exports.Outlet = _chunkAM3XM4LSjs.Outlet; exports.Route = _chunkAM3XM4LSjs.Route; exports.Router = _chunkAM3XM4LSjs.Router; exports.RouterProvider = _chunkAM3XM4LSjs.RouterProvider; exports.Routes = _chunkAM3XM4LSjs.Routes; exports.ScrollRestoration = _chunkZ5YQYACEjs.ScrollRestoration; exports.StaticRouter = _chunkZ5YQYACEjs.StaticRouter; exports.StaticRouterProvider = _chunkZ5YQYACEjs.StaticRouterProvider; exports.UNSAFE_AwaitContextProvider = _chunkAM3XM4LSjs.AwaitContextProvider; exports.UNSAFE_WithComponentProps = _chunkAM3XM4LSjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunkAM3XM4LSjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunkAM3XM4LSjs.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunkZ5YQYACEjs.HistoryRouter;
+exports.BrowserRouter = _chunk66UKHEGQjs.BrowserRouter; exports.Form = _chunk66UKHEGQjs.Form; exports.HashRouter = _chunk66UKHEGQjs.HashRouter; exports.Link = _chunk66UKHEGQjs.Link; exports.Links = _chunkD6LUOGOQjs.Links; exports.MemoryRouter = _chunkD6LUOGOQjs.MemoryRouter; exports.Meta = _chunkD6LUOGOQjs.Meta; exports.NavLink = _chunk66UKHEGQjs.NavLink; exports.Navigate = _chunkD6LUOGOQjs.Navigate; exports.Outlet = _chunkD6LUOGOQjs.Outlet; exports.Route = _chunkD6LUOGOQjs.Route; exports.Router = _chunkD6LUOGOQjs.Router; exports.RouterProvider = _chunkD6LUOGOQjs.RouterProvider; exports.Routes = _chunkD6LUOGOQjs.Routes; exports.ScrollRestoration = _chunk66UKHEGQjs.ScrollRestoration; exports.StaticRouter = _chunk66UKHEGQjs.StaticRouter; exports.StaticRouterProvider = _chunk66UKHEGQjs.StaticRouterProvider; exports.UNSAFE_AwaitContextProvider = _chunkD6LUOGOQjs.AwaitContextProvider; exports.UNSAFE_WithComponentProps = _chunkD6LUOGOQjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunkD6LUOGOQjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunkD6LUOGOQjs.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunk66UKHEGQjs.HistoryRouter;

package/dist/development/index-react-server-client.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.15.0
+ * react-router v7.15.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -32,7 +32,7 @@ import {
   WithComponentProps,
   WithErrorBoundaryProps,
   WithHydrateFallbackProps
-} from "./chunk-5KNZJZUH.mjs";
+} from "./chunk-4N6VE7H7.mjs";
 export {
   BrowserRouter,
   Form,