react-router 7.15.0 → 7.16.0

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

@@ -1,4 +1,4 @@
-import { m as HTMLFormMethod, n as FormEncType, o as LoaderFunctionArgs, p as MiddlewareEnabled, c as RouterContextProvider, q as AppLoadContext, r as RouteObject, s as History, t as MaybePromise, u as MapRoutePropertiesFunction, v as Action, L as Location, w as DataRouteMatch, x as Submission, y as RouteData, z as DataStrategyFunction, B as PatchRoutesOnNavigationFunction, E as DataRouteObject, I as RouteBranch, J as RouteManifest, U as UIMatch, T as To, K as Path, P as Params, O as InitialEntry, Q as NonIndexRouteObject, V as LazyRouteFunction, W as IndexRouteObject, X as RouteMatch, Y as TrackedPromise } from './data-BVUf681J.mjs';
+import { m as HTMLFormMethod, n as FormEncType, o as LoaderFunctionArgs, p as MiddlewareEnabled, c as RouterContextProvider, q as AppLoadContext, r as RouteObject, s as History, t as MaybePromise, u as MapRoutePropertiesFunction, v as Action, L as Location, w as DataRouteMatch, x as Submission, y as RouteData, z as DataStrategyFunction, B as PatchRoutesOnNavigationFunction, E as DataRouteObject, I as RouteBranch, J as RouteManifest, U as UIMatch, T as To, K as Path, P as Params, O as InitialEntry, Q as NonIndexRouteObject, V as LazyRouteFunction, W as IndexRouteObject, X as RouteMatch, Y as TrackedPromise } from './data-U8FS-wNn.mjs';
 import * as React from 'react';
 
 type ServerInstrumentation = {
@@ -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 RouterState as g, type GetScrollRestorationKeyFunction as h, type StaticHandlerContext as i, type Navigation 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/production/{data-BqZ2x964.d.ts → data-D4xhSy90.d.ts}

@@ -1693,7 +1693,7 @@ type MetaDescriptor = {
     httpEquiv: string;
     content: string;
 } | {
-    "script:ld+json": LdJsonObject;
+    "script:ld+json": LdJsonObject | LdJsonObject[];
 } | {
     tagName: "meta" | "link";
     [name: string]: string;

package/dist/{development/data-BVUf681J.d.mts → production/data-U8FS-wNn.d.mts}

@@ -1693,7 +1693,7 @@ type MetaDescriptor = {
     httpEquiv: string;
     content: string;
 } | {
-    "script:ld+json": LdJsonObject;
+    "script:ld+json": LdJsonObject | LdJsonObject[];
 } | {
     tagName: "meta" | "link";
     [name: string]: string;

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

@@ -1,7 +1,7 @@
 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 './data-BVUf681J.mjs';
+import { a as RouterProviderProps$1, R as RouterInit, C as ClientInstrumentation, b as ClientOnErrorFunction } from './context-m8rizgnE.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-nIQ4Nsyi.mjs';
+import './data-U8FS-wNn.mjs';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;
 declare function RouterProvider(props: RouterProviderProps): React.JSX.Element;

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

@@ -1,8 +1,8 @@
 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 './data-BqZ2x964.js';
+import { C as ClientInstrumentation } from './instrumentation-1q4YhLGP.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-D3uq9sI1.js';
+import './data-D4xhSy90.js';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;
 declare function RouterProvider(props: RouterProviderProps): React.JSX.Element;

package/dist/production/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.16.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -13,7 +13,7 @@
 
 
 
-var _chunk7YXKJMLNjs = require('./chunk-7YXKJMLN.js');
+var _chunkEAQNHM3Njs = require('./chunk-EAQNHM3N.js');
 
 
 
@@ -34,7 +34,7 @@ var _chunk7YXKJMLNjs = require('./chunk-7YXKJMLN.js');
 
 
 
-var _chunkLCJTIOKZjs = require('./chunk-LCJTIOKZ.js');
+var _chunkY7DNFQZPjs = require('./chunk-Y7DNFQZP.js');
 
 // lib/dom-export/dom-router-provider.tsx
 var _react = require('react'); var React = _interopRequireWildcard(_react); var React2 = _interopRequireWildcard(_react); var React3 = _interopRequireWildcard(_react);
@@ -175,7 +175,7 @@ function createHydratedRouter({
       ssrInfo.routeModules,
       ssrInfo.context.ssr,
       ssrInfo.context.basename,
-      ssrInfo.context.future.unstable_trailingSlashAwareDataRequests
+      ssrInfo.context.future.v8_trailingSlashAwareDataRequests
     ),
     patchRoutesOnNavigation: _reactrouter.UNSAFE_getPatchRoutesOnNavigationFunction.call(void 0, 
       () => router2,
@@ -214,7 +214,7 @@ function HydratedRouter(props) {
   }, []);
   React2.useEffect(() => {
     if (process.env.NODE_ENV === "development" && criticalCss === void 0) {
-      document.querySelectorAll(`[${_chunkLCJTIOKZjs.CRITICAL_CSS_DATA_ATTRIBUTE}]`).forEach((element) => element.remove());
+      document.querySelectorAll(`[${_chunkY7DNFQZPjs.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, () => ( {}));
-  _chunk7YXKJMLNjs.populateRSCRouteModules.call(void 0, globalVar.__reactRouterRouteModules, payload.matches);
+  _chunkEAQNHM3Njs.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 = _chunkLCJTIOKZjs.createRouter.call(void 0, {
+  globalVar.__reactRouterDataRouter = _chunkY7DNFQZPjs.createRouter.call(void 0, {
     routes,
     getContext,
     basename: payload.basename,
-    history: _chunkLCJTIOKZjs.createBrowserHistory.call(void 0, ),
-    hydrationData: _chunk7YXKJMLNjs.getHydrationData.call(void 0, {
+    history: _chunkY7DNFQZPjs.createBrowserHistory.call(void 0, ),
+    hydrationData: _chunkEAQNHM3Njs.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);
-        _chunkLCJTIOKZjs.invariant.call(void 0, match, "Route not found in payload");
+        _chunkY7DNFQZPjs.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 = _chunkLCJTIOKZjs.createContext.call(void 0, );
+var renderedRoutesContext = _chunkY7DNFQZPjs.createContext.call(void 0, );
 function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, createFromReadableStream, fetchImplementation) {
-  let dataStrategy = _chunkLCJTIOKZjs.getSingleFetchDataStrategyImpl.call(void 0, 
+  let dataStrategy = _chunkY7DNFQZPjs.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 = _chunkLCJTIOKZjs.singleFetchUrl.call(void 0, request.url, basename, trailingSlashAware, "rsc");
+    let url = _chunkY7DNFQZPjs.singleFetchUrl.call(void 0, request.url, basename, trailingSlashAware, "rsc");
     if (request.method === "GET") {
-      url = _chunkLCJTIOKZjs.stripIndexParam.call(void 0, url);
+      url = _chunkY7DNFQZPjs.stripIndexParam.call(void 0, url);
       if (targetRoutes) {
         url.searchParams.set("_routes", targetRoutes.join(","));
       }
     }
     let res = await fetchImplementation(
-      new Request(url, await _chunkLCJTIOKZjs.createRequestInit.call(void 0, request))
+      new Request(url, await _chunkY7DNFQZPjs.createRequestInit.call(void 0, request))
     );
     if (res.status >= 400 && !res.headers.has("X-Remix-Response")) {
-      throw new (0, _chunkLCJTIOKZjs.ErrorResponseImpl)(res.status, res.statusText, await res.text());
+      throw new (0, _chunkY7DNFQZPjs.ErrorResponseImpl)(res.status, res.statusText, await res.text());
     }
-    _chunkLCJTIOKZjs.invariant.call(void 0, res.body, "No response body to decode");
+    _chunkY7DNFQZPjs.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 = _chunkLCJTIOKZjs.isMutationMethod.call(void 0, request.method) ? "actionData" : "loaderData";
+      const dataKey = _chunkY7DNFQZPjs.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(() => {
-    _chunkLCJTIOKZjs.setIsHydrated.call(void 0, );
+    _chunkY7DNFQZPjs.setIsHydrated.call(void 0, );
   }, []);
   React3.useLayoutEffect(() => {
     const globalVar = window;
@@ -750,7 +750,7 @@ function RSCHydratedRouter({
       // These flags have no runtime impact so can always be false.  If we add
       // flags that drive runtime behavior they'll need to be proxied through.
       v8_middleware: false,
-      unstable_trailingSlashAwareDataRequests: true,
+      v8_trailingSlashAwareDataRequests: true,
       // always on for RSC
       v8_passThroughRequests: true
       // always on for RSC
@@ -773,8 +773,8 @@ function RSCHydratedRouter({
     },
     routeModules
   };
-  return /* @__PURE__ */ React3.createElement(_chunkLCJTIOKZjs.RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React3.createElement(_chunk7YXKJMLNjs.RSCRouterGlobalErrorBoundary, { location: state.location }, /* @__PURE__ */ React3.createElement(_chunkLCJTIOKZjs.FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React3.createElement(
-    _chunkLCJTIOKZjs.RouterProvider,
+  return /* @__PURE__ */ React3.createElement(_chunkY7DNFQZPjs.RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React3.createElement(_chunkEAQNHM3Njs.RSCRouterGlobalErrorBoundary, { location: state.location }, /* @__PURE__ */ React3.createElement(_chunkY7DNFQZPjs.FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React3.createElement(
+    _chunkY7DNFQZPjs.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;
-  _chunkLCJTIOKZjs.invariant.call(void 0, window.__reactRouterRouteModules);
-  _chunk7YXKJMLNjs.populateRSCRouteModules.call(void 0, window.__reactRouterRouteModules, match);
+  _chunkY7DNFQZPjs.invariant.call(void 0, window.__reactRouterRouteModules);
+  _chunkEAQNHM3Njs.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 _chunkLCJTIOKZjs.noActionDefinedError.call(void 0, "action", match.id);
+      throw _chunkY7DNFQZPjs.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 = _chunkLCJTIOKZjs.shouldHydrateRouteLoader.call(void 0, 
+    dataRoute.loader.hydrate = _chunkY7DNFQZPjs.shouldHydrateRouteLoader.call(void 0, 
       match.id,
       match.clientLoader,
       match.hasLoader,
@@ -863,7 +861,7 @@ function createRouteFromServerManifest(match, payload) {
   return dataRoute;
 }
 function callSingleFetch(singleFetch) {
-  _chunkLCJTIOKZjs.invariant.call(void 0, typeof singleFetch === "function", "Invalid singleFetch parameter");
+  _chunkY7DNFQZPjs.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, _chunkLCJTIOKZjs.ErrorResponseImpl)(400, "Bad Request", new Error(msg), true);
+    throw new (0, _chunkY7DNFQZPjs.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 > _chunkLCJTIOKZjs.URL_LIMIT) {
+  if (url.toString().length > _chunkY7DNFQZPjs.URL_LIMIT) {
     nextPaths.clear();
     return;
   }
@@ -943,7 +941,7 @@ function isExternalLocation(location2) {
 }
 function hasInvalidProtocol(location2) {
   try {
-    return _chunkLCJTIOKZjs.invalidProtocols.includes(new URL(location2).protocol);
+    return _chunkY7DNFQZPjs.invalidProtocols.includes(new URL(location2).protocol);
   } catch (e2) {
     return false;
   }

package/dist/production/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.15.0
+ * react-router v7.16.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -14,7 +14,7 @@ import {
   deserializeErrors,
   getHydrationData,
   populateRSCRouteModules
-} from "./chunk-23ZOHYE5.mjs";
+} from "./chunk-NALGHHKE.mjs";
 import {
   CRITICAL_CSS_DATA_ATTRIBUTE,
   ErrorResponseImpl,
@@ -44,7 +44,7 @@ import {
   singleFetchUrl,
   stripIndexParam,
   useFogOFWarDiscovery
-} from "./chunk-GM3PW4GX.mjs";
+} from "./chunk-Q65P7S7Y.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";
@@ -167,7 +167,7 @@ function createHydratedRouter({
       ssrInfo.routeModules,
       ssrInfo.context.ssr,
       ssrInfo.context.basename,
-      ssrInfo.context.future.unstable_trailingSlashAwareDataRequests
+      ssrInfo.context.future.v8_trailingSlashAwareDataRequests
     ),
     patchRoutesOnNavigation: getPatchRoutesOnNavigationFunction(
       () => router2,
@@ -742,7 +742,7 @@ function RSCHydratedRouter({
       // These flags have no runtime impact so can always be false.  If we add
       // flags that drive runtime behavior they'll need to be proxied through.
       v8_middleware: false,
-      unstable_trailingSlashAwareDataRequests: true,
+      v8_trailingSlashAwareDataRequests: true,
       // always on for RSC
       v8_passThroughRequests: true
       // always on for RSC
@@ -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/{development/index-react-server-client-CSv-KZBk.d.ts → production/index-react-server-client-BLiUx67a.d.ts}

@@ -1,6 +1,6 @@
-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, 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-1q4YhLGP.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';
+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-D4xhSy90.js';
 
 type ServerRouteManifest = RouteManifest<Omit<ServerRoute, "children">>;
 interface ServerRoute extends Route$1 {
@@ -125,7 +125,7 @@ interface EntryContext extends FrameworkContextObject {
 }
 interface FutureConfig {
     v8_passThroughRequests: boolean;
-    unstable_trailingSlashAwareDataRequests: boolean;
+    v8_trailingSlashAwareDataRequests: boolean;
     v8_middleware: boolean;
 }
 type CriticalCss = string | {
@@ -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/{development/index-react-server-client-Ck_yZ1qL.d.mts → production/index-react-server-client-CdKROblb.d.mts}

@@ -1,6 +1,6 @@
-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, i as StaticHandlerContext, f 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-m8rizgnE.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';
+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-U8FS-wNn.mjs';
 
 type ServerRouteManifest = RouteManifest<Omit<ServerRoute, "children">>;
 interface ServerRoute extends Route {
@@ -125,7 +125,7 @@ interface EntryContext extends FrameworkContextObject {
 }
 interface FutureConfig {
     v8_passThroughRequests: boolean;
-    unstable_trailingSlashAwareDataRequests: boolean;
+    v8_trailingSlashAwareDataRequests: boolean;
     v8_middleware: boolean;
 }
 type CriticalCss = string | {
@@ -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/production/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';
-import './data-BVUf681J.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-m8rizgnE.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-CdKROblb.mjs';
+import './data-U8FS-wNn.mjs';
 import 'react';

package/dist/production/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';
-import './data-BqZ2x964.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-BLiUx67a.js';
+import './instrumentation-1q4YhLGP.js';
+import './data-D4xhSy90.js';
 import 'react';

package/dist/production/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.16.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -19,7 +19,7 @@
 
 
 
-var _chunkYBQJ3ABEjs = require('./chunk-YBQJ3ABE.js');
+var _chunkSKEDDLRMjs = require('./chunk-SKEDDLRM.js');
 
 
 
@@ -34,7 +34,7 @@ var _chunkYBQJ3ABEjs = require('./chunk-YBQJ3ABE.js');
 
 
 
-var _chunkLCJTIOKZjs = require('./chunk-LCJTIOKZ.js');
+var _chunkY7DNFQZPjs = require('./chunk-Y7DNFQZP.js');
 
 
 
@@ -58,4 +58,4 @@ var _chunkLCJTIOKZjs = require('./chunk-LCJTIOKZ.js');
 
 
 
-exports.BrowserRouter = _chunkYBQJ3ABEjs.BrowserRouter; exports.Form = _chunkYBQJ3ABEjs.Form; exports.HashRouter = _chunkYBQJ3ABEjs.HashRouter; exports.Link = _chunkYBQJ3ABEjs.Link; exports.Links = _chunkLCJTIOKZjs.Links; exports.MemoryRouter = _chunkLCJTIOKZjs.MemoryRouter; exports.Meta = _chunkLCJTIOKZjs.Meta; exports.NavLink = _chunkYBQJ3ABEjs.NavLink; exports.Navigate = _chunkLCJTIOKZjs.Navigate; exports.Outlet = _chunkLCJTIOKZjs.Outlet; exports.Route = _chunkLCJTIOKZjs.Route; exports.Router = _chunkLCJTIOKZjs.Router; exports.RouterProvider = _chunkLCJTIOKZjs.RouterProvider; exports.Routes = _chunkLCJTIOKZjs.Routes; exports.ScrollRestoration = _chunkYBQJ3ABEjs.ScrollRestoration; exports.StaticRouter = _chunkYBQJ3ABEjs.StaticRouter; exports.StaticRouterProvider = _chunkYBQJ3ABEjs.StaticRouterProvider; exports.UNSAFE_AwaitContextProvider = _chunkLCJTIOKZjs.AwaitContextProvider; exports.UNSAFE_WithComponentProps = _chunkLCJTIOKZjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunkLCJTIOKZjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunkLCJTIOKZjs.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunkYBQJ3ABEjs.HistoryRouter;
+exports.BrowserRouter = _chunkSKEDDLRMjs.BrowserRouter; exports.Form = _chunkSKEDDLRMjs.Form; exports.HashRouter = _chunkSKEDDLRMjs.HashRouter; exports.Link = _chunkSKEDDLRMjs.Link; exports.Links = _chunkY7DNFQZPjs.Links; exports.MemoryRouter = _chunkY7DNFQZPjs.MemoryRouter; exports.Meta = _chunkY7DNFQZPjs.Meta; exports.NavLink = _chunkSKEDDLRMjs.NavLink; exports.Navigate = _chunkY7DNFQZPjs.Navigate; exports.Outlet = _chunkY7DNFQZPjs.Outlet; exports.Route = _chunkY7DNFQZPjs.Route; exports.Router = _chunkY7DNFQZPjs.Router; exports.RouterProvider = _chunkY7DNFQZPjs.RouterProvider; exports.Routes = _chunkY7DNFQZPjs.Routes; exports.ScrollRestoration = _chunkSKEDDLRMjs.ScrollRestoration; exports.StaticRouter = _chunkSKEDDLRMjs.StaticRouter; exports.StaticRouterProvider = _chunkSKEDDLRMjs.StaticRouterProvider; exports.UNSAFE_AwaitContextProvider = _chunkY7DNFQZPjs.AwaitContextProvider; exports.UNSAFE_WithComponentProps = _chunkY7DNFQZPjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunkY7DNFQZPjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunkY7DNFQZPjs.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunkSKEDDLRMjs.HistoryRouter;

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

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

package/dist/production/index-react-server.d.mts

@@ -1593,6 +1593,8 @@ type NavigationStates = {
     Idle: {
         state: "idle";
         location: undefined;
+        matches: undefined;
+        historyAction: undefined;
         formMethod: undefined;
         formAction: undefined;
         formEncType: undefined;
@@ -1603,6 +1605,8 @@ type NavigationStates = {
     Loading: {
         state: "loading";
         location: Location;
+        matches: DataRouteMatch[];
+        historyAction: Action;
         formMethod: Submission["formMethod"] | undefined;
         formAction: Submission["formAction"] | undefined;
         formEncType: Submission["formEncType"] | undefined;
@@ -1613,6 +1617,8 @@ type NavigationStates = {
     Submitting: {
         state: "submitting";
         location: Location;
+        matches: DataRouteMatch[];
+        historyAction: Action;
         formMethod: Submission["formMethod"];
         formAction: Submission["formAction"];
         formEncType: Submission["formEncType"];
@@ -2052,7 +2058,7 @@ type MetaDescriptor = {
     httpEquiv: string;
     content: string;
 } | {
-    "script:ld+json": LdJsonObject;
+    "script:ld+json": LdJsonObject | LdJsonObject[];
 } | {
     tagName: "meta" | "link";
     [name: string]: string;