react-router 7.16.0 → 7.18.0

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.16.0
+ * react-router v7.18.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -13,7 +13,7 @@
 
 
 
-var _chunkEAQNHM3Njs = require('./chunk-EAQNHM3N.js');
+var _chunk3Z6WS2WZjs = require('./chunk-3Z6WS2WZ.js');
 
 
 
@@ -34,7 +34,10 @@ var _chunkEAQNHM3Njs = require('./chunk-EAQNHM3N.js');
 
 
 
-var _chunkY7DNFQZPjs = require('./chunk-Y7DNFQZP.js');
+
+
+
+var _chunkIUPBOWYOjs = require('./chunk-IUPBOWYO.js');
 
 // lib/dom-export/dom-router-provider.tsx
 var _react = require('react'); var React = _interopRequireWildcard(_react); var React2 = _interopRequireWildcard(_react); var React3 = _interopRequireWildcard(_react);
@@ -62,7 +65,6 @@ function RouterProvider2(props) {
 
 
 
-
 var ssrInfo = null;
 var router = null;
 function initSsrInfo() {
@@ -147,9 +149,6 @@ function createHydratedRouter({
       basename: _optionalChain([window, 'access', _17 => _17.__reactRouterContext, 'optionalAccess', _18 => _18.basename]),
       isSpaMode: ssrInfo.context.isSpaMode
     });
-    if (hydrationData && hydrationData.errors) {
-      hydrationData.errors = _reactrouter.UNSAFE_deserializeErrors.call(void 0, hydrationData.errors);
-    }
   }
   if (window.history.state && window.history.state.masked) {
     window.history.replaceState(
@@ -214,7 +213,7 @@ function HydratedRouter(props) {
   }, []);
   React2.useEffect(() => {
     if (process.env.NODE_ENV === "development" && criticalCss === void 0) {
-      document.querySelectorAll(`[${_chunkY7DNFQZPjs.CRITICAL_CSS_DATA_ATTRIBUTE}]`).forEach((element) => element.remove());
+      document.querySelectorAll(`[${_chunkIUPBOWYOjs.CRITICAL_CSS_DATA_ATTRIBUTE}]`).forEach((element) => element.remove());
     }
   }, [criticalCss]);
   let [location2, setLocation] = React2.useState(router.state.location);
@@ -307,15 +306,16 @@ function createCallServer({
         // @ts-expect-error - Needs React 19 types
         Promise.resolve(payloadPromise).then(async (payload) => {
           if (payload.type === "redirect") {
-            if (payload.reload || isExternalLocation(payload.location)) {
-              if (hasInvalidProtocol(payload.location)) {
+            let location2 = normalizeRedirectLocation(payload.location);
+            if (payload.reload || isExternalLocation(location2)) {
+              if (_chunkIUPBOWYOjs.hasInvalidProtocol.call(void 0, location2)) {
                 throw new Error("Invalid redirect location");
               }
-              window.location.href = payload.location;
+              window.location.href = location2;
               return;
             }
             React3.startTransition(() => {
-              globalVar.__reactRouterDataRouter.navigate(payload.location, {
+              globalVar.__reactRouterDataRouter.navigate(location2, {
                 replace: payload.replace
               });
             });
@@ -327,15 +327,16 @@ function createCallServer({
           const rerender = await payload.rerender;
           if (rerender && landedActionId < actionId && globalVar.__routerActionID <= actionId) {
             if (rerender.type === "redirect") {
-              if (rerender.reload || isExternalLocation(rerender.location)) {
-                if (hasInvalidProtocol(rerender.location)) {
+              let location2 = normalizeRedirectLocation(rerender.location);
+              if (rerender.reload || isExternalLocation(location2)) {
+                if (_chunkIUPBOWYOjs.hasInvalidProtocol.call(void 0, location2)) {
                   throw new Error("Invalid redirect location");
                 }
-                window.location.href = rerender.location;
+                window.location.href = location2;
                 return;
               }
               React3.startTransition(() => {
-                globalVar.__reactRouterDataRouter.navigate(rerender.location, {
+                globalVar.__reactRouterDataRouter.navigate(location2, {
                   replace: rerender.replace
                 });
               });
@@ -393,7 +394,7 @@ function createRouterFromPayload({
     };
   if (payload.type !== "render") throw new Error("Invalid payload type");
   globalVar.__reactRouterRouteModules = _nullishCoalesce(globalVar.__reactRouterRouteModules, () => ( {}));
-  _chunkEAQNHM3Njs.populateRSCRouteModules.call(void 0, globalVar.__reactRouterRouteModules, payload.matches);
+  _chunk3Z6WS2WZjs.populateRSCRouteModules.call(void 0, globalVar.__reactRouterRouteModules, payload.matches);
   let routes = payload.matches.reduceRight((previous, match) => {
     const route = createRouteFromServerManifest(
       match,
@@ -407,12 +408,12 @@ function createRouterFromPayload({
     return [route];
   }, []);
   let applyPatchesPromise;
-  globalVar.__reactRouterDataRouter = _chunkY7DNFQZPjs.createRouter.call(void 0, {
+  globalVar.__reactRouterDataRouter = _chunkIUPBOWYOjs.createRouter.call(void 0, {
     routes,
     getContext,
     basename: payload.basename,
-    history: _chunkY7DNFQZPjs.createBrowserHistory.call(void 0, ),
-    hydrationData: _chunkEAQNHM3Njs.getHydrationData.call(void 0, {
+    history: _chunkIUPBOWYOjs.createBrowserHistory.call(void 0, ),
+    hydrationData: _chunk3Z6WS2WZjs.getHydrationData.call(void 0, {
       state: {
         loaderData: payload.loaderData,
         actionData: payload.actionData,
@@ -421,7 +422,7 @@ function createRouterFromPayload({
       routes,
       getRouteInfo: (routeId) => {
         let match = payload.matches.find((m) => m.id === routeId);
-        _chunkY7DNFQZPjs.invariant.call(void 0, match, "Route not found in payload");
+        _chunkIUPBOWYOjs.invariant.call(void 0, match, "Route not found in payload");
         return {
           clientLoader: match.clientLoader,
           hasLoader: match.hasLoader,
@@ -536,9 +537,9 @@ function createRouterFromPayload({
     routeModules: globalVar.__reactRouterRouteModules
   };
 }
-var renderedRoutesContext = _chunkY7DNFQZPjs.createContext.call(void 0, );
+var renderedRoutesContext = _chunkIUPBOWYOjs.createContext.call(void 0, );
 function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, createFromReadableStream, fetchImplementation) {
-  let dataStrategy = _chunkY7DNFQZPjs.getSingleFetchDataStrategyImpl.call(void 0, 
+  let dataStrategy = _chunkIUPBOWYOjs.getSingleFetchDataStrategyImpl.call(void 0, 
     getRouter,
     (match) => {
       let M = match;
@@ -595,20 +596,20 @@ function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, createFromReada
 function getFetchAndDecodeViaRSC(createFromReadableStream, fetchImplementation) {
   return async (args, basename, trailingSlashAware, targetRoutes) => {
     let { request, context } = args;
-    let url = _chunkY7DNFQZPjs.singleFetchUrl.call(void 0, request.url, basename, trailingSlashAware, "rsc");
+    let url = _chunkIUPBOWYOjs.singleFetchUrl.call(void 0, request.url, basename, trailingSlashAware, "rsc");
     if (request.method === "GET") {
-      url = _chunkY7DNFQZPjs.stripIndexParam.call(void 0, url);
+      url = _chunkIUPBOWYOjs.stripIndexParam.call(void 0, url);
       if (targetRoutes) {
         url.searchParams.set("_routes", targetRoutes.join(","));
       }
     }
     let res = await fetchImplementation(
-      new Request(url, await _chunkY7DNFQZPjs.createRequestInit.call(void 0, request))
+      new Request(url, await _chunkIUPBOWYOjs.createRequestInit.call(void 0, request))
     );
     if (res.status >= 400 && !res.headers.has("X-Remix-Response")) {
-      throw new (0, _chunkY7DNFQZPjs.ErrorResponseImpl)(res.status, res.statusText, await res.text());
+      throw new (0, _chunkIUPBOWYOjs.ErrorResponseImpl)(res.status, res.statusText, await res.text());
     }
-    _chunkY7DNFQZPjs.invariant.call(void 0, res.body, "No response body to decode");
+    _chunkIUPBOWYOjs.invariant.call(void 0, res.body, "No response body to decode");
     try {
       const payload = await createFromReadableStream(res.body, {
         temporaryReferences: void 0
@@ -632,7 +633,7 @@ function getFetchAndDecodeViaRSC(createFromReadableStream, fetchImplementation)
       }
       context.get(renderedRoutesContext).push(...payload.matches);
       let results = { routes: {} };
-      const dataKey = _chunkY7DNFQZPjs.isMutationMethod.call(void 0, request.method) ? "actionData" : "loaderData";
+      const dataKey = _chunkIUPBOWYOjs.isMutationMethod.call(void 0, request.method) ? "actionData" : "loaderData";
       for (let [routeId, data] of Object.entries(payload[dataKey] || {})) {
         results.routes[routeId] = { data };
       }
@@ -665,7 +666,7 @@ function RSCHydratedRouter({
     [createFromReadableStream, payload, fetchImplementation, getContext]
   );
   React3.useEffect(() => {
-    _chunkY7DNFQZPjs.setIsHydrated.call(void 0, );
+    _chunkIUPBOWYOjs.setIsHydrated.call(void 0, );
   }, []);
   React3.useLayoutEffect(() => {
     const globalVar = window;
@@ -773,8 +774,8 @@ function RSCHydratedRouter({
     },
     routeModules
   };
-  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,
+  return /* @__PURE__ */ React3.createElement(_chunkIUPBOWYOjs.RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React3.createElement(_chunk3Z6WS2WZjs.RSCRouterGlobalErrorBoundary, { location: state.location }, /* @__PURE__ */ React3.createElement(_chunkIUPBOWYOjs.FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React3.createElement(
+    _chunkIUPBOWYOjs.RouterProvider,
     {
       router: transitionEnabledRouter,
       flushSync: ReactDOM2.flushSync
@@ -790,8 +791,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;
-  _chunkY7DNFQZPjs.invariant.call(void 0, window.__reactRouterRouteModules);
-  _chunkEAQNHM3Njs.populateRSCRouteModules.call(void 0, window.__reactRouterRouteModules, match);
+  _chunkIUPBOWYOjs.invariant.call(void 0, window.__reactRouterRouteModules);
+  _chunk3Z6WS2WZjs.populateRSCRouteModules.call(void 0, window.__reactRouterRouteModules, match);
   let dataRoute = {
     id: match.id,
     element: match.element,
@@ -839,7 +840,7 @@ function createRouteFromServerManifest(match, payload) {
         return await callSingleFetch(singleFetch);
       }
     }) : match.hasAction ? (_, singleFetch) => callSingleFetch(singleFetch) : () => {
-      throw _chunkY7DNFQZPjs.noActionDefinedError.call(void 0, "action", match.id);
+      throw _chunkIUPBOWYOjs.noActionDefinedError.call(void 0, "action", match.id);
     },
     path: match.path,
     shouldRevalidate: match.shouldRevalidate,
@@ -851,7 +852,7 @@ function createRouteFromServerManifest(match, payload) {
     hasClientAction: match.clientAction != null
   };
   if (typeof dataRoute.loader === "function") {
-    dataRoute.loader.hydrate = _chunkY7DNFQZPjs.shouldHydrateRouteLoader.call(void 0, 
+    dataRoute.loader.hydrate = _chunkIUPBOWYOjs.shouldHydrateRouteLoader.call(void 0, 
       match.id,
       match.clientLoader,
       match.hasLoader,
@@ -861,7 +862,7 @@ function createRouteFromServerManifest(match, payload) {
   return dataRoute;
 }
 function callSingleFetch(singleFetch) {
-  _chunkY7DNFQZPjs.invariant.call(void 0, typeof singleFetch === "function", "Invalid singleFetch parameter");
+  _chunkIUPBOWYOjs.invariant.call(void 0, typeof singleFetch === "function", "Invalid singleFetch parameter");
   return singleFetch();
 }
 function preventInvalidServerHandlerCall(type, routeId, hasHandler) {
@@ -869,7 +870,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, _chunkY7DNFQZPjs.ErrorResponseImpl)(400, "Bad Request", new Error(msg), true);
+    throw new (0, _chunkIUPBOWYOjs.ErrorResponseImpl)(400, "Bad Request", new Error(msg), true);
   }
 }
 var nextPaths = /* @__PURE__ */ new Set();
@@ -892,11 +893,12 @@ function getManifestUrl(paths) {
   return url;
 }
 async function fetchAndApplyManifestPatches(paths, createFromReadableStream, fetchImplementation, signal) {
+  paths = _chunkIUPBOWYOjs.getPathsWithAncestors.call(void 0, paths);
   let url = getManifestUrl(paths);
   if (url == null) {
     return;
   }
-  if (url.toString().length > _chunkY7DNFQZPjs.URL_LIMIT) {
+  if (url.toString().length > _chunkIUPBOWYOjs.URL_LIMIT) {
     nextPaths.clear();
     return;
   }
@@ -939,12 +941,12 @@ function isExternalLocation(location2) {
   const newLocation = new URL(location2, window.location.href);
   return newLocation.origin !== window.location.origin;
 }
-function hasInvalidProtocol(location2) {
-  try {
-    return _chunkY7DNFQZPjs.invalidProtocols.includes(new URL(location2).protocol);
-  } catch (e2) {
-    return false;
+function normalizeRedirectLocation(location2) {
+  if (_chunkIUPBOWYOjs.PROTOCOL_RELATIVE_URL_REGEX.test(location2)) {
+    let path = _chunkIUPBOWYOjs.resolvePath.call(void 0, location2);
+    return path.pathname + path.search + path.hash;
   }
+  return location2;
 }
 function cloneRoutes(routes) {
   if (!routes) return void 0;

package/dist/production/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.16.0
+ * react-router v7.18.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -11,14 +11,14 @@
 "use client";
 import {
   RSCRouterGlobalErrorBoundary,
-  deserializeErrors,
   getHydrationData,
   populateRSCRouteModules
-} from "./chunk-NALGHHKE.mjs";
+} from "./chunk-EGOTSXNH.mjs";
 import {
   CRITICAL_CSS_DATA_ATTRIBUTE,
   ErrorResponseImpl,
   FrameworkContext,
+  PROTOCOL_RELATIVE_URL_REGEX,
   RSCRouterContext,
   RemixErrorBoundary,
   RouterProvider,
@@ -31,20 +31,22 @@ import {
   createRouter,
   decodeViaTurboStream,
   getPatchRoutesOnNavigationFunction,
+  getPathsWithAncestors,
   getSingleFetchDataStrategyImpl,
   getTurboStreamSingleFetchDataStrategy,
+  hasInvalidProtocol,
   hydrationRouteProperties,
-  invalidProtocols,
   invariant,
   isMutationMethod,
   mapRouteProperties,
   noActionDefinedError,
+  resolvePath,
   setIsHydrated,
   shouldHydrateRouteLoader,
   singleFetchUrl,
   stripIndexParam,
   useFogOFWarDiscovery
-} from "./chunk-Q65P7S7Y.mjs";
+} from "./chunk-M7NGGUU6.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";
@@ -139,9 +141,6 @@ function createHydratedRouter({
       basename: window.__reactRouterContext?.basename,
       isSpaMode: ssrInfo.context.isSpaMode
     });
-    if (hydrationData && hydrationData.errors) {
-      hydrationData.errors = deserializeErrors(hydrationData.errors);
-    }
   }
   if (window.history.state && window.history.state.masked) {
     window.history.replaceState(
@@ -299,15 +298,16 @@ function createCallServer({
         // @ts-expect-error - Needs React 19 types
         Promise.resolve(payloadPromise).then(async (payload) => {
           if (payload.type === "redirect") {
-            if (payload.reload || isExternalLocation(payload.location)) {
-              if (hasInvalidProtocol(payload.location)) {
+            let location2 = normalizeRedirectLocation(payload.location);
+            if (payload.reload || isExternalLocation(location2)) {
+              if (hasInvalidProtocol(location2)) {
                 throw new Error("Invalid redirect location");
               }
-              window.location.href = payload.location;
+              window.location.href = location2;
               return;
             }
             React3.startTransition(() => {
-              globalVar.__reactRouterDataRouter.navigate(payload.location, {
+              globalVar.__reactRouterDataRouter.navigate(location2, {
                 replace: payload.replace
               });
             });
@@ -319,15 +319,16 @@ function createCallServer({
           const rerender = await payload.rerender;
           if (rerender && landedActionId < actionId && globalVar.__routerActionID <= actionId) {
             if (rerender.type === "redirect") {
-              if (rerender.reload || isExternalLocation(rerender.location)) {
-                if (hasInvalidProtocol(rerender.location)) {
+              let location2 = normalizeRedirectLocation(rerender.location);
+              if (rerender.reload || isExternalLocation(location2)) {
+                if (hasInvalidProtocol(location2)) {
                   throw new Error("Invalid redirect location");
                 }
-                window.location.href = rerender.location;
+                window.location.href = location2;
                 return;
               }
               React3.startTransition(() => {
-                globalVar.__reactRouterDataRouter.navigate(rerender.location, {
+                globalVar.__reactRouterDataRouter.navigate(location2, {
                   replace: rerender.replace
                 });
               });
@@ -884,6 +885,7 @@ function getManifestUrl(paths) {
   return url;
 }
 async function fetchAndApplyManifestPatches(paths, createFromReadableStream, fetchImplementation, signal) {
+  paths = getPathsWithAncestors(paths);
   let url = getManifestUrl(paths);
   if (url == null) {
     return;
@@ -931,12 +933,12 @@ function isExternalLocation(location2) {
   const newLocation = new URL(location2, window.location.href);
   return newLocation.origin !== window.location.origin;
 }
-function hasInvalidProtocol(location2) {
-  try {
-    return invalidProtocols.includes(new URL(location2).protocol);
-  } catch {
-    return false;
+function normalizeRedirectLocation(location2) {
+  if (PROTOCOL_RELATIVE_URL_REGEX.test(location2)) {
+    let path = resolvePath(location2);
+    return path.pathname + path.search + path.hash;
   }
+  return location2;
 }
 function cloneRoutes(routes) {
   if (!routes) return void 0;

package/dist/{development/index-react-server-client-BLiUx67a.d.ts → production/index-react-server-client-3ykjivgQ.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-1q4YhLGP.js';
+import { l as ServerInstrumentation, H as HydrationState, e as StaticHandlerContext, c as RelativeRoutingType, a as Router$1, g as RouterState, R as RouterInit, t as FutureConfig$1, C as ClientInstrumentation, d as GetScrollRestorationKeyFunction, F as Fetcher, B as BlockerFunction, u as CreateStaticHandlerOptions$1, S as StaticHandler } from './instrumentation-Dkmpzd13.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-D4xhSy90.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-CjO11-hU.js';
 
 type ServerRouteManifest = RouteManifest<Omit<ServerRoute, "children">>;
 interface ServerRoute extends Route$1 {
@@ -106,6 +106,7 @@ interface FrameworkContextObject {
     ssr: boolean;
     isSpaMode: boolean;
     routeDiscovery: ServerBuild["routeDiscovery"];
+    nonce?: string;
     serializeError?(error: Error): SerializedError;
     renderMeta?: {
         didRenderScripts?: boolean;
@@ -346,6 +347,10 @@ interface MemoryRouterOpts {
  * in-memory [`History`](https://developer.mozilla.org/en-US/docs/Web/API/History)
  * stack. Useful for non-browser environments without a DOM API.
  *
+ * Data Routers should not be held in React state. You should create your router
+ * once outside of the React tree and pass it to {@link RouterProvider | `<RouterProvider>`}.
+ * You can use `patchRoutesOnNavigation` to add additional routes programmatically.
+ *
  * @public
  * @category Data Routers
  * @mode data
@@ -380,7 +385,9 @@ interface ClientOnErrorFunction {
  */
 interface RouterProviderProps {
     /**
-     * The {@link DataRouter} instance to use for navigation and data fetching.
+     * The {@link DataRouter} instance to use for navigation and data fetching. The
+     * router prop should be a single router instance created outside of the React
+     * tree. Avoid creating new routers during React renders/re-renders.
      */
     router: Router$1;
     /**
@@ -404,7 +411,7 @@ interface RouterProviderProps {
      * and is only present for render errors.
      *
      * ```tsx
-     * <RouterProvider onError=(error, info) => {
+     * <RouterProvider onError={(error, info) => {
      *   let { location, params, pattern, errorInfo } = info;
      *   console.error(error, location, errorInfo);
      *   reportToErrorService(error, location, errorInfo);
@@ -434,7 +441,9 @@ interface RouterProviderProps {
 }
 /**
  * Render the UI for the given {@link DataRouter}. This component should
- * typically be at the top of an app's element tree.
+ * typically be at the top of an app's element tree. The router prop should
+ * be a single router instance created outside of the React tree. Avoid
+ * creating new routers during React renders/re-renders.
  *
  * ```tsx
  * import { createBrowserRouter } from "react-router";
@@ -1347,7 +1356,8 @@ interface LinksProps {
     /**
      * A [`nonce`](https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Global_attributes/nonce)
      * attribute to render on the [`<link>`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/link)
-     * element
+     * element. If not provided in Framework Mode, it will default to any
+     * {@link ServerRouter | `<ServerRouter nonce>`} prop.
      */
     nonce?: string | undefined;
     /**
@@ -1464,7 +1474,8 @@ type ScriptsProps = Omit<React.HTMLProps<HTMLScriptElement>, "async" | "children
     /**
      * A [`nonce`](https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Global_attributes/nonce)
      * attribute to render on the [`<script>`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script)
-     * element
+     * element. If not provided in Framework Mode, it will default to any
+     * {@link ServerRouter | `<ServerRouter nonce>`} prop.
      */
     nonce?: string | undefined;
 };
@@ -1996,6 +2007,10 @@ interface DOMRouterOpts {
  * path via [`history.pushState`](https://developer.mozilla.org/en-US/docs/Web/API/History/pushState)
  * and [`history.replaceState`](https://developer.mozilla.org/en-US/docs/Web/API/History/replaceState).
  *
+ * Data Routers should not be held in React state. You should create your router
+ * once outside of the React tree and pass it to {@link RouterProvider | `<RouterProvider>`}.
+ * You can use `patchRoutesOnNavigation` to add additional routes programmatically.
+ *
  * @public
  * @category Data Routers
  * @mode data
@@ -2016,6 +2031,10 @@ declare function createBrowserRouter(routes: RouteObject[], opts?: DOMRouterOpts
  * Create a new {@link DataRouter| data router} that manages the application
  * path via the URL [`hash`](https://developer.mozilla.org/en-US/docs/Web/API/URL/hash).
  *
+ * Data Routers should not be held in React state. You should create your router
+ * once outside of the React tree and pass it to {@link RouterProvider | `<RouterProvider>`}.
+ * You can use `patchRoutesOnNavigation` to add additional routes programmatically.
+ *
  * @public
  * @category Data Routers
  * @mode data
@@ -2836,7 +2855,10 @@ type ScrollRestorationProps = ScriptsProps & {
  * }
  * ```
  *
- * This component renders an inline `<script>` to prevent scroll flashing. The `nonce` prop will be passed down to the script tag to allow CSP nonce usage.
+ * This component renders an inline `<script>` to prevent scroll flashing. The
+ * `nonce` prop will be passed down to the script tag to allow CSP nonce usage.
+ * If not provided in Framework Mode, it will default to any
+ * {@link ServerRouter | `<ServerRouter nonce>`} prop.
  *
  * ```tsx
  * <ScrollRestoration nonce={cspNonce} />

package/dist/production/{index-react-server-client-CdKROblb.d.mts → index-react-server-client-CACgcj2J.d.mts}

@@ -1,6 +1,6 @@
-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 { o as ServerInstrumentation, H as HydrationState, h as StaticHandlerContext, f as RelativeRoutingType, g 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-CeD5LmaF.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-U8FS-wNn.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-DEjBmEfD.mjs';
 
 type ServerRouteManifest = RouteManifest<Omit<ServerRoute, "children">>;
 interface ServerRoute extends Route {
@@ -106,6 +106,7 @@ interface FrameworkContextObject {
     ssr: boolean;
     isSpaMode: boolean;
     routeDiscovery: ServerBuild["routeDiscovery"];
+    nonce?: string;
     serializeError?(error: Error): SerializedError;
     renderMeta?: {
         didRenderScripts?: boolean;
@@ -292,7 +293,8 @@ interface LinksProps {
     /**
      * A [`nonce`](https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Global_attributes/nonce)
      * attribute to render on the [`<link>`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/link)
-     * element
+     * element. If not provided in Framework Mode, it will default to any
+     * {@link ServerRouter | `<ServerRouter nonce>`} prop.
      */
     nonce?: string | undefined;
     /**
@@ -409,7 +411,8 @@ type ScriptsProps = Omit<React.HTMLProps<HTMLScriptElement>, "async" | "children
     /**
      * A [`nonce`](https://developer.mozilla.org/en-US/docs/Web/HTML/Reference/Global_attributes/nonce)
      * attribute to render on the [`<script>`](https://developer.mozilla.org/en-US/docs/Web/HTML/Element/script)
-     * element
+     * element. If not provided in Framework Mode, it will default to any
+     * {@link ServerRouter | `<ServerRouter nonce>`} prop.
      */
     nonce?: string | undefined;
 };
@@ -941,6 +944,10 @@ interface DOMRouterOpts {
  * path via [`history.pushState`](https://developer.mozilla.org/en-US/docs/Web/API/History/pushState)
  * and [`history.replaceState`](https://developer.mozilla.org/en-US/docs/Web/API/History/replaceState).
  *
+ * Data Routers should not be held in React state. You should create your router
+ * once outside of the React tree and pass it to {@link RouterProvider | `<RouterProvider>`}.
+ * You can use `patchRoutesOnNavigation` to add additional routes programmatically.
+ *
  * @public
  * @category Data Routers
  * @mode data
@@ -961,6 +968,10 @@ declare function createBrowserRouter(routes: RouteObject[], opts?: DOMRouterOpts
  * Create a new {@link DataRouter| data router} that manages the application
  * path via the URL [`hash`](https://developer.mozilla.org/en-US/docs/Web/API/URL/hash).
  *
+ * Data Routers should not be held in React state. You should create your router
+ * once outside of the React tree and pass it to {@link RouterProvider | `<RouterProvider>`}.
+ * You can use `patchRoutesOnNavigation` to add additional routes programmatically.
+ *
  * @public
  * @category Data Routers
  * @mode data
@@ -1781,7 +1792,10 @@ type ScrollRestorationProps = ScriptsProps & {
  * }
  * ```
  *
- * This component renders an inline `<script>` to prevent scroll flashing. The `nonce` prop will be passed down to the script tag to allow CSP nonce usage.
+ * This component renders an inline `<script>` to prevent scroll flashing. The
+ * `nonce` prop will be passed down to the script tag to allow CSP nonce usage.
+ * If not provided in Framework Mode, it will default to any
+ * {@link ServerRouter | `<ServerRouter nonce>`} prop.
  *
  * ```tsx
  * <ScrollRestoration nonce={cspNonce} />

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-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';
+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-CeD5LmaF.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-CACgcj2J.mjs';
+import './data-DEjBmEfD.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-BLiUx67a.js';
-import './instrumentation-1q4YhLGP.js';
-import './data-D4xhSy90.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-3ykjivgQ.js';
+import './instrumentation-Dkmpzd13.js';
+import './data-CjO11-hU.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.16.0
+ * react-router v7.18.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -19,7 +19,7 @@
 
 
 
-var _chunkSKEDDLRMjs = require('./chunk-SKEDDLRM.js');
+var _chunkBIP66BKVjs = require('./chunk-BIP66BKV.js');
 
 
 
@@ -34,7 +34,7 @@ var _chunkSKEDDLRMjs = require('./chunk-SKEDDLRM.js');
 
 
 
-var _chunkY7DNFQZPjs = require('./chunk-Y7DNFQZP.js');
+var _chunkIUPBOWYOjs = require('./chunk-IUPBOWYO.js');
 
 
 
@@ -58,4 +58,4 @@ var _chunkY7DNFQZPjs = require('./chunk-Y7DNFQZP.js');
 
 
 
-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;
+exports.BrowserRouter = _chunkBIP66BKVjs.BrowserRouter; exports.Form = _chunkBIP66BKVjs.Form; exports.HashRouter = _chunkBIP66BKVjs.HashRouter; exports.Link = _chunkBIP66BKVjs.Link; exports.Links = _chunkIUPBOWYOjs.Links; exports.MemoryRouter = _chunkIUPBOWYOjs.MemoryRouter; exports.Meta = _chunkIUPBOWYOjs.Meta; exports.NavLink = _chunkBIP66BKVjs.NavLink; exports.Navigate = _chunkIUPBOWYOjs.Navigate; exports.Outlet = _chunkIUPBOWYOjs.Outlet; exports.Route = _chunkIUPBOWYOjs.Route; exports.Router = _chunkIUPBOWYOjs.Router; exports.RouterProvider = _chunkIUPBOWYOjs.RouterProvider; exports.Routes = _chunkIUPBOWYOjs.Routes; exports.ScrollRestoration = _chunkBIP66BKVjs.ScrollRestoration; exports.StaticRouter = _chunkBIP66BKVjs.StaticRouter; exports.StaticRouterProvider = _chunkBIP66BKVjs.StaticRouterProvider; exports.UNSAFE_AwaitContextProvider = _chunkIUPBOWYOjs.AwaitContextProvider; exports.UNSAFE_WithComponentProps = _chunkIUPBOWYOjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunkIUPBOWYOjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunkIUPBOWYOjs.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunkBIP66BKVjs.HistoryRouter;

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

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