react-router 7.13.1 → 7.13.2

package/dist/production/{chunk-772H4TVR.js → chunk-LKUVSIBA.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.13.1
+ * react-router v7.13.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1380,6 +1380,7 @@ function createRouter(init) {
   }
   let dataStrategyImpl = init.dataStrategy || defaultDataStrategyWithMiddleware;
   let future = {
+    unstable_passThroughRequests: false,
     ...init.future
   };
   let unlistenHistory = null;
@@ -1443,10 +1444,11 @@ function createRouter(init) {
         relevantMatches = relevantMatches.slice(0, idx + 1);
       }
       renderFallback = false;
-      initialized = relevantMatches.every((m) => {
+      initialized = true;
+      relevantMatches.forEach((m) => {
         let status = getRouteHydrationStatus(m.route, loaderData, errors);
         renderFallback = renderFallback || status.renderFallback;
-        return !status.shouldLoad;
+        initialized = initialized && !status.shouldLoad;
       });
     }
   }
@@ -2025,6 +2027,7 @@ function createRouter(init) {
         mapRouteProperties2,
         manifest,
         request,
+        location,
         matches,
         actionMatch,
         initialHydration ? [] : hydrationRouteProperties2,
@@ -2032,6 +2035,7 @@ function createRouter(init) {
       );
       let results = await callDataStrategy(
         request,
+        location,
         dsMatches,
         scopedContext,
         null
@@ -2219,6 +2223,7 @@ function createRouter(init) {
       dsMatches,
       revalidatingFetchers,
       request,
+      location,
       scopedContext
     );
     if (request.signal.aborted) {
@@ -2410,6 +2415,7 @@ function createRouter(init) {
       mapRouteProperties2,
       manifest,
       fetchRequest,
+      path,
       requestMatches,
       match,
       hydrationRouteProperties2,
@@ -2417,6 +2423,7 @@ function createRouter(init) {
     );
     let actionResults = await callDataStrategy(
       fetchRequest,
+      path,
       fetchMatches,
       scopedContext,
       key
@@ -2520,6 +2527,7 @@ function createRouter(init) {
       dsMatches,
       revalidatingFetchers,
       revalidationRequest,
+      nextLocation,
       scopedContext
     );
     if (abortController.signal.aborted) {
@@ -2634,6 +2642,7 @@ function createRouter(init) {
       mapRouteProperties2,
       manifest,
       fetchRequest,
+      path,
       matches,
       match,
       hydrationRouteProperties2,
@@ -2641,6 +2650,7 @@ function createRouter(init) {
     );
     let results = await callDataStrategy(
       fetchRequest,
+      path,
       dsMatches,
       scopedContext,
       key
@@ -2749,13 +2759,14 @@ function createRouter(init) {
       });
     }
   }
-  async function callDataStrategy(request, matches, scopedContext, fetcherKey) {
+  async function callDataStrategy(request, path, matches, scopedContext, fetcherKey) {
     let results;
     let dataResults = {};
     try {
       results = await callDataStrategyImpl(
         dataStrategyImpl,
         request,
+        path,
         matches,
         fetcherKey,
         scopedContext,
@@ -2807,9 +2818,10 @@ function createRouter(init) {
     }
     return dataResults;
   }
-  async function callLoadersAndMaybeResolveData(matches, fetchersToLoad, request, scopedContext) {
+  async function callLoadersAndMaybeResolveData(matches, fetchersToLoad, request, location, scopedContext) {
     let loaderResultsPromise = callDataStrategy(
       request,
+      location,
       matches,
       scopedContext,
       null
@@ -2819,6 +2831,7 @@ function createRouter(init) {
         if (f.matches && f.match && f.request && f.controller) {
           let results = await callDataStrategy(
             f.request,
+            f.path,
             f.matches,
             scopedContext,
             f.key
@@ -3227,7 +3240,12 @@ function createStaticHandler(routes, opts) {
   let basename = (opts ? opts.basename : null) || "/";
   let _mapRouteProperties = _optionalChain([opts, 'optionalAccess', _29 => _29.mapRouteProperties]) || defaultMapRouteProperties;
   let mapRouteProperties2 = _mapRouteProperties;
-  if (_optionalChain([opts, 'optionalAccess', _30 => _30.unstable_instrumentations])) {
+  let future = {
+    unstable_passThroughRequests: false,
+    // unused in static handler
+    ..._optionalChain([opts, 'optionalAccess', _30 => _30.future])
+  };
+  if (_optionalChain([opts, 'optionalAccess', _31 => _31.unstable_instrumentations])) {
     let instrumentations = opts.unstable_instrumentations;
     mapRouteProperties2 = (route) => {
       return {
@@ -3251,11 +3269,12 @@ function createStaticHandler(routes, opts) {
     skipLoaderErrorBubbling,
     skipRevalidation,
     dataStrategy,
-    generateMiddlewareResponse
+    generateMiddlewareResponse,
+    unstable_normalizePath
   } = {}) {
-    let url = new URL(request.url);
+    let normalizePath = unstable_normalizePath || defaultNormalizePath;
     let method = request.method;
-    let location = createLocation("", createPath(url), null, "default");
+    let location = createLocation("", normalizePath(request), null, "default");
     let matches = matchRoutes(dataRoutes, location, basename);
     requestContext = requestContext != null ? requestContext : new RouterContextProvider();
     if (!isValidMethod(method) && method !== "HEAD") {
@@ -3308,6 +3327,7 @@ function createStaticHandler(routes, opts) {
         let response = await runServerMiddlewarePipeline(
           {
             request,
+            unstable_url: createDataFunctionUrl(request, location),
             unstable_pattern: getRoutePattern(matches),
             matches,
             params: matches[0].params,
@@ -3372,9 +3392,9 @@ function createStaticHandler(routes, opts) {
             } else {
               let boundaryRouteId = skipLoaderErrorBubbling ? routeId : findNearestBoundary(
                 matches,
-                _optionalChain([matches, 'access', _31 => _31.find, 'call', _32 => _32(
+                _optionalChain([matches, 'access', _32 => _32.find, 'call', _33 => _33(
                   (m) => m.route.id === routeId || m.route.loader
-                ), 'optionalAccess', _33 => _33.route, 'access', _34 => _34.id]) || routeId
+                ), 'optionalAccess', _34 => _34.route, 'access', _35 => _35.id]) || routeId
               ).route.id;
               let staticContext = {
                 matches,
@@ -3424,11 +3444,12 @@ function createStaticHandler(routes, opts) {
     routeId,
     requestContext,
     dataStrategy,
-    generateMiddlewareResponse
+    generateMiddlewareResponse,
+    unstable_normalizePath
   } = {}) {
-    let url = new URL(request.url);
+    let normalizePath = unstable_normalizePath || defaultNormalizePath;
     let method = request.method;
-    let location = createLocation("", createPath(url), null, "default");
+    let location = createLocation("", normalizePath(request), null, "default");
     let matches = matchRoutes(dataRoutes, location, basename);
     requestContext = requestContext != null ? requestContext : new RouterContextProvider();
     if (!isValidMethod(method) && method !== "HEAD" && method !== "OPTIONS") {
@@ -3454,6 +3475,7 @@ function createStaticHandler(routes, opts) {
       let response = await runServerMiddlewarePipeline(
         {
           request,
+          unstable_url: createDataFunctionUrl(request, location),
           unstable_pattern: getRoutePattern(matches),
           matches,
           params: matches[0].params,
@@ -3531,6 +3553,7 @@ function createStaticHandler(routes, opts) {
       if (isMutationMethod(request.method)) {
         let result2 = await submit(
           request,
+          location,
           matches,
           routeMatch || getTargetMatch(matches, location),
           requestContext,
@@ -3544,6 +3567,7 @@ function createStaticHandler(routes, opts) {
       }
       let result = await loadRouteData(
         request,
+        location,
         matches,
         requestContext,
         dataStrategy,
@@ -3569,7 +3593,7 @@ function createStaticHandler(routes, opts) {
       throw e;
     }
   }
-  async function submit(request, matches, actionMatch, requestContext, dataStrategy, skipLoaderErrorBubbling, isRouteRequest, filterMatchesToLoad, skipRevalidation) {
+  async function submit(request, location, matches, actionMatch, requestContext, dataStrategy, skipLoaderErrorBubbling, isRouteRequest, filterMatchesToLoad, skipRevalidation) {
     let result;
     if (!actionMatch.route.action && !actionMatch.route.lazy) {
       let error = getInternalRouterError(405, {
@@ -3589,6 +3613,7 @@ function createStaticHandler(routes, opts) {
         mapRouteProperties2,
         manifest,
         request,
+        location,
         matches,
         actionMatch,
         [],
@@ -3596,6 +3621,7 @@ function createStaticHandler(routes, opts) {
       );
       let results = await callDataStrategy(
         request,
+        location,
         dsMatches,
         isRouteRequest,
         requestContext,
@@ -3669,6 +3695,7 @@ function createStaticHandler(routes, opts) {
       let boundaryMatch = skipLoaderErrorBubbling ? actionMatch : findNearestBoundary(matches, actionMatch.route.id);
       let handlerContext2 = await loadRouteData(
         loaderRequest,
+        location,
         matches,
         requestContext,
         dataStrategy,
@@ -3688,6 +3715,7 @@ function createStaticHandler(routes, opts) {
     }
     let handlerContext = await loadRouteData(
       loaderRequest,
+      location,
       matches,
       requestContext,
       dataStrategy,
@@ -3705,13 +3733,13 @@ function createStaticHandler(routes, opts) {
       actionHeaders: result.headers ? { [actionMatch.route.id]: result.headers } : {}
     };
   }
-  async function loadRouteData(request, matches, requestContext, dataStrategy, skipLoaderErrorBubbling, routeMatch, filterMatchesToLoad, pendingActionResult) {
+  async function loadRouteData(request, location, matches, requestContext, dataStrategy, skipLoaderErrorBubbling, routeMatch, filterMatchesToLoad, pendingActionResult) {
     let isRouteRequest = routeMatch != null;
-    if (isRouteRequest && !_optionalChain([routeMatch, 'optionalAccess', _35 => _35.route, 'access', _36 => _36.loader]) && !_optionalChain([routeMatch, 'optionalAccess', _37 => _37.route, 'access', _38 => _38.lazy])) {
+    if (isRouteRequest && !_optionalChain([routeMatch, 'optionalAccess', _36 => _36.route, 'access', _37 => _37.loader]) && !_optionalChain([routeMatch, 'optionalAccess', _38 => _38.route, 'access', _39 => _39.lazy])) {
       throw getInternalRouterError(400, {
         method: request.method,
         pathname: new URL(request.url).pathname,
-        routeId: _optionalChain([routeMatch, 'optionalAccess', _39 => _39.route, 'access', _40 => _40.id])
+        routeId: _optionalChain([routeMatch, 'optionalAccess', _40 => _40.route, 'access', _41 => _41.id])
       });
     }
     let dsMatches;
@@ -3720,6 +3748,7 @@ function createStaticHandler(routes, opts) {
         mapRouteProperties2,
         manifest,
         request,
+        location,
         matches,
         routeMatch,
         [],
@@ -3737,6 +3766,7 @@ function createStaticHandler(routes, opts) {
             mapRouteProperties2,
             manifest,
             request,
+            location,
             pattern,
             match,
             [],
@@ -3748,6 +3778,7 @@ function createStaticHandler(routes, opts) {
           mapRouteProperties2,
           manifest,
           request,
+          location,
           pattern,
           match,
           [],
@@ -3769,6 +3800,7 @@ function createStaticHandler(routes, opts) {
     }
     let results = await callDataStrategy(
       request,
+      location,
       dsMatches,
       isRouteRequest,
       requestContext,
@@ -3789,10 +3821,11 @@ function createStaticHandler(routes, opts) {
       matches
     };
   }
-  async function callDataStrategy(request, matches, isRouteRequest, requestContext, dataStrategy) {
+  async function callDataStrategy(request, location, matches, isRouteRequest, requestContext, dataStrategy) {
     let results = await callDataStrategyImpl(
       dataStrategy || defaultDataStrategy,
       request,
+      location,
       matches,
       null,
       requestContext,
@@ -3855,6 +3888,14 @@ function throwStaticHandlerAbortedError(request, isRouteRequest) {
 function isSubmissionNavigation(opts) {
   return opts != null && ("formData" in opts && opts.formData != null || "body" in opts && opts.body !== void 0);
 }
+function defaultNormalizePath(request) {
+  let url = new URL(request.url);
+  return {
+    pathname: url.pathname,
+    search: url.search,
+    hash: url.hash
+  };
+}
 function normalizeTo(location, matches, basename, to, fromRouteId, relative) {
   let contextualMatches;
   let activeRouteMatch;
@@ -4022,7 +4063,7 @@ function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest,
   let shouldSkipRevalidation = actionStatus && actionStatus >= 400;
   let baseShouldRevalidateArgs = {
     currentUrl,
-    currentParams: _optionalChain([state, 'access', _41 => _41.matches, 'access', _42 => _42[0], 'optionalAccess', _43 => _43.params]) || {},
+    currentParams: _optionalChain([state, 'access', _42 => _42.matches, 'access', _43 => _43[0], 'optionalAccess', _44 => _44.params]) || {},
     nextUrl,
     nextParams: matches[0].params,
     ...submission,
@@ -4054,6 +4095,7 @@ function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest,
         mapRouteProperties2,
         manifest,
         request,
+        location,
         pattern,
         match,
         lazyRoutePropertiesToSkip,
@@ -4084,6 +4126,7 @@ function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest,
       mapRouteProperties2,
       manifest,
       request,
+      location,
       pattern,
       match,
       lazyRoutePropertiesToSkip,
@@ -4133,6 +4176,7 @@ function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest,
         mapRouteProperties2,
         manifest,
         fetchRequest,
+        f.path,
         fetcherMatches,
         fetcherMatch,
         lazyRoutePropertiesToSkip,
@@ -4144,6 +4188,7 @@ function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest,
           mapRouteProperties2,
           manifest,
           fetchRequest,
+          f.path,
           fetcherMatches,
           fetcherMatch,
           lazyRoutePropertiesToSkip,
@@ -4168,6 +4213,7 @@ function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest,
           mapRouteProperties2,
           manifest,
           fetchRequest,
+          f.path,
           fetcherMatches,
           fetcherMatch,
           lazyRoutePropertiesToSkip,
@@ -4269,7 +4315,7 @@ function patchRoutesImpl(routeId, children, routesToUse, manifest, mapRoutePrope
     let newRoutes = convertRoutesToDataRoutes(
       uniqueChildren,
       mapRouteProperties2,
-      [routeId || "_", "patch", String(_optionalChain([childrenToPatch, 'optionalAccess', _44 => _44.length]) || "0")],
+      [routeId || "_", "patch", String(_optionalChain([childrenToPatch, 'optionalAccess', _45 => _45.length]) || "0")],
       manifest
     );
     childrenToPatch.push(...newRoutes);
@@ -4305,8 +4351,8 @@ function isSameRoute(newRoute, existingRoute) {
   if ((!newRoute.children || newRoute.children.length === 0) && (!existingRoute.children || existingRoute.children.length === 0)) {
     return true;
   }
-  return _nullishCoalesce(_optionalChain([newRoute, 'access', _45 => _45.children, 'optionalAccess', _46 => _46.every, 'call', _47 => _47(
-    (aChild, i) => _optionalChain([existingRoute, 'access', _48 => _48.children, 'optionalAccess', _49 => _49.some, 'call', _50 => _50((bChild) => isSameRoute(aChild, bChild))])
+  return _nullishCoalesce(_optionalChain([newRoute, 'access', _46 => _46.children, 'optionalAccess', _47 => _47.every, 'call', _48 => _48(
+    (aChild, i) => _optionalChain([existingRoute, 'access', _49 => _49.children, 'optionalAccess', _50 => _50.some, 'call', _51 => _51((bChild) => isSameRoute(aChild, bChild))])
   )]), () => ( false));
 }
 var lazyRoutePropertyCache = /* @__PURE__ */ new WeakMap();
@@ -4454,9 +4500,9 @@ function loadLazyRoute(route, type, manifest, mapRouteProperties2, lazyRouteProp
   }
   let lazyRoutePromise = lazyPropertyPromises.length > 0 ? Promise.all(lazyPropertyPromises).then(() => {
   }) : void 0;
-  _optionalChain([lazyRoutePromise, 'optionalAccess', _51 => _51.catch, 'call', _52 => _52(() => {
+  _optionalChain([lazyRoutePromise, 'optionalAccess', _52 => _52.catch, 'call', _53 => _53(() => {
   })]);
-  _optionalChain([lazyHandlerPromise, 'optionalAccess', _53 => _53.catch, 'call', _54 => _54(() => {
+  _optionalChain([lazyHandlerPromise, 'optionalAccess', _54 => _54.catch, 'call', _55 => _55(() => {
   })]);
   return {
     lazyRoutePromise,
@@ -4552,17 +4598,12 @@ function runClientMiddlewarePipeline(args, handler) {
   }
 }
 async function runMiddlewarePipeline(args, handler, processResult, isResult, errorHandler) {
-  let { matches, request, params, context, unstable_pattern } = args;
+  let { matches, ...dataFnArgs } = args;
   let tuples = matches.flatMap(
     (m) => m.route.middleware ? m.route.middleware.map((fn) => [m.route.id, fn]) : []
   );
   let result = await callRouteMiddleware(
-    {
-      request,
-      params,
-      context,
-      unstable_pattern
-    },
+    dataFnArgs,
     tuples,
     handler,
     processResult,
@@ -4640,7 +4681,7 @@ function getDataStrategyMatchLazyPromises(mapRouteProperties2, manifest, request
     handler: lazyRoutePromises.lazyHandlerPromise
   };
 }
-function getDataStrategyMatch(mapRouteProperties2, manifest, request, unstable_pattern, match, lazyRoutePropertiesToSkip, scopedContext, shouldLoad, shouldRevalidateArgs = null, callSiteDefaultShouldRevalidate) {
+function getDataStrategyMatch(mapRouteProperties2, manifest, request, path, unstable_pattern, match, lazyRoutePropertiesToSkip, scopedContext, shouldLoad, shouldRevalidateArgs = null, callSiteDefaultShouldRevalidate) {
   let isUsingNewApi = false;
   let _lazyPromises = getDataStrategyMatchLazyPromises(
     mapRouteProperties2,
@@ -4680,10 +4721,11 @@ function getDataStrategyMatch(mapRouteProperties2, manifest, request, unstable_p
       if (callHandler && (isMutationMethod(request.method) || !isMiddlewareOnlyRoute)) {
         return callLoaderOrAction({
           request,
+          path,
           unstable_pattern,
           match,
-          lazyHandlerPromise: _optionalChain([_lazyPromises, 'optionalAccess', _55 => _55.handler]),
-          lazyRoutePromise: _optionalChain([_lazyPromises, 'optionalAccess', _56 => _56.route]),
+          lazyHandlerPromise: _optionalChain([_lazyPromises, 'optionalAccess', _56 => _56.handler]),
+          lazyRoutePromise: _optionalChain([_lazyPromises, 'optionalAccess', _57 => _57.route]),
           handlerOverride,
           scopedContext
         });
@@ -4692,7 +4734,7 @@ function getDataStrategyMatch(mapRouteProperties2, manifest, request, unstable_p
     }
   };
 }
-function getTargetedDataStrategyMatches(mapRouteProperties2, manifest, request, matches, targetMatch, lazyRoutePropertiesToSkip, scopedContext, shouldRevalidateArgs = null) {
+function getTargetedDataStrategyMatches(mapRouteProperties2, manifest, request, path, matches, targetMatch, lazyRoutePropertiesToSkip, scopedContext, shouldRevalidateArgs = null) {
   return matches.map((match) => {
     if (match.route.id !== targetMatch.route.id) {
       return {
@@ -4714,6 +4756,7 @@ function getTargetedDataStrategyMatches(mapRouteProperties2, manifest, request,
       mapRouteProperties2,
       manifest,
       request,
+      path,
       getRoutePattern(matches),
       match,
       lazyRoutePropertiesToSkip,
@@ -4723,12 +4766,13 @@ function getTargetedDataStrategyMatches(mapRouteProperties2, manifest, request,
     );
   });
 }
-async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherKey, scopedContext, isStaticHandler) {
-  if (matches.some((m) => _optionalChain([m, 'access', _57 => _57._lazyPromises, 'optionalAccess', _58 => _58.middleware]))) {
-    await Promise.all(matches.map((m) => _optionalChain([m, 'access', _59 => _59._lazyPromises, 'optionalAccess', _60 => _60.middleware])));
+async function callDataStrategyImpl(dataStrategyImpl, request, path, matches, fetcherKey, scopedContext, isStaticHandler) {
+  if (matches.some((m) => _optionalChain([m, 'access', _58 => _58._lazyPromises, 'optionalAccess', _59 => _59.middleware]))) {
+    await Promise.all(matches.map((m) => _optionalChain([m, 'access', _60 => _60._lazyPromises, 'optionalAccess', _61 => _61.middleware])));
   }
   let dataStrategyArgs = {
     request,
+    unstable_url: createDataFunctionUrl(request, path),
     unstable_pattern: getRoutePattern(matches),
     params: matches[0].params,
     context: scopedContext,
@@ -4760,8 +4804,8 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
   try {
     await Promise.all(
       matches.flatMap((m) => [
-        _optionalChain([m, 'access', _61 => _61._lazyPromises, 'optionalAccess', _62 => _62.handler]),
-        _optionalChain([m, 'access', _63 => _63._lazyPromises, 'optionalAccess', _64 => _64.route])
+        _optionalChain([m, 'access', _62 => _62._lazyPromises, 'optionalAccess', _63 => _63.handler]),
+        _optionalChain([m, 'access', _64 => _64._lazyPromises, 'optionalAccess', _65 => _65.route])
       ])
     );
   } catch (e) {
@@ -4770,6 +4814,7 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
 }
 async function callLoaderOrAction({
   request,
+  path,
   unstable_pattern,
   match,
   lazyHandlerPromise,
@@ -4797,6 +4842,7 @@ async function callLoaderOrAction({
       return handler(
         {
           request,
+          unstable_url: createDataFunctionUrl(request, path),
           unstable_pattern,
           params: match.params,
           context: scopedContext
@@ -4906,15 +4952,15 @@ async function convertDataStrategyResultToDataResult(dataStrategyResult) {
         return {
           type: "error" /* error */,
           error: result.data,
-          statusCode: _optionalChain([result, 'access', _65 => _65.init, 'optionalAccess', _66 => _66.status]),
-          headers: _optionalChain([result, 'access', _67 => _67.init, 'optionalAccess', _68 => _68.headers]) ? new Headers(result.init.headers) : void 0
+          statusCode: _optionalChain([result, 'access', _66 => _66.init, 'optionalAccess', _67 => _67.status]),
+          headers: _optionalChain([result, 'access', _68 => _68.init, 'optionalAccess', _69 => _69.headers]) ? new Headers(result.init.headers) : void 0
         };
       }
       return {
         type: "error" /* error */,
         error: dataWithResponseInitToErrorResponse(result),
         statusCode: isRouteErrorResponse(result) ? result.status : void 0,
-        headers: _optionalChain([result, 'access', _69 => _69.init, 'optionalAccess', _70 => _70.headers]) ? new Headers(result.init.headers) : void 0
+        headers: _optionalChain([result, 'access', _70 => _70.init, 'optionalAccess', _71 => _71.headers]) ? new Headers(result.init.headers) : void 0
       };
     }
     return {
@@ -4927,8 +4973,8 @@ async function convertDataStrategyResultToDataResult(dataStrategyResult) {
     return {
       type: "data" /* data */,
       data: result.data,
-      statusCode: _optionalChain([result, 'access', _71 => _71.init, 'optionalAccess', _72 => _72.status]),
-      headers: _optionalChain([result, 'access', _73 => _73.init, 'optionalAccess', _74 => _74.headers]) ? new Headers(result.init.headers) : void 0
+      statusCode: _optionalChain([result, 'access', _72 => _72.init, 'optionalAccess', _73 => _73.status]),
+      headers: _optionalChain([result, 'access', _74 => _74.init, 'optionalAccess', _75 => _75.headers]) ? new Headers(result.init.headers) : void 0
     };
   }
   return { type: "data" /* data */, data: result };
@@ -4954,20 +5000,20 @@ function normalizeRelativeRoutingRedirectResponse(response, request, routeId, ma
   }
   return response;
 }
+var invalidProtocols = [
+  "about:",
+  "blob:",
+  "chrome:",
+  "chrome-untrusted:",
+  "content:",
+  "data:",
+  "devtools:",
+  "file:",
+  "filesystem:",
+  // eslint-disable-next-line no-script-url
+  "javascript:"
+];
 function normalizeRedirectLocation(location, currentUrl, basename, historyInstance) {
-  let invalidProtocols = [
-    "about:",
-    "blob:",
-    "chrome:",
-    "chrome-untrusted:",
-    "content:",
-    "data:",
-    "devtools:",
-    "file:",
-    "filesystem:",
-    // eslint-disable-next-line no-script-url
-    "javascript:"
-  ];
   if (isAbsoluteUrl(location)) {
     let normalizedLocation = location;
     let url = normalizedLocation.startsWith("//") ? new URL(currentUrl.protocol + normalizedLocation) : new URL(normalizedLocation);
@@ -5007,6 +5053,24 @@ function createClientSideRequest(history, location, signal, submission) {
   }
   return new Request(url, init);
 }
+function createDataFunctionUrl(request, path) {
+  let url = new URL(request.url);
+  let parsed = typeof path === "string" ? parsePath(path) : path;
+  url.pathname = parsed.pathname || "/";
+  if (parsed.search) {
+    let searchParams = new URLSearchParams(parsed.search);
+    let indexValues = searchParams.getAll("index");
+    searchParams.delete("index");
+    for (let value of indexValues.filter(Boolean)) {
+      searchParams.append("index", value);
+    }
+    url.search = searchParams.size ? `?${searchParams.toString()}` : "";
+  } else {
+    url.search = "";
+  }
+  url.hash = parsed.hash || "";
+  return url;
+}
 function convertFormDataToSearchParams(formData) {
   let searchParams = new URLSearchParams();
   for (let [key, value] of formData.entries()) {
@@ -5100,7 +5164,7 @@ function processLoaderData(state, matches, results, pendingActionResult, revalid
     let result = fetcherResults[key];
     invariant(result, "Did not find corresponding fetcher result");
     if (isErrorResult(result)) {
-      let boundaryMatch = findNearestBoundary(state.matches, _optionalChain([match, 'optionalAccess', _75 => _75.route, 'access', _76 => _76.id]));
+      let boundaryMatch = findNearestBoundary(state.matches, _optionalChain([match, 'optionalAccess', _76 => _76.route, 'access', _77 => _77.id]));
       if (!(errors && errors[boundaryMatch.route.id])) {
         errors = {
           ...errors,
@@ -5234,8 +5298,8 @@ function dataWithResponseInitToResponse(data2) {
 }
 function dataWithResponseInitToErrorResponse(data2) {
   return new ErrorResponseImpl(
-    _nullishCoalesce(_optionalChain([data2, 'access', _77 => _77.init, 'optionalAccess', _78 => _78.status]), () => ( 500)),
-    _nullishCoalesce(_optionalChain([data2, 'access', _79 => _79.init, 'optionalAccess', _80 => _80.statusText]), () => ( "Internal Server Error")),
+    _nullishCoalesce(_optionalChain([data2, 'access', _78 => _78.init, 'optionalAccess', _79 => _79.status]), () => ( 500)),
+    _nullishCoalesce(_optionalChain([data2, 'access', _80 => _80.init, 'optionalAccess', _81 => _81.statusText]), () => ( "Internal Server Error")),
     data2.data
   );
 }
@@ -6138,7 +6202,7 @@ function encode(input, options) {
         raceDone();
       }
       await Promise.all(Object.values(encoder.deferred));
-      _optionalChain([onComplete, 'optionalCall', _81 => _81()]);
+      _optionalChain([onComplete, 'optionalCall', _82 => _82()]);
       controller.close();
     }
   });
@@ -6268,7 +6332,7 @@ function getTurboStreamSingleFetchDataStrategy(getRouter, manifest, routeModules
       return {
         hasLoader: manifestRoute.hasLoader,
         hasClientLoader: manifestRoute.hasClientLoader,
-        hasShouldRevalidate: Boolean(_optionalChain([routeModule, 'optionalAccess', _82 => _82.shouldRevalidate]))
+        hasShouldRevalidate: Boolean(_optionalChain([routeModule, 'optionalAccess', _83 => _83.shouldRevalidate]))
       };
     },
     fetchAndDecodeViaTurboStream,
@@ -6469,7 +6533,7 @@ async function bubbleMiddlewareErrors(singleFetchPromise, matches, routesParams,
           let routeResult = fetchedData.routes[match.route.id];
           if ("error" in routeResult) {
             middlewareError = routeResult.error;
-            if (_optionalChain([results, 'access', _83 => _83[match.route.id], 'optionalAccess', _84 => _84.result]) == null) {
+            if (_optionalChain([results, 'access', _84 => _84[match.route.id], 'optionalAccess', _85 => _85.result]) == null) {
               results[match.route.id] = {
                 type: "error",
                 result: middlewareError
@@ -6592,7 +6656,7 @@ async function fetchAndDecodeViaTurboStream(args, basename, trailingSlashAware,
       }
     } else {
       let typed = decoded.value;
-      let routeId = _optionalChain([targetRoutes, 'optionalAccess', _85 => _85[0]]);
+      let routeId = _optionalChain([targetRoutes, 'optionalAccess', _86 => _86[0]]);
       invariant2(routeId, "No routeId found for single fetch call decoding");
       if ("redirect" in typed) {
         data2 = { redirect: typed };
@@ -6939,7 +7003,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
   if (locationArg) {
     let parsedLocationArg = typeof locationArg === "string" ? parsePath(locationArg) : locationArg;
     invariant(
-      parentPathnameBase === "/" || _optionalChain([parsedLocationArg, 'access', _86 => _86.pathname, 'optionalAccess', _87 => _87.startsWith, 'call', _88 => _88(parentPathnameBase)]),
+      parentPathnameBase === "/" || _optionalChain([parsedLocationArg, 'access', _87 => _87.pathname, 'optionalAccess', _88 => _88.startsWith, 'call', _89 => _89(parentPathnameBase)]),
       `When overriding the location using \`<Routes location>\` or \`useRoutes(routes, location)\`, the location pathname must begin with the portion of the URL pathname that was matched by all parent routes. The current pathname base is "${parentPathnameBase}" but pathname "${parsedLocationArg.pathname}" was given in the \`location\` prop.`
     );
     location = parsedLocationArg;
@@ -6971,21 +7035,21 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
         pathname: joinPaths([
           parentPathnameBase,
           // Re-encode pathnames that were decoded inside matchRoutes.
-          // Pre-encode `?` and `#` ahead of `encodeLocation` because it uses
+          // Pre-encode `%`, `?` and `#` ahead of `encodeLocation` because it uses
           // `new URL()` internally and we need to prevent it from treating
           // them as separators
           navigator.encodeLocation ? navigator.encodeLocation(
-            match.pathname.replace(/\?/g, "%3F").replace(/#/g, "%23")
+            match.pathname.replace(/%/g, "%25").replace(/\?/g, "%3F").replace(/#/g, "%23")
           ).pathname : match.pathname
         ]),
         pathnameBase: match.pathnameBase === "/" ? parentPathnameBase : joinPaths([
           parentPathnameBase,
           // Re-encode pathnames that were decoded inside matchRoutes
-          // Pre-encode `?` and `#` ahead of `encodeLocation` because it uses
+          // Pre-encode `%`, `?` and `#` ahead of `encodeLocation` because it uses
           // `new URL()` internally and we need to prevent it from treating
           // them as separators
           navigator.encodeLocation ? navigator.encodeLocation(
-            match.pathnameBase.replace(/\?/g, "%3F").replace(/#/g, "%23")
+            match.pathnameBase.replace(/%/g, "%25").replace(/\?/g, "%3F").replace(/#/g, "%23")
           ).pathname : match.pathnameBase
         ])
       })
@@ -7133,7 +7197,7 @@ function RenderedRoute({ routeContext, match, children }) {
   return /* @__PURE__ */ React3.createElement(RouteContext.Provider, { value: routeContext }, children);
 }
 function _renderMatches(matches, parentMatches = [], dataRouterOpts) {
-  let dataRouterState = _optionalChain([dataRouterOpts, 'optionalAccess', _89 => _89.state]);
+  let dataRouterState = _optionalChain([dataRouterOpts, 'optionalAccess', _90 => _90.state]);
   if (matches == null) {
     if (!dataRouterState) {
       return null;
@@ -7147,10 +7211,10 @@ function _renderMatches(matches, parentMatches = [], dataRouterOpts) {
     }
   }
   let renderedMatches = matches;
-  let errors = _optionalChain([dataRouterState, 'optionalAccess', _90 => _90.errors]);
+  let errors = _optionalChain([dataRouterState, 'optionalAccess', _91 => _91.errors]);
   if (errors != null) {
     let errorIndex = renderedMatches.findIndex(
-      (m) => m.route.id && _optionalChain([errors, 'optionalAccess', _91 => _91[m.route.id]]) !== void 0
+      (m) => m.route.id && _optionalChain([errors, 'optionalAccess', _92 => _92[m.route.id]]) !== void 0
     );
     invariant(
       errorIndex >= 0,
@@ -7189,11 +7253,11 @@ function _renderMatches(matches, parentMatches = [], dataRouterOpts) {
       }
     }
   }
-  let onErrorHandler = _optionalChain([dataRouterOpts, 'optionalAccess', _92 => _92.onError]);
+  let onErrorHandler = _optionalChain([dataRouterOpts, 'optionalAccess', _93 => _93.onError]);
   let onError = dataRouterState && onErrorHandler ? (error, errorInfo) => {
     onErrorHandler(error, {
       location: dataRouterState.location,
-      params: _nullishCoalesce(_optionalChain([dataRouterState, 'access', _93 => _93.matches, 'optionalAccess', _94 => _94[0], 'optionalAccess', _95 => _95.params]), () => ( {})),
+      params: _nullishCoalesce(_optionalChain([dataRouterState, 'access', _94 => _94.matches, 'optionalAccess', _95 => _95[0], 'optionalAccess', _96 => _96.params]), () => ( {})),
       unstable_pattern: getRoutePattern(dataRouterState.matches),
       errorInfo
     });
@@ -7340,15 +7404,15 @@ function useRouteError() {
   if (error !== void 0) {
     return error;
   }
-  return _optionalChain([state, 'access', _96 => _96.errors, 'optionalAccess', _97 => _97[routeId]]);
+  return _optionalChain([state, 'access', _97 => _97.errors, 'optionalAccess', _98 => _98[routeId]]);
 }
 function useAsyncValue() {
   let value = React3.useContext(AwaitContext);
-  return _optionalChain([value, 'optionalAccess', _98 => _98._data]);
+  return _optionalChain([value, 'optionalAccess', _99 => _99._data]);
 }
 function useAsyncError() {
   let value = React3.useContext(AwaitContext);
-  return _optionalChain([value, 'optionalAccess', _99 => _99._error]);
+  return _optionalChain([value, 'optionalAccess', _100 => _100._error]);
 }
 var blockerId = 0;
 function useBlocker(shouldBlock) {
@@ -7429,7 +7493,7 @@ function useRoute(...args) {
   return {
     handle: route.route.handle,
     loaderData: state.loaderData[id],
-    actionData: _optionalChain([state, 'access', _100 => _100.actionData, 'optionalAccess', _101 => _101[id]])
+    actionData: _optionalChain([state, 'access', _101 => _101.actionData, 'optionalAccess', _102 => _102[id]])
   };
 }
 
@@ -7474,7 +7538,7 @@ function getKeyedLinksForMatches(matches, routeModules, manifest) {
     let route = manifest.routes[match.route.id];
     return [
       route && route.css ? route.css.map((href) => ({ rel: "stylesheet", href })) : [],
-      _optionalChain([module, 'optionalAccess', _102 => _102.links, 'optionalCall', _103 => _103()]) || []
+      _optionalChain([module, 'optionalAccess', _103 => _103.links, 'optionalCall', _104 => _104()]) || []
     ];
   }).flat(2);
   let preloads = getModuleLinkHrefs(matches, manifest);
@@ -7575,7 +7639,7 @@ function getNewMatchesForLinks(page, nextMatches, currentMatches, manifest, loca
       // param change, /users/123 -> /users/456
       currentMatches[index].pathname !== match.pathname || // splat param changed, which is not present in match.path
       // e.g. /files/images/avatar.jpg -> files/finances.xls
-      _optionalChain([currentMatches, 'access', _104 => _104[index], 'access', _105 => _105.route, 'access', _106 => _106.path, 'optionalAccess', _107 => _107.endsWith, 'call', _108 => _108("*")]) && currentMatches[index].params["*"] !== match.params["*"]
+      _optionalChain([currentMatches, 'access', _105 => _105[index], 'access', _106 => _106.route, 'access', _107 => _107.path, 'optionalAccess', _108 => _108.endsWith, 'call', _109 => _109("*")]) && currentMatches[index].params["*"] !== match.params["*"]
     );
   };
   if (mode === "assets") {
@@ -7598,7 +7662,7 @@ function getNewMatchesForLinks(page, nextMatches, currentMatches, manifest, loca
             location.pathname + location.search + location.hash,
             window.origin
           ),
-          currentParams: _optionalChain([currentMatches, 'access', _109 => _109[0], 'optionalAccess', _110 => _110.params]) || {},
+          currentParams: _optionalChain([currentMatches, 'access', _110 => _110[0], 'optionalAccess', _111 => _111.params]) || {},
           nextUrl: new URL(page, window.origin),
           nextParams: match.params,
           defaultShouldRevalidate: true
@@ -7870,11 +7934,17 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
         )
       });
       let hasInitialData = initialState && initialState.loaderData && route.id in initialState.loaderData;
-      let initialData = hasInitialData ? _optionalChain([initialState, 'optionalAccess', _111 => _111.loaderData, 'optionalAccess', _112 => _112[route.id]]) : void 0;
+      let initialData = hasInitialData ? _optionalChain([initialState, 'optionalAccess', _112 => _112.loaderData, 'optionalAccess', _113 => _113[route.id]]) : void 0;
       let hasInitialError = initialState && initialState.errors && route.id in initialState.errors;
-      let initialError = hasInitialError ? _optionalChain([initialState, 'optionalAccess', _113 => _113.errors, 'optionalAccess', _114 => _114[route.id]]) : void 0;
-      let isHydrationRequest = needsRevalidation == null && (_optionalChain([routeModule, 'access', _115 => _115.clientLoader, 'optionalAccess', _116 => _116.hydrate]) === true || !route.hasLoader);
-      dataRoute.loader = async ({ request, params, context, unstable_pattern }, singleFetch) => {
+      let initialError = hasInitialError ? _optionalChain([initialState, 'optionalAccess', _114 => _114.errors, 'optionalAccess', _115 => _115[route.id]]) : void 0;
+      let isHydrationRequest = needsRevalidation == null && (_optionalChain([routeModule, 'access', _116 => _116.clientLoader, 'optionalAccess', _117 => _117.hydrate]) === true || !route.hasLoader);
+      dataRoute.loader = async ({
+        request,
+        params,
+        context,
+        unstable_pattern,
+        unstable_url
+      }, singleFetch) => {
         try {
           let result = await prefetchStylesAndCallHandler(async () => {
             invariant2(
@@ -7889,6 +7959,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
               params,
               context,
               unstable_pattern,
+              unstable_url,
               async serverLoader() {
                 preventInvalidServerHandlerCall("loader", route);
                 if (isHydrationRequest) {
@@ -7914,7 +7985,13 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
         route.hasLoader,
         isSpaMode
       );
-      dataRoute.action = ({ request, params, context, unstable_pattern }, singleFetch) => {
+      dataRoute.action = ({
+        request,
+        params,
+        context,
+        unstable_pattern,
+        unstable_url
+      }, singleFetch) => {
         return prefetchStylesAndCallHandler(async () => {
           invariant2(
             routeModule,
@@ -7931,6 +8008,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
             params,
             context,
             unstable_pattern,
+            unstable_url,
             async serverAction() {
               preventInvalidServerHandlerCall("action", route);
               return fetchServerAction(singleFetch);
@@ -8168,7 +8246,7 @@ function getPatchRoutesOnNavigationFunction(getRouter, manifest, routeModules, s
 function useFogOFWarDiscovery(router, manifest, routeModules, ssr, routeDiscovery, isSpaMode) {
   React6.useEffect(() => {
     if (!isFogOfWarEnabled(routeDiscovery, ssr) || // @ts-expect-error - TS doesn't know about this yet
-    _optionalChain([window, 'access', _117 => _117.navigator, 'optionalAccess', _118 => _118.connection, 'optionalAccess', _119 => _119.saveData]) === true) {
+    _optionalChain([window, 'access', _118 => _118.navigator, 'optionalAccess', _119 => _119.connection, 'optionalAccess', _120 => _120.saveData]) === true) {
       return;
     }
     function registerElement(el) {
@@ -8277,7 +8355,7 @@ async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, ro
     }
     serverPatches = await res.json();
   } catch (e) {
-    if (_optionalChain([signal, 'optionalAccess', _120 => _120.aborted])) return;
+    if (_optionalChain([signal, 'optionalAccess', _121 => _121.aborted])) return;
     throw e;
   }
   let knownRoutes = new Set(Object.keys(manifest.routes));
@@ -8536,7 +8614,7 @@ function PrefetchPageLinksImpl({
       if (!manifestRoute || !manifestRoute.hasLoader) {
         return;
       }
-      if (!newMatchesForData.some((m2) => m2.route.id === m.route.id) && m.route.id in loaderData && _optionalChain([routeModules, 'access', _121 => _121[m.route.id], 'optionalAccess', _122 => _122.shouldRevalidate])) {
+      if (!newMatchesForData.some((m2) => m2.route.id === m.route.id) && m.route.id in loaderData && _optionalChain([routeModules, 'access', _122 => _122[m.route.id], 'optionalAccess', _123 => _123.shouldRevalidate])) {
         foundOptOutRoute = true;
       } else if (manifestRoute.hasClientLoader) {
         foundOptOutRoute = true;
@@ -8624,7 +8702,7 @@ function Meta() {
       error
     };
     matches[i] = match;
-    if (_optionalChain([routeModule, 'optionalAccess', _123 => _123.meta])) {
+    if (_optionalChain([routeModule, 'optionalAccess', _124 => _124.meta])) {
       routeMeta = typeof routeModule.meta === "function" ? routeModule.meta({
         data: data2,
         loaderData: data2,
@@ -8723,7 +8801,7 @@ function Scripts(scriptProps) {
     }
     let streamScript = "window.__reactRouterContext.stream = new ReadableStream({start(controller){window.__reactRouterContext.streamController = controller;}}).pipeThrough(new TextEncoderStream());";
     let contextScript = staticContext ? `window.__reactRouterContext = ${serverHandoffString};${streamScript}` : " ";
-    let routeModulesScript = !isStatic ? " " : `${_optionalChain([manifest, 'access', _124 => _124.hmr, 'optionalAccess', _125 => _125.runtime]) ? `import ${JSON.stringify(manifest.hmr.runtime)};` : ""}${!enableFogOfWar ? `import ${JSON.stringify(manifest.url)}` : ""};
+    let routeModulesScript = !isStatic ? " " : `${_optionalChain([manifest, 'access', _125 => _125.hmr, 'optionalAccess', _126 => _126.runtime]) ? `import ${JSON.stringify(manifest.hmr.runtime)};` : ""}${!enableFogOfWar ? `import ${JSON.stringify(manifest.url)}` : ""};
 ${matches.map((match, routeIndex) => {
       let routeVarName = `route${routeIndex}`;
       let manifestEntry = manifest.routes[match.route.id];
@@ -8954,7 +9032,7 @@ function BoundaryShell({
   children
 }) {
   let { routeModules } = useFrameworkContext();
-  if (_optionalChain([routeModules, 'access', _126 => _126.root, 'optionalAccess', _127 => _127.Layout]) && !isOutsideRemixApp) {
+  if (_optionalChain([routeModules, 'access', _127 => _127.root, 'optionalAccess', _128 => _128.Layout]) && !isOutsideRemixApp) {
     return children;
   }
   return /* @__PURE__ */ React8.createElement("html", { lang: "en" }, /* @__PURE__ */ React8.createElement("head", null, /* @__PURE__ */ React8.createElement("meta", { charSet: "utf-8" }), /* @__PURE__ */ React8.createElement(
@@ -9034,20 +9112,20 @@ var hydrationRouteProperties = [
 ];
 function createMemoryRouter(routes, opts) {
   return createRouter({
-    basename: _optionalChain([opts, 'optionalAccess', _128 => _128.basename]),
-    getContext: _optionalChain([opts, 'optionalAccess', _129 => _129.getContext]),
-    future: _optionalChain([opts, 'optionalAccess', _130 => _130.future]),
+    basename: _optionalChain([opts, 'optionalAccess', _129 => _129.basename]),
+    getContext: _optionalChain([opts, 'optionalAccess', _130 => _130.getContext]),
+    future: _optionalChain([opts, 'optionalAccess', _131 => _131.future]),
     history: createMemoryHistory({
-      initialEntries: _optionalChain([opts, 'optionalAccess', _131 => _131.initialEntries]),
-      initialIndex: _optionalChain([opts, 'optionalAccess', _132 => _132.initialIndex])
+      initialEntries: _optionalChain([opts, 'optionalAccess', _132 => _132.initialEntries]),
+      initialIndex: _optionalChain([opts, 'optionalAccess', _133 => _133.initialIndex])
     }),
-    hydrationData: _optionalChain([opts, 'optionalAccess', _133 => _133.hydrationData]),
+    hydrationData: _optionalChain([opts, 'optionalAccess', _134 => _134.hydrationData]),
     routes,
     hydrationRouteProperties,
     mapRouteProperties,
-    dataStrategy: _optionalChain([opts, 'optionalAccess', _134 => _134.dataStrategy]),
-    patchRoutesOnNavigation: _optionalChain([opts, 'optionalAccess', _135 => _135.patchRoutesOnNavigation]),
-    unstable_instrumentations: _optionalChain([opts, 'optionalAccess', _136 => _136.unstable_instrumentations])
+    dataStrategy: _optionalChain([opts, 'optionalAccess', _135 => _135.dataStrategy]),
+    patchRoutesOnNavigation: _optionalChain([opts, 'optionalAccess', _136 => _136.patchRoutesOnNavigation]),
+    unstable_instrumentations: _optionalChain([opts, 'optionalAccess', _137 => _137.unstable_instrumentations])
   }).initialize();
 }
 var Deferred2 = class {
@@ -9093,7 +9171,7 @@ function RouterProvider({
         Object.values(newErrors).forEach(
           (error) => onError(error, {
             location: newState.location,
-            params: _nullishCoalesce(_optionalChain([newState, 'access', _137 => _137.matches, 'access', _138 => _138[0], 'optionalAccess', _139 => _139.params]), () => ( {})),
+            params: _nullishCoalesce(_optionalChain([newState, 'access', _138 => _138.matches, 'access', _139 => _139[0], 'optionalAccess', _140 => _140.params]), () => ( {})),
             unstable_pattern: getRoutePattern(newState.matches)
           })
         );
@@ -9131,7 +9209,7 @@ function RouterProvider({
       if (reactDomFlushSyncImpl && flushSync) {
         reactDomFlushSyncImpl(() => {
           if (transition) {
-            _optionalChain([renderDfd, 'optionalAccess', _140 => _140.resolve, 'call', _141 => _141()]);
+            _optionalChain([renderDfd, 'optionalAccess', _141 => _141.resolve, 'call', _142 => _142()]);
             transition.skipTransition();
           }
           setVtContext({
@@ -9156,7 +9234,7 @@ function RouterProvider({
         return;
       }
       if (transition) {
-        _optionalChain([renderDfd, 'optionalAccess', _142 => _142.resolve, 'call', _143 => _143()]);
+        _optionalChain([renderDfd, 'optionalAccess', _143 => _143.resolve, 'call', _144 => _144()]);
         transition.skipTransition();
         setInterruption({
           state: newState,
@@ -9245,12 +9323,12 @@ function RouterProvider({
       go: (n) => router.navigate(n),
       push: (to, state2, opts) => router.navigate(to, {
         state: state2,
-        preventScrollReset: _optionalChain([opts, 'optionalAccess', _144 => _144.preventScrollReset])
+        preventScrollReset: _optionalChain([opts, 'optionalAccess', _145 => _145.preventScrollReset])
       }),
       replace: (to, state2, opts) => router.navigate(to, {
         replace: true,
         state: state2,
-        preventScrollReset: _optionalChain([opts, 'optionalAccess', _145 => _145.preventScrollReset])
+        preventScrollReset: _optionalChain([opts, 'optionalAccess', _146 => _146.preventScrollReset])
       })
     };
   }, [router]);
@@ -9482,7 +9560,7 @@ function Await({
       if (dataRouterContext && dataRouterContext.onError && dataRouterStateContext) {
         dataRouterContext.onError(error, {
           location: dataRouterStateContext.location,
-          params: _optionalChain([dataRouterStateContext, 'access', _146 => _146.matches, 'access', _147 => _147[0], 'optionalAccess', _148 => _148.params]) || {},
+          params: _optionalChain([dataRouterStateContext, 'access', _147 => _147.matches, 'access', _148 => _148[0], 'optionalAccess', _149 => _149.params]) || {},
           unstable_pattern: getRoutePattern(dataRouterStateContext.matches),
           errorInfo
         });
@@ -9544,7 +9622,7 @@ var AwaitErrorBoundary = class extends React9.Component {
       promise = resolve.then(
         (data2) => Object.defineProperty(resolve, "_data", { get: () => data2 }),
         (error) => {
-          _optionalChain([this, 'access', _149 => _149.props, 'access', _150 => _150.onError, 'optionalCall', _151 => _151(error)]);
+          _optionalChain([this, 'access', _150 => _150.props, 'access', _151 => _151.onError, 'optionalCall', _152 => _152(error)]);
           Object.defineProperty(resolve, "_error", { get: () => error });
         }
       );
@@ -9808,4 +9886,5 @@ function withErrorBoundaryProps(ErrorBoundary) {
 
 
 
-exports.Action = Action; exports.createMemoryHistory = createMemoryHistory; exports.createBrowserHistory = createBrowserHistory; exports.createHashHistory = createHashHistory; exports.invariant = invariant; exports.warning = warning; exports.createPath = createPath; exports.parsePath = parsePath; exports.createContext = createContext; exports.RouterContextProvider = RouterContextProvider; exports.convertRoutesToDataRoutes = convertRoutesToDataRoutes; exports.matchRoutes = matchRoutes; exports.generatePath = generatePath; exports.matchPath = matchPath; exports.stripBasename = stripBasename; exports.resolvePath = resolvePath; exports.resolveTo = resolveTo; exports.joinPaths = joinPaths; exports.data = data; exports.redirect = redirect; exports.redirectDocument = redirectDocument; exports.replace = replace; exports.ErrorResponseImpl = ErrorResponseImpl; exports.isRouteErrorResponse = isRouteErrorResponse; exports.parseToInfo = parseToInfo; exports.escapeHtml = escapeHtml; exports.encode = encode; exports.instrumentHandler = instrumentHandler; exports.IDLE_NAVIGATION = IDLE_NAVIGATION; exports.IDLE_FETCHER = IDLE_FETCHER; exports.IDLE_BLOCKER = IDLE_BLOCKER; exports.createRouter = createRouter; exports.createStaticHandler = createStaticHandler; exports.getStaticContextFromError = getStaticContextFromError; exports.isDataWithResponseInit = isDataWithResponseInit; exports.isResponse = isResponse; exports.isRedirectStatusCode = isRedirectStatusCode; exports.isRedirectResponse = isRedirectResponse; exports.isMutationMethod = isMutationMethod; exports.createRequestInit = createRequestInit; exports.SingleFetchRedirectSymbol = SingleFetchRedirectSymbol; exports.SINGLE_FETCH_REDIRECT_STATUS = SINGLE_FETCH_REDIRECT_STATUS; exports.NO_BODY_STATUS_CODES = NO_BODY_STATUS_CODES; exports.StreamTransfer = StreamTransfer; exports.getTurboStreamSingleFetchDataStrategy = getTurboStreamSingleFetchDataStrategy; exports.getSingleFetchDataStrategyImpl = getSingleFetchDataStrategyImpl; exports.stripIndexParam = stripIndexParam; exports.singleFetchUrl = singleFetchUrl; exports.decodeViaTurboStream = decodeViaTurboStream; exports.DataRouterContext = DataRouterContext; exports.DataRouterStateContext = DataRouterStateContext; exports.RSCRouterContext = RSCRouterContext; exports.ViewTransitionContext = ViewTransitionContext; exports.FetchersContext = FetchersContext; exports.AwaitContextProvider = AwaitContextProvider; exports.NavigationContext = NavigationContext; exports.LocationContext = LocationContext; exports.RouteContext = RouteContext; exports.ENABLE_DEV_WARNINGS = ENABLE_DEV_WARNINGS; exports.warnOnce = warnOnce; exports.decodeRedirectErrorDigest = decodeRedirectErrorDigest; exports.decodeRouteErrorResponseDigest = decodeRouteErrorResponseDigest; exports.useHref = useHref; exports.useInRouterContext = useInRouterContext; exports.useLocation = useLocation; exports.useNavigationType = useNavigationType; exports.useMatch = useMatch; exports.useNavigate = useNavigate; exports.useOutletContext = useOutletContext; exports.useOutlet = useOutlet; exports.useParams = useParams; exports.useResolvedPath = useResolvedPath; exports.useRoutes = useRoutes; exports.useRouteId = useRouteId; exports.useNavigation = useNavigation; exports.useRevalidator = useRevalidator; exports.useMatches = useMatches; exports.useLoaderData = useLoaderData; exports.useRouteLoaderData = useRouteLoaderData; exports.useActionData = useActionData; exports.useRouteError = useRouteError; exports.useAsyncValue = useAsyncValue; exports.useAsyncError = useAsyncError; exports.useBlocker = useBlocker; exports.useRoute = useRoute; exports.RemixErrorBoundary = RemixErrorBoundary; exports.createServerRoutes = createServerRoutes; exports.createClientRoutesWithHMRRevalidationOptOut = createClientRoutesWithHMRRevalidationOptOut; exports.noActionDefinedError = noActionDefinedError; exports.createClientRoutes = createClientRoutes; exports.shouldHydrateRouteLoader = shouldHydrateRouteLoader; exports.getPatchRoutesOnNavigationFunction = getPatchRoutesOnNavigationFunction; exports.useFogOFWarDiscovery = useFogOFWarDiscovery; exports.getManifestPath = getManifestPath; exports.FrameworkContext = FrameworkContext; exports.usePrefetchBehavior = usePrefetchBehavior; exports.CRITICAL_CSS_DATA_ATTRIBUTE = CRITICAL_CSS_DATA_ATTRIBUTE; exports.Links = Links; exports.PrefetchPageLinks = PrefetchPageLinks; exports.Meta = Meta; exports.setIsHydrated = setIsHydrated; exports.Scripts = Scripts; exports.mergeRefs = mergeRefs; exports.mapRouteProperties = mapRouteProperties; exports.hydrationRouteProperties = hydrationRouteProperties; exports.createMemoryRouter = createMemoryRouter; exports.RouterProvider = RouterProvider; exports.DataRoutes = DataRoutes; exports.MemoryRouter = MemoryRouter; exports.Navigate = Navigate; exports.Outlet = Outlet; exports.Route = Route; exports.Router = Router; exports.Routes = Routes; exports.Await = Await; exports.createRoutesFromChildren = createRoutesFromChildren; exports.createRoutesFromElements = createRoutesFromElements; exports.renderMatches = renderMatches; exports.WithComponentProps = WithComponentProps; exports.withComponentProps = withComponentProps; exports.WithHydrateFallbackProps = WithHydrateFallbackProps; exports.withHydrateFallbackProps = withHydrateFallbackProps; exports.WithErrorBoundaryProps = WithErrorBoundaryProps; exports.withErrorBoundaryProps = withErrorBoundaryProps;
+
+exports.Action = Action; exports.createMemoryHistory = createMemoryHistory; exports.createBrowserHistory = createBrowserHistory; exports.createHashHistory = createHashHistory; exports.invariant = invariant; exports.warning = warning; exports.createPath = createPath; exports.parsePath = parsePath; exports.createContext = createContext; exports.RouterContextProvider = RouterContextProvider; exports.convertRoutesToDataRoutes = convertRoutesToDataRoutes; exports.matchRoutes = matchRoutes; exports.generatePath = generatePath; exports.matchPath = matchPath; exports.stripBasename = stripBasename; exports.resolvePath = resolvePath; exports.resolveTo = resolveTo; exports.joinPaths = joinPaths; exports.data = data; exports.redirect = redirect; exports.redirectDocument = redirectDocument; exports.replace = replace; exports.ErrorResponseImpl = ErrorResponseImpl; exports.isRouteErrorResponse = isRouteErrorResponse; exports.parseToInfo = parseToInfo; exports.escapeHtml = escapeHtml; exports.encode = encode; exports.instrumentHandler = instrumentHandler; exports.IDLE_NAVIGATION = IDLE_NAVIGATION; exports.IDLE_FETCHER = IDLE_FETCHER; exports.IDLE_BLOCKER = IDLE_BLOCKER; exports.createRouter = createRouter; exports.createStaticHandler = createStaticHandler; exports.getStaticContextFromError = getStaticContextFromError; exports.invalidProtocols = invalidProtocols; exports.isDataWithResponseInit = isDataWithResponseInit; exports.isResponse = isResponse; exports.isRedirectStatusCode = isRedirectStatusCode; exports.isRedirectResponse = isRedirectResponse; exports.isMutationMethod = isMutationMethod; exports.createRequestInit = createRequestInit; exports.SingleFetchRedirectSymbol = SingleFetchRedirectSymbol; exports.SINGLE_FETCH_REDIRECT_STATUS = SINGLE_FETCH_REDIRECT_STATUS; exports.NO_BODY_STATUS_CODES = NO_BODY_STATUS_CODES; exports.StreamTransfer = StreamTransfer; exports.getTurboStreamSingleFetchDataStrategy = getTurboStreamSingleFetchDataStrategy; exports.getSingleFetchDataStrategyImpl = getSingleFetchDataStrategyImpl; exports.stripIndexParam = stripIndexParam; exports.singleFetchUrl = singleFetchUrl; exports.decodeViaTurboStream = decodeViaTurboStream; exports.DataRouterContext = DataRouterContext; exports.DataRouterStateContext = DataRouterStateContext; exports.RSCRouterContext = RSCRouterContext; exports.ViewTransitionContext = ViewTransitionContext; exports.FetchersContext = FetchersContext; exports.AwaitContextProvider = AwaitContextProvider; exports.NavigationContext = NavigationContext; exports.LocationContext = LocationContext; exports.RouteContext = RouteContext; exports.ENABLE_DEV_WARNINGS = ENABLE_DEV_WARNINGS; exports.warnOnce = warnOnce; exports.decodeRedirectErrorDigest = decodeRedirectErrorDigest; exports.decodeRouteErrorResponseDigest = decodeRouteErrorResponseDigest; exports.useHref = useHref; exports.useInRouterContext = useInRouterContext; exports.useLocation = useLocation; exports.useNavigationType = useNavigationType; exports.useMatch = useMatch; exports.useNavigate = useNavigate; exports.useOutletContext = useOutletContext; exports.useOutlet = useOutlet; exports.useParams = useParams; exports.useResolvedPath = useResolvedPath; exports.useRoutes = useRoutes; exports.useRouteId = useRouteId; exports.useNavigation = useNavigation; exports.useRevalidator = useRevalidator; exports.useMatches = useMatches; exports.useLoaderData = useLoaderData; exports.useRouteLoaderData = useRouteLoaderData; exports.useActionData = useActionData; exports.useRouteError = useRouteError; exports.useAsyncValue = useAsyncValue; exports.useAsyncError = useAsyncError; exports.useBlocker = useBlocker; exports.useRoute = useRoute; exports.RemixErrorBoundary = RemixErrorBoundary; exports.createServerRoutes = createServerRoutes; exports.createClientRoutesWithHMRRevalidationOptOut = createClientRoutesWithHMRRevalidationOptOut; exports.noActionDefinedError = noActionDefinedError; exports.createClientRoutes = createClientRoutes; exports.shouldHydrateRouteLoader = shouldHydrateRouteLoader; exports.getPatchRoutesOnNavigationFunction = getPatchRoutesOnNavigationFunction; exports.useFogOFWarDiscovery = useFogOFWarDiscovery; exports.getManifestPath = getManifestPath; exports.FrameworkContext = FrameworkContext; exports.usePrefetchBehavior = usePrefetchBehavior; exports.CRITICAL_CSS_DATA_ATTRIBUTE = CRITICAL_CSS_DATA_ATTRIBUTE; exports.Links = Links; exports.PrefetchPageLinks = PrefetchPageLinks; exports.Meta = Meta; exports.setIsHydrated = setIsHydrated; exports.Scripts = Scripts; exports.mergeRefs = mergeRefs; exports.mapRouteProperties = mapRouteProperties; exports.hydrationRouteProperties = hydrationRouteProperties; exports.createMemoryRouter = createMemoryRouter; exports.RouterProvider = RouterProvider; exports.DataRoutes = DataRoutes; exports.MemoryRouter = MemoryRouter; exports.Navigate = Navigate; exports.Outlet = Outlet; exports.Route = Route; exports.Router = Router; exports.Routes = Routes; exports.Await = Await; exports.createRoutesFromChildren = createRoutesFromChildren; exports.createRoutesFromElements = createRoutesFromElements; exports.renderMatches = renderMatches; exports.WithComponentProps = WithComponentProps; exports.withComponentProps = withComponentProps; exports.WithHydrateFallbackProps = WithHydrateFallbackProps; exports.withHydrateFallbackProps = withHydrateFallbackProps; exports.WithErrorBoundaryProps = WithErrorBoundaryProps; exports.withErrorBoundaryProps = withErrorBoundaryProps;