react-router 7.17.0 → 7.18.1

package/dist/{development/context-CmHpk1Ws.d.mts → production/context-CeD5LmaF.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-U8FS-wNn.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-DEjBmEfD.mjs';
 import * as React from 'react';
 
 type ServerInstrumentation = {
@@ -838,6 +838,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
@@ -872,7 +876,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;
     /**
@@ -926,7 +932,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";
@@ -1768,4 +1776,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 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 };
+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 GetScrollRestorationKeyFunction as g, type StaticHandlerContext as h, type Navigation as i, type RouterState 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/data-D4xhSy90.d.ts → production/data-CjO11-hU.d.ts}

@@ -961,6 +961,8 @@ interface RouteMeta<RouteObjectType extends RouteObject = RouteObject> {
     caseSensitive: boolean;
     childrenIndex: number;
     route: RouteObjectType;
+    matcher?: RegExp;
+    compiledParams?: CompiledPathParam[];
 }
 /**
  * @private
@@ -1045,6 +1047,10 @@ interface PathMatch<ParamKey extends string = string> {
  * or `null` if it does not match.
  */
 declare function matchPath<Path extends string>(pattern: PathPattern<Path> | Path, pathname: string): PathMatch<ParamParseKey<Path>> | null;
+type CompiledPathParam = {
+    paramName: string;
+    isOptional?: boolean;
+};
 /**
  * Returns a resolved {@link Path} object relative to the given pathname.
  *
@@ -1332,7 +1338,9 @@ interface PageLinkDescriptor extends Omit<HtmlLinkDescriptor, "href" | "rel" | "
     /**
      * 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;
     /**

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

@@ -961,6 +961,8 @@ interface RouteMeta<RouteObjectType extends RouteObject = RouteObject> {
     caseSensitive: boolean;
     childrenIndex: number;
     route: RouteObjectType;
+    matcher?: RegExp;
+    compiledParams?: CompiledPathParam[];
 }
 /**
  * @private
@@ -1045,6 +1047,10 @@ interface PathMatch<ParamKey extends string = string> {
  * or `null` if it does not match.
  */
 declare function matchPath<Path extends string>(pattern: PathPattern<Path> | Path, pathname: string): PathMatch<ParamParseKey<Path>> | null;
+type CompiledPathParam = {
+    paramName: string;
+    isOptional?: boolean;
+};
 /**
  * Returns a resolved {@link Path} object relative to the given pathname.
  *
@@ -1332,7 +1338,9 @@ interface PageLinkDescriptor extends Omit<HtmlLinkDescriptor, "href" | "rel" | "
     /**
      * 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;
     /**

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-CmHpk1Ws.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-CGcs-0pD.mjs';
-import './data-U8FS-wNn.mjs';
+import { a as RouterProviderProps$1, R as RouterInit, C as ClientInstrumentation, b as ClientOnErrorFunction } from './context-CeD5LmaF.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-DBmQ1yAR.mjs';
+import './data-DEjBmEfD.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-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';
+import { C as ClientInstrumentation } from './instrumentation-Dkmpzd13.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-B2PdsXXH.js';
+import './data-CjO11-hU.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.17.0
+ * react-router v7.18.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -13,7 +13,7 @@
 
 
 
-var _chunkCTIXC7EVjs = require('./chunk-CTIXC7EV.js');
+var _chunkGOIER6MLjs = require('./chunk-GOIER6ML.js');
 
 
 
@@ -34,7 +34,10 @@ var _chunkCTIXC7EVjs = require('./chunk-CTIXC7EV.js');
 
 
 
-var _chunkRTRY3JFTjs = require('./chunk-RTRY3JFT.js');
+
+
+
+var _chunkIEF7VMTAjs = require('./chunk-IEF7VMTA.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(`[${_chunkRTRY3JFTjs.CRITICAL_CSS_DATA_ATTRIBUTE}]`).forEach((element) => element.remove());
+      document.querySelectorAll(`[${_chunkIEF7VMTAjs.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 (_chunkIEF7VMTAjs.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 (_chunkIEF7VMTAjs.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, () => ( {}));
-  _chunkCTIXC7EVjs.populateRSCRouteModules.call(void 0, globalVar.__reactRouterRouteModules, payload.matches);
+  _chunkGOIER6MLjs.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 = _chunkRTRY3JFTjs.createRouter.call(void 0, {
+  globalVar.__reactRouterDataRouter = _chunkIEF7VMTAjs.createRouter.call(void 0, {
     routes,
     getContext,
     basename: payload.basename,
-    history: _chunkRTRY3JFTjs.createBrowserHistory.call(void 0, ),
-    hydrationData: _chunkCTIXC7EVjs.getHydrationData.call(void 0, {
+    history: _chunkIEF7VMTAjs.createBrowserHistory.call(void 0, ),
+    hydrationData: _chunkGOIER6MLjs.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);
-        _chunkRTRY3JFTjs.invariant.call(void 0, match, "Route not found in payload");
+        _chunkIEF7VMTAjs.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 = _chunkRTRY3JFTjs.createContext.call(void 0, );
+var renderedRoutesContext = _chunkIEF7VMTAjs.createContext.call(void 0, );
 function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, createFromReadableStream, fetchImplementation) {
-  let dataStrategy = _chunkRTRY3JFTjs.getSingleFetchDataStrategyImpl.call(void 0, 
+  let dataStrategy = _chunkIEF7VMTAjs.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 = _chunkRTRY3JFTjs.singleFetchUrl.call(void 0, request.url, basename, trailingSlashAware, "rsc");
+    let url = _chunkIEF7VMTAjs.singleFetchUrl.call(void 0, request.url, basename, trailingSlashAware, "rsc");
     if (request.method === "GET") {
-      url = _chunkRTRY3JFTjs.stripIndexParam.call(void 0, url);
+      url = _chunkIEF7VMTAjs.stripIndexParam.call(void 0, url);
       if (targetRoutes) {
         url.searchParams.set("_routes", targetRoutes.join(","));
       }
     }
     let res = await fetchImplementation(
-      new Request(url, await _chunkRTRY3JFTjs.createRequestInit.call(void 0, request))
+      new Request(url, await _chunkIEF7VMTAjs.createRequestInit.call(void 0, request))
     );
     if (res.status >= 400 && !res.headers.has("X-Remix-Response")) {
-      throw new (0, _chunkRTRY3JFTjs.ErrorResponseImpl)(res.status, res.statusText, await res.text());
+      throw new (0, _chunkIEF7VMTAjs.ErrorResponseImpl)(res.status, res.statusText, await res.text());
     }
-    _chunkRTRY3JFTjs.invariant.call(void 0, res.body, "No response body to decode");
+    _chunkIEF7VMTAjs.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 = _chunkRTRY3JFTjs.isMutationMethod.call(void 0, request.method) ? "actionData" : "loaderData";
+      const dataKey = _chunkIEF7VMTAjs.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(() => {
-    _chunkRTRY3JFTjs.setIsHydrated.call(void 0, );
+    _chunkIEF7VMTAjs.setIsHydrated.call(void 0, );
   }, []);
   React3.useLayoutEffect(() => {
     const globalVar = window;
@@ -773,8 +774,8 @@ function RSCHydratedRouter({
     },
     routeModules
   };
-  return /* @__PURE__ */ React3.createElement(_chunkRTRY3JFTjs.RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React3.createElement(_chunkCTIXC7EVjs.RSCRouterGlobalErrorBoundary, { location: state.location }, /* @__PURE__ */ React3.createElement(_chunkRTRY3JFTjs.FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React3.createElement(
-    _chunkRTRY3JFTjs.RouterProvider,
+  return /* @__PURE__ */ React3.createElement(_chunkIEF7VMTAjs.RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React3.createElement(_chunkGOIER6MLjs.RSCRouterGlobalErrorBoundary, { location: state.location }, /* @__PURE__ */ React3.createElement(_chunkIEF7VMTAjs.FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React3.createElement(
+    _chunkIEF7VMTAjs.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;
-  _chunkRTRY3JFTjs.invariant.call(void 0, window.__reactRouterRouteModules);
-  _chunkCTIXC7EVjs.populateRSCRouteModules.call(void 0, window.__reactRouterRouteModules, match);
+  _chunkIEF7VMTAjs.invariant.call(void 0, window.__reactRouterRouteModules);
+  _chunkGOIER6MLjs.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 _chunkRTRY3JFTjs.noActionDefinedError.call(void 0, "action", match.id);
+      throw _chunkIEF7VMTAjs.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 = _chunkRTRY3JFTjs.shouldHydrateRouteLoader.call(void 0, 
+    dataRoute.loader.hydrate = _chunkIEF7VMTAjs.shouldHydrateRouteLoader.call(void 0, 
       match.id,
       match.clientLoader,
       match.hasLoader,
@@ -861,7 +862,7 @@ function createRouteFromServerManifest(match, payload) {
   return dataRoute;
 }
 function callSingleFetch(singleFetch) {
-  _chunkRTRY3JFTjs.invariant.call(void 0, typeof singleFetch === "function", "Invalid singleFetch parameter");
+  _chunkIEF7VMTAjs.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, _chunkRTRY3JFTjs.ErrorResponseImpl)(400, "Bad Request", new Error(msg), true);
+    throw new (0, _chunkIEF7VMTAjs.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 = _chunkIEF7VMTAjs.getPathsWithAncestors.call(void 0, paths);
   let url = getManifestUrl(paths);
   if (url == null) {
     return;
   }
-  if (url.toString().length > _chunkRTRY3JFTjs.URL_LIMIT) {
+  if (url.toString().length > _chunkIEF7VMTAjs.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 _chunkRTRY3JFTjs.invalidProtocols.includes(new URL(location2).protocol);
-  } catch (e2) {
-    return false;
+function normalizeRedirectLocation(location2) {
+  if (_chunkIEF7VMTAjs.PROTOCOL_RELATIVE_URL_REGEX.test(location2)) {
+    let path = _chunkIEF7VMTAjs.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.17.0
+ * react-router v7.18.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -11,14 +11,14 @@
 "use client";
 import {
   RSCRouterGlobalErrorBoundary,
-  deserializeErrors,
   getHydrationData,
   populateRSCRouteModules
-} from "./chunk-5TQZEVD5.mjs";
+} from "./chunk-3MA7PLKB.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-OSYEOCBT.mjs";
+} from "./chunk-3WDNQUW5.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/production/{index-react-server-client-CwU9bE5R.d.ts → 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;
     /**
@@ -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} />