react-router 7.9.6-pre.1 → 7.10.0-pre.0

package/dist/production/{chunk-LESYMMDQ.mjs → chunk-KJ5676BZ.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.9.6-pre.1
+ * react-router v7.10.0-pre.0
  *
  * 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 });
             }
           });
+          pendingPopstateNavigationDfd?.resolve();
+          pendingPopstateNavigationDfd = null;
           return;
         }
         return startNavigation(historyAction, location);
@@ -1541,6 +1544,7 @@ function createRouter(init) {
     [...subscribers].forEach(
       (subscriber) => subscriber(state, {
         deletedFetchers: unmountedFetchers,
+        newErrors: newState.errors ?? null,
         viewTransitionOpts: opts.viewTransitionOpts,
         flushSync: opts.flushSync === true
       })
@@ -1638,13 +1642,21 @@ function createRouter(init) {
     pendingViewTransitionEnabled = false;
     isUninterruptedRevalidation = false;
     isRevalidationRequired = false;
+    pendingPopstateNavigationDfd?.resolve();
+    pendingPopstateNavigationDfd = null;
     pendingRevalidationDfd?.resolve();
     pendingRevalidationDfd = null;
   }
   async function navigate(to, opts) {
+    pendingPopstateNavigationDfd?.resolve();
+    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,
@@ -2584,6 +2596,10 @@ function createRouter(init) {
     preventScrollReset,
     replace: replace2
   } = {}) {
+    if (!isNavigation) {
+      pendingPopstateNavigationDfd?.resolve();
+      pendingPopstateNavigationDfd = null;
+    }
     if (redirect2.response.headers.has("X-Remix-Revalidate")) {
       isRevalidationRequired = true;
     }
@@ -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
@@ -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
@@ -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(
@@ -3913,7 +3929,7 @@ function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest,
     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;
@@ -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;
@@ -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,
@@ -4583,7 +4599,7 @@ async function callDataStrategyImpl(dataStrategyImpl, request, matches, fetcherK
   }
   let dataStrategyArgs = {
     request,
-    unstable_pattern: getRoutePattern(matches.map((m) => m.route.path)),
+    unstable_pattern: getRoutePattern(matches),
     params: matches[0].params,
     context: scopedContext,
     matches
@@ -4766,11 +4782,7 @@ async function convertDataStrategyResultToDataResult(dataStrategyResult) {
       }
       return {
         type: "error" /* error */,
-        error: new ErrorResponseImpl(
-          result.init?.status || 500,
-          void 0,
-          result.data
-        ),
+        error: dataWithResponseInitToErrorResponse(result),
         statusCode: isRouteErrorResponse(result) ? result.status : void 0,
         headers: result.init?.headers ? new Headers(result.init.headers) : void 0
       };
@@ -5721,6 +5733,7 @@ function _renderMatches(matches, parentMatches = [], dataRouterState = null, uns
     unstable_onError(error, {
       location: dataRouterState.location,
       params: dataRouterState.matches?.[0]?.params ?? {},
+      unstable_pattern: getRoutePattern(dataRouterState.matches),
       errorInfo
     });
   } : void 0;
@@ -5928,7 +5941,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 });
       }
@@ -5972,6 +5985,15 @@ function warnOnce(condition, message) {
 }
 
 // lib/components.tsx
+var USE_OPTIMISTIC = "useOptimistic";
+var useOptimisticImpl = React3[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
@@ -6063,125 +6085,14 @@ var Deferred = 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 = React3.useRef(/* @__PURE__ */ new Map());
-  let [revalidating, startRevalidation] = React3.useTransition();
-  let [state, setState] = React3.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 = React3.useMemo(() => {
-    return {
-      createHref: router.createHref,
-      encodeLocation: router.encodeLocation,
-      go: (n) => router.navigate(n),
-      push: (to, state2, opts) => router.navigate(to, {
-        state: state2,
-        preventScrollReset: opts?.preventScrollReset
-      }),
-      replace: (to, state2, opts) => router.navigate(to, {
-        replace: true,
-        state: state2,
-        preventScrollReset: opts?.preventScrollReset
-      })
-    };
-  }, [router]);
-  let basename = router.basename || "/";
-  let dataRouterContext = React3.useMemo(
-    () => ({
-      router,
-      navigator,
-      static: false,
-      basename,
-      unstable_onError
-    }),
-    [router, navigator, basename, unstable_onError]
-  );
-  React3.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 {
-          React3.startTransition(() => {
-            setState(newState);
-          });
-        }
-      }
-    );
-  }, [router, reactDomFlushSyncImpl, state]);
-  return /* @__PURE__ */ React3.createElement(React3.Fragment, null, /* @__PURE__ */ React3.createElement(DataRouterContext.Provider, { value: dataRouterContext }, /* @__PURE__ */ React3.createElement(
-    DataRouterStateContext.Provider,
-    {
-      value: {
-        ...state,
-        revalidation: revalidating ? "loading" : state.revalidation
-      }
-    },
-    /* @__PURE__ */ React3.createElement(FetchersContext.Provider, { value: fetcherData.current }, /* @__PURE__ */ React3.createElement(
-      Router,
-      {
-        basename,
-        location: state.location,
-        navigationType: state.historyAction,
-        navigator
-      },
-      /* @__PURE__ */ React3.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] = React3.useState(router.state);
+  let [_state, setStateImpl] = React3.useState(router.state);
+  let [state, setOptimisticState] = useOptimisticSafe(_state);
   let [pendingState, setPendingState] = React3.useState();
   let [vtContext, setVtContext] = React3.useState({
     isTransitioning: false
@@ -6190,26 +6101,17 @@ function RouterProvider({
   let [transition, setTransition] = React3.useState();
   let [interruption, setInterruption] = React3.useState();
   let fetcherData = React3.useRef(/* @__PURE__ */ new Map());
-  let logErrorsAndSetState = React3.useCallback(
-    (newState) => {
-      setStateImpl((prevState) => {
-        if (newState.errors && unstable_onError) {
-          Object.entries(newState.errors).forEach(([routeId, error]) => {
-            if (prevState.errors?.[routeId] !== error) {
-              unstable_onError(error, {
-                location: newState.location,
-                params: newState.matches[0]?.params ?? {}
-              });
-            }
-          });
-        }
-        return newState;
-      });
-    },
-    [unstable_onError]
-  );
   let setState = React3.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: newState.matches[0]?.params ?? {},
+            unstable_pattern: getRoutePattern(newState.matches)
+          })
+        );
+      }
       newState.fetchers.forEach((fetcher, key) => {
         if (fetcher.data !== void 0) {
           fetcherData.current.set(key, fetcher.data);
@@ -6227,16 +6129,23 @@ function RouterProvider({
       );
       if (!viewTransitionOpts || !isViewTransitionAvailable) {
         if (reactDomFlushSyncImpl && flushSync) {
-          reactDomFlushSyncImpl(() => logErrorsAndSetState(newState));
+          reactDomFlushSyncImpl(() => setStateImpl(newState));
+        } else if (unstable_useTransitions === false) {
+          setStateImpl(newState);
         } else {
-          React3.startTransition(() => logErrorsAndSetState(newState));
+          React3.startTransition(() => {
+            if (unstable_useTransitions === true) {
+              setOptimisticState((s) => getOptimisticRouterState(s, newState));
+            }
+            setStateImpl(newState);
+          });
         }
         return;
       }
       if (reactDomFlushSyncImpl && flushSync) {
         reactDomFlushSyncImpl(() => {
           if (transition) {
-            renderDfd && renderDfd.resolve();
+            renderDfd?.resolve();
             transition.skipTransition();
           }
           setVtContext({
@@ -6247,7 +6156,7 @@ function RouterProvider({
           });
         });
         let t = router.window.document.startViewTransition(() => {
-          reactDomFlushSyncImpl(() => logErrorsAndSetState(newState));
+          reactDomFlushSyncImpl(() => setStateImpl(newState));
         });
         t.finished.finally(() => {
           reactDomFlushSyncImpl(() => {
@@ -6261,7 +6170,7 @@ function RouterProvider({
         return;
       }
       if (transition) {
-        renderDfd && renderDfd.resolve();
+        renderDfd?.resolve();
         transition.skipTransition();
         setInterruption({
           state: newState,
@@ -6283,7 +6192,9 @@ function RouterProvider({
       reactDomFlushSyncImpl,
       transition,
       renderDfd,
-      logErrorsAndSetState
+      unstable_useTransitions,
+      setOptimisticState,
+      unstable_onError
     ]
   );
   React3.useLayoutEffect(() => router.subscribe(setState), [router, setState]);
@@ -6297,7 +6208,16 @@ function RouterProvider({
       let newState = pendingState;
       let renderPromise = renderDfd.promise;
       let transition2 = router.window.document.startViewTransition(async () => {
-        React3.startTransition(() => logErrorsAndSetState(newState));
+        if (unstable_useTransitions === false) {
+          setStateImpl(newState);
+        } else {
+          React3.startTransition(() => {
+            if (unstable_useTransitions === true) {
+              setOptimisticState((s) => getOptimisticRouterState(s, newState));
+            }
+            setStateImpl(newState);
+          });
+        }
         await renderPromise;
       });
       transition2.finished.finally(() => {
@@ -6308,7 +6228,13 @@ function RouterProvider({
       });
       setTransition(transition2);
     }
-  }, [pendingState, renderDfd, router.window, logErrorsAndSetState]);
+  }, [
+    pendingState,
+    renderDfd,
+    router.window,
+    unstable_useTransitions,
+    setOptimisticState
+  ]);
   React3.useEffect(() => {
     if (renderDfd && pendingState && state.location.key === pendingState.location.key) {
       renderDfd.resolve();
@@ -6359,7 +6285,8 @@ function RouterProvider({
       basename,
       location: state.location,
       navigationType: state.historyAction,
-      navigator
+      navigator,
+      unstable_useTransitions: unstable_useTransitions === true
     },
     /* @__PURE__ */ React3.createElement(
       MemoizedDataRoutes,
@@ -6372,6 +6299,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 = React3.memo(DataRoutes);
 function DataRoutes({
   routes,
@@ -6385,7 +6326,8 @@ function MemoryRouter({
   basename,
   children,
   initialEntries,
-  initialIndex
+  initialIndex,
+  unstable_useTransitions
 }) {
   let historyRef = React3.useRef();
   if (historyRef.current == null) {
@@ -6402,9 +6344,13 @@ function MemoryRouter({
   });
   let setState = React3.useCallback(
     (newState) => {
-      React3.startTransition(() => setStateImpl(newState));
+      if (unstable_useTransitions === false) {
+        setStateImpl(newState);
+      } else {
+        React3.startTransition(() => setStateImpl(newState));
+      }
     },
-    [setStateImpl]
+    [unstable_useTransitions]
   );
   React3.useLayoutEffect(() => history.listen(setState), [history, setState]);
   return /* @__PURE__ */ React3.createElement(
@@ -6414,7 +6360,8 @@ function MemoryRouter({
       children,
       location: state.location,
       navigationType: state.action,
-      navigator: history
+      navigator: history,
+      unstable_useTransitions: unstable_useTransitions === true
     }
   );
 }
@@ -6465,7 +6412,8 @@ function Router({
   location: locationProp,
   navigationType = "POP" /* Pop */,
   navigator,
-  static: staticProp = false
+  static: staticProp = false,
+  unstable_useTransitions
 }) {
   invariant(
     !useInRouterContext(),
@@ -6477,9 +6425,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);
@@ -6534,7 +6483,8 @@ function Await({
       if (dataRouterContext && dataRouterContext.unstable_onError && dataRouterStateContext) {
         dataRouterContext.unstable_onError(error, {
           location: dataRouterStateContext.location,
-          params: dataRouterStateContext.matches?.[0]?.params || {},
+          params: dataRouterStateContext.matches[0]?.params || {},
+          unstable_pattern: getRoutePattern(dataRouterStateContext.matches),
           errorInfo
         });
       }
@@ -6738,7 +6688,7 @@ function withErrorBoundaryProps(ErrorBoundary) {
 var defaultMethod = "get";
 var defaultEncType = "application/x-www-form-urlencoded";
 function isHtmlElement(object) {
-  return object != null && typeof object.tagName === "string";
+  return typeof HTMLElement !== "undefined" && object instanceof HTMLElement;
 }
 function isButtonElement(object) {
   return isHtmlElement(object) && object.tagName.toLowerCase() === "button";
@@ -7672,7 +7622,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);
@@ -7692,7 +7642,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) => {
@@ -7716,9 +7666,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(
@@ -7751,10 +7699,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;
@@ -7843,7 +7791,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(
@@ -8662,10 +8610,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) {
@@ -9538,7 +9482,7 @@ var isBrowser = typeof window !== "undefined" && typeof window.document !== "und
 try {
   if (isBrowser) {
     window.__reactRouterVersion = // @ts-expect-error
-    "7.9.6-pre.1";
+    "7.10.0-pre.0";
   }
 } catch (e) {
 }
@@ -9622,6 +9566,7 @@ function deserializeErrors(errors) {
 function BrowserRouter({
   basename,
   children,
+  unstable_useTransitions,
   window: window2
 }) {
   let historyRef = React10.useRef();
@@ -9635,9 +9580,13 @@ function BrowserRouter({
   });
   let setState = React10.useCallback(
     (newState) => {
-      React10.startTransition(() => setStateImpl(newState));
+      if (unstable_useTransitions === false) {
+        setStateImpl(newState);
+      } else {
+        React10.startTransition(() => setStateImpl(newState));
+      }
     },
-    [setStateImpl]
+    [unstable_useTransitions]
   );
   React10.useLayoutEffect(() => history.listen(setState), [history, setState]);
   return /* @__PURE__ */ React10.createElement(
@@ -9647,11 +9596,17 @@ function BrowserRouter({
       children,
       location: state.location,
       navigationType: state.action,
-      navigator: history
+      navigator: history,
+      unstable_useTransitions: unstable_useTransitions === true
     }
   );
 }
-function HashRouter({ basename, children, window: window2 }) {
+function HashRouter({
+  basename,
+  children,
+  unstable_useTransitions,
+  window: window2
+}) {
   let historyRef = React10.useRef();
   if (historyRef.current == null) {
     historyRef.current = createHashHistory({ window: window2, v5Compat: true });
@@ -9663,9 +9618,13 @@ function HashRouter({ basename, children, window: window2 }) {
   });
   let setState = React10.useCallback(
     (newState) => {
-      React10.startTransition(() => setStateImpl(newState));
+      if (unstable_useTransitions === false) {
+        setStateImpl(newState);
+      } else {
+        React10.startTransition(() => setStateImpl(newState));
+      }
     },
-    [setStateImpl]
+    [unstable_useTransitions]
   );
   React10.useLayoutEffect(() => history.listen(setState), [history, setState]);
   return /* @__PURE__ */ React10.createElement(
@@ -9675,14 +9634,16 @@ function HashRouter({ basename, children, window: window2 }) {
       children,
       location: state.location,
       navigationType: state.action,
-      navigator: history
+      navigator: history,
+      unstable_useTransitions: unstable_useTransitions === true
     }
   );
 }
 function HistoryRouter({
   basename,
   children,
-  history
+  history,
+  unstable_useTransitions
 }) {
   let [state, setStateImpl] = React10.useState({
     action: history.action,
@@ -9690,9 +9651,13 @@ function HistoryRouter({
   });
   let setState = React10.useCallback(
     (newState) => {
-      React10.startTransition(() => setStateImpl(newState));
+      if (unstable_useTransitions === false) {
+        setStateImpl(newState);
+      } else {
+        React10.startTransition(() => setStateImpl(newState));
+      }
     },
-    [setStateImpl]
+    [unstable_useTransitions]
   );
   React10.useLayoutEffect(() => history.listen(setState), [history, setState]);
   return /* @__PURE__ */ React10.createElement(
@@ -9702,7 +9667,8 @@ function HistoryRouter({
       children,
       location: state.location,
       navigationType: state.action,
-      navigator: history
+      navigator: history,
+      unstable_useTransitions: unstable_useTransitions === true
     }
   );
 }
@@ -9723,7 +9689,7 @@ var Link = React10.forwardRef(
     viewTransition,
     ...rest
   }, forwardedRef) {
-    let { basename } = React10.useContext(NavigationContext);
+    let { basename, unstable_useTransitions } = React10.useContext(NavigationContext);
     let isAbsolute = typeof to === "string" && ABSOLUTE_URL_REGEX2.test(to);
     let absoluteHref;
     let isExternal = false;
@@ -9758,7 +9724,8 @@ var Link = React10.forwardRef(
       target,
       preventScrollReset,
       relative,
-      viewTransition
+      viewTransition,
+      unstable_useTransitions
     });
     function handleClick(event) {
       if (onClick) onClick(event);
@@ -9868,6 +9835,7 @@ var Form = React10.forwardRef(
     viewTransition,
     ...props
   }, forwardedRef) => {
+    let { unstable_useTransitions } = React10.useContext(NavigationContext);
     let submit = useSubmit();
     let formAction = useFormAction(action, { relative });
     let formMethod = method.toLowerCase() === "get" ? "get" : "post";
@@ -9878,7 +9846,7 @@ var Form = React10.forwardRef(
       event.preventDefault();
       let submitter = event.nativeEvent.submitter;
       let submitMethod = submitter?.getAttribute("formmethod") || method;
-      submit(submitter || event.currentTarget, {
+      let doSubmit = () => submit(submitter || event.currentTarget, {
         fetcherKey,
         method: submitMethod,
         navigate,
@@ -9888,6 +9856,11 @@ var Form = React10.forwardRef(
         preventScrollReset,
         viewTransition
       });
+      if (unstable_useTransitions && navigate !== false) {
+        React10.startTransition(() => doSubmit());
+      } else {
+        doSubmit();
+      }
     };
     return /* @__PURE__ */ React10.createElement(
       "form",
@@ -9980,7 +9953,8 @@ function useLinkClickHandler(to, {
   state,
   preventScrollReset,
   relative,
-  viewTransition
+  viewTransition,
+  unstable_useTransitions
 } = {}) {
   let navigate = useNavigate();
   let location = useLocation();
@@ -9990,13 +9964,18 @@ function useLinkClickHandler(to, {
       if (shouldProcessLinkClick(event, target)) {
         event.preventDefault();
         let replace2 = replaceProp !== void 0 ? replaceProp : createPath(location) === createPath(path);
-        navigate(to, {
+        let doNavigate = () => navigate(to, {
           replace: replace2,
           state,
           preventScrollReset,
           relative,
           viewTransition
         });
+        if (unstable_useTransitions) {
+          React10.startTransition(() => doNavigate());
+        } else {
+          doNavigate();
+        }
       }
     },
     [
@@ -10009,7 +9988,8 @@ function useLinkClickHandler(to, {
       to,
       preventScrollReset,
       relative,
-      viewTransition
+      viewTransition,
+      unstable_useTransitions
     ]
   );
 }
@@ -10052,6 +10032,8 @@ function useSubmit() {
   let { router } = useDataRouterContext3("useSubmit" /* UseSubmit */);
   let { basename } = React10.useContext(NavigationContext);
   let currentRouteId = useRouteId();
+  let routerFetch = router.fetch;
+  let routerNavigate = router.navigate;
   return React10.useCallback(
     async (target, options = {}) => {
       let { action, method, encType, formData, body } = getFormSubmissionInfo(
@@ -10060,7 +10042,7 @@ function useSubmit() {
       );
       if (options.navigate === false) {
         let key = options.fetcherKey || getUniqueFetcherId();
-        await router.fetch(key, currentRouteId, options.action || action, {
+        await routerFetch(key, currentRouteId, options.action || action, {
           preventScrollReset: options.preventScrollReset,
           formData,
           body,
@@ -10069,7 +10051,7 @@ function useSubmit() {
           flushSync: options.flushSync
         });
       } else {
-        await router.navigate(options.action || action, {
+        await routerNavigate(options.action || action, {
           preventScrollReset: options.preventScrollReset,
           formData,
           body,
@@ -10083,7 +10065,7 @@ function useSubmit() {
         });
       }
     },
-    [router, basename, currentRouteId]
+    [routerFetch, routerNavigate, basename, currentRouteId]
   );
 }
 function useFormAction(action, { relative } = {}) {
@@ -10132,16 +10114,17 @@ function useFetcher({
   if (key && key !== fetcherKey) {
     setFetcherKey(key);
   }
+  let { deleteFetcher, getFetcher, resetFetcher, fetch: routerFetch } = router;
   React10.useEffect(() => {
-    router.getFetcher(fetcherKey);
-    return () => router.deleteFetcher(fetcherKey);
-  }, [router, fetcherKey]);
+    getFetcher(fetcherKey);
+    return () => deleteFetcher(fetcherKey);
+  }, [deleteFetcher, getFetcher, fetcherKey]);
   let load = React10.useCallback(
     async (href, opts) => {
       invariant(routeId, "No routeId available for fetcher.load()");
-      await router.fetch(fetcherKey, routeId, href, opts);
+      await routerFetch(fetcherKey, routeId, href, opts);
     },
-    [fetcherKey, routeId, router]
+    [fetcherKey, routeId, routerFetch]
   );
   let submitImpl = useSubmit();
   let submit = React10.useCallback(
@@ -10154,7 +10137,10 @@ function useFetcher({
     },
     [fetcherKey, submitImpl]
   );
-  let unstable_reset = React10.useCallback((opts) => router.resetFetcher(fetcherKey, opts), [router, fetcherKey]);
+  let reset = React10.useCallback(
+    (opts) => resetFetcher(fetcherKey, opts),
+    [resetFetcher, fetcherKey]
+  );
   let FetcherForm = React10.useMemo(() => {
     let FetcherForm2 = React10.forwardRef(
       (props, ref) => {
@@ -10171,11 +10157,11 @@ function useFetcher({
       Form: FetcherForm,
       submit,
       load,
-      unstable_reset,
+      reset,
       ...fetcher,
       data: data2
     }),
-    [FetcherForm, submit, load, unstable_reset, fetcher, data2]
+    [FetcherForm, submit, load, reset, fetcher, data2]
   );
   return fetcherWithComponents;
 }
@@ -10385,7 +10371,8 @@ function StaticRouter({
       location,
       navigationType: action,
       navigator: staticNavigator,
-      static: true
+      static: true,
+      unstable_useTransitions: false
     }
   );
 }
@@ -10425,7 +10412,8 @@ function StaticRouterProvider({
       location: state.location,
       navigationType: state.historyAction,
       navigator: dataRouterContext.navigator,
-      static: dataRouterContext.static
+      static: dataRouterContext.static,
+      unstable_useTransitions: false
     },
     /* @__PURE__ */ React11.createElement(
       DataRoutes2,
@@ -10704,7 +10692,6 @@ export {
   mapRouteProperties,
   hydrationRouteProperties,
   createMemoryRouter,
-  UNSTABLE_TransitionEnabledRouterProvider,
   RouterProvider,
   MemoryRouter,
   Navigate,