react-router 7.9.6 → 7.10.0-pre.1

package/dist/development/{chunk-AMVS5XVJ.js → chunk-KQLPIZ7E.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.9.6
+ * react-router v7.10.0-pre.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -973,8 +973,8 @@ var ErrorResponseImpl = class {
 function isRouteErrorResponse(error) {
   return error != null && typeof error.status === "number" && typeof error.statusText === "string" && typeof error.internal === "boolean" && "data" in error;
 }
-function getRoutePattern(paths) {
-  return paths.filter(Boolean).join("/").replace(/\/\/*/g, "/") || "/";
+function getRoutePattern(matches) {
+  return matches.map((m) => m.route.path).filter(Boolean).join("/").replace(/\/\/*/g, "/") || "/";
 }
 
 // lib/router/instrumentation.ts
@@ -1411,6 +1411,7 @@ function createRouter(init) {
     blockers: /* @__PURE__ */ new Map()
   };
   let pendingAction = "POP" /* Pop */;
+  let pendingPopstateNavigationDfd = null;
   let pendingPreventScrollReset = false;
   let pendingNavigationController;
   let pendingViewTransitionEnabled = false;
@@ -1470,6 +1471,8 @@ function createRouter(init) {
               updateState({ blockers });
             }
           });
+          _optionalChain([pendingPopstateNavigationDfd, 'optionalAccess', _5 => _5.resolve, 'call', _6 => _6()]);
+          pendingPopstateNavigationDfd = null;
           return;
         }
         return startNavigation(historyAction, location);
