react-router 7.18.2 → 7.18.3

package/dist/{production/context-CeD5LmaF.d.mts → development/context-nqAapj74.d.mts}

@@ -207,6 +207,14 @@ interface Router$1 {
      * @param location
      */
     createHref(location: Location | URL): string;
+    /**
+     * @private
+     * PRIVATE - DO NOT USE
+     *
+     * Utility function to create a URL for the given location
+     * @param location
+     */
+    createURL?(to: To): URL;
     /**
      * @private
      * PRIVATE - DO NOT USE
@@ -1751,6 +1759,7 @@ interface NavigateOptions {
  */
 interface Navigator {
     createHref: History["createHref"];
+    createURL?: History["createURL"];
     encodeLocation?: History["encodeLocation"];
     go: History["go"];
     push(to: To, state?: any, opts?: NavigateOptions): void;

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

@@ -1,6 +1,6 @@
 import * as React from 'react';
-import { a as RouterProviderProps$1, R as RouterInit, C as ClientInstrumentation, b as ClientOnErrorFunction } from './context-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 { a as RouterProviderProps$1, R as RouterInit, C as ClientInstrumentation, b as ClientOnErrorFunction } from './context-nqAapj74.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-BR5QG7ZC.mjs';
 import './data-DEjBmEfD.mjs';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;

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

@@ -1,7 +1,7 @@
 import * as React from 'react';
 import { RouterProviderProps as RouterProviderProps$1, RouterInit, ClientOnErrorFunction } from 'react-router';
-import { C as ClientInstrumentation } from './instrumentation-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 { C as ClientInstrumentation } from './instrumentation-B7w3_Eo9.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-eq4RgLsD.js';
 import './data-CjO11-hU.js';
 
 type RouterProviderProps = Omit<RouterProviderProps$1, "flushSync">;

package/dist/development/dom-export.js

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _nullishCoalesce(lhs, rhsFn) { if (lhs != null) { return lhs; } else { return rhsFn(); } } function _optionalChain(ops) { let lastAccessLHS = undefined; let value = ops[0]; let i = 1; while (i < ops.length) { const op = ops[i]; const fn = ops[i + 1]; i += 2; if ((op === 'optionalAccess' || op === 'optionalCall') && value == null) { return undefined; } if (op === 'access' || op === 'optionalAccess') { lastAccessLHS = value; value = fn(value); } else if (op === 'call' || op === 'optionalCall') { value = fn((...args) => value.call(lastAccessLHS, ...args)); lastAccessLHS = undefined; } } return value; }/**
- * react-router v7.18.2
+ * react-router v7.18.3
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -13,7 +13,7 @@
 
 
 
-var _chunk3UVS743Kjs = require('./chunk-3UVS743K.js');
+var _chunkQPXIKN46js = require('./chunk-QPXIKN46.js');
 
 
 
@@ -37,7 +37,8 @@ var _chunk3UVS743Kjs = require('./chunk-3UVS743K.js');
 
 
 
-var _chunkHHGH3NKSjs = require('./chunk-HHGH3NKS.js');
+
+var _chunk7SIULPXIjs = require('./chunk-7SIULPXI.js');
 
 // lib/dom-export/dom-router-provider.tsx
 var _react = require('react'); var React = _interopRequireWildcard(_react); var React2 = _interopRequireWildcard(_react); var React3 = _interopRequireWildcard(_react);
@@ -213,7 +214,7 @@ function HydratedRouter(props) {
   }, []);
   React2.useEffect(() => {
     if (process.env.NODE_ENV === "development" && criticalCss === void 0) {
-      document.querySelectorAll(`[${_chunkHHGH3NKSjs.CRITICAL_CSS_DATA_ATTRIBUTE}]`).forEach((element) => element.remove());
+      document.querySelectorAll(`[${_chunk7SIULPXIjs.CRITICAL_CSS_DATA_ATTRIBUTE}]`).forEach((element) => element.remove());
     }
   }, [criticalCss]);
   let [location2, setLocation] = React2.useState(router.state.location);
@@ -307,8 +308,14 @@ function createCallServer({
         Promise.resolve(payloadPromise).then(async (payload) => {
           if (payload.type === "redirect") {
             let location2 = normalizeRedirectLocation(payload.location);
+            _chunk7SIULPXIjs.validateNavigationTarget.call(void 0, 
+              payload.location,
+              location2,
+              new URL(window.location.href),
+              "allow-explicit"
+            );
             if (payload.reload || isExternalLocation(location2)) {
-              if (_chunkHHGH3NKSjs.hasInvalidProtocol.call(void 0, location2)) {
+              if (_chunk7SIULPXIjs.hasInvalidProtocol.call(void 0, location2)) {
                 throw new Error("Invalid redirect location");
               }
               window.location.href = location2;
@@ -328,8 +335,14 @@ function createCallServer({
           if (rerender && landedActionId < actionId && globalVar.__routerActionID <= actionId) {
             if (rerender.type === "redirect") {
               let location2 = normalizeRedirectLocation(rerender.location);
+              _chunk7SIULPXIjs.validateNavigationTarget.call(void 0, 
+                rerender.location,
+                location2,
+                new URL(window.location.href),
+                "allow-explicit"
+              );
               if (rerender.reload || isExternalLocation(location2)) {
-                if (_chunkHHGH3NKSjs.hasInvalidProtocol.call(void 0, location2)) {
+                if (_chunk7SIULPXIjs.hasInvalidProtocol.call(void 0, location2)) {
                   throw new Error("Invalid redirect location");
                 }
                 window.location.href = location2;
@@ -394,7 +407,7 @@ function createRouterFromPayload({
     };
   if (payload.type !== "render") throw new Error("Invalid payload type");
   globalVar.__reactRouterRouteModules = _nullishCoalesce(globalVar.__reactRouterRouteModules, () => ( {}));
-  _chunk3UVS743Kjs.populateRSCRouteModules.call(void 0, globalVar.__reactRouterRouteModules, payload.matches);
+  _chunkQPXIKN46js.populateRSCRouteModules.call(void 0, globalVar.__reactRouterRouteModules, payload.matches);
   let routes = payload.matches.reduceRight((previous, match) => {
     const route = createRouteFromServerManifest(
       match,
@@ -408,12 +421,12 @@ function createRouterFromPayload({
     return [route];
   }, []);
   let applyPatchesPromise;
-  globalVar.__reactRouterDataRouter = _chunkHHGH3NKSjs.createRouter.call(void 0, {
+  globalVar.__reactRouterDataRouter = _chunk7SIULPXIjs.createRouter.call(void 0, {
     routes,
     getContext,
     basename: payload.basename,
-    history: _chunkHHGH3NKSjs.createBrowserHistory.call(void 0, ),
-    hydrationData: _chunk3UVS743Kjs.getHydrationData.call(void 0, {
+    history: _chunk7SIULPXIjs.createBrowserHistory.call(void 0, ),
+    hydrationData: _chunkQPXIKN46js.getHydrationData.call(void 0, {
       state: {
         loaderData: payload.loaderData,
         actionData: payload.actionData,
@@ -422,7 +435,7 @@ function createRouterFromPayload({
       routes,
       getRouteInfo: (routeId) => {
         let match = payload.matches.find((m) => m.id === routeId);
-        _chunkHHGH3NKSjs.invariant.call(void 0, match, "Route not found in payload");
+        _chunk7SIULPXIjs.invariant.call(void 0, match, "Route not found in payload");
         return {
           clientLoader: match.clientLoader,
           hasLoader: match.hasLoader,
@@ -537,9 +550,9 @@ function createRouterFromPayload({
     routeModules: globalVar.__reactRouterRouteModules
   };
 }
-var renderedRoutesContext = _chunkHHGH3NKSjs.createContext.call(void 0, );
+var renderedRoutesContext = _chunk7SIULPXIjs.createContext.call(void 0, );
 function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, createFromReadableStream, fetchImplementation) {
-  let dataStrategy = _chunkHHGH3NKSjs.getSingleFetchDataStrategyImpl.call(void 0, 
+  let dataStrategy = _chunk7SIULPXIjs.getSingleFetchDataStrategyImpl.call(void 0, 
     getRouter,
     (match) => {
       let M = match;
@@ -596,20 +609,20 @@ function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, createFromReada
 function getFetchAndDecodeViaRSC(createFromReadableStream, fetchImplementation) {
   return async (args, basename, trailingSlashAware, targetRoutes) => {
     let { request, context } = args;
-    let url = _chunkHHGH3NKSjs.singleFetchUrl.call(void 0, request.url, basename, trailingSlashAware, "rsc");
+    let url = _chunk7SIULPXIjs.singleFetchUrl.call(void 0, request.url, basename, trailingSlashAware, "rsc");
     if (request.method === "GET") {
-      url = _chunkHHGH3NKSjs.stripIndexParam.call(void 0, url);
+      url = _chunk7SIULPXIjs.stripIndexParam.call(void 0, url);
       if (targetRoutes) {
         url.searchParams.set("_routes", targetRoutes.join(","));
       }
     }
     let res = await fetchImplementation(
-      new Request(url, await _chunkHHGH3NKSjs.createRequestInit.call(void 0, request))
+      new Request(url, await _chunk7SIULPXIjs.createRequestInit.call(void 0, request))
     );
     if (res.status >= 400 && !res.headers.has("X-Remix-Response")) {
-      throw new (0, _chunkHHGH3NKSjs.ErrorResponseImpl)(res.status, res.statusText, await res.text());
+      throw new (0, _chunk7SIULPXIjs.ErrorResponseImpl)(res.status, res.statusText, await res.text());
     }
-    _chunkHHGH3NKSjs.invariant.call(void 0, res.body, "No response body to decode");
+    _chunk7SIULPXIjs.invariant.call(void 0, res.body, "No response body to decode");
     try {
       const payload = await createFromReadableStream(res.body, {
         temporaryReferences: void 0
@@ -633,7 +646,7 @@ function getFetchAndDecodeViaRSC(createFromReadableStream, fetchImplementation)
       }
       context.get(renderedRoutesContext).push(...payload.matches);
       let results = { routes: {} };
-      const dataKey = _chunkHHGH3NKSjs.isMutationMethod.call(void 0, request.method) ? "actionData" : "loaderData";
+      const dataKey = _chunk7SIULPXIjs.isMutationMethod.call(void 0, request.method) ? "actionData" : "loaderData";
       for (let [routeId, data] of Object.entries(payload[dataKey] || {})) {
         results.routes[routeId] = { data };
       }
@@ -666,7 +679,7 @@ function RSCHydratedRouter({
     [createFromReadableStream, payload, fetchImplementation, getContext]
   );
   React3.useEffect(() => {
-    _chunkHHGH3NKSjs.setIsHydrated.call(void 0, );
+    _chunk7SIULPXIjs.setIsHydrated.call(void 0, );
   }, []);
   React3.useLayoutEffect(() => {
     const globalVar = window;
@@ -774,8 +787,8 @@ function RSCHydratedRouter({
     },
     routeModules
   };
-  return /* @__PURE__ */ React3.createElement(_chunkHHGH3NKSjs.RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React3.createElement(_chunk3UVS743Kjs.RSCRouterGlobalErrorBoundary, { location: state.location }, /* @__PURE__ */ React3.createElement(_chunkHHGH3NKSjs.FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React3.createElement(
-    _chunkHHGH3NKSjs.RouterProvider,
+  return /* @__PURE__ */ React3.createElement(_chunk7SIULPXIjs.RSCRouterContext.Provider, { value: true }, /* @__PURE__ */ React3.createElement(_chunkQPXIKN46js.RSCRouterGlobalErrorBoundary, { location: state.location }, /* @__PURE__ */ React3.createElement(_chunk7SIULPXIjs.FrameworkContext.Provider, { value: frameworkContext }, /* @__PURE__ */ React3.createElement(
+    _chunk7SIULPXIjs.RouterProvider,
     {
       router: transitionEnabledRouter,
       flushSync: ReactDOM2.flushSync
@@ -791,8 +804,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;
-  _chunkHHGH3NKSjs.invariant.call(void 0, window.__reactRouterRouteModules);
-  _chunk3UVS743Kjs.populateRSCRouteModules.call(void 0, window.__reactRouterRouteModules, match);
+  _chunk7SIULPXIjs.invariant.call(void 0, window.__reactRouterRouteModules);
+  _chunkQPXIKN46js.populateRSCRouteModules.call(void 0, window.__reactRouterRouteModules, match);
   let dataRoute = {
     id: match.id,
     element: match.element,
@@ -840,7 +853,7 @@ function createRouteFromServerManifest(match, payload) {
         return await callSingleFetch(singleFetch);
       }
     }) : match.hasAction ? (_, singleFetch) => callSingleFetch(singleFetch) : () => {
-      throw _chunkHHGH3NKSjs.noActionDefinedError.call(void 0, "action", match.id);
+      throw _chunk7SIULPXIjs.noActionDefinedError.call(void 0, "action", match.id);
     },
     path: match.path,
     shouldRevalidate: match.shouldRevalidate,
@@ -852,7 +865,7 @@ function createRouteFromServerManifest(match, payload) {
     hasClientAction: match.clientAction != null
   };
   if (typeof dataRoute.loader === "function") {
-    dataRoute.loader.hydrate = _chunkHHGH3NKSjs.shouldHydrateRouteLoader.call(void 0, 
+    dataRoute.loader.hydrate = _chunk7SIULPXIjs.shouldHydrateRouteLoader.call(void 0, 
       match.id,
       match.clientLoader,
       match.hasLoader,
@@ -862,7 +875,7 @@ function createRouteFromServerManifest(match, payload) {
   return dataRoute;
 }
 function callSingleFetch(singleFetch) {
-  _chunkHHGH3NKSjs.invariant.call(void 0, typeof singleFetch === "function", "Invalid singleFetch parameter");
+  _chunk7SIULPXIjs.invariant.call(void 0, typeof singleFetch === "function", "Invalid singleFetch parameter");
   return singleFetch();
 }
 function preventInvalidServerHandlerCall(type, routeId, hasHandler) {
@@ -870,7 +883,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, _chunkHHGH3NKSjs.ErrorResponseImpl)(400, "Bad Request", new Error(msg), true);
+    throw new (0, _chunk7SIULPXIjs.ErrorResponseImpl)(400, "Bad Request", new Error(msg), true);
   }
 }
 var nextPaths = /* @__PURE__ */ new Set();
@@ -893,12 +906,12 @@ function getManifestUrl(paths) {
   return url;
 }
 async function fetchAndApplyManifestPatches(paths, createFromReadableStream, fetchImplementation, signal) {
-  paths = _chunkHHGH3NKSjs.getPathsWithAncestors.call(void 0, paths);
+  paths = _chunk7SIULPXIjs.getPathsWithAncestors.call(void 0, paths);
   let url = getManifestUrl(paths);
   if (url == null) {
     return;
   }
-  if (url.toString().length > _chunkHHGH3NKSjs.URL_LIMIT) {
+  if (url.toString().length > _chunk7SIULPXIjs.URL_LIMIT) {
     nextPaths.clear();
     return;
   }
@@ -942,8 +955,8 @@ function isExternalLocation(location2) {
   return newLocation.origin !== window.location.origin;
 }
 function normalizeRedirectLocation(location2) {
-  if (_chunkHHGH3NKSjs.PROTOCOL_RELATIVE_URL_REGEX.test(location2)) {
-    let path = _chunkHHGH3NKSjs.resolvePath.call(void 0, location2);
+  if (_chunk7SIULPXIjs.PROTOCOL_RELATIVE_URL_REGEX.test(location2)) {
+    let path = _chunk7SIULPXIjs.resolvePath.call(void 0, location2);
     return path.pathname + path.search + path.hash;
   }
   return location2;

package/dist/development/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.18.2
+ * react-router v7.18.3
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -13,7 +13,7 @@ import {
   RSCRouterGlobalErrorBoundary,
   getHydrationData,
   populateRSCRouteModules
-} from "./chunk-ZA36QIGN.mjs";
+} from "./chunk-HT4INDD5.mjs";
 import {
   CRITICAL_CSS_DATA_ATTRIBUTE,
   ErrorResponseImpl,
@@ -45,8 +45,9 @@ import {
   shouldHydrateRouteLoader,
   singleFetchUrl,
   stripIndexParam,
-  useFogOFWarDiscovery
-} from "./chunk-62JRHF6Z.mjs";
+  useFogOFWarDiscovery,
+  validateNavigationTarget
+} from "./chunk-BV7QT456.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";
@@ -299,6 +300,12 @@ function createCallServer({
         Promise.resolve(payloadPromise).then(async (payload) => {
           if (payload.type === "redirect") {
             let location2 = normalizeRedirectLocation(payload.location);
+            validateNavigationTarget(
+              payload.location,
+              location2,
+              new URL(window.location.href),
+              "allow-explicit"
+            );
             if (payload.reload || isExternalLocation(location2)) {
               if (hasInvalidProtocol(location2)) {
                 throw new Error("Invalid redirect location");
@@ -320,6 +327,12 @@ function createCallServer({
           if (rerender && landedActionId < actionId && globalVar.__routerActionID <= actionId) {
             if (rerender.type === "redirect") {
               let location2 = normalizeRedirectLocation(rerender.location);
+              validateNavigationTarget(
+                rerender.location,
+                location2,
+                new URL(window.location.href),
+                "allow-explicit"
+              );
               if (rerender.reload || isExternalLocation(location2)) {
                 if (hasInvalidProtocol(location2)) {
                   throw new Error("Invalid redirect location");

package/dist/{production/index-react-server-client-3ykjivgQ.d.ts → development/index-react-server-client-BjY-eKuf.d.ts}

@@ -1,4 +1,4 @@
-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 { 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-B7w3_Eo9.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-CjO11-hU.js';
 
@@ -197,6 +197,7 @@ interface NavigateOptions {
  */
 interface Navigator {
     createHref: History["createHref"];
+    createURL?: History["createURL"];
     encodeLocation?: History["encodeLocation"];
     go: History["go"];
     push(to: To, state?: any, opts?: NavigateOptions): void;

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

@@ -1,4 +1,4 @@
-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 { 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-nqAapj74.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-DEjBmEfD.mjs';
 

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

@@ -1,4 +1,4 @@
-export { Q as MemoryRouter, T as Navigate, U as Outlet, V as Route, W as Router, X as RouterProvider, Y as Routes, A as UNSAFE_AwaitContextProvider, ab as UNSAFE_WithComponentProps, af as UNSAFE_WithErrorBoundaryProps, ad as UNSAFE_WithHydrateFallbackProps } from './context-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';
+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-nqAapj74.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-K63fpMH4.mjs';
 import './data-DEjBmEfD.mjs';
 import 'react';

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

@@ -1,4 +1,4 @@
-export { W as BrowserRouter, $ as Form, X as HashRouter, Y as Link, an as Links, j as MemoryRouter, am as Meta, _ as NavLink, k as Navigate, l as Outlet, m as Route, n as Router, o as RouterProvider, p as Routes, a0 as ScrollRestoration, ak as StaticRouter, al as StaticRouterProvider, b as UNSAFE_AwaitContextProvider, aH as UNSAFE_WithComponentProps, aL as UNSAFE_WithErrorBoundaryProps, aJ as UNSAFE_WithHydrateFallbackProps, Z as unstable_HistoryRouter } from './index-react-server-client-3ykjivgQ.js';
-import './instrumentation-Dkmpzd13.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-BjY-eKuf.js';
+import './instrumentation-B7w3_Eo9.js';
 import './data-CjO11-hU.js';
 import 'react';

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

@@ -1,5 +1,5 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true});/**
- * react-router v7.18.2
+ * react-router v7.18.3
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -19,7 +19,7 @@
 
 
 
-var _chunk7XGYIT3Mjs = require('./chunk-7XGYIT3M.js');
+var _chunkYRTY65LJjs = require('./chunk-YRTY65LJ.js');
 
 
 
@@ -34,7 +34,7 @@ var _chunk7XGYIT3Mjs = require('./chunk-7XGYIT3M.js');
 
 
 
-var _chunkHHGH3NKSjs = require('./chunk-HHGH3NKS.js');
+var _chunk7SIULPXIjs = require('./chunk-7SIULPXI.js');
 
 
 
@@ -58,4 +58,4 @@ var _chunkHHGH3NKSjs = require('./chunk-HHGH3NKS.js');
 
 
 
-exports.BrowserRouter = _chunk7XGYIT3Mjs.BrowserRouter; exports.Form = _chunk7XGYIT3Mjs.Form; exports.HashRouter = _chunk7XGYIT3Mjs.HashRouter; exports.Link = _chunk7XGYIT3Mjs.Link; exports.Links = _chunkHHGH3NKSjs.Links; exports.MemoryRouter = _chunkHHGH3NKSjs.MemoryRouter; exports.Meta = _chunkHHGH3NKSjs.Meta; exports.NavLink = _chunk7XGYIT3Mjs.NavLink; exports.Navigate = _chunkHHGH3NKSjs.Navigate; exports.Outlet = _chunkHHGH3NKSjs.Outlet; exports.Route = _chunkHHGH3NKSjs.Route; exports.Router = _chunkHHGH3NKSjs.Router; exports.RouterProvider = _chunkHHGH3NKSjs.RouterProvider; exports.Routes = _chunkHHGH3NKSjs.Routes; exports.ScrollRestoration = _chunk7XGYIT3Mjs.ScrollRestoration; exports.StaticRouter = _chunk7XGYIT3Mjs.StaticRouter; exports.StaticRouterProvider = _chunk7XGYIT3Mjs.StaticRouterProvider; exports.UNSAFE_AwaitContextProvider = _chunkHHGH3NKSjs.AwaitContextProvider; exports.UNSAFE_WithComponentProps = _chunkHHGH3NKSjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunkHHGH3NKSjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunkHHGH3NKSjs.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunk7XGYIT3Mjs.HistoryRouter;
+exports.BrowserRouter = _chunkYRTY65LJjs.BrowserRouter; exports.Form = _chunkYRTY65LJjs.Form; exports.HashRouter = _chunkYRTY65LJjs.HashRouter; exports.Link = _chunkYRTY65LJjs.Link; exports.Links = _chunk7SIULPXIjs.Links; exports.MemoryRouter = _chunk7SIULPXIjs.MemoryRouter; exports.Meta = _chunk7SIULPXIjs.Meta; exports.NavLink = _chunkYRTY65LJjs.NavLink; exports.Navigate = _chunk7SIULPXIjs.Navigate; exports.Outlet = _chunk7SIULPXIjs.Outlet; exports.Route = _chunk7SIULPXIjs.Route; exports.Router = _chunk7SIULPXIjs.Router; exports.RouterProvider = _chunk7SIULPXIjs.RouterProvider; exports.Routes = _chunk7SIULPXIjs.Routes; exports.ScrollRestoration = _chunkYRTY65LJjs.ScrollRestoration; exports.StaticRouter = _chunkYRTY65LJjs.StaticRouter; exports.StaticRouterProvider = _chunkYRTY65LJjs.StaticRouterProvider; exports.UNSAFE_AwaitContextProvider = _chunk7SIULPXIjs.AwaitContextProvider; exports.UNSAFE_WithComponentProps = _chunk7SIULPXIjs.WithComponentProps; exports.UNSAFE_WithErrorBoundaryProps = _chunk7SIULPXIjs.WithErrorBoundaryProps; exports.UNSAFE_WithHydrateFallbackProps = _chunk7SIULPXIjs.WithHydrateFallbackProps; exports.unstable_HistoryRouter = _chunkYRTY65LJjs.HistoryRouter;

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

@@ -1,5 +1,5 @@
 /**
- * react-router v7.18.2
+ * react-router v7.18.3
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -32,7 +32,7 @@ import {
   WithComponentProps,
   WithErrorBoundaryProps,
   WithHydrateFallbackProps
-} from "./chunk-62JRHF6Z.mjs";
+} from "./chunk-BV7QT456.mjs";
 export {
   BrowserRouter,
   Form,

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

@@ -1243,6 +1243,14 @@ interface Router {
      * @param location
      */
     createHref(location: Location | URL): string;
+    /**
+     * @private
+     * PRIVATE - DO NOT USE
+     *
+     * Utility function to create a URL for the given location
+     * @param location
+     */
+    createURL?(to: To): URL;
     /**
      * @private
      * PRIVATE - DO NOT USE

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

@@ -1243,6 +1243,14 @@ interface Router {
      * @param location
      */
     createHref(location: Location | URL): string;
+    /**
+     * @private
+     * PRIVATE - DO NOT USE
+     *
+     * Utility function to create a URL for the given location
+     * @param location
+     */
+    createURL?(to: To): URL;
     /**
      * @private
      * PRIVATE - DO NOT USE

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

@@ -27,7 +27,7 @@ function _interopNamespace(e) {
 var React3__namespace = /*#__PURE__*/_interopNamespace(React3);
 
 /**
- * react-router v7.18.2
+ * react-router v7.18.3
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -664,13 +664,16 @@ function matchPathImpl(pattern, pathname, matcher, compiledParams) {
   let match = pathname.match(matcher);
   if (!match) return null;
   let matchedPathname = match[0];
-  let pathnameBase = matchedPathname.replace(/(.)\/+$/, "$1");
+  let pathnameBase = removeTrailingSlash(matchedPathname, 1);
   let captureGroups = match.slice(1);
   let params = compiledParams.reduce(
     (memo, { paramName, isOptional }, index) => {
       if (paramName === "*") {
         let splatValue = captureGroups[index] || "";
-        pathnameBase = matchedPathname.slice(0, matchedPathname.length - splatValue.length).replace(/(.)\/+$/, "$1");
+        pathnameBase = removeTrailingSlash(
+          matchedPathname.slice(0, matchedPathname.length - splatValue.length),
+          1
+        );
       }
       const value = captureGroups[index];
       if (isOptional && !value) {
@@ -759,7 +762,7 @@ function resolvePath(to, fromPathname = "/") {
   let pathname;
   if (toPathname) {
     toPathname = removeDoubleSlashes(toPathname);
-    if (toPathname.startsWith("/")) {
+    if (toPathname.startsWith("/") || toPathname.startsWith("\\")) {
       pathname = resolvePathname(toPathname.substring(1), "/");
     } else {
       pathname = resolvePathname(toPathname, fromPathname);
@@ -847,7 +850,13 @@ function resolveTo(toArg, routePathnames, locationPathname, isPathRelative = fal
 }
 var removeDoubleSlashes = (path) => path.replace(/[\\/]{2,}/g, "/");
 var joinPaths = (paths) => removeDoubleSlashes(paths.join("/"));
-var removeTrailingSlash = (path) => path.replace(/\/+$/, "");
+function removeTrailingSlash(path, minLength = 0) {
+  let end = path.length;
+  while (end > minLength && path.charCodeAt(end - 1) === 47) {
+    end--;
+  }
+  return end === path.length ? path : path.slice(0, end);
+}
 var normalizePathname = (pathname) => removeTrailingSlash(pathname).replace(/^\/*/, "/");
 var normalizeSearch = (search) => !search || search === "?" ? "" : search.startsWith("?") ? search : "?" + search;
 var normalizeHash = (hash) => !hash || hash === "#" ? "" : hash.startsWith("#") ? hash : "#" + hash;
@@ -2561,18 +2570,25 @@ function getPathsWithAncestors(paths) {
 function throwIfPotentialCSRFAttack(request, allowedActionOrigins) {
   let originHeader = request.headers.get("origin");
   let originDomain = null;
+  let originUrl = null;
   try {
-    originDomain = typeof originHeader === "string" && originHeader !== "null" ? new URL(originHeader).host : originHeader;
+    if (typeof originHeader === "string" && originHeader !== "null") {
+      originUrl = new URL(originHeader);
+      originDomain = originUrl.host;
+    } else {
+      originDomain = originHeader;
+    }
   } catch {
     throw new Error(
       `\`origin\` header is not a valid URL. Aborting the action.`
     );
   }
-  let host = new URL(request.url).host;
-  if (originDomain && originDomain !== host) {
+  let requestUrl = new URL(request.url);
+  let originMatchesRequest = originUrl ? originUrl.origin === requestUrl.origin : originDomain === requestUrl.host;
+  if (originDomain && !originMatchesRequest) {
     if (!isAllowedOrigin(originDomain, allowedActionOrigins)) {
       throw new Error(
-        "The `request.url` host does not match `origin` header from a forwarded action request. Aborting the action."
+        "The `request.url` origin does not match `origin` header from a forwarded action request. Aborting the action."
       );
     }
   }

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

@@ -6,7 +6,7 @@ export { BrowserRouter, Form, HashRouter, Link, Links, MemoryRouter, Meta, NavLi
 import { serialize, parse } from 'cookie';
 
 /**
- * react-router v7.18.2
+ * react-router v7.18.3
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -643,13 +643,16 @@ function matchPathImpl(pattern, pathname, matcher, compiledParams) {
   let match = pathname.match(matcher);
   if (!match) return null;
   let matchedPathname = match[0];
-  let pathnameBase = matchedPathname.replace(/(.)\/+$/, "$1");
+  let pathnameBase = removeTrailingSlash(matchedPathname, 1);
   let captureGroups = match.slice(1);
   let params = compiledParams.reduce(
     (memo, { paramName, isOptional }, index) => {
       if (paramName === "*") {
         let splatValue = captureGroups[index] || "";
-        pathnameBase = matchedPathname.slice(0, matchedPathname.length - splatValue.length).replace(/(.)\/+$/, "$1");
+        pathnameBase = removeTrailingSlash(
+          matchedPathname.slice(0, matchedPathname.length - splatValue.length),
+          1
+        );
       }
       const value = captureGroups[index];
       if (isOptional && !value) {
@@ -738,7 +741,7 @@ function resolvePath(to, fromPathname = "/") {
   let pathname;
   if (toPathname) {
     toPathname = removeDoubleSlashes(toPathname);
-    if (toPathname.startsWith("/")) {
+    if (toPathname.startsWith("/") || toPathname.startsWith("\\")) {
       pathname = resolvePathname(toPathname.substring(1), "/");
     } else {
       pathname = resolvePathname(toPathname, fromPathname);
@@ -826,7 +829,13 @@ function resolveTo(toArg, routePathnames, locationPathname, isPathRelative = fal
 }
 var removeDoubleSlashes = (path) => path.replace(/[\\/]{2,}/g, "/");
 var joinPaths = (paths) => removeDoubleSlashes(paths.join("/"));
-var removeTrailingSlash = (path) => path.replace(/\/+$/, "");
+function removeTrailingSlash(path, minLength = 0) {
+  let end = path.length;
+  while (end > minLength && path.charCodeAt(end - 1) === 47) {
+    end--;
+  }
+  return end === path.length ? path : path.slice(0, end);
+}
 var normalizePathname = (pathname) => removeTrailingSlash(pathname).replace(/^\/*/, "/");
 var normalizeSearch = (search) => !search || search === "?" ? "" : search.startsWith("?") ? search : "?" + search;
 var normalizeHash = (hash) => !hash || hash === "#" ? "" : hash.startsWith("#") ? hash : "#" + hash;
@@ -2540,18 +2549,25 @@ function getPathsWithAncestors(paths) {
 function throwIfPotentialCSRFAttack(request, allowedActionOrigins) {
   let originHeader = request.headers.get("origin");
   let originDomain = null;
+  let originUrl = null;
   try {
-    originDomain = typeof originHeader === "string" && originHeader !== "null" ? new URL(originHeader).host : originHeader;
+    if (typeof originHeader === "string" && originHeader !== "null") {
+      originUrl = new URL(originHeader);
+      originDomain = originUrl.host;
+    } else {
+      originDomain = originHeader;
+    }
   } catch {
     throw new Error(
       `\`origin\` header is not a valid URL. Aborting the action.`
     );
   }
-  let host = new URL(request.url).host;
-  if (originDomain && originDomain !== host) {
+  let requestUrl = new URL(request.url);
+  let originMatchesRequest = originUrl ? originUrl.origin === requestUrl.origin : originDomain === requestUrl.host;
+  if (originDomain && !originMatchesRequest) {
     if (!isAllowedOrigin(originDomain, allowedActionOrigins)) {
       throw new Error(
-        "The `request.url` host does not match `origin` header from a forwarded action request. Aborting the action."
+        "The `request.url` origin does not match `origin` header from a forwarded action request. Aborting the action."
       );
     }
   }