react-router 7.14.2 → 7.15.1

package/dist/development/{chunk-EVOBXE3Y.mjs → chunk-4N6VE7H7.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.14.2
+ * react-router v7.15.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -14,6 +14,7 @@ var __typeError = (msg) => {
 var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
 var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
+var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
 
 // lib/router/history.ts
 var Action = /* @__PURE__ */ ((Action2) => {
@@ -34,7 +35,7 @@ function createMemoryHistory(options = {}) {
       entry,
       typeof entry === "string" ? null : entry.state,
       index2 === 0 ? "default" : void 0,
-      typeof entry === "string" ? void 0 : entry.unstable_mask
+      typeof entry === "string" ? void 0 : entry.mask
     )
   );
   let index = clampIndex(
@@ -48,13 +49,13 @@ function createMemoryHistory(options = {}) {
   function getCurrentLocation() {
     return entries[index];
   }
-  function createMemoryLocation(to, state = null, key, unstable_mask) {
+  function createMemoryLocation(to, state = null, key, mask) {
     let location = createLocation(
       entries ? getCurrentLocation().pathname : "/",
       to,
       state,
       key,
-      unstable_mask
+      mask
     );
     warning(
       location.pathname.charAt(0) === "/",
@@ -216,14 +217,14 @@ function getHistoryState(location, index) {
     usr: location.state,
     key: location.key,
     idx: index,
-    masked: location.unstable_mask ? {
+    masked: location.mask ? {
       pathname: location.pathname,
       search: location.search,
       hash: location.hash
     } : void 0
   };
 }
-function createLocation(current, to, state = null, key, unstable_mask) {
+function createLocation(current, to, state = null, key, mask) {
   let location = {
     pathname: typeof current === "string" ? current : current.pathname,
     search: "",
@@ -235,7 +236,7 @@ function createLocation(current, to, state = null, key, unstable_mask) {
     // But that's a pretty big refactor to the current test suite so going to
     // keep as is for the time being and just let any incoming keys take precedence
     key: to && to.key || key || createKey(),
-    unstable_mask
+    mask
   };
   return location;
 }
@@ -298,7 +299,7 @@ function getUrlBasedHistory(getLocation, createHref2, validateLocation, options
     if (validateLocation) validateLocation(location, to);
     index = getIndex() + 1;
     let historyState = getHistoryState(location, index);
-    let url = history.createHref(location.unstable_mask || location);
+    let url = history.createHref(location.mask || location);
     try {
       globalHistory.pushState(historyState, "", url);
     } catch (error) {
@@ -317,7 +318,7 @@ function getUrlBasedHistory(getLocation, createHref2, validateLocation, options
     if (validateLocation) validateLocation(location, to);
     index = getIndex();
     let historyState = getHistoryState(location, index);
-    let url = history.createHref(location.unstable_mask || location);
+    let url = history.createHref(location.mask || location);
     globalHistory.replaceState(historyState, "", url);
     if (v5Compat && listener) {
       listener({ action, location: history.location, delta: 0 });
@@ -515,17 +516,16 @@ function mergeRouteUpdates(route, updates) {
 function matchRoutes(routes, locationArg, basename = "/") {
   return matchRoutesImpl(routes, locationArg, basename, false);
 }
-function matchRoutesImpl(routes, locationArg, basename, allowPartial) {
+function matchRoutesImpl(routes, locationArg, basename, allowPartial, precomputedBranches) {
   let location = typeof locationArg === "string" ? parsePath(locationArg) : locationArg;
   let pathname = stripBasename(location.pathname || "/", basename);
   if (pathname == null) {
     return null;
   }
-  let branches = flattenRoutes(routes);
-  rankRouteBranches(branches);
+  let branches = precomputedBranches ?? flattenAndRankRoutes(routes);
   let matches = null;
+  let decoded = decodePath(pathname);
   for (let i = 0; matches == null && i < branches.length; ++i) {
-    let decoded = decodePath(pathname);
     matches = matchRouteBranch(
       branches[i],
       decoded,
@@ -545,6 +545,11 @@ function convertRouteMatchToUiMatch(match, loaderData) {
     handle: route.handle
   };
 }
+function flattenAndRankRoutes(routes) {
+  let branches = flattenRoutes(routes);
+  rankRouteBranches(branches);
+  return branches;
+}
 function flattenRoutes(routes, branches = [], parentsMeta = [], parentPath = "", _hasParentOptionalSegments = false) {
   let flattenRoute = (route, index, hasParentOptionalSegments = _hasParentOptionalSegments, relativePath) => {
     let meta = {
@@ -1252,11 +1257,11 @@ async function recurseRight(impls, info, handler, index) {
   };
 }
 function getHandlerInfo(args) {
-  let { request, context, params, unstable_pattern } = args;
+  let { request, context, params, pattern } = args;
   return {
     request: getReadonlyRequest(request),
     params: { ...params },
-    unstable_pattern,
+    pattern,
     context: getReadonlyContext(context)
   };
 }
@@ -1318,6 +1323,8 @@ var redirectPreserveMethodStatusCodes = /* @__PURE__ */ new Set([307, 308]);
 var IDLE_NAVIGATION = {
   state: "idle",
   location: void 0,
+  matches: void 0,
+  historyAction: void 0,
   formMethod: void 0,
   formAction: void 0,
   formEncType: void 0,
@@ -1346,6 +1353,55 @@ var defaultMapRouteProperties = (route) => ({
 });
 var TRANSITIONS_STORAGE_KEY = "remix-router-transitions";
 var ResetLoaderDataSymbol = Symbol("ResetLoaderData");
+var _routes, _branches, _hmrRoutes, _hmrBranches;
+var DataRoutes = class {
+  constructor(routes) {
+    __privateAdd(this, _routes);
+    __privateAdd(this, _branches);
+    __privateAdd(this, _hmrRoutes);
+    __privateAdd(this, _hmrBranches);
+    __privateSet(this, _routes, routes);
+    __privateSet(this, _branches, flattenAndRankRoutes(routes));
+  }
+  /** The stable route tree */
+  get stableRoutes() {
+    return __privateGet(this, _routes);
+  }
+  /** The in-flight route tree if one is active, otherwise the stable tree */
+  get activeRoutes() {
+    return __privateGet(this, _hmrRoutes) ?? __privateGet(this, _routes);
+  }
+  /** Pre-computed branches */
+  get branches() {
+    return __privateGet(this, _hmrBranches) ?? __privateGet(this, _branches);
+  }
+  get hasHMRRoutes() {
+    return __privateGet(this, _hmrRoutes) != null;
+  }
+  /** Replace the stable route tree and recompute its branches */
+  setRoutes(routes) {
+    __privateSet(this, _routes, routes);
+    __privateSet(this, _branches, flattenAndRankRoutes(routes));
+  }
+  /** Set a new in-flight route tree and recompute its branches */
+  setHmrRoutes(routes) {
+    __privateSet(this, _hmrRoutes, routes);
+    __privateSet(this, _hmrBranches, flattenAndRankRoutes(routes));
+  }
+  /** Commit in-flight routes/branches to the stable slot and clear in-flight */
+  commitHmrRoutes() {
+    if (__privateGet(this, _hmrRoutes)) {
+      __privateSet(this, _routes, __privateGet(this, _hmrRoutes));
+      __privateSet(this, _branches, __privateGet(this, _hmrBranches));
+      __privateSet(this, _hmrRoutes, void 0);
+      __privateSet(this, _hmrBranches, void 0);
+    }
+  }
+};
+_routes = new WeakMap();
+_branches = new WeakMap();
+_hmrRoutes = new WeakMap();
+_hmrBranches = new WeakMap();
 function createRouter(init) {
   const routerWindow = init.window ? init.window : typeof window !== "undefined" ? window : void 0;
   const isBrowser3 = typeof routerWindow !== "undefined" && typeof routerWindow.document !== "undefined" && typeof routerWindow.document.createElement !== "undefined";
@@ -1356,8 +1412,8 @@ function createRouter(init) {
   let hydrationRouteProperties2 = init.hydrationRouteProperties || [];
   let _mapRouteProperties = init.mapRouteProperties || defaultMapRouteProperties;
   let mapRouteProperties2 = _mapRouteProperties;
-  if (init.unstable_instrumentations) {
-    let instrumentations = init.unstable_instrumentations;
+  if (init.instrumentations) {
+    let instrumentations = init.instrumentations;
     mapRouteProperties2 = (route) => {
       return {
         ..._mapRouteProperties(route),
@@ -1369,29 +1425,36 @@ function createRouter(init) {
     };
   }
   let manifest = {};
-  let dataRoutes = convertRoutesToDataRoutes(
-    init.routes,
-    mapRouteProperties2,
-    void 0,
-    manifest
+  let dataRoutes = new DataRoutes(
+    convertRoutesToDataRoutes(
+      init.routes,
+      mapRouteProperties2,
+      void 0,
+      manifest
+    )
   );
-  let inFlightDataRoutes;
   let basename = init.basename || "/";
   if (!basename.startsWith("/")) {
     basename = `/${basename}`;
   }
   let dataStrategyImpl = init.dataStrategy || defaultDataStrategyWithMiddleware;
   let future = {
-    unstable_passThroughRequests: false,
     ...init.future
   };
   let unlistenHistory = null;
   let subscribers = /* @__PURE__ */ new Set();
+  let bufferedInitialStateUpdate = null;
   let savedScrollPositions2 = null;
   let getScrollRestorationKey2 = null;
   let getScrollPosition = null;
   let initialScrollRestored = init.hydrationData != null;
-  let initialMatches = matchRoutes(dataRoutes, init.history.location, basename);
+  let initialMatches = matchRoutesImpl(
+    dataRoutes.activeRoutes,
+    init.history.location,
+    basename,
+    false,
+    dataRoutes.branches
+  );
   let initialMatchesIsFOW = false;
   let initialErrors = null;
   let initialized;
@@ -1400,7 +1463,7 @@ function createRouter(init) {
     let error = getInternalRouterError(404, {
       pathname: init.history.location.pathname
     });
-    let { matches, route } = getShortCircuitMatches(dataRoutes);
+    let { matches, route } = getShortCircuitMatches(dataRoutes.activeRoutes);
     initialized = true;
     renderFallback = !initialized;
     initialMatches = matches;
@@ -1409,7 +1472,7 @@ function createRouter(init) {
     if (initialMatches && !init.hydrationData) {
       let fogOfWar = checkFogOfWar(
         initialMatches,
-        dataRoutes,
+        dataRoutes.activeRoutes,
         init.history.location.pathname
       );
       if (fogOfWar.active) {
@@ -1422,7 +1485,7 @@ function createRouter(init) {
       initialMatches = [];
       let fogOfWar = checkFogOfWar(
         null,
-        dataRoutes,
+        dataRoutes.activeRoutes,
         init.history.location.pathname
       );
       if (fogOfWar.active && fogOfWar.matches) {
@@ -1562,11 +1625,21 @@ function createRouter(init) {
     }
     subscribers.clear();
     pendingNavigationController && pendingNavigationController.abort();
-    state.fetchers.forEach((_, key) => deleteFetcher(key));
+    state.fetchers.forEach((_, key) => deleteFetcher(state.fetchers, key));
     state.blockers.forEach((_, key) => deleteBlocker(key));
   }
   function subscribe(fn) {
     subscribers.add(fn);
+    if (bufferedInitialStateUpdate) {
+      let { newErrors } = bufferedInitialStateUpdate;
+      bufferedInitialStateUpdate = null;
+      fn(state, {
+        deletedFetchers: [],
+        newErrors,
+        viewTransitionOpts: void 0,
+        flushSync: false
+      });
+    }
     return () => subscribers.delete(fn);
   }
   function updateState(newState, opts = {}) {
@@ -1603,6 +1676,9 @@ function createRouter(init) {
         unmountedFetchers.push(key);
       }
     });
+    if (subscribers.size === 0) {
+      bufferedInitialStateUpdate = { newErrors: newState.errors ?? null };
+    }
     [...subscribers].forEach(
       (subscriber) => subscriber(state, {
         deletedFetchers: unmountedFetchers,
@@ -1611,7 +1687,7 @@ function createRouter(init) {
         flushSync: opts.flushSync === true
       })
     );
-    unmountedFetchers.forEach((key) => deleteFetcher(key));
+    unmountedFetchers.forEach((key) => deleteFetcher(state.fetchers, key));
     mountedFetchers.forEach((key) => state.fetchers.delete(key));
   }
   function completeNavigation(location, newState, { flushSync } = {}) {
@@ -1641,10 +1717,7 @@ function createRouter(init) {
     }
     let restoreScrollPosition = isUninterruptedRevalidation ? false : getSavedScrollPosition(location, newState.matches || state.matches);
     let preventScrollReset = pendingPreventScrollReset === true || state.navigation.formMethod != null && isMutationMethod(state.navigation.formMethod) && location.state?._isRedirect !== true;
-    if (inFlightDataRoutes) {
-      dataRoutes = inFlightDataRoutes;
-      inFlightDataRoutes = void 0;
-    }
+    dataRoutes.commitHmrRoutes();
     if (isUninterruptedRevalidation) {
     } else if (pendingAction === "POP" /* Pop */) {
     } else if (pendingAction === "PUSH" /* Push */) {
@@ -1735,10 +1808,10 @@ function createRouter(init) {
       opts
     );
     let maskPath;
-    if (opts?.unstable_mask) {
-      let partialPath = typeof opts.unstable_mask === "string" ? parsePath(opts.unstable_mask) : {
-        ...state.location.unstable_mask,
-        ...opts.unstable_mask
+    if (opts?.mask) {
+      let partialPath = typeof opts.mask === "string" ? parsePath(opts.mask) : {
+        ...state.location.mask,
+        ...opts.mask
       };
       maskPath = {
         pathname: "",
@@ -1804,7 +1877,7 @@ function createRouter(init) {
       replace: opts && opts.replace,
       enableViewTransition: opts && opts.viewTransition,
       flushSync,
-      callSiteDefaultShouldRevalidate: opts && opts.unstable_defaultShouldRevalidate
+      callSiteDefaultShouldRevalidate: opts && opts.defaultShouldRevalidate
     });
   }
   function revalidate() {
@@ -1842,12 +1915,17 @@ function createRouter(init) {
     saveScrollPosition(state.location, state.matches);
     pendingPreventScrollReset = (opts && opts.preventScrollReset) === true;
     pendingViewTransitionEnabled = (opts && opts.enableViewTransition) === true;
-    let routesToUse = inFlightDataRoutes || dataRoutes;
-    let loadingNavigation = opts && opts.overrideNavigation;
+    let routesToUse = dataRoutes.activeRoutes;
     let matches = opts?.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);
+    ) : matchRoutesImpl(
+      routesToUse,
+      location,
+      basename,
+      false,
+      dataRoutes.branches
+    );
     let flushSync = (opts && opts.flushSync) === true;
     if (matches && state.initialized && !isRevalidationRequired && isHashChangeOnly(state.location, location) && !(opts && opts.submission && isMutationMethod(opts.submission.formMethod))) {
       completeNavigation(location, { matches }, { flushSync });
@@ -1874,6 +1952,11 @@ function createRouter(init) {
       );
       return;
     }
+    let loadingNavigation = opts && opts.overrideNavigation ? {
+      ...opts.overrideNavigation,
+      matches,
+      historyAction
+    } : void 0;
     pendingNavigationController = new AbortController();
     let request = createClientSideRequest(
       init.history,
@@ -1894,6 +1977,7 @@ function createRouter(init) {
         location,
         opts.submission,
         matches,
+        historyAction,
         scopedContext,
         fogOfWar.active,
         opts && opts.initialHydration === true,
@@ -1918,7 +2002,12 @@ function createRouter(init) {
       }
       matches = actionResult.matches || matches;
       pendingActionResult = actionResult.pendingActionResult;
-      loadingNavigation = getLoadingNavigation(location, opts.submission);
+      loadingNavigation = getLoadingNavigation(
+        location,
+        matches,
+        historyAction,
+        opts.submission
+      );
       flushSync = false;
       fogOfWar.active = false;
       request = createClientSideRequest(
@@ -1931,11 +2020,13 @@ function createRouter(init) {
       shortCircuited,
       matches: updatedMatches,
       loaderData,
-      errors
+      errors,
+      workingFetchers
     } = await handleLoaders(
       request,
       location,
       matches,
+      historyAction,
       scopedContext,
       fogOfWar.active,
       loadingNavigation,
@@ -1955,12 +2046,18 @@ function createRouter(init) {
       matches: updatedMatches || matches,
       ...getActionDataForCommit(pendingActionResult),
       loaderData,
-      errors
+      errors,
+      ...workingFetchers ? { fetchers: workingFetchers } : {}
     });
   }
-  async function handleAction(request, location, submission, matches, scopedContext, isFogOfWar, initialHydration, opts = {}) {
+  async function handleAction(request, location, submission, matches, historyAction, scopedContext, isFogOfWar, initialHydration, opts = {}) {
     interruptActiveLoads();
-    let navigation = getSubmittingNavigation(location, submission);
+    let navigation = getSubmittingNavigation(
+      location,
+      matches,
+      historyAction,
+      submission
+    );
     updateState({ navigation }, { flushSync: opts.flushSync === true });
     if (isFogOfWar) {
       let discoverResult = await discoverRoutes(
@@ -1972,7 +2069,9 @@ function createRouter(init) {
         return { shortCircuited: true };
       } else if (discoverResult.type === "error") {
         if (discoverResult.partialMatches.length === 0) {
-          let { matches: matches2, route } = getShortCircuitMatches(dataRoutes);
+          let { matches: matches2, route } = getShortCircuitMatches(
+            dataRoutes.activeRoutes
+          );
           return {
             matches: matches2,
             pendingActionResult: [
@@ -2093,8 +2192,8 @@ function createRouter(init) {
       pendingActionResult: [actionMatch.route.id, result]
     };
   }
-  async function handleLoaders(request, location, matches, scopedContext, isFogOfWar, overrideNavigation, submission, fetcherSubmission, replace2, initialHydration, flushSync, pendingActionResult, callSiteDefaultShouldRevalidate) {
-    let loadingNavigation = overrideNavigation || getLoadingNavigation(location, submission);
+  async function handleLoaders(request, location, matches, historyAction, scopedContext, isFogOfWar, overrideNavigation, submission, fetcherSubmission, replace2, initialHydration, flushSync, pendingActionResult, callSiteDefaultShouldRevalidate) {
+    let loadingNavigation = overrideNavigation || getLoadingNavigation(location, matches, historyAction, submission);
     let activeSubmission = submission || fetcherSubmission || getSubmissionFromNavigation(loadingNavigation);
     let shouldUpdateNavigationState = !isUninterruptedRevalidation && !initialHydration;
     if (isFogOfWar) {
@@ -2119,7 +2218,9 @@ function createRouter(init) {
         return { shortCircuited: true };
       } else if (discoverResult.type === "error") {
         if (discoverResult.partialMatches.length === 0) {
-          let { matches: matches2, route } = getShortCircuitMatches(dataRoutes);
+          let { matches: matches2, route } = getShortCircuitMatches(
+            dataRoutes.activeRoutes
+          );
           return {
             matches: matches2,
             loaderData: {},
@@ -2151,7 +2252,7 @@ function createRouter(init) {
         matches = discoverResult.matches;
       }
     }
-    let routesToUse = inFlightDataRoutes || dataRoutes;
+    let routesToUse = dataRoutes.activeRoutes;
     let { dsMatches, revalidatingFetchers } = getMatchesToLoad(
       request,
       scopedContext,
@@ -2172,6 +2273,7 @@ function createRouter(init) {
       routesToUse,
       basename,
       init.patchRoutesOnNavigation != null,
+      dataRoutes.branches,
       pendingActionResult,
       callSiteDefaultShouldRevalidate
     );
@@ -2179,7 +2281,8 @@ function createRouter(init) {
     if (!init.dataStrategy && !dsMatches.some((m) => m.shouldLoad) && !dsMatches.some(
       (m) => m.route.middleware && m.route.middleware.length > 0
     ) && revalidatingFetchers.length === 0) {
-      let updatedFetchers2 = markFetchRedirectsDone();
+      let workingFetchers2 = new Map(state.fetchers);
+      let didUpdateFetcherRedirects2 = markFetchRedirectsDone(workingFetchers2);
       completeNavigation(
         location,
         {
@@ -2188,7 +2291,7 @@ function createRouter(init) {
           // Commit pending error if we're short circuiting
           errors: pendingActionResult && isErrorResult(pendingActionResult[1]) ? { [pendingActionResult[0]]: pendingActionResult[1].error } : null,
           ...getActionDataForCommit(pendingActionResult),
-          ...updatedFetchers2 ? { fetchers: new Map(state.fetchers) } : {}
+          ...didUpdateFetcherRedirects2 ? { fetchers: workingFetchers2 } : {}
         },
         { flushSync }
       );
@@ -2253,25 +2356,30 @@ function createRouter(init) {
       });
       return { shortCircuited: true };
     }
+    let workingFetchers = new Map(state.fetchers);
     let { loaderData, errors } = processLoaderData(
       state,
       matches,
       loaderResults,
       pendingActionResult,
       revalidatingFetchers,
-      fetcherResults
+      fetcherResults,
+      workingFetchers
     );
     if (initialHydration && state.errors) {
       errors = { ...state.errors, ...errors };
     }
-    let updatedFetchers = markFetchRedirectsDone();
-    let didAbortFetchLoads = abortStaleFetchLoads(pendingNavigationLoadId);
-    let shouldUpdateFetchers = updatedFetchers || didAbortFetchLoads || revalidatingFetchers.length > 0;
+    let didUpdateFetcherRedirects = markFetchRedirectsDone(workingFetchers);
+    let didAbortFetchLoads = abortStaleFetchLoads(
+      pendingNavigationLoadId,
+      workingFetchers
+    );
+    let shouldUpdateFetchers = didUpdateFetcherRedirects || didAbortFetchLoads || revalidatingFetchers.length > 0;
     return {
       matches,
       loaderData,
       errors,
-      ...shouldUpdateFetchers ? { fetchers: new Map(state.fetchers) } : {}
+      ...shouldUpdateFetchers ? { workingFetchers } : {}
     };
   }
   function getUpdatedActionData(pendingActionResult) {
@@ -2288,20 +2396,21 @@ function createRouter(init) {
     }
   }
   function getUpdatedRevalidatingFetchers(revalidatingFetchers) {
+    let workingFetchers = new Map(state.fetchers);
     revalidatingFetchers.forEach((rf) => {
-      let fetcher = state.fetchers.get(rf.key);
+      let fetcher = workingFetchers.get(rf.key);
       let revalidatingFetcher = getLoadingFetcher(
         void 0,
         fetcher ? fetcher.data : void 0
       );
-      state.fetchers.set(rf.key, revalidatingFetcher);
+      workingFetchers.set(rf.key, revalidatingFetcher);
     });
-    return new Map(state.fetchers);
+    return workingFetchers;
   }
   async function fetch2(key, routeId, href, opts) {
     abortFetcher(key);
     let flushSync = (opts && opts.flushSync) === true;
-    let routesToUse = inFlightDataRoutes || dataRoutes;
+    let routesToUse = dataRoutes.activeRoutes;
     let normalizedPath = normalizeTo(
       state.location,
       state.matches,
@@ -2310,7 +2419,13 @@ function createRouter(init) {
       routeId,
       opts?.relative
     );
-    let matches = matchRoutes(routesToUse, normalizedPath, basename);
+    let matches = matchRoutesImpl(
+      routesToUse,
+      normalizedPath,
+      basename,
+      false,
+      dataRoutes.branches
+    );
     let fogOfWar = checkFogOfWar(matches, routesToUse, normalizedPath);
     if (fogOfWar.active && fogOfWar.matches) {
       matches = fogOfWar.matches;
@@ -2346,7 +2461,7 @@ function createRouter(init) {
         flushSync,
         preventScrollReset,
         submission,
-        opts && opts.unstable_defaultShouldRevalidate
+        opts && opts.defaultShouldRevalidate
       );
       return;
     }
@@ -2476,13 +2591,17 @@ function createRouter(init) {
       nextLocation,
       abortController.signal
     );
-    let routesToUse = inFlightDataRoutes || dataRoutes;
-    let matches = state.navigation.state !== "idle" ? matchRoutes(routesToUse, state.navigation.location, basename) : state.matches;
+    let routesToUse = dataRoutes.activeRoutes;
+    let matches = state.navigation.state !== "idle" ? matchRoutesImpl(
+      routesToUse,
+      state.navigation.location,
+      basename,
+      false,
+      dataRoutes.branches
+    ) : state.matches;
     invariant(matches, "Didn't find any matches after fetcher action");
     let loadId = ++incrementingLoadId;
     fetchReloadIds.set(key, loadId);
-    let loadFetcher = getLoadingFetcher(submission, actionResult.data);
-    state.fetchers.set(key, loadFetcher);
     let { dsMatches, revalidatingFetchers } = getMatchesToLoad(
       revalidationRequest,
       scopedContext,
@@ -2503,23 +2622,27 @@ function createRouter(init) {
       routesToUse,
       basename,
       init.patchRoutesOnNavigation != null,
+      dataRoutes.branches,
       [match.route.id, actionResult],
       callSiteDefaultShouldRevalidate
     );
+    let loadFetcher = getLoadingFetcher(submission, actionResult.data);
+    let workingFetchers = new Map(state.fetchers);
+    workingFetchers.set(key, loadFetcher);
     revalidatingFetchers.filter((rf) => rf.key !== key).forEach((rf) => {
       let staleKey = rf.key;
-      let existingFetcher2 = state.fetchers.get(staleKey);
+      let existingFetcher2 = workingFetchers.get(staleKey);
       let revalidatingFetcher = getLoadingFetcher(
         void 0,
         existingFetcher2 ? existingFetcher2.data : void 0
       );
-      state.fetchers.set(staleKey, revalidatingFetcher);
+      workingFetchers.set(staleKey, revalidatingFetcher);
       abortFetcher(staleKey);
       if (rf.controller) {
         fetchControllers.set(staleKey, rf.controller);
       }
     });
-    updateState({ fetchers: new Map(state.fetchers) });
+    updateState({ fetchers: workingFetchers });
     let abortPendingFetchRevalidations = () => revalidatingFetchers.forEach((rf) => abortFetcher(rf.key));
     abortController.signal.addEventListener(
       "abort",
@@ -2542,12 +2665,16 @@ function createRouter(init) {
     fetchReloadIds.delete(key);
     fetchControllers.delete(key);
     revalidatingFetchers.forEach((r) => fetchControllers.delete(r.key));
-    if (state.fetchers.has(key)) {
-      let doneFetcher = getDoneFetcher(actionResult.data);
-      state.fetchers.set(key, doneFetcher);
-    }
+    let fetcherIsMounted = state.fetchers.has(key);
+    let getRedirectStateWithDoneFetcher = (s) => {
+      if (!fetcherIsMounted) return s;
+      let workingFetchers2 = new Map(s.fetchers);
+      workingFetchers2.set(key, getDoneFetcher(actionResult.data));
+      return { ...s, fetchers: workingFetchers2 };
+    };
     let redirect2 = findRedirect(loaderResults);
     if (redirect2) {
+      state = getRedirectStateWithDoneFetcher(state);
       return startRedirectNavigation(
         revalidationRequest,
         redirect2.result,
@@ -2558,6 +2685,7 @@ function createRouter(init) {
     redirect2 = findRedirect(fetcherResults);
     if (redirect2) {
       fetchRedirectIds.add(redirect2.key);
+      state = getRedirectStateWithDoneFetcher(state);
       return startRedirectNavigation(
         revalidationRequest,
         redirect2.result,
@@ -2565,15 +2693,20 @@ function createRouter(init) {
         { preventScrollReset }
       );
     }
+    let finalFetchers = new Map(state.fetchers);
+    if (fetcherIsMounted) {
+      finalFetchers.set(key, getDoneFetcher(actionResult.data));
+    }
     let { loaderData, errors } = processLoaderData(
       state,
       matches,
       loaderResults,
       void 0,
       revalidatingFetchers,
-      fetcherResults
+      fetcherResults,
+      finalFetchers
     );
-    abortStaleFetchLoads(loadId);
+    abortStaleFetchLoads(loadId, finalFetchers);
     if (state.navigation.state === "loading" && loadId > pendingNavigationLoadId) {
       invariant(pendingAction, "Expected pending action");
       pendingNavigationController && pendingNavigationController.abort();
@@ -2581,7 +2714,7 @@ function createRouter(init) {
         matches,
         loaderData,
         errors,
-        fetchers: new Map(state.fetchers)
+        fetchers: finalFetchers
       });
     } else {
       updateState({
@@ -2592,7 +2725,7 @@ function createRouter(init) {
           matches,
           errors
         ),
-        fetchers: new Map(state.fetchers)
+        fetchers: finalFetchers
       });
       isRevalidationRequired = false;
     }
@@ -2757,6 +2890,8 @@ function createRouter(init) {
     } else {
       let overrideNavigation = getLoadingNavigation(
         redirectLocation,
+        [],
+        redirectNavigationType,
         submission
       );
       await startNavigation(redirectNavigationType, redirectLocation, {
@@ -2880,21 +3015,23 @@ function createRouter(init) {
     });
   }
   function updateFetcherState(key, fetcher, opts = {}) {
-    state.fetchers.set(key, fetcher);
+    let workingFetchers = new Map(state.fetchers);
+    workingFetchers.set(key, fetcher);
     updateState(
-      { fetchers: new Map(state.fetchers) },
+      { fetchers: workingFetchers },
       { flushSync: (opts && opts.flushSync) === true }
     );
   }
   function setFetcherError(key, routeId, error, opts = {}) {
     let boundaryMatch = findNearestBoundary(state.matches, routeId);
-    deleteFetcher(key);
+    let workingFetchers = new Map(state.fetchers);
+    deleteFetcher(workingFetchers, key);
     updateState(
       {
         errors: {
           [boundaryMatch.route.id]: error
         },
-        fetchers: new Map(state.fetchers)
+        fetchers: workingFetchers
       },
       { flushSync: (opts && opts.flushSync) === true }
     );
@@ -2910,7 +3047,7 @@ function createRouter(init) {
     abortFetcher(key, opts?.reason);
     updateFetcherState(key, getDoneFetcher(null));
   }
-  function deleteFetcher(key) {
+  function deleteFetcher(fetchers, key) {
     let fetcher = state.fetchers.get(key);
     if (fetchControllers.has(key) && !(fetcher && fetcher.state === "loading" && fetchReloadIds.has(key))) {
       abortFetcher(key);
@@ -2920,7 +3057,7 @@ function createRouter(init) {
     fetchRedirectIds.delete(key);
     fetchersQueuedForDeletion.delete(key);
     cancelledFetcherLoads.delete(key);
-    state.fetchers.delete(key);
+    fetchers.delete(key);
   }
   function queueFetcherForDeletion(key) {
     let count = (activeFetchers.get(key) || 0) - 1;
@@ -2939,33 +3076,34 @@ function createRouter(init) {
       fetchControllers.delete(key);
     }
   }
-  function markFetchersDone(keys) {
+  function markFetchersDone(keys, fetchers) {
     for (let key of keys) {
-      let fetcher = getFetcher(key);
+      let fetcher = fetchers.get(key);
+      invariant(fetcher, `Expected fetcher: ${key}`);
       let doneFetcher = getDoneFetcher(fetcher.data);
-      state.fetchers.set(key, doneFetcher);
+      fetchers.set(key, doneFetcher);
     }
   }
-  function markFetchRedirectsDone() {
+  function markFetchRedirectsDone(fetchers) {
     let doneKeys = [];
-    let updatedFetchers = false;
+    let didUpdateFetchers = false;
     for (let key of fetchRedirectIds) {
-      let fetcher = state.fetchers.get(key);
+      let fetcher = fetchers.get(key);
       invariant(fetcher, `Expected fetcher: ${key}`);
       if (fetcher.state === "loading") {
         fetchRedirectIds.delete(key);
         doneKeys.push(key);
-        updatedFetchers = true;
+        didUpdateFetchers = true;
       }
     }
-    markFetchersDone(doneKeys);
-    return updatedFetchers;
+    markFetchersDone(doneKeys, fetchers);
+    return didUpdateFetchers;
   }
-  function abortStaleFetchLoads(landedId) {
+  function abortStaleFetchLoads(landedId, fetchers) {
     let yeetedKeys = [];
     for (let [key, id] of fetchReloadIds) {
       if (id < landedId) {
-        let fetcher = state.fetchers.get(key);
+        let fetcher = fetchers.get(key);
         invariant(fetcher, `Expected fetcher: ${key}`);
         if (fetcher.state === "loading") {
           abortFetcher(key);
@@ -2974,7 +3112,7 @@ function createRouter(init) {
         }
       }
     }
-    markFetchersDone(yeetedKeys);
+    markFetchersDone(yeetedKeys, fetchers);
     return yeetedKeys.length > 0;
   }
   function getBlocker(key, fn) {
@@ -3021,7 +3159,7 @@ function createRouter(init) {
   }
   function handleNavigational404(pathname) {
     let error = getInternalRouterError(404, { pathname });
-    let routesToUse = inFlightDataRoutes || dataRoutes;
+    let routesToUse = dataRoutes.activeRoutes;
     let { matches, route } = getShortCircuitMatches(routesToUse);
     return { notFoundMatches: matches, route, error };
   }
@@ -3070,12 +3208,14 @@ function createRouter(init) {
   }
   function checkFogOfWar(matches, routesToUse, pathname) {
     if (init.patchRoutesOnNavigation) {
+      let activeBranches = dataRoutes.branches;
       if (!matches) {
         let fogMatches = matchRoutesImpl(
           routesToUse,
           pathname,
           basename,
-          true
+          true,
+          activeBranches
         );
         return { active: true, matches: fogMatches || [] };
       } else {
@@ -3084,7 +3224,8 @@ function createRouter(init) {
             routesToUse,
             pathname,
             basename,
-            true
+            true,
+            activeBranches
           );
           return { active: true, matches: partialMatches };
         }
@@ -3098,8 +3239,6 @@ function createRouter(init) {
     }
     let partialMatches = matches;
     while (true) {
-      let isNonHMR = inFlightDataRoutes == null;
-      let routesToUse = inFlightDataRoutes || dataRoutes;
       let localManifest = manifest;
       try {
         await init.patchRoutesOnNavigation({
@@ -3112,7 +3251,7 @@ function createRouter(init) {
             patchRoutesImpl(
               routeId,
               children,
-              routesToUse,
+              dataRoutes,
               localManifest,
               mapRouteProperties2,
               false
@@ -3121,25 +3260,29 @@ function createRouter(init) {
         });
       } catch (e) {
         return { type: "error", error: e, partialMatches };
-      } finally {
-        if (isNonHMR && !signal.aborted) {
-          dataRoutes = [...dataRoutes];
-        }
       }
       if (signal.aborted) {
         return { type: "aborted" };
       }
-      let newMatches = matchRoutes(routesToUse, pathname, basename);
+      let activeBranches = dataRoutes.branches;
+      let newMatches = matchRoutesImpl(
+        dataRoutes.activeRoutes,
+        pathname,
+        basename,
+        false,
+        activeBranches
+      );
       let newPartialMatches = null;
       if (newMatches) {
         if (Object.keys(newMatches[0].params).length === 0) {
           return { type: "success", matches: newMatches };
         } else {
           newPartialMatches = matchRoutesImpl(
-            routesToUse,
+            dataRoutes.activeRoutes,
             pathname,
             basename,
-            true
+            true,
+            activeBranches
           );
           let matchedDeeper = newPartialMatches && partialMatches.length < newPartialMatches.length && compareMatches(
             partialMatches,
@@ -3152,10 +3295,11 @@ function createRouter(init) {
       }
       if (!newPartialMatches) {
         newPartialMatches = matchRoutesImpl(
-          routesToUse,
+          dataRoutes.activeRoutes,
           pathname,
           basename,
-          true
+          true,
+          activeBranches
         );
       }
       if (!newPartialMatches || compareMatches(partialMatches, newPartialMatches)) {
@@ -3169,26 +3313,25 @@ function createRouter(init) {
   }
   function _internalSetRoutes(newRoutes) {
     manifest = {};
-    inFlightDataRoutes = convertRoutesToDataRoutes(
-      newRoutes,
-      mapRouteProperties2,
-      void 0,
-      manifest
+    dataRoutes.setHmrRoutes(
+      convertRoutesToDataRoutes(
+        newRoutes,
+        mapRouteProperties2,
+        void 0,
+        manifest
+      )
     );
   }
   function patchRoutes(routeId, children, unstable_allowElementMutations = false) {
-    let isNonHMR = inFlightDataRoutes == null;
-    let routesToUse = inFlightDataRoutes || dataRoutes;
     patchRoutesImpl(
       routeId,
       children,
-      routesToUse,
+      dataRoutes,
       manifest,
       mapRouteProperties2,
       unstable_allowElementMutations
     );
-    if (isNonHMR) {
-      dataRoutes = [...dataRoutes];
+    if (!dataRoutes.hasHMRRoutes) {
       updateState({});
     }
   }
@@ -3203,7 +3346,13 @@ function createRouter(init) {
       return state;
     },
     get routes() {
-      return dataRoutes;
+      return dataRoutes.stableRoutes;
+    },
+    get branches() {
+      return dataRoutes.branches;
+    },
+    get manifest() {
+      return manifest;
     },
     get window() {
       return routerWindow;
@@ -3233,10 +3382,10 @@ function createRouter(init) {
       updateState(newState);
     }
   };
-  if (init.unstable_instrumentations) {
+  if (init.instrumentations) {
     router = instrumentClientSideRouter(
       router,
-      init.unstable_instrumentations.map((i) => i.router).filter(Boolean)
+      init.instrumentations.map((i) => i.router).filter(Boolean)
     );
   }
   return router;
@@ -3251,12 +3400,10 @@ function createStaticHandler(routes, opts) {
   let _mapRouteProperties = opts?.mapRouteProperties || defaultMapRouteProperties;
   let mapRouteProperties2 = _mapRouteProperties;
   let future = {
-    unstable_passThroughRequests: false,
-    // unused in static handler
     ...opts?.future
   };
-  if (opts?.unstable_instrumentations) {
-    let instrumentations = opts.unstable_instrumentations;
+  if (opts?.instrumentations) {
+    let instrumentations = opts.instrumentations;
     mapRouteProperties2 = (route) => {
       return {
         ..._mapRouteProperties(route),
@@ -3273,6 +3420,7 @@ function createStaticHandler(routes, opts) {
     void 0,
     manifest
   );
+  let routeBranches = flattenAndRankRoutes(dataRoutes);
   async function query(request, {
     requestContext,
     filterMatchesToLoad,
@@ -3280,12 +3428,23 @@ function createStaticHandler(routes, opts) {
     skipRevalidation,
     dataStrategy,
     generateMiddlewareResponse,
-    unstable_normalizePath
+    normalizePath
   } = {}) {
-    let normalizePath = unstable_normalizePath || defaultNormalizePath;
+    let normalizePathImpl = normalizePath || defaultNormalizePath;
     let method = request.method;
-    let location = createLocation("", normalizePath(request), null, "default");
-    let matches = matchRoutes(dataRoutes, location, basename);
+    let location = createLocation(
+      "",
+      normalizePathImpl(request),
+      null,
+      "default"
+    );
+    let matches = matchRoutesImpl(
+      dataRoutes,
+      location,
+      basename,
+      false,
+      routeBranches
+    );
     requestContext = requestContext != null ? requestContext : new RouterContextProvider();
     if (!isValidMethod(method) && method !== "HEAD") {
       let error = getInternalRouterError(405, { method });
@@ -3337,8 +3496,8 @@ function createStaticHandler(routes, opts) {
         let response = await runServerMiddlewarePipeline(
           {
             request,
-            unstable_url: createDataFunctionUrl(request, location),
-            unstable_pattern: getRoutePattern(matches),
+            url: createDataFunctionUrl(request, location),
+            pattern: getRoutePattern(matches),
             matches,
             params: matches[0].params,
             // If we're calling middleware then it must be enabled so we can cast
@@ -3455,12 +3614,23 @@ function createStaticHandler(routes, opts) {
     requestContext,
     dataStrategy,
     generateMiddlewareResponse,
-    unstable_normalizePath
+    normalizePath
   } = {}) {
-    let normalizePath = unstable_normalizePath || defaultNormalizePath;
+    let normalizePathImpl = normalizePath || defaultNormalizePath;
     let method = request.method;
-    let location = createLocation("", normalizePath(request), null, "default");
-    let matches = matchRoutes(dataRoutes, location, basename);
+    let location = createLocation(
+      "",
+      normalizePathImpl(request),
+      null,
+      "default"
+    );
+    let matches = matchRoutesImpl(
+      dataRoutes,
+      location,
+      basename,
+      false,
+      routeBranches
+    );
     requestContext = requestContext != null ? requestContext : new RouterContextProvider();
     if (!isValidMethod(method) && method !== "HEAD" && method !== "OPTIONS") {
       throw getInternalRouterError(405, { method });
@@ -3485,8 +3655,8 @@ function createStaticHandler(routes, opts) {
       let response = await runServerMiddlewarePipeline(
         {
           request,
-          unstable_url: createDataFunctionUrl(request, location),
-          unstable_pattern: getRoutePattern(matches),
+          url: createDataFunctionUrl(request, location),
+          pattern: getRoutePattern(matches),
           matches,
           params: matches[0].params,
           // If we're calling middleware then it must be enabled so we can cast
@@ -3872,6 +4042,7 @@ function createStaticHandler(routes, opts) {
   }
   return {
     dataRoutes,
+    _internalRouteBranches: routeBranches,
     query,
     queryRoute
   };
@@ -4057,7 +4228,7 @@ function normalizeNavigateOptions(isFetcher, path, opts) {
   parsedPath.search = `?${searchParams}`;
   return { path: createPath(parsedPath), submission };
 }
-function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest, history, state, matches, submission, location, lazyRoutePropertiesToSkip, initialHydration, isRevalidationRequired, cancelledFetcherLoads, fetchersQueuedForDeletion, fetchLoadMatches, fetchRedirectIds, routesToUse, basename, hasPatchRoutesOnNavigation, pendingActionResult, callSiteDefaultShouldRevalidate) {
+function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest, history, state, matches, submission, location, lazyRoutePropertiesToSkip, initialHydration, isRevalidationRequired, cancelledFetcherLoads, fetchersQueuedForDeletion, fetchLoadMatches, fetchRedirectIds, routesToUse, basename, hasPatchRoutesOnNavigation, branches, pendingActionResult, callSiteDefaultShouldRevalidate) {
   let actionResult = pendingActionResult ? isErrorResult(pendingActionResult[1]) ? pendingActionResult[1].error : pendingActionResult[1].data : void 0;
   let currentUrl = history.createURL(state.location);
   let nextUrl = history.createURL(location);
@@ -4153,7 +4324,13 @@ function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest,
     }
     let fetcher = state.fetchers.get(key);
     let isMidInitialLoad = fetcher && fetcher.state !== "idle" && fetcher.data === void 0;
-    let fetcherMatches = matchRoutes(routesToUse, f.path, basename);
+    let fetcherMatches = matchRoutesImpl(
+      routesToUse,
+      f.path,
+      basename ?? "/",
+      false,
+      branches
+    );
     if (!fetcherMatches) {
       if (hasPatchRoutesOnNavigation && isMidInitialLoad) {
         return;
@@ -4294,7 +4471,7 @@ function shouldRevalidateLoader(loaderMatch, arg) {
   }
   return arg.defaultShouldRevalidate;
 }
-function patchRoutesImpl(routeId, children, routesToUse, manifest, mapRouteProperties2, allowElementMutations) {
+function patchRoutesImpl(routeId, children, dataRoutes, manifest, mapRouteProperties2, allowElementMutations) {
   let childrenToPatch;
   if (routeId) {
     let route = manifest[routeId];
@@ -4307,7 +4484,7 @@ function patchRoutesImpl(routeId, children, routesToUse, manifest, mapRoutePrope
     }
     childrenToPatch = route.children;
   } else {
-    childrenToPatch = routesToUse;
+    childrenToPatch = dataRoutes.activeRoutes;
   }
   let uniqueChildren = [];
   let existingChildren = [];
@@ -4350,6 +4527,9 @@ function patchRoutesImpl(routeId, children, routesToUse, manifest, mapRoutePrope
       });
     }
   }
+  if (!dataRoutes.hasHMRRoutes) {
+    dataRoutes.setRoutes([...dataRoutes.activeRoutes]);
+  }
 }
 function isSameRoute(newRoute, existingRoute) {
   if ("id" in newRoute && "id" in existingRoute && newRoute.id === existingRoute.id) {
@@ -4691,7 +4871,7 @@ function getDataStrategyMatchLazyPromises(mapRouteProperties2, manifest, request
     handler: lazyRoutePromises.lazyHandlerPromise
   };
 }
-function getDataStrategyMatch(mapRouteProperties2, manifest, request, path, unstable_pattern, match, lazyRoutePropertiesToSkip, scopedContext, shouldLoad, shouldRevalidateArgs = null, callSiteDefaultShouldRevalidate) {
+function getDataStrategyMatch(mapRouteProperties2, manifest, request, path, pattern, match, lazyRoutePropertiesToSkip, scopedContext, shouldLoad, shouldRevalidateArgs = null, callSiteDefaultShouldRevalidate) {
   let isUsingNewApi = false;
   let _lazyPromises = getDataStrategyMatchLazyPromises(
     mapRouteProperties2,
@@ -4732,7 +4912,7 @@ function getDataStrategyMatch(mapRouteProperties2, manifest, request, path, unst
         return callLoaderOrAction({
           request,
           path,
-          unstable_pattern,
+          pattern,
           match,
           lazyHandlerPromise: _lazyPromises?.handler,
           lazyRoutePromise: _lazyPromises?.route,
@@ -4782,8 +4962,8 @@ async function callDataStrategyImpl(dataStrategyImpl, request, path, matches, fe
   }
   let dataStrategyArgs = {
     request,
-    unstable_url: createDataFunctionUrl(request, path),
-    unstable_pattern: getRoutePattern(matches),
+    url: createDataFunctionUrl(request, path),
+    pattern: getRoutePattern(matches),
     params: matches[0].params,
     context: scopedContext,
     matches
@@ -4825,7 +5005,7 @@ async function callDataStrategyImpl(dataStrategyImpl, request, path, matches, fe
 async function callLoaderOrAction({
   request,
   path,
-  unstable_pattern,
+  pattern,
   match,
   lazyHandlerPromise,
   lazyRoutePromise,
@@ -4852,8 +5032,8 @@ async function callLoaderOrAction({
       return handler(
         {
           request,
-          unstable_url: createDataFunctionUrl(request, path),
-          unstable_pattern,
+          url: createDataFunctionUrl(request, path),
+          pattern,
           params: match.params,
           context: scopedContext
         },
@@ -5160,7 +5340,7 @@ function processRouteLoaderData(matches, results, pendingActionResult, isStaticH
     loaderHeaders
   };
 }
-function processLoaderData(state, matches, results, pendingActionResult, revalidatingFetchers, fetcherResults) {
+function processLoaderData(state, matches, results, pendingActionResult, revalidatingFetchers, fetcherResults, workingFetchers) {
   let { loaderData, errors } = processRouteLoaderData(
     matches,
     results,
@@ -5181,12 +5361,12 @@ function processLoaderData(state, matches, results, pendingActionResult, revalid
           [boundaryMatch.route.id]: result.error
         };
       }
-      state.fetchers.delete(key);
+      workingFetchers.delete(key);
     } else if (isRedirectResult(result)) {
       invariant(false, "Unhandled fetcher revalidation redirect");
     } else {
       let doneFetcher = getDoneFetcher(result.data);
-      state.fetchers.set(key, doneFetcher);
+      workingFetchers.set(key, doneFetcher);
     }
   });
   return { loaderData, errors };
@@ -5393,11 +5573,13 @@ function getSubmissionFromNavigation(navigation) {
     };
   }
 }
-function getLoadingNavigation(location, submission) {
+function getLoadingNavigation(location, matches, historyAction, submission) {
   if (submission) {
     let navigation = {
       state: "loading",
       location,
+      matches,
+      historyAction,
       formMethod: submission.formMethod,
       formAction: submission.formAction,
       formEncType: submission.formEncType,
@@ -5410,6 +5592,8 @@ function getLoadingNavigation(location, submission) {
     let navigation = {
       state: "loading",
       location,
+      matches,
+      historyAction,
       formMethod: void 0,
       formAction: void 0,
       formEncType: void 0,
@@ -5420,10 +5604,12 @@ function getLoadingNavigation(location, submission) {
     return navigation;
   }
 }
-function getSubmittingNavigation(location, submission) {
+function getSubmittingNavigation(location, matches, historyAction, submission) {
   let navigation = {
     state: "submitting",
     location,
+    matches,
+    historyAction,
     formMethod: submission.formMethod,
     formAction: submission.formAction,
     formEncType: submission.formEncType,
@@ -5804,7 +5990,15 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
     let segments = pathname.replace(/^\//, "").split("/");
     remainingPathname = "/" + segments.slice(parentSegments.length).join("/");
   }
-  let matches = matchRoutes(routes, { pathname: remainingPathname });
+  let matches = dataRouterOpts && dataRouterOpts.state.matches.length ? (
+    // If we're in a data router, use the matches we've already identified but ensure
+    // we have the latest route instances from the manifest in case elements have changed
+    dataRouterOpts.state.matches.map(
+      (m) => Object.assign(m, {
+        route: dataRouterOpts.manifest[m.route.id] || m.route
+      })
+    )
+  ) : matchRoutes(routes, { pathname: remainingPathname });
   if (ENABLE_DEV_WARNINGS) {
     warning(
       parentRoute || matches != null,
@@ -5855,7 +6049,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
             hash: "",
             state: null,
             key: "default",
-            unstable_mask: void 0,
+            mask: void 0,
             ...location
           },
           navigationType: "POP" /* Pop */
@@ -6045,7 +6239,7 @@ function _renderMatches(matches, parentMatches = [], dataRouterOpts) {
     onErrorHandler(error, {
       location: dataRouterState.location,
       params: dataRouterState.matches?.[0]?.params ?? {},
-      unstable_pattern: getRoutePattern(dataRouterState.matches),
+      pattern: getRoutePattern(dataRouterState.matches),
       errorInfo
     });
   } : void 0;
@@ -6148,7 +6342,10 @@ function useRouteId() {
 }
 function useNavigation() {
   let state = useDataRouterState("useNavigation" /* UseNavigation */);
-  return state.navigation;
+  return React2.useMemo(() => {
+    let { matches, historyAction, ...rest } = state.navigation;
+    return rest;
+  }, [state.navigation]);
 }
 function useRevalidator() {
   let dataRouterContext = useDataRouterContext("useRevalidator" /* UseRevalidator */);
@@ -6283,6 +6480,65 @@ function useRoute(...args) {
     actionData: state.actionData?.[id]
   };
 }
+function toRouterStateMatch(match) {
+  return {
+    id: match.route.id,
+    pathname: match.pathname,
+    params: match.params,
+    handle: match.route.handle
+  };
+}
+function useRouterState() {
+  let {
+    location,
+    historyAction: type,
+    matches,
+    navigation
+  } = useDataRouterState("unstable_useRouterState" /* UseRouterState */);
+  let active = React2.useMemo(
+    () => ({
+      type,
+      location,
+      searchParams: new URLSearchParams(location.search),
+      params: matches[matches.length - 1]?.params ?? {},
+      matches: matches.map((m) => toRouterStateMatch(m))
+    }),
+    [location, matches, type]
+  );
+  let pending = React2.useMemo(() => {
+    if (navigation.state === "idle") return null;
+    let shared = {
+      type: navigation.historyAction,
+      location: navigation.location,
+      searchParams: new URLSearchParams(navigation.location.search),
+      params: navigation.matches[navigation.matches.length - 1]?.params ?? {},
+      matches: navigation.matches.map((m) => toRouterStateMatch(m))
+    };
+    return navigation.state === "loading" ? {
+      ...shared,
+      state: "loading",
+      formMethod: navigation.formMethod,
+      formAction: navigation.formAction,
+      formEncType: navigation.formEncType,
+      formData: navigation.formData,
+      json: navigation.json,
+      text: navigation.text
+    } : {
+      ...shared,
+      state: "submitting",
+      formMethod: navigation.formMethod,
+      formAction: navigation.formAction,
+      formEncType: navigation.formEncType,
+      formData: navigation.formData,
+      json: navigation.json,
+      text: navigation.text
+    };
+  }, [navigation]);
+  return React2.useMemo(
+    () => ({ active, pending }),
+    [active, pending]
+  );
+}
 
 // lib/components.tsx
 import * as React3 from "react";
@@ -6376,7 +6632,7 @@ function createMemoryRouter(routes, opts) {
     mapRouteProperties,
     dataStrategy: opts?.dataStrategy,
     patchRoutesOnNavigation: opts?.patchRoutesOnNavigation,
-    unstable_instrumentations: opts?.unstable_instrumentations
+    instrumentations: opts?.instrumentations
   }).initialize();
 }
 var Deferred = class {
@@ -6402,10 +6658,10 @@ function RouterProvider({
   router,
   flushSync: reactDomFlushSyncImpl,
   onError,
-  unstable_useTransitions
+  useTransitions
 }) {
   let unstable_rsc = useIsRSCRouterContext();
-  unstable_useTransitions = unstable_rsc || unstable_useTransitions;
+  useTransitions = unstable_rsc || useTransitions;
   let [_state, setStateImpl] = React3.useState(router.state);
   let [state, setOptimisticState] = useOptimisticSafe(_state);
   let [pendingState, setPendingState] = React3.useState();
@@ -6423,7 +6679,7 @@ function RouterProvider({
           (error) => onError(error, {
             location: newState.location,
             params: newState.matches[0]?.params ?? {},
-            unstable_pattern: getRoutePattern(newState.matches)
+            pattern: getRoutePattern(newState.matches)
           })
         );
       }
@@ -6445,11 +6701,11 @@ function RouterProvider({
       if (!viewTransitionOpts || !isViewTransitionAvailable) {
         if (reactDomFlushSyncImpl && flushSync) {
           reactDomFlushSyncImpl(() => setStateImpl(newState));
-        } else if (unstable_useTransitions === false) {
+        } else if (useTransitions === false) {
           setStateImpl(newState);
         } else {
           React3.startTransition(() => {
-            if (unstable_useTransitions === true) {
+            if (useTransitions === true) {
               setOptimisticState((s) => getOptimisticRouterState(s, newState));
             }
             setStateImpl(newState);
@@ -6507,22 +6763,12 @@ function RouterProvider({
       reactDomFlushSyncImpl,
       transition,
       renderDfd,
-      unstable_useTransitions,
+      useTransitions,
       setOptimisticState,
       onError
     ]
   );
   React3.useLayoutEffect(() => router.subscribe(setState), [router, setState]);
-  let initialized = state.initialized;
-  React3.useLayoutEffect(() => {
-    if (!initialized && router.state.initialized) {
-      setState(router.state, {
-        deletedFetchers: [],
-        flushSync: false,
-        newErrors: null
-      });
-    }
-  }, [initialized, setState, router.state]);
   React3.useEffect(() => {
     if (vtContext.isTransitioning && !vtContext.flushSync) {
       setRenderDfd(new Deferred());
@@ -6533,11 +6779,11 @@ function RouterProvider({
       let newState = pendingState;
       let renderPromise = renderDfd.promise;
       let transition2 = router.window.document.startViewTransition(async () => {
-        if (unstable_useTransitions === false) {
+        if (useTransitions === false) {
           setStateImpl(newState);
         } else {
           React3.startTransition(() => {
-            if (unstable_useTransitions === true) {
+            if (useTransitions === true) {
               setOptimisticState((s) => getOptimisticRouterState(s, newState));
             }
             setStateImpl(newState);
@@ -6557,7 +6803,7 @@ function RouterProvider({
     pendingState,
     renderDfd,
     router.window,
-    unstable_useTransitions,
+    useTransitions,
     setOptimisticState
   ]);
   React3.useEffect(() => {
@@ -6611,12 +6857,13 @@ function RouterProvider({
       location: state.location,
       navigationType: state.historyAction,
       navigator,
-      unstable_useTransitions
+      useTransitions
     },
     /* @__PURE__ */ React3.createElement(
       MemoizedDataRoutes,
       {
         routes: router.routes,
+        manifest: router.manifest,
         future: router.future,
         state,
         isStatic: false,
@@ -6639,22 +6886,29 @@ function getOptimisticRouterState(currentState, newState) {
     fetchers: newState.fetchers
   };
 }
-var MemoizedDataRoutes = React3.memo(DataRoutes);
-function DataRoutes({
+var MemoizedDataRoutes = React3.memo(DataRoutes2);
+function DataRoutes2({
   routes,
+  manifest,
   future,
   state,
   isStatic,
   onError
 }) {
-  return useRoutesImpl(routes, void 0, { state, isStatic, onError, future });
+  return useRoutesImpl(routes, void 0, {
+    manifest,
+    state,
+    isStatic,
+    onError,
+    future
+  });
 }
 function MemoryRouter({
   basename,
   children,
   initialEntries,
   initialIndex,
-  unstable_useTransitions
+  useTransitions
 }) {
   let historyRef = React3.useRef();
   if (historyRef.current == null) {
@@ -6671,13 +6925,13 @@ function MemoryRouter({
   });
   let setState = React3.useCallback(
     (newState) => {
-      if (unstable_useTransitions === false) {
+      if (useTransitions === false) {
         setStateImpl(newState);
       } else {
         React3.startTransition(() => setStateImpl(newState));
       }
     },
-    [unstable_useTransitions]
+    [useTransitions]
   );
   React3.useLayoutEffect(() => history.listen(setState), [history, setState]);
   return /* @__PURE__ */ React3.createElement(
@@ -6688,7 +6942,7 @@ function MemoryRouter({
       location: state.location,
       navigationType: state.action,
       navigator: history,
-      unstable_useTransitions
+      useTransitions
     }
   );
 }
@@ -6740,7 +6994,7 @@ function Router({
   navigationType = "POP" /* Pop */,
   navigator,
   static: staticProp = false,
-  unstable_useTransitions
+  useTransitions
 }) {
   invariant(
     !useInRouterContext(),
@@ -6752,10 +7006,10 @@ function Router({
       basename,
       navigator,
       static: staticProp,
-      unstable_useTransitions,
+      useTransitions,
       future: {}
     }),
-    [basename, navigator, staticProp, unstable_useTransitions]
+    [basename, navigator, staticProp, useTransitions]
   );
   if (typeof locationProp === "string") {
     locationProp = parsePath(locationProp);
@@ -6766,7 +7020,7 @@ function Router({
     hash = "",
     state = null,
     key = "default",
-    unstable_mask
+    mask
   } = locationProp;
   let locationContext = React3.useMemo(() => {
     let trailingPathname = stripBasename(pathname, basename);
@@ -6780,20 +7034,11 @@ function Router({
         hash,
         state,
         key,
-        unstable_mask
+        mask
       },
       navigationType
     };
-  }, [
-    basename,
-    pathname,
-    search,
-    hash,
-    state,
-    key,
-    navigationType,
-    unstable_mask
-  ]);
+  }, [basename, pathname, search, hash, state, key, navigationType, mask]);
   warning(
     locationContext != null,
     `<Router basename="${basename}"> is not able to match the URL "${pathname}${search}${hash}" because it does not start with the basename, so the <Router> won't render anything.`
@@ -6822,7 +7067,7 @@ function Await({
         dataRouterContext.onError(error, {
           location: dataRouterStateContext.location,
           params: dataRouterStateContext.matches[0]?.params || {},
-          unstable_pattern: getRoutePattern(dataRouterStateContext.matches),
+          pattern: getRoutePattern(dataRouterStateContext.matches),
           errorInfo
         });
       }
@@ -7976,11 +8221,9 @@ function getTurboStreamSingleFetchDataStrategy(getRouter, manifest, routeModules
     (match) => {
       let manifestRoute = manifest.routes[match.route.id];
       invariant2(manifestRoute, "Route not found in manifest");
-      let routeModule = routeModules[match.route.id];
       return {
         hasLoader: manifestRoute.hasLoader,
-        hasClientLoader: manifestRoute.hasClientLoader,
-        hasShouldRevalidate: Boolean(routeModule?.shouldRevalidate)
+        hasClientLoader: manifestRoute.hasClientLoader
       };
     },
     fetchAndDecodeViaTurboStream,
@@ -8100,13 +8343,12 @@ async function singleFetchLoaderNavigationStrategy(args, router, getRouteInfo, f
       async (m, i) => m.resolve(async (handler) => {
         routeDfds[i].resolve();
         let routeId = m.route.id;
-        let { hasLoader, hasClientLoader, hasShouldRevalidate } = getRouteInfo(m);
+        let { hasLoader, hasClientLoader } = getRouteInfo(m);
         let defaultShouldRevalidate = !m.shouldRevalidateArgs || m.shouldRevalidateArgs.actionStatus == null || m.shouldRevalidateArgs.actionStatus < 400;
         let shouldCall = m.shouldCallHandler(defaultShouldRevalidate);
         if (!shouldCall) {
           foundOptOutRoute || (foundOptOutRoute = m.shouldRevalidateArgs != null && // This is a revalidation,
-          hasLoader && // for a route with a server loader,
-          hasShouldRevalidate === true);
+          hasLoader);
           return;
         }
         if (shouldAllowOptOut(m) && hasClientLoader) {
@@ -8843,46 +9085,38 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
       let hasInitialError = initialState && initialState.errors && route.id in initialState.errors;
       let initialError = hasInitialError ? initialState?.errors?.[route.id] : void 0;
       let isHydrationRequest = needsRevalidation == null && (routeModule.clientLoader?.hydrate === true || !route.hasLoader);
-      dataRoute.loader = async ({
-        request,
-        params,
-        context,
-        unstable_pattern,
-        unstable_url
-      }, singleFetch) => {
-        try {
-          let result = await prefetchStylesAndCallHandler(async () => {
-            invariant2(
-              routeModule,
-              "No `routeModule` available for critical-route loader"
-            );
-            if (!routeModule.clientLoader) {
-              return fetchServerLoader(singleFetch);
-            }
-            return routeModule.clientLoader({
-              request,
-              params,
-              context,
-              unstable_pattern,
-              unstable_url,
-              async serverLoader() {
-                preventInvalidServerHandlerCall("loader", route);
-                if (isHydrationRequest) {
-                  if (hasInitialData) {
-                    return initialData;
-                  }
-                  if (hasInitialError) {
-                    throw initialError;
-                  }
+      dataRoute.loader = async ({ request, params, context, pattern, url }, singleFetch) => {
+        let _isHydrationRequest = isHydrationRequest;
+        isHydrationRequest = false;
+        let result = await prefetchStylesAndCallHandler(async () => {
+          invariant2(
+            routeModule,
+            "No `routeModule` available for critical-route loader"
+          );
+          if (!routeModule.clientLoader) {
+            return fetchServerLoader(singleFetch);
+          }
+          return routeModule.clientLoader({
+            request,
+            params,
+            context,
+            pattern,
+            url,
+            async serverLoader() {
+              preventInvalidServerHandlerCall("loader", route);
+              if (_isHydrationRequest) {
+                if (hasInitialData) {
+                  return initialData;
+                }
+                if (hasInitialError) {
+                  throw initialError;
                 }
-                return fetchServerLoader(singleFetch);
               }
-            });
+              return fetchServerLoader(singleFetch);
+            }
           });
-          return result;
-        } finally {
-          isHydrationRequest = false;
-        }
+        });
+        return result;
       };
       dataRoute.loader.hydrate = shouldHydrateRouteLoader(
         route.id,
@@ -8890,13 +9124,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
         route.hasLoader,
         isSpaMode
       );
-      dataRoute.action = ({
-        request,
-        params,
-        context,
-        unstable_pattern,
-        unstable_url
-      }, singleFetch) => {
+      dataRoute.action = ({ request, params, context, pattern, url }, singleFetch) => {
         return prefetchStylesAndCallHandler(async () => {
           invariant2(
             routeModule,
@@ -8912,8 +9140,8 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
             request,
             params,
             context,
-            unstable_pattern,
-            unstable_url,
+            pattern,
+            url,
             async serverAction() {
               preventInvalidServerHandlerCall("action", route);
               return fetchServerAction(singleFetch);
@@ -9108,7 +9336,13 @@ function getPartialManifest({ sri, ...manifest }, router) {
     segments.pop();
   }
   paths.forEach((path) => {
-    let matches = matchRoutes(router.routes, path, router.basename);
+    let matches = matchRoutesImpl(
+      router.routes,
+      path,
+      router.basename || "/",
+      false,
+      router.branches
+    );
     if (matches) {
       matches.forEach((m) => routeIds.add(m.route.id));
     }
@@ -9707,7 +9941,7 @@ function Meta() {
             dangerouslySetInnerHTML: { __html: escapeHtml(json) }
           }
         );
-      } catch (err) {
+      } catch (e) {
         return null;
       }
     }
@@ -9823,13 +10057,16 @@ import(${JSON.stringify(manifest.entry.module)});`;
       }
     ));
   }, []);
-  let preloads = isHydrated || isRSCRouterContext ? [] : dedupe(
-    manifest.entry.imports.concat(
-      getModuleLinkHrefs(matches, manifest, {
-        includeHydrateFallback: true
-      })
+  let preloads = isHydrated || isRSCRouterContext ? [] : [
+    // Dedupe through a Set
+    ...new Set(
+      manifest.entry.imports.concat(
+        getModuleLinkHrefs(matches, manifest, {
+          includeHydrateFallback: true
+        })
+      )
     )
-  );
+  ];
   let sri = typeof manifest.sri === "object" ? manifest.sri : {};
   warnOnce(
     !isRSCRouterContext,
@@ -9855,6 +10092,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
       href: manifest.url,
       crossOrigin: scriptProps.crossOrigin,
       integrity: sri[manifest.url],
+      nonce: scriptProps.nonce,
       suppressHydrationWarning: true
     }
   ) : null, /* @__PURE__ */ React8.createElement(
@@ -9864,6 +10102,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
       href: manifest.entry.module,
       crossOrigin: scriptProps.crossOrigin,
       integrity: sri[manifest.entry.module],
+      nonce: scriptProps.nonce,
       suppressHydrationWarning: true
     }
   ), preloads.map((path) => /* @__PURE__ */ React8.createElement(
@@ -9874,13 +10113,11 @@ import(${JSON.stringify(manifest.entry.module)});`;
       href: path,
       crossOrigin: scriptProps.crossOrigin,
       integrity: sri[path],
+      nonce: scriptProps.nonce,
       suppressHydrationWarning: true
     }
   )), initialScripts);
 }
-function dedupe(array) {
-  return [...new Set(array)];
-}
 function mergeRefs(...refs) {
   return (value) => {
     refs.forEach((ref) => {
@@ -9996,7 +10233,7 @@ var isBrowser2 = typeof window !== "undefined" && typeof window.document !== "un
 try {
   if (isBrowser2) {
     window.__reactRouterVersion = // @ts-expect-error
-    "7.14.2";
+    "7.15.1";
   }
 } catch (e) {
 }
@@ -10013,7 +10250,7 @@ function createBrowserRouter(routes, opts) {
     dataStrategy: opts?.dataStrategy,
     patchRoutesOnNavigation: opts?.patchRoutesOnNavigation,
     window: opts?.window,
-    unstable_instrumentations: opts?.unstable_instrumentations
+    instrumentations: opts?.instrumentations
   }).initialize();
 }
 function createHashRouter(routes, opts) {
@@ -10029,7 +10266,7 @@ function createHashRouter(routes, opts) {
     dataStrategy: opts?.dataStrategy,
     patchRoutesOnNavigation: opts?.patchRoutesOnNavigation,
     window: opts?.window,
-    unstable_instrumentations: opts?.unstable_instrumentations
+    instrumentations: opts?.instrumentations
   }).initialize();
 }
 function parseHydrationData() {
@@ -10080,7 +10317,7 @@ function deserializeErrors(errors) {
 function BrowserRouter({
   basename,
   children,
-  unstable_useTransitions,
+  useTransitions,
   window: window2
 }) {
   let historyRef = React10.useRef();
@@ -10094,13 +10331,13 @@ function BrowserRouter({
   });
   let setState = React10.useCallback(
     (newState) => {
-      if (unstable_useTransitions === false) {
+      if (useTransitions === false) {
         setStateImpl(newState);
       } else {
         React10.startTransition(() => setStateImpl(newState));
       }
     },
-    [unstable_useTransitions]
+    [useTransitions]
   );
   React10.useLayoutEffect(() => history.listen(setState), [history, setState]);
   return /* @__PURE__ */ React10.createElement(
@@ -10111,14 +10348,14 @@ function BrowserRouter({
       location: state.location,
       navigationType: state.action,
       navigator: history,
-      unstable_useTransitions
+      useTransitions
     }
   );
 }
 function HashRouter({
   basename,
   children,
-  unstable_useTransitions,
+  useTransitions,
   window: window2
 }) {
   let historyRef = React10.useRef();
@@ -10132,13 +10369,13 @@ function HashRouter({
   });
   let setState = React10.useCallback(
     (newState) => {
-      if (unstable_useTransitions === false) {
+      if (useTransitions === false) {
         setStateImpl(newState);
       } else {
         React10.startTransition(() => setStateImpl(newState));
       }
     },
-    [unstable_useTransitions]
+    [useTransitions]
   );
   React10.useLayoutEffect(() => history.listen(setState), [history, setState]);
   return /* @__PURE__ */ React10.createElement(
@@ -10149,7 +10386,7 @@ function HashRouter({
       location: state.location,
       navigationType: state.action,
       navigator: history,
-      unstable_useTransitions
+      useTransitions
     }
   );
 }
@@ -10157,7 +10394,7 @@ function HistoryRouter({
   basename,
   children,
   history,
-  unstable_useTransitions
+  useTransitions
 }) {
   let [state, setStateImpl] = React10.useState({
     action: history.action,
@@ -10165,13 +10402,13 @@ function HistoryRouter({
   });
   let setState = React10.useCallback(
     (newState) => {
-      if (unstable_useTransitions === false) {
+      if (useTransitions === false) {
         setStateImpl(newState);
       } else {
         React10.startTransition(() => setStateImpl(newState));
       }
     },
-    [unstable_useTransitions]
+    [useTransitions]
   );
   React10.useLayoutEffect(() => history.listen(setState), [history, setState]);
   return /* @__PURE__ */ React10.createElement(
@@ -10182,7 +10419,7 @@ function HistoryRouter({
       location: state.location,
       navigationType: state.action,
       navigator: history,
-      unstable_useTransitions
+      useTransitions
     }
   );
 }
@@ -10196,27 +10433,27 @@ var Link = React10.forwardRef(
     relative,
     reloadDocument,
     replace: replace2,
-    unstable_mask,
+    mask,
     state,
     target,
     to,
     preventScrollReset,
     viewTransition,
-    unstable_defaultShouldRevalidate,
+    defaultShouldRevalidate,
     ...rest
   }, forwardedRef) {
-    let { basename, navigator, unstable_useTransitions } = React10.useContext(NavigationContext);
+    let { basename, navigator, useTransitions } = React10.useContext(NavigationContext);
     let isAbsolute = typeof to === "string" && ABSOLUTE_URL_REGEX2.test(to);
     let parsed = parseToInfo(to, basename);
     to = parsed.to;
     let href = useHref(to, { relative });
     let location = useLocation();
     let maskedHref = null;
-    if (unstable_mask) {
+    if (mask) {
       let resolved = resolveTo(
-        unstable_mask,
+        mask,
         [],
-        location.unstable_mask ? location.unstable_mask.pathname : "/",
+        location.mask ? location.mask.pathname : "/",
         true
       );
       if (basename !== "/") {
@@ -10230,14 +10467,14 @@ var Link = React10.forwardRef(
     );
     let internalOnClick = useLinkClickHandler(to, {
       replace: replace2,
-      unstable_mask,
+      mask,
       state,
       target,
       preventScrollReset,
       relative,
       viewTransition,
-      unstable_defaultShouldRevalidate,
-      unstable_useTransitions
+      defaultShouldRevalidate,
+      useTransitions
     });
     function handleClick(event) {
       if (onClick) onClick(event);
@@ -10346,10 +10583,10 @@ var Form = React10.forwardRef(
     relative,
     preventScrollReset,
     viewTransition,
-    unstable_defaultShouldRevalidate,
+    defaultShouldRevalidate,
     ...props
   }, forwardedRef) => {
-    let { unstable_useTransitions } = React10.useContext(NavigationContext);
+    let { useTransitions } = React10.useContext(NavigationContext);
     let submit = useSubmit();
     let formAction = useFormAction(action, { relative });
     let formMethod = method.toLowerCase() === "get" ? "get" : "post";
@@ -10369,9 +10606,9 @@ var Form = React10.forwardRef(
         relative,
         preventScrollReset,
         viewTransition,
-        unstable_defaultShouldRevalidate
+        defaultShouldRevalidate
       });
-      if (unstable_useTransitions && navigate !== false) {
+      if (useTransitions && navigate !== false) {
         React10.startTransition(() => doSubmit());
       } else {
         doSubmit();
@@ -10465,13 +10702,13 @@ function useDataRouterState2(hookName) {
 function useLinkClickHandler(to, {
   target,
   replace: replaceProp,
-  unstable_mask,
+  mask,
   state,
   preventScrollReset,
   relative,
   viewTransition,
-  unstable_defaultShouldRevalidate,
-  unstable_useTransitions
+  defaultShouldRevalidate,
+  useTransitions
 } = {}) {
   let navigate = useNavigate();
   let location = useLocation();
@@ -10483,14 +10720,14 @@ function useLinkClickHandler(to, {
         let replace2 = replaceProp !== void 0 ? replaceProp : createPath(location) === createPath(path);
         let doNavigate = () => navigate(to, {
           replace: replace2,
-          unstable_mask,
+          mask,
           state,
           preventScrollReset,
           relative,
           viewTransition,
-          unstable_defaultShouldRevalidate
+          defaultShouldRevalidate
         });
-        if (unstable_useTransitions) {
+        if (useTransitions) {
           React10.startTransition(() => doNavigate());
         } else {
           doNavigate();
@@ -10502,15 +10739,15 @@ function useLinkClickHandler(to, {
       navigate,
       path,
       replaceProp,
-      unstable_mask,
+      mask,
       state,
       target,
       to,
       preventScrollReset,
       relative,
       viewTransition,
-      unstable_defaultShouldRevalidate,
-      unstable_useTransitions
+      defaultShouldRevalidate,
+      useTransitions
     ]
   );
 }
@@ -10564,7 +10801,7 @@ function useSubmit() {
       if (options.navigate === false) {
         let key = options.fetcherKey || getUniqueFetcherId();
         await routerFetch(key, currentRouteId, options.action || action, {
-          unstable_defaultShouldRevalidate: options.unstable_defaultShouldRevalidate,
+          defaultShouldRevalidate: options.defaultShouldRevalidate,
           preventScrollReset: options.preventScrollReset,
           formData,
           body,
@@ -10574,7 +10811,7 @@ function useSubmit() {
         });
       } else {
         await routerNavigate(options.action || action, {
-          unstable_defaultShouldRevalidate: options.unstable_defaultShouldRevalidate,
+          defaultShouldRevalidate: options.defaultShouldRevalidate,
           preventScrollReset: options.preventScrollReset,
           formData,
           body,
@@ -10690,10 +10927,13 @@ function useFetcher({
 }
 function useFetchers() {
   let state = useDataRouterState2("useFetchers" /* UseFetchers */);
-  return Array.from(state.fetchers.entries()).map(([key, fetcher]) => ({
-    ...fetcher,
-    key
-  }));
+  return React10.useMemo(
+    () => Array.from(state.fetchers.entries()).map(([key, fetcher]) => ({
+      ...fetcher,
+      key
+    })),
+    [state.fetchers]
+  );
 }
 var SCROLL_RESTORATION_STORAGE_KEY = "react-router-scroll-positions";
 var savedScrollPositions = {};
@@ -10884,7 +11124,7 @@ function StaticRouter({
     hash: locationProp.hash || "",
     state: locationProp.state != null ? locationProp.state : null,
     key: locationProp.key || "default",
-    unstable_mask: void 0
+    mask: void 0
   };
   let staticNavigator = getStatelessNavigator();
   return /* @__PURE__ */ React11.createElement(
@@ -10896,7 +11136,7 @@ function StaticRouter({
       navigationType: action,
       navigator: staticNavigator,
       static: true,
-      unstable_useTransitions: false
+      useTransitions: false
     }
   );
 }
@@ -10937,11 +11177,12 @@ function StaticRouterProvider({
       navigationType: state.historyAction,
       navigator: dataRouterContext.navigator,
       static: dataRouterContext.static,
-      unstable_useTransitions: false
+      useTransitions: false
     },
     /* @__PURE__ */ React11.createElement(
-      DataRoutes,
+      DataRoutes2,
       {
+        manifest: router.manifest,
         routes: router.routes,
         future: router.future,
         state,
@@ -11040,7 +11281,7 @@ function createStaticRouter(routes, context, opts = {}) {
     get future() {
       return {
         v8_middleware: false,
-        unstable_passThroughRequests: false,
+        v8_passThroughRequests: false,
         ...opts?.future
       };
     },
@@ -11065,6 +11306,12 @@ function createStaticRouter(routes, context, opts = {}) {
     get routes() {
       return dataRoutes;
     },
+    get branches() {
+      return opts.branches;
+    },
+    get manifest() {
+      return manifest;
+    },
     get window() {
       return void 0;
     },
@@ -11145,6 +11392,7 @@ export {
   RouterContextProvider,
   convertRoutesToDataRoutes,
   matchRoutes,
+  matchRoutesImpl,
   generatePath,
   matchPath,
   stripBasename,
@@ -11202,6 +11450,7 @@ export {
   useAsyncError,
   useBlocker,
   useRoute,
+  useRouterState,
   warnOnce,
   mapRouteProperties,
   hydrationRouteProperties,
@@ -11242,6 +11491,7 @@ export {
   noActionDefinedError,
   createClientRoutes,
   shouldHydrateRouteLoader,
+  URL_LIMIT,
   getPatchRoutesOnNavigationFunction,
   useFogOFWarDiscovery,
   getManifestPath,