@@ -1541,6 +1544,7 @@ function createRouter(init) {
     [...subscribers].forEach(
       (subscriber) => subscriber(state, {
         deletedFetchers: unmountedFetchers,
+        newErrors: _nullishCoalesce(newState.errors, () => ( null)),
         viewTransitionOpts: opts.viewTransitionOpts,
         flushSync: opts.flushSync === true
       })
@@ -1549,7 +1553,7 @@ function createRouter(init) {
     mountedFetchers.forEach((key) => state.fetchers.delete(key));
   }
   function completeNavigation(location, newState, { flushSync } = {}) {
-    let isActionReload = state.actionData != null && state.navigation.formMethod != null && isMutationMethod(state.navigation.formMethod) && state.navigation.state === "loading" && _optionalChain([location, 'access', _5 => _5.state, 'optionalAccess', _6 => _6._isRedirect]) !== true;
+    let isActionReload = state.actionData != null && state.navigation.formMethod != null && isMutationMethod(state.navigation.formMethod) && state.navigation.state === "loading" && _optionalChain([location, 'access', _7 => _7.state, 'optionalAccess', _8 => _8._isRedirect]) !== true;
     let actionData;
     if (newState.actionData) {
       if (Object.keys(newState.actionData).length > 0) {
@@ -1574,7 +1578,7 @@ function createRouter(init) {
       blockers.forEach((_, k) => blockers.set(k, IDLE_BLOCKER));
     }
     let restoreScrollPosition = isUninterruptedRevalidation ? false : getSavedScrollPosition(location, newState.matches || state.matches);
-    let preventScrollReset = pendingPreventScrollReset === true || state.navigation.formMethod != null && isMutationMethod(state.navigation.formMethod) && _optionalChain([location, 'access', _7 => _7.state, 'optionalAccess', _8 => _8._isRedirect]) !== true;
+    let preventScrollReset = pendingPreventScrollReset === true || state.navigation.formMethod != null && isMutationMethod(state.navigation.formMethod) && _optionalChain([location, 'access', _9 => _9.state, 'optionalAccess', _10 => _10._isRedirect]) !== true;
     if (inFlightDataRoutes) {
       dataRoutes = inFlightDataRoutes;
       inFlightDataRoutes = void 0;
@@ -1638,21 +1642,29 @@ function createRouter(init) {
     pendingViewTransitionEnabled = false;
     isUninterruptedRevalidation = false;
     isRevalidationRequired = false;
-    _optionalChain([pendingRevalidationDfd, 'optionalAccess', _9 => _9.resolve, 'call', _10 => _10()]);
+    _optionalChain([pendingPopstateNavigationDfd, 'optionalAccess', _11 => _11.resolve, 'call', _12 => _12()]);
+    pendingPopstateNavigationDfd = null;
+    _optionalChain([pendingRevalidationDfd, 'optionalAccess', _13 => _13.resolve, 'call', _14 => _14()]);
     pendingRevalidationDfd = null;
   }
   async function navigate(to, opts) {
+    _optionalChain([pendingPopstateNavigationDfd, 'optionalAccess', _15 => _15.resolve, 'call', _16 => _16()]);
+    pendingPopstateNavigationDfd = null;
     if (typeof to === "number") {
+      if (!pendingPopstateNavigationDfd) {
+        pendingPopstateNavigationDfd = createDeferred();
+      }
+      let promise = pendingPopstateNavigationDfd.promise;
       init.history.go(to);
-      return;
+      return promise;
     }
     let normalizedPath = normalizeTo(
       state.location,
       state.matches,
       basename,
       to,
-      _optionalChain([opts, 'optionalAccess', _11 => _11.fromRouteId]),
-      _optionalChain([opts, 'optionalAccess', _12 => _12.relative])
+      _optionalChain([opts, 'optionalAccess', _17 => _17.fromRouteId]),
+      _optionalChain([opts, 'optionalAccess', _18 => _18.relative])
     );
     let { path, submission, error } = normalizeNavigateOptions(
       false,
@@ -1749,7 +1761,7 @@ function createRouter(init) {
     pendingViewTransitionEnabled = (opts && opts.enableViewTransition) === true;
     let routesToUse = inFlightDataRoutes || dataRoutes;
     let loadingNavigation = opts && opts.overrideNavigation;
-    let matches = _optionalChain([opts, 'optionalAccess', _13 => _13.initialHydration]) && state.matches && state.matches.length > 0 && !initialMatchesIsFOW ? (
+    let matches = _optionalChain([opts, 'optionalAccess', _19 => _19.initialHydration]) && state.matches && state.matches.length > 0 && !initialMatchesIsFOW ? (
       // `matchRoutes()` has already been called if we're in here via `router.initialize()`
       state.matches
     ) : matchRoutes(routesToUse, location, basename);
@@ -2207,7 +2219,7 @@ function createRouter(init) {
       basename,
       href,
       routeId,
-      _optionalChain([opts, 'optionalAccess', _14 => _14.relative])
+      _optionalChain([opts, 'optionalAccess', _20 => _20.relative])
     );
     let matches = matchRoutes(routesToUse, normalizedPath, basename);
     let fogOfWar = checkFogOfWar(matches, routesToUse, normalizedPath);
@@ -2584,6 +2596,10 @@ function createRouter(init) {
     preventScrollReset,
     replace: replace2
   } = {}) {
+    if (!isNavigation) {
+      _optionalChain([pendingPopstateNavigationDfd, 'optionalAccess', _21 => _21.resolve, 'call', _22 => _22()]);
+      pendingPopstateNavigationDfd = null;
+    }
     if (redirect2.response.headers.has("X-Remix-Revalidate")) {
       isRevalidationRequired = true;
     }
@@ -2768,7 +2784,7 @@ function createRouter(init) {
     return state.fetchers.get(key) || IDLE_FETCHER;
   }
   function resetFetcher(key, opts) {
-    abortFetcher(key, _optionalChain([opts, 'optionalAccess', _15 => _15.reason]));
+    abortFetcher(key, _optionalChain([opts, 'optionalAccess', _23 => _23.reason]));
     updateFetcherState(key, getDoneFetcher(null));
   }
   function deleteFetcher(key) {
@@ -3109,9 +3125,9 @@ function createStaticHandler(routes, opts) {
   );
   let manifest = {};
   let basename = (opts ? opts.basename : null) || "/";
-  let _mapRouteProperties = _optionalChain([opts, 'optionalAccess', _16 => _16.mapRouteProperties]) || defaultMapRouteProperties;
+  let _mapRouteProperties = _optionalChain([opts, 'optionalAccess', _24 => _24.mapRouteProperties]) || defaultMapRouteProperties;
   let mapRouteProperties2 = _mapRouteProperties;
-  if (_optionalChain([opts, 'optionalAccess', _17 => _17.unstable_instrumentations])) {
+  if (_optionalChain([opts, 'optionalAccess', _25 => _25.unstable_instrumentations])) {
     let instrumentations = opts.unstable_instrumentations;
     mapRouteProperties2 = (route) => {
       return {
@@ -3192,7 +3208,7 @@ function createStaticHandler(routes, opts) {
         let response = await runServerMiddlewarePipeline(
           {
             request,
-            unstable_pattern: getRoutePattern(matches.map((m) => m.route.path)),
+            unstable_pattern: getRoutePattern(matches),
             matches,
             params: matches[0].params,
             // If we're calling middleware then it must be enabled so we can cast
@@ -3256,9 +3272,9 @@ function createStaticHandler(routes, opts) {
             } else {
               let boundaryRouteId = skipLoaderErrorBubbling ? routeId : findNearestBoundary(
                 matches,
-                _optionalChain([matches, 'access', _18 => _18.find, 'call', _19 => _19(
+                _optionalChain([matches, 'access', _26 => _26.find, 'call', _27 => _27(
                   (m) => m.route.id === routeId || m.route.loader
-                ), 'optionalAccess', _20 => _20.route, 'access', _21 => _21.id]) || routeId
+                ), 'optionalAccess', _28 => _28.route, 'access', _29 => _29.id]) || routeId
               ).route.id;
               let staticContext = {
                 matches,
@@ -3338,7 +3354,7 @@ function createStaticHandler(routes, opts) {
       let response = await runServerMiddlewarePipeline(
         {
           request,
-          unstable_pattern: getRoutePattern(matches.map((m) => m.route.path)),
+          unstable_pattern: getRoutePattern(matches),
           matches,
           params: matches[0].params,
           // If we're calling middleware then it must be enabled so we can cast
@@ -3591,11 +3607,11 @@ function createStaticHandler(routes, opts) {
   }
   async function loadRouteData(request, matches, requestContext, dataStrategy, skipLoaderErrorBubbling, routeMatch, filterMatchesToLoad, pendingActionResult) {
     let isRouteRequest = routeMatch != null;
-    if (isRouteRequest && !_optionalChain([routeMatch, 'optionalAccess', _22 => _22.route, 'access', _23 => _23.loader]) && !_optionalChain([routeMatch, 'optionalAccess', _24 => _24.route, 'access', _25 => _25.lazy])) {
+    if (isRouteRequest && !_optionalChain([routeMatch, 'optionalAccess', _30 => _30.route, 'access', _31 => _31.loader]) && !_optionalChain([routeMatch, 'optionalAccess', _32 => _32.route, 'access', _33 => _33.lazy])) {
       throw getInternalRouterError(400, {
         method: request.method,
         pathname: new URL(request.url).pathname,
-        routeId: _optionalChain([routeMatch, 'optionalAccess', _26 => _26.route, 'access', _27 => _27.id])
+        routeId: _optionalChain([routeMatch, 'optionalAccess', _34 => _34.route, 'access', _35 => _35.id])
       });
     }
     let dsMatches;
@@ -3614,7 +3630,7 @@ function createStaticHandler(routes, opts) {
         // Up to but not including the boundary
         matches.findIndex((m) => m.route.id === pendingActionResult[0]) - 1
       ) : void 0;
-      let pattern = getRoutePattern(matches.map((m) => m.route.path));
+      let pattern = getRoutePattern(matches);
       dsMatches = matches.map((match, index) => {
         if (maxIdx != null && index > maxIdx) {
           return getDataStrategyMatch(
@@ -3906,14 +3922,14 @@ function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest,
   let shouldSkipRevalidation = actionStatus && actionStatus >= 400;
   let baseShouldRevalidateArgs = {
     currentUrl,
-    currentParams: _optionalChain([state, 'access', _28 => _28.matches, 'access', _29 => _29[0], 'optionalAccess', _30 => _30.params]) || {},
+    currentParams: _optionalChain([state, 'access', _36 => _36.matches, 'access', _37 => _37[0], 'optionalAccess', _38 => _38.params]) || {},
     nextUrl,
     nextParams: matches[0].params,
     ...submission,
     actionResult,
     actionStatus
   };
-  let pattern = getRoutePattern(matches.map((m) => m.route.path));
+  let pattern = getRoutePattern(matches);
   let dsMatches = matches.map((match, index) => {
     let { route } = match;
     let forceShouldLoad = null;
@@ -4133,7 +4149,7 @@ function patchRoutesImpl(routeId, children, routesToUse, manifest, mapRoutePrope
     let newRoutes = convertRoutesToDataRoutes(
       uniqueChildren,
       mapRouteProperties2,
-      [routeId || "_", "patch", String(_optionalChain([childrenToPatch, 'optionalAccess', _31 => _31.length]) || "0")],
+      [routeId || "_", "patch", String(_optionalChain([childrenToPatch, 'optionalAccess', _39 => _39.length]) || "0")],
       manifest
     );
     childrenToPatch.push(...newRoutes);
@@ -4170,7 +4186,7 @@ function isSameRoute(newRoute, existingRoute) {
     return true;
   }
   return newRoute.children.every(
-    (aChild, i) => _optionalChain([existingRoute, 'access', _32 => _32.children, 'optionalAccess', _33 => _33.some, 'call', _34 => _34((bChild) => isSameRoute(aChild, bChild))])
+    (aChild, i) => _optionalChain([existingRoute, 'access', _40 => _40.children, 'optionalAccess', _41 => _41.some, 'call', _42 => _42((bChild) => isSameRoute(aChild, bChild))])
   );
 }
 var lazyRoutePropertyCache = /* @__PURE__ */ new WeakMap();
@@ -4318,9 +4334,9 @@ function loadLazyRoute(route, type, manifest, mapRouteProperties2, lazyRouteProp
   }
   let lazyRoutePromise = lazyPropertyPromises.length > 0 ? Promise.all(lazyPropertyPromises).then(() => {
   }) : void 0;
-  _optionalChain([lazyRoutePromise, 'optionalAccess', _35 => _35.catch, 'call', _36 => _36(() => {
+  _optionalChain([lazyRoutePromise, 'optionalAccess', _43 => _43.catch, 'call', _44 => _44(() => {
   })]);
-  _optionalChain([lazyHandlerPromise, 'optionalAccess', _37 => _37.catch, 'call', _38 => _38(() => {
+  _optionalChain([lazyHandlerPromise, 'optionalAccess', _45 => _45.catch, 'call', _46 => _46(() => {
   })]);
   return {
     lazyRoutePromise,
@@ -4397,7 +4413,7 @@ function runClientMiddlewarePipeline(args, handler) {
         ),
         // or the shallowest route that needs to load data
         Math.max(
-          matches.findIndex((m) => m.unstable_shouldCallHandler()),
+          matches.findIndex((m) => m.shouldCallHandler()),
           0
         )
       );
@@ -4500,7 +4516,7 @@ function getDataStrategyMatchLazyPromises(mapRouteProperties2, manifest, request
     handler: lazyRoutePromises.lazyHandlerPromise
   };
 }
-function getDataStrategyMatch(mapRouteProperties2, manifest, request, unstable_pattern, match, lazyRoutePropertiesToSkip, scopedContext, shouldLoad, unstable_shouldRevalidateArgs = null) {
+function getDataStrategyMatch(mapRouteProperties2, manifest, request, unstable_pattern, match, lazyRoutePropertiesToSkip, scopedContext, shouldLoad, shouldRevalidateArgs = null) {
   let isUsingNewApi = false;
   let _lazyPromises = getDataStrategyMatchLazyPromises(
     mapRouteProperties2,
@@ -4513,19 +4529,19 @@ function getDataStrategyMatch(mapRouteProperties2, manifest, request, unstable_p
     ...match,
     _lazyPromises,
     shouldLoad,
-    unstable_shouldRevalidateArgs,
-    unstable_shouldCallHandler(defaultShouldRevalidate) {
+    shouldRevalidateArgs,
+    shouldCallHandler(defaultShouldRevalidate) {
       isUsingNewApi = true;
-      if (!unstable_shouldRevalidateArgs) {
+      if (!shouldRevalidateArgs) {
         return shouldLoad;
       }
       if (typeof defaultShouldRevalidate === "boolean") {
         return shouldRevalidateLoader(match, {
-          ...unstable_shouldRevalidateArgs,
+          ...shouldRevalidateArgs,
           defaultShouldRevalidate
         });
       }
-      return shouldRevalidateLoader(match, unstable_shouldRevalidateArgs);
+      return shouldRevalidateLoader(match, shouldRevalidateArgs);
     },
     resolve(handlerOverride) {
       let { lazy, loader, middleware } = match.route;
@@ -4536,8 +4552,8 @@ function getDataStrategyMatch(mapRouteProperties2, manifest, request, unstable_p
           request,
           unstable_pattern,
           match,
-          lazyHandlerPromise: _optionalChain([_lazyPromises, 'optionalAccess', _39 => _39.handler]),
-          lazyRoutePromise: _optionalChain([_lazyPromises, 'optionalAccess', _40 => _40.route]),
+          lazyHandlerPromise: _optionalChain([_lazyPromises, 'optionalAccess', _47 => _47.handler]),
+          lazyRoutePromise: _optionalChain([_lazyPromises, 'optionalAccess', _48 => _48.route]),
           handlerOverride,
           scopedContext
         });
@@ -4552,8 +4568,8 @@ function getTargetedDataStrategyMatches(mapRouteProperties2, manifest, request,
       return {
         ...match,
         shouldLoad: false,
-        unstable_shouldRevalidateArgs: shouldRevalidateArgs,
-        unstable_shouldCallHandler: () => false,
+        shouldRevalidateArgs,
+        shouldCallHandler: () => false,
         _lazyPromises: getDataStrategyMatchLazyPromises(
           mapRouteProperties2,
           manifest,
@@ -4568,7 +4584,7 @@ function getTargetedDataStrategyMatches(mapRouteProperties2, manifest, request,
       mapRouteProperties2,
       manifest,
       request,
-      getRoutePattern(matches.map((m) => m.route.path)),
+      getRoutePattern(matches),
       match,
       lazyRoutePropertiesToSkip,
       scopedContext,
@@ -4578,12 +4594,12 @@ function getTargetedDataStrategyMatches(mapRouteProperties2, manifest, request,
   });
 }
 async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherKey, scopedContext, isStaticHandler) {
-  if (matches.some((m) => _optionalChain([m, 'access', _41 => _41._lazyPromises, 'optionalAccess', _42 => _42.middleware]))) {
-    await Promise.all(matches.map((m) => _optionalChain([m, 'access', _43 => _43._lazyPromises, 'optionalAccess', _44 => _44.middleware])));
+  if (matches.some((m) => _optionalChain([m, 'access', _49 => _49._lazyPromises, 'optionalAccess', _50 => _50.middleware]))) {
+    await Promise.all(matches.map((m) => _optionalChain([m, 'access', _51 => _51._lazyPromises, 'optionalAccess', _52 => _52.middleware])));
   }
   let dataStrategyArgs = {
     request,
-    unstable_pattern: getRoutePattern(matches.map((m) => m.route.path)),
+    unstable_pattern: getRoutePattern(matches),
     params: matches[0].params,
     context: scopedContext,
     matches
@@ -4614,8 +4630,8 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
   try {
     await Promise.all(
       matches.flatMap((m) => [
-        _optionalChain([m, 'access', _45 => _45._lazyPromises, 'optionalAccess', _46 => _46.handler]),
-        _optionalChain([m, 'access', _47 => _47._lazyPromises, 'optionalAccess', _48 => _48.route])
+        _optionalChain([m, 'access', _53 => _53._lazyPromises, 'optionalAccess', _54 => _54.handler]),
+        _optionalChain([m, 'access', _55 => _55._lazyPromises, 'optionalAccess', _56 => _56.route])
       ])
     );
   } catch (e) {
@@ -4760,19 +4776,15 @@ async function convertDataStrategyResultToDataResult(dataStrategyResult) {
         return {
           type: "error" /* error */,
           error: result.data,
-          statusCode: _optionalChain([result, 'access', _49 => _49.init, 'optionalAccess', _50 => _50.status]),
-          headers: _optionalChain([result, 'access', _51 => _51.init, 'optionalAccess', _52 => _52.headers]) ? new Headers(result.init.headers) : void 0
+          statusCode: _optionalChain([result, 'access', _57 => _57.init, 'optionalAccess', _58 => _58.status]),
+          headers: _optionalChain([result, 'access', _59 => _59.init, 'optionalAccess', _60 => _60.headers]) ? new Headers(result.init.headers) : void 0
         };
       }
       return {
         type: "error" /* error */,
-        error: new ErrorResponseImpl(
-          _optionalChain([result, 'access', _53 => _53.init, 'optionalAccess', _54 => _54.status]) || 500,
-          void 0,
-          result.data
-        ),
+        error: dataWithResponseInitToErrorResponse(result),
         statusCode: isRouteErrorResponse(result) ? result.status : void 0,
-        headers: _optionalChain([result, 'access', _55 => _55.init, 'optionalAccess', _56 => _56.headers]) ? new Headers(result.init.headers) : void 0
+        headers: _optionalChain([result, 'access', _61 => _61.init, 'optionalAccess', _62 => _62.headers]) ? new Headers(result.init.headers) : void 0
       };
     }
     return {
@@ -4785,8 +4797,8 @@ async function convertDataStrategyResultToDataResult(dataStrategyResult) {
     return {
       type: "data" /* data */,
       data: result.data,
-      statusCode: _optionalChain([result, 'access', _57 => _57.init, 'optionalAccess', _58 => _58.status]),
-      headers: _optionalChain([result, 'access', _59 => _59.init, 'optionalAccess', _60 => _60.headers]) ? new Headers(result.init.headers) : void 0
+      statusCode: _optionalChain([result, 'access', _63 => _63.init, 'optionalAccess', _64 => _64.status]),
+      headers: _optionalChain([result, 'access', _65 => _65.init, 'optionalAccess', _66 => _66.headers]) ? new Headers(result.init.headers) : void 0
     };
   }
   return { type: "data" /* data */, data: result };
@@ -4935,7 +4947,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', _61 => _61.route, 'access', _62 => _62.id]));
+      let boundaryMatch = findNearestBoundary(state.matches, _optionalChain([match, 'optionalAccess', _67 => _67.route, 'access', _68 => _68.id]));
       if (!(errors && errors[boundaryMatch.route.id])) {
         errors = {
           ...errors,
@@ -5069,8 +5081,8 @@ function dataWithResponseInitToResponse(data2) {
 }
 function dataWithResponseInitToErrorResponse(data2) {
   return new ErrorResponseImpl(
-    _nullishCoalesce(_optionalChain([data2, 'access', _63 => _63.init, 'optionalAccess', _64 => _64.status]), () => ( 500)),
-    _nullishCoalesce(_optionalChain([data2, 'access', _65 => _65.init, 'optionalAccess', _66 => _66.statusText]), () => ( "Internal Server Error")),
+    _nullishCoalesce(_optionalChain([data2, 'access', _69 => _69.init, 'optionalAccess', _70 => _70.status]), () => ( 500)),
+    _nullishCoalesce(_optionalChain([data2, 'access', _71 => _71.init, 'optionalAccess', _72 => _72.statusText]), () => ( "Internal Server Error")),
     data2.data
   );
 }
@@ -6102,7 +6114,7 @@ function getTurboStreamSingleFetchDataStrategy(getRouter, manifest, routeModules
       return {
         hasLoader: manifestRoute.hasLoader,
         hasClientLoader: manifestRoute.hasClientLoader,
-        hasShouldRevalidate: Boolean(_optionalChain([routeModule, 'optionalAccess', _67 => _67.shouldRevalidate]))
+        hasShouldRevalidate: Boolean(_optionalChain([routeModule, 'optionalAccess', _73 => _73.shouldRevalidate]))
       };
     },
     fetchAndDecodeViaTurboStream,
@@ -6120,7 +6132,7 @@ function getSingleFetchDataStrategyImpl(getRouter, getRouteInfo, fetchAndDecode,
     }
     let foundRevalidatingServerLoader = matches.some((m) => {
       let { hasLoader, hasClientLoader } = getRouteInfo(m);
-      return m.unstable_shouldCallHandler() && hasLoader && !hasClientLoader;
+      return m.shouldCallHandler() && hasLoader && !hasClientLoader;
     });
     if (!ssr && !foundRevalidatingServerLoader) {
       return nonSsrStrategy(args, getRouteInfo, fetchAndDecode, basename);
@@ -6140,7 +6152,7 @@ function getSingleFetchDataStrategyImpl(getRouter, getRouteInfo, fetchAndDecode,
   };
 }
 async function singleFetchActionStrategy(args, fetchAndDecode, basename) {
-  let actionMatch = args.matches.find((m) => m.unstable_shouldCallHandler());
+  let actionMatch = args.matches.find((m) => m.shouldCallHandler());
   invariant2(actionMatch, "No action match found");
   let actionStatus = void 0;
   let result = await actionMatch.resolve(async (handler) => {
@@ -6164,9 +6176,7 @@ async function singleFetchActionStrategy(args, fetchAndDecode, basename) {
   };
 }
 async function nonSsrStrategy(args, getRouteInfo, fetchAndDecode, basename) {
-  let matchesToLoad = args.matches.filter(
-    (m) => m.unstable_shouldCallHandler()
-  );
+  let matchesToLoad = args.matches.filter((m) => m.shouldCallHandler());
   let results = {};
   await Promise.all(
     matchesToLoad.map(
@@ -6199,10 +6209,10 @@ async function singleFetchLoaderNavigationStrategy(args, router, getRouteInfo, f
         routeDfds[i].resolve();
         let routeId = m.route.id;
         let { hasLoader, hasClientLoader, hasShouldRevalidate } = getRouteInfo(m);
-        let defaultShouldRevalidate = !m.unstable_shouldRevalidateArgs || m.unstable_shouldRevalidateArgs.actionStatus == null || m.unstable_shouldRevalidateArgs.actionStatus < 400;
-        let shouldCall = m.unstable_shouldCallHandler(defaultShouldRevalidate);
+        let defaultShouldRevalidate = !m.shouldRevalidateArgs || m.shouldRevalidateArgs.actionStatus == null || m.shouldRevalidateArgs.actionStatus < 400;
+        let shouldCall = m.shouldCallHandler(defaultShouldRevalidate);
         if (!shouldCall) {
-          foundOptOutRoute || (foundOptOutRoute = m.unstable_shouldRevalidateArgs != null && // This is a revalidation,
+          foundOptOutRoute || (foundOptOutRoute = m.shouldRevalidateArgs != null && // This is a revalidation,
           hasLoader && // for a route with a server loader,
           hasShouldRevalidate === true);
           return;
@@ -6269,7 +6279,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', _68 => _68[match.route.id], 'optionalAccess', _69 => _69.result]) == null) {
+            if (_optionalChain([results, 'access', _74 => _74[match.route.id], 'optionalAccess', _75 => _75.result]) == null) {
               results[match.route.id] = {
                 type: "error",
                 result: middlewareError
@@ -6291,7 +6301,7 @@ async function bubbleMiddlewareErrors(singleFetchPromise, matches, routesParams,
   }
 }
 async function singleFetchLoaderFetcherStrategy(args, fetchAndDecode, basename) {
-  let fetcherMatch = args.matches.find((m) => m.unstable_shouldCallHandler());
+  let fetcherMatch = args.matches.find((m) => m.shouldCallHandler());
   invariant2(fetcherMatch, "No fetcher match found");
   let routeId = fetcherMatch.route.id;
   let result = await fetcherMatch.resolve(
@@ -6382,7 +6392,7 @@ async function fetchAndDecodeViaTurboStream(args, basename, targetRoutes) {
       }
     } else {
       let typed = decoded.value;
-      let routeId = _optionalChain([targetRoutes, 'optionalAccess', _70 => _70[0]]);
+      let routeId = _optionalChain([targetRoutes, 'optionalAccess', _76 => _76[0]]);
       invariant2(routeId, "No routeId found for single fetch call decoding");
       if ("redirect" in typed) {
         data2 = { redirect: typed };
@@ -6694,7 +6704,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', _71 => _71.pathname, 'optionalAccess', _72 => _72.startsWith, 'call', _73 => _73(parentPathnameBase)]),
+      parentPathnameBase === "/" || _optionalChain([parsedLocationArg, 'access', _77 => _77.pathname, 'optionalAccess', _78 => _78.startsWith, 'call', _79 => _79(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;
@@ -6856,10 +6866,10 @@ function _renderMatches(matches, parentMatches = [], dataRouterState = null, uns
     }
   }
   let renderedMatches = matches;
-  let errors = _optionalChain([dataRouterState, 'optionalAccess', _74 => _74.errors]);
+  let errors = _optionalChain([dataRouterState, 'optionalAccess', _80 => _80.errors]);
   if (errors != null) {
     let errorIndex = renderedMatches.findIndex(
-      (m) => m.route.id && _optionalChain([errors, 'optionalAccess', _75 => _75[m.route.id]]) !== void 0
+      (m) => m.route.id && _optionalChain([errors, 'optionalAccess', _81 => _81[m.route.id]]) !== void 0
     );
     invariant(
       errorIndex >= 0,
@@ -6898,7 +6908,8 @@ function _renderMatches(matches, parentMatches = [], dataRouterState = null, uns
   let onError = dataRouterState && unstable_onError ? (error, errorInfo) => {
     unstable_onError(error, {
       location: dataRouterState.location,
-      params: _nullishCoalesce(_optionalChain([dataRouterState, 'access', _76 => _76.matches, 'optionalAccess', _77 => _77[0], 'optionalAccess', _78 => _78.params]), () => ( {})),
+      params: _nullishCoalesce(_optionalChain([dataRouterState, 'access', _82 => _82.matches, 'optionalAccess', _83 => _83[0], 'optionalAccess', _84 => _84.params]), () => ( {})),
+      unstable_pattern: getRoutePattern(dataRouterState.matches),
       errorInfo
     });
   } : void 0;
@@ -7044,15 +7055,15 @@ function useRouteError() {
   if (error !== void 0) {
     return error;
   }
-  return _optionalChain([state, 'access', _79 => _79.errors, 'optionalAccess', _80 => _80[routeId]]);
+  return _optionalChain([state, 'access', _85 => _85.errors, 'optionalAccess', _86 => _86[routeId]]);
 }
 function useAsyncValue() {
   let value = React3.useContext(AwaitContext);
-  return _optionalChain([value, 'optionalAccess', _81 => _81._data]);
+  return _optionalChain([value, 'optionalAccess', _87 => _87._data]);
 }
 function useAsyncError() {
   let value = React3.useContext(AwaitContext);
-  return _optionalChain([value, 'optionalAccess', _82 => _82._error]);
+  return _optionalChain([value, 'optionalAccess', _88 => _88._error]);
 }
 var blockerId = 0;
 function useBlocker(shouldBlock) {
@@ -7106,7 +7117,7 @@ function useNavigateStable() {
       warning(activeRef.current, navigateEffectWarning);
       if (!activeRef.current) return;
       if (typeof to === "number") {
-        router.navigate(to);
+        await router.navigate(to);
       } else {
         await router.navigate(to, { fromRouteId: id, ...options });
       }
@@ -7133,7 +7144,7 @@ function useRoute(...args) {
   return {
     handle: route.route.handle,
     loaderData: state.loaderData[id],
-    actionData: _optionalChain([state, 'access', _83 => _83.actionData, 'optionalAccess', _84 => _84[id]])
+    actionData: _optionalChain([state, 'access', _89 => _89.actionData, 'optionalAccess', _90 => _90[id]])
   };
 }
 
@@ -7178,7 +7189,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', _85 => _85.links, 'optionalCall', _86 => _86()]) || []
+      _optionalChain([module, 'optionalAccess', _91 => _91.links, 'optionalCall', _92 => _92()]) || []
     ];
   }).flat(2);
   let preloads = getModuleLinkHrefs(matches, manifest);
@@ -7279,7 +7290,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', _87 => _87[index], 'access', _88 => _88.route, 'access', _89 => _89.path, 'optionalAccess', _90 => _90.endsWith, 'call', _91 => _91("*")]) && currentMatches[index].params["*"] !== match.params["*"]
+      _optionalChain([currentMatches, 'access', _93 => _93[index], 'access', _94 => _94.route, 'access', _95 => _95.path, 'optionalAccess', _96 => _96.endsWith, 'call', _97 => _97("*")]) && currentMatches[index].params["*"] !== match.params["*"]
     );
   };
   if (mode === "assets") {
@@ -7302,7 +7313,7 @@ function getNewMatchesForLinks(page, nextMatches, currentMatches, manifest, loca
             location.pathname + location.search + location.hash,
             window.origin
           ),
-          currentParams: _optionalChain([currentMatches, 'access', _92 => _92[0], 'optionalAccess', _93 => _93.params]) || {},
+          currentParams: _optionalChain([currentMatches, 'access', _98 => _98[0], 'optionalAccess', _99 => _99.params]) || {},
           nextUrl: new URL(page, window.origin),
           nextParams: match.params,
           defaultShouldRevalidate: true
@@ -7574,10 +7585,10 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
         )
       });
       let hasInitialData = initialState && initialState.loaderData && route.id in initialState.loaderData;
-      let initialData = hasInitialData ? _optionalChain([initialState, 'optionalAccess', _94 => _94.loaderData, 'optionalAccess', _95 => _95[route.id]]) : void 0;
+      let initialData = hasInitialData ? _optionalChain([initialState, 'optionalAccess', _100 => _100.loaderData, 'optionalAccess', _101 => _101[route.id]]) : void 0;
       let hasInitialError = initialState && initialState.errors && route.id in initialState.errors;
-      let initialError = hasInitialError ? _optionalChain([initialState, 'optionalAccess', _96 => _96.errors, 'optionalAccess', _97 => _97[route.id]]) : void 0;
-      let isHydrationRequest = needsRevalidation == null && (_optionalChain([routeModule, 'access', _98 => _98.clientLoader, 'optionalAccess', _99 => _99.hydrate]) === true || !route.hasLoader);
+      let initialError = hasInitialError ? _optionalChain([initialState, 'optionalAccess', _102 => _102.errors, 'optionalAccess', _103 => _103[route.id]]) : void 0;
+      let isHydrationRequest = needsRevalidation == null && (_optionalChain([routeModule, 'access', _104 => _104.clientLoader, 'optionalAccess', _105 => _105.hydrate]) === true || !route.hasLoader);
       dataRoute.loader = async ({ request, params, context, unstable_pattern }, singleFetch) => {
         try {
           let result = await prefetchStylesAndCallHandler(async () => {
@@ -7768,10 +7779,6 @@ function getShouldRevalidateFunction(path, route, manifestRoute, ssr, needsReval
       return (opts) => didParamsChange(opts);
     }
   }
-  if (ssr && route.shouldRevalidate) {
-    let fn = route.shouldRevalidate;
-    return (opts) => fn({ ...opts, defaultShouldRevalidate: true });
-  }
   return route.shouldRevalidate;
 }
 function wrapShouldRevalidateForHdr(routeId, routeShouldRevalidate, needsRevalidation) {
@@ -7873,7 +7880,7 @@ function getPatchRoutesOnNavigationFunction(manifest, routeModules, ssr, routeDi
 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', _100 => _100.navigator, 'optionalAccess', _101 => _101.connection, 'optionalAccess', _102 => _102.saveData]) === true) {
+    _optionalChain([window, 'access', _106 => _106.navigator, 'optionalAccess', _107 => _107.connection, 'optionalAccess', _108 => _108.saveData]) === true) {
       return;
     }
     function registerElement(el) {
@@ -7982,7 +7989,7 @@ async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, ro
     }
     serverPatches = await res.json();
   } catch (e) {
-    if (_optionalChain([signal, 'optionalAccess', _103 => _103.aborted])) return;
+    if (_optionalChain([signal, 'optionalAccess', _109 => _109.aborted])) return;
     throw e;
   }
   let knownRoutes = new Set(Object.keys(manifest.routes));
@@ -8223,7 +8230,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', _104 => _104[m.route.id], 'optionalAccess', _105 => _105.shouldRevalidate])) {
+      if (!newMatchesForData.some((m2) => m2.route.id === m.route.id) && m.route.id in loaderData && _optionalChain([routeModules, 'access', _110 => _110[m.route.id], 'optionalAccess', _111 => _111.shouldRevalidate])) {
         foundOptOutRoute = true;
       } else if (manifestRoute.hasClientLoader) {
         foundOptOutRoute = true;
@@ -8297,7 +8304,7 @@ function Meta() {
       error
     };
     matches[i] = match;
-    if (_optionalChain([routeModule, 'optionalAccess', _106 => _106.meta])) {
+    if (_optionalChain([routeModule, 'optionalAccess', _112 => _112.meta])) {
       routeMeta = typeof routeModule.meta === "function" ? routeModule.meta({
         data: data2,
         loaderData: data2,
@@ -8396,7 +8403,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', _107 => _107.hmr, 'optionalAccess', _108 => _108.runtime]) ? `import ${JSON.stringify(manifest.hmr.runtime)};` : ""}${!enableFogOfWar ? `import ${JSON.stringify(manifest.url)}` : ""};
+    let routeModulesScript = !isStatic ? " " : `${_optionalChain([manifest, 'access', _113 => _113.hmr, 'optionalAccess', _114 => _114.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];
@@ -8626,7 +8633,7 @@ function BoundaryShell({
   children
 }) {
   let { routeModules } = useFrameworkContext();
-  if (_optionalChain([routeModules, 'access', _109 => _109.root, 'optionalAccess', _110 => _110.Layout]) && !isOutsideRemixApp) {
+  if (_optionalChain([routeModules, 'access', _115 => _115.root, 'optionalAccess', _116 => _116.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(
@@ -8640,6 +8647,15 @@ function BoundaryShell({
 
 // lib/components.tsx
 
+var USE_OPTIMISTIC = "useOptimistic";
+var useOptimisticImpl = React9[USE_OPTIMISTIC];
+function useOptimisticSafe(val) {
+  if (useOptimisticImpl) {
+    return useOptimisticImpl(val);
+  } else {
+    return [val, () => void 0];
+  }
+}
 function mapRouteProperties(route) {
   let updates = {
     // Note: this check also occurs in createRoutesFromChildren so update
@@ -8696,20 +8712,20 @@ var hydrationRouteProperties = [
 ];
 function createMemoryRouter(routes, opts) {
   return createRouter({
-    basename: _optionalChain([opts, 'optionalAccess', _111 => _111.basename]),
-    getContext: _optionalChain([opts, 'optionalAccess', _112 => _112.getContext]),
-    future: _optionalChain([opts, 'optionalAccess', _113 => _113.future]),
+    basename: _optionalChain([opts, 'optionalAccess', _117 => _117.basename]),
+    getContext: _optionalChain([opts, 'optionalAccess', _118 => _118.getContext]),
+    future: _optionalChain([opts, 'optionalAccess', _119 => _119.future]),
     history: createMemoryHistory({
-      initialEntries: _optionalChain([opts, 'optionalAccess', _114 => _114.initialEntries]),
-      initialIndex: _optionalChain([opts, 'optionalAccess', _115 => _115.initialIndex])
+      initialEntries: _optionalChain([opts, 'optionalAccess', _120 => _120.initialEntries]),
+      initialIndex: _optionalChain([opts, 'optionalAccess', _121 => _121.initialIndex])
     }),
-    hydrationData: _optionalChain([opts, 'optionalAccess', _116 => _116.hydrationData]),
+    hydrationData: _optionalChain([opts, 'optionalAccess', _122 => _122.hydrationData]),
     routes,
     hydrationRouteProperties,
     mapRouteProperties,
-    dataStrategy: _optionalChain([opts, 'optionalAccess', _117 => _117.dataStrategy]),
-    patchRoutesOnNavigation: _optionalChain([opts, 'optionalAccess', _118 => _118.patchRoutesOnNavigation]),
-    unstable_instrumentations: _optionalChain([opts, 'optionalAccess', _119 => _119.unstable_instrumentations])
+    dataStrategy: _optionalChain([opts, 'optionalAccess', _123 => _123.dataStrategy]),
+    patchRoutesOnNavigation: _optionalChain([opts, 'optionalAccess', _124 => _124.patchRoutesOnNavigation]),
+    unstable_instrumentations: _optionalChain([opts, 'optionalAccess', _125 => _125.unstable_instrumentations])
   }).initialize();
 }
 var Deferred2 = class {
@@ -8731,125 +8747,14 @@ var Deferred2 = class {
     });
   }
 };
-function shallowDiff(a, b) {
-  if (a === b) {
-    return false;
-  }
-  let aKeys = Object.keys(a);
-  let bKeys = Object.keys(b);
-  if (aKeys.length !== bKeys.length) {
-    return true;
-  }
-  for (let key of aKeys) {
-    if (a[key] !== b[key]) {
-      return true;
-    }
-  }
-  return false;
-}
-function UNSTABLE_TransitionEnabledRouterProvider({
-  router,
-  flushSync: reactDomFlushSyncImpl,
-  unstable_onError
-}) {
-  let fetcherData = React9.useRef(/* @__PURE__ */ new Map());
-  let [revalidating, startRevalidation] = React9.useTransition();
-  let [state, setState] = React9.useState(router.state);
-  router.__setPendingRerender = (promise) => startRevalidation(
-    // @ts-expect-error - need react 19 types for this to be async
-    async () => {
-      const rerender = await promise;
-      startRevalidation(() => {
-        rerender();
-      });
-    }
-  );
-  let navigator = React9.useMemo(() => {
-    return {
-      createHref: router.createHref,
-      encodeLocation: router.encodeLocation,
-      go: (n) => router.navigate(n),
-      push: (to, state2, opts) => router.navigate(to, {
-        state: state2,
-        preventScrollReset: _optionalChain([opts, 'optionalAccess', _120 => _120.preventScrollReset])
-      }),
-      replace: (to, state2, opts) => router.navigate(to, {
-        replace: true,
-        state: state2,
-        preventScrollReset: _optionalChain([opts, 'optionalAccess', _121 => _121.preventScrollReset])
-      })
-    };
-  }, [router]);
-  let basename = router.basename || "/";
-  let dataRouterContext = React9.useMemo(
-    () => ({
-      router,
-      navigator,
-      static: false,
-      basename,
-      unstable_onError
-    }),
-    [router, navigator, basename, unstable_onError]
-  );
-  React9.useLayoutEffect(() => {
-    return router.subscribe(
-      (newState, { deletedFetchers, flushSync, viewTransitionOpts }) => {
-        newState.fetchers.forEach((fetcher, key) => {
-          if (fetcher.data !== void 0) {
-            fetcherData.current.set(key, fetcher.data);
-          }
-        });
-        deletedFetchers.forEach((key) => fetcherData.current.delete(key));
-        const diff = shallowDiff(state, newState);
-        if (!diff) return;
-        if (flushSync) {
-          if (reactDomFlushSyncImpl) {
-            reactDomFlushSyncImpl(() => setState(newState));
-          } else {
-            setState(newState);
-          }
-        } else {
-          React9.startTransition(() => {
-            setState(newState);
-          });
-        }
-      }
-    );
-  }, [router, reactDomFlushSyncImpl, state]);
-  return /* @__PURE__ */ React9.createElement(React9.Fragment, null, /* @__PURE__ */ React9.createElement(DataRouterContext.Provider, { value: dataRouterContext }, /* @__PURE__ */ React9.createElement(
-    DataRouterStateContext.Provider,
-    {
-      value: {
-        ...state,
-        revalidation: revalidating ? "loading" : state.revalidation
-      }
-    },
-    /* @__PURE__ */ React9.createElement(FetchersContext.Provider, { value: fetcherData.current }, /* @__PURE__ */ React9.createElement(
-      Router,
-      {
-        basename,
-        location: state.location,
-        navigationType: state.historyAction,
-        navigator
-      },
-      /* @__PURE__ */ React9.createElement(
-        MemoizedDataRoutes,
-        {
-          routes: router.routes,
-          future: router.future,
-          state,
-          unstable_onError
-        }
-      )
-    ))
-  )), null);
-}
 function RouterProvider({
   router,
   flushSync: reactDomFlushSyncImpl,
-  unstable_onError
+  unstable_onError,
+  unstable_useTransitions
 }) {
-  let [state, setStateImpl] = React9.useState(router.state);
+  let [_state, setStateImpl] = React9.useState(router.state);
+  let [state, setOptimisticState] = useOptimisticSafe(_state);
   let [pendingState, setPendingState] = React9.useState();
   let [vtContext, setVtContext] = React9.useState({
     isTransitioning: false
@@ -8858,26 +8763,17 @@ function RouterProvider({
   let [transition, setTransition] = React9.useState();
   let [interruption, setInterruption] = React9.useState();
   let fetcherData = React9.useRef(/* @__PURE__ */ new Map());
-  let logErrorsAndSetState = React9.useCallback(
-    (newState) => {
-      setStateImpl((prevState) => {
-        if (newState.errors && unstable_onError) {
-          Object.entries(newState.errors).forEach(([routeId, error]) => {
-            if (_optionalChain([prevState, 'access', _122 => _122.errors, 'optionalAccess', _123 => _123[routeId]]) !== error) {
-              unstable_onError(error, {
-                location: newState.location,
-                params: _nullishCoalesce(_optionalChain([newState, 'access', _124 => _124.matches, 'access', _125 => _125[0], 'optionalAccess', _126 => _126.params]), () => ( {}))
-              });
-            }
-          });
-        }
-        return newState;
-      });
-    },
-    [unstable_onError]
-  );
   let setState = React9.useCallback(
-    (newState, { deletedFetchers, flushSync, viewTransitionOpts }) => {
+    (newState, { deletedFetchers, newErrors, flushSync, viewTransitionOpts }) => {
+      if (newErrors && unstable_onError) {
+        Object.values(newErrors).forEach(
+          (error) => unstable_onError(error, {
+            location: newState.location,
+            params: _nullishCoalesce(_optionalChain([newState, 'access', _126 => _126.matches, 'access', _127 => _127[0], 'optionalAccess', _128 => _128.params]), () => ( {})),
+            unstable_pattern: getRoutePattern(newState.matches)
+          })
+        );
+      }
       newState.fetchers.forEach((fetcher, key) => {
         if (fetcher.data !== void 0) {
           fetcherData.current.set(key, fetcher.data);
@@ -8895,16 +8791,23 @@ function RouterProvider({
       );
       if (!viewTransitionOpts || !isViewTransitionAvailable) {
         if (reactDomFlushSyncImpl && flushSync) {
-          reactDomFlushSyncImpl(() => logErrorsAndSetState(newState));
+          reactDomFlushSyncImpl(() => setStateImpl(newState));
+        } else if (unstable_useTransitions === false) {
+          setStateImpl(newState);
         } else {
-          React9.startTransition(() => logErrorsAndSetState(newState));
+          React9.startTransition(() => {
+            if (unstable_useTransitions === true) {
+              setOptimisticState((s) => getOptimisticRouterState(s, newState));
+            }
+            setStateImpl(newState);
+          });
         }
         return;
       }
       if (reactDomFlushSyncImpl && flushSync) {
         reactDomFlushSyncImpl(() => {
           if (transition) {
-            renderDfd && renderDfd.resolve();
+            _optionalChain([renderDfd, 'optionalAccess', _129 => _129.resolve, 'call', _130 => _130()]);
             transition.skipTransition();
           }
           setVtContext({
@@ -8915,7 +8818,7 @@ function RouterProvider({
           });
         });
         let t = router.window.document.startViewTransition(() => {
-          reactDomFlushSyncImpl(() => logErrorsAndSetState(newState));
+          reactDomFlushSyncImpl(() => setStateImpl(newState));
         });
         t.finished.finally(() => {
           reactDomFlushSyncImpl(() => {
@@ -8929,7 +8832,7 @@ function RouterProvider({
         return;
       }
       if (transition) {
-        renderDfd && renderDfd.resolve();
+        _optionalChain([renderDfd, 'optionalAccess', _131 => _131.resolve, 'call', _132 => _132()]);
         transition.skipTransition();
         setInterruption({
           state: newState,
@@ -8951,7 +8854,9 @@ function RouterProvider({
       reactDomFlushSyncImpl,
       transition,
       renderDfd,
-      logErrorsAndSetState
+      unstable_useTransitions,
+      setOptimisticState,
+      unstable_onError
     ]
   );
   React9.useLayoutEffect(() => router.subscribe(setState), [router, setState]);
@@ -8965,7 +8870,16 @@ function RouterProvider({
       let newState = pendingState;
       let renderPromise = renderDfd.promise;
       let transition2 = router.window.document.startViewTransition(async () => {
-        React9.startTransition(() => logErrorsAndSetState(newState));
+        if (unstable_useTransitions === false) {
+          setStateImpl(newState);
+        } else {
+          React9.startTransition(() => {
+            if (unstable_useTransitions === true) {
+              setOptimisticState((s) => getOptimisticRouterState(s, newState));
+            }
+            setStateImpl(newState);
+          });
+        }
         await renderPromise;
       });
       transition2.finished.finally(() => {
@@ -8976,7 +8890,13 @@ function RouterProvider({
       });
       setTransition(transition2);
     }
-  }, [pendingState, renderDfd, router.window, logErrorsAndSetState]);
+  }, [
+    pendingState,
+    renderDfd,
+    router.window,
+    unstable_useTransitions,
+    setOptimisticState
+  ]);
   React9.useEffect(() => {
     if (renderDfd && pendingState && state.location.key === pendingState.location.key) {
       renderDfd.resolve();
@@ -9001,12 +8921,12 @@ function RouterProvider({
       go: (n) => router.navigate(n),
       push: (to, state2, opts) => router.navigate(to, {
         state: state2,
-        preventScrollReset: _optionalChain([opts, 'optionalAccess', _127 => _127.preventScrollReset])
+        preventScrollReset: _optionalChain([opts, 'optionalAccess', _133 => _133.preventScrollReset])
       }),
       replace: (to, state2, opts) => router.navigate(to, {
         replace: true,
         state: state2,
-        preventScrollReset: _optionalChain([opts, 'optionalAccess', _128 => _128.preventScrollReset])
+        preventScrollReset: _optionalChain([opts, 'optionalAccess', _134 => _134.preventScrollReset])
       })
     };
   }, [router]);
@@ -9027,7 +8947,8 @@ function RouterProvider({
       basename,
       location: state.location,
       navigationType: state.historyAction,
-      navigator
+      navigator,
+      unstable_useTransitions: unstable_useTransitions === true
     },
     /* @__PURE__ */ React9.createElement(
       MemoizedDataRoutes,
@@ -9040,6 +8961,20 @@ function RouterProvider({
     )
   ))))), null);
 }
+function getOptimisticRouterState(currentState, newState) {
+  return {
+    // Don't surface "current location specific" stuff mid-navigation
+    // (historyAction, location, matches, loaderData, errors, initialized,
+    // restoreScroll, preventScrollReset, blockers, etc.)
+    ...currentState,
+    // Only surface "pending/in-flight stuff"
+    // (navigation, revalidation, actionData, fetchers, )
+    navigation: newState.navigation.state !== "idle" ? newState.navigation : currentState.navigation,
+    revalidation: newState.revalidation !== "idle" ? newState.revalidation : currentState.revalidation,
+    actionData: newState.navigation.state !== "submitting" ? newState.actionData : currentState.actionData,
+    fetchers: newState.fetchers
+  };
+}
 var MemoizedDataRoutes = React9.memo(DataRoutes);
 function DataRoutes({
   routes,
@@ -9053,7 +8988,8 @@ function MemoryRouter({
   basename,
   children,
   initialEntries,
-  initialIndex
+  initialIndex,
+  unstable_useTransitions
 }) {
   let historyRef = React9.useRef();
   if (historyRef.current == null) {
@@ -9070,9 +9006,13 @@ function MemoryRouter({
   });
   let setState = React9.useCallback(
     (newState) => {
-      React9.startTransition(() => setStateImpl(newState));
+      if (unstable_useTransitions === false) {
+        setStateImpl(newState);
+      } else {
+        React9.startTransition(() => setStateImpl(newState));
+      }
     },
-    [setStateImpl]
+    [unstable_useTransitions]
   );
   React9.useLayoutEffect(() => history.listen(setState), [history, setState]);
   return /* @__PURE__ */ React9.createElement(
@@ -9082,7 +9022,8 @@ function MemoryRouter({
       children,
       location: state.location,
       navigationType: state.action,
-      navigator: history
+      navigator: history,
+      unstable_useTransitions: unstable_useTransitions === true
     }
   );
 }
@@ -9133,7 +9074,8 @@ function Router({
   location: locationProp,
   navigationType = "POP" /* Pop */,
   navigator,
-  static: staticProp = false
+  static: staticProp = false,
+  unstable_useTransitions
 }) {
   invariant(
     !useInRouterContext(),
@@ -9145,9 +9087,10 @@ function Router({
       basename,
       navigator,
       static: staticProp,
+      unstable_useTransitions,
       future: {}
     }),
-    [basename, navigator, staticProp]
+    [basename, navigator, staticProp, unstable_useTransitions]
   );
   if (typeof locationProp === "string") {
     locationProp = parsePath(locationProp);
@@ -9202,7 +9145,8 @@ function Await({
       if (dataRouterContext && dataRouterContext.unstable_onError && dataRouterStateContext) {
         dataRouterContext.unstable_onError(error, {
           location: dataRouterStateContext.location,
-          params: _optionalChain([dataRouterStateContext, 'access', _129 => _129.matches, 'optionalAccess', _130 => _130[0], 'optionalAccess', _131 => _131.params]) || {},
+          params: _optionalChain([dataRouterStateContext, 'access', _135 => _135.matches, 'access', _136 => _136[0], 'optionalAccess', _137 => _137.params]) || {},
+          unstable_pattern: getRoutePattern(dataRouterStateContext.matches),
           errorInfo
         });
       }
@@ -9263,7 +9207,7 @@ var AwaitErrorBoundary = class extends React9.Component {
       promise = resolve.then(
         (data2) => Object.defineProperty(resolve, "_data", { get: () => data2 }),
         (error) => {
-          _optionalChain([this, 'access', _132 => _132.props, 'access', _133 => _133.onError, 'optionalCall', _134 => _134(error)]);
+          _optionalChain([this, 'access', _138 => _138.props, 'access', _139 => _139.onError, 'optionalCall', _140 => _140(error)]);
           Object.defineProperty(resolve, "_error", { get: () => error });
         }
       );
@@ -9522,5 +9466,4 @@ function withErrorBoundaryProps(ErrorBoundary) {
 
 
 
-
-exports.Action = Action; 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.joinPaths = joinPaths; exports.data = data; exports.redirect = redirect; exports.redirectDocument = redirectDocument; exports.replace = replace; exports.ErrorResponseImpl = ErrorResponseImpl; exports.isRouteErrorResponse = isRouteErrorResponse; 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.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.useRoutesImpl = useRoutesImpl; 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.UNSTABLE_TransitionEnabledRouterProvider = UNSTABLE_TransitionEnabledRouterProvider; exports.RouterProvider = RouterProvider; 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.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.joinPaths = joinPaths; exports.data = data; exports.redirect = redirect; exports.redirectDocument = redirectDocument; exports.replace = replace; exports.ErrorResponseImpl = ErrorResponseImpl; exports.isRouteErrorResponse = isRouteErrorResponse; 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.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.useRoutesImpl = useRoutesImpl; 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.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;