@omnitron-dev/prism 0.1.3 → 0.2.0

package/dist/{chunk-GYDT5EKX.js → chunk-XQXGE2PW.js}

@@ -41,7 +41,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(
@@ -55,13 +55,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 location2 = createLocation(
       entries ? getCurrentLocation().pathname : "/",
       to,
       state,
       key,
-      unstable_mask
+      mask
     );
     warning(
       location2.pathname.charAt(0) === "/",
@@ -223,14 +223,14 @@ function getHistoryState(location2, index) {
     usr: location2.state,
     key: location2.key,
     idx: index,
-    masked: location2.unstable_mask ? {
+    masked: location2.mask ? {
       pathname: location2.pathname,
       search: location2.search,
       hash: location2.hash
     } : void 0
   };
 }
-function createLocation(current, to, state = null, key, unstable_mask) {
+function createLocation(current, to, state = null, key, mask) {
   let location2 = {
     pathname: typeof current === "string" ? current : current.pathname,
     search: "",
@@ -242,7 +242,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 location2;
 }
@@ -305,7 +305,7 @@ function getUrlBasedHistory(getLocation, createHref2, validateLocation, options
     if (validateLocation) validateLocation(location2, to);
     index = getIndex() + 1;
     let historyState = getHistoryState(location2, index);
-    let url = history.createHref(location2.unstable_mask || location2);
+    let url = history.createHref(location2.mask || location2);
     try {
       globalHistory.pushState(historyState, "", url);
     } catch (error) {
@@ -324,7 +324,7 @@ function getUrlBasedHistory(getLocation, createHref2, validateLocation, options
     if (validateLocation) validateLocation(location2, to);
     index = getIndex();
     let historyState = getHistoryState(location2, index);
-    let url = history.createHref(location2.unstable_mask || location2);
+    let url = history.createHref(location2.mask || location2);
     globalHistory.replaceState(historyState, "", url);
     if (v5Compat && listener) {
       listener({ action, location: history.location, delta: 0 });
@@ -459,17 +459,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 location2 = typeof locationArg === "string" ? parsePath(locationArg) : locationArg;
   let pathname = stripBasename(location2.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,
@@ -489,6 +488,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 = {
@@ -660,8 +664,7 @@ function generatePath(originalPath, params = {}) {
   const segments = path.split(/\/+/).map((segment, index, array) => {
     const isLastSegment = index === array.length - 1;
     if (isLastSegment && segment === "*") {
-      const star = "*";
-      return stringify2(params[star]);
+      return stringify2(params["*"]);
     }
     const keyMatch = segment.match(/^:([\w-]+)(\??)(.*)/);
     if (keyMatch) {
@@ -779,7 +782,7 @@ function resolvePath(to, fromPathname = "/") {
   } = typeof to === "string" ? parsePath(to) : to;
   let pathname;
   if (toPathname) {
-    toPathname = toPathname.replace(/\/\/+/g, "/");
+    toPathname = removeDoubleSlashes(toPathname);
     if (toPathname.startsWith("/")) {
       pathname = resolvePathname(toPathname.substring(1), "/");
     } else {
@@ -795,7 +798,7 @@ function resolvePath(to, fromPathname = "/") {
   };
 }
 function resolvePathname(relativePath, fromPathname) {
-  let segments = fromPathname.replace(/\/+$/, "").split("/");
+  let segments = removeTrailingSlash(fromPathname).split("/");
   let relativeSegments = relativePath.split("/");
   relativeSegments.forEach((segment) => {
     if (segment === "..") {
@@ -876,7 +879,8 @@ function isRouteErrorResponse(error) {
   return error != null && typeof error.status === "number" && typeof error.statusText === "string" && typeof error.internal === "boolean" && "data" in error;
 }
 function getRoutePattern(matches) {
-  return matches.map((m) => m.route.path).filter(Boolean).join("/").replace(/\/\/*/g, "/") || "/";
+  let parts = matches.map((m) => m.route.path).filter(Boolean);
+  return joinPaths(parts) || "/";
 }
 function parseToInfo(_to, basename) {
   let to = _to;
@@ -1135,11 +1139,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)
   };
 }
@@ -1189,8 +1193,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),
@@ -1202,29 +1206,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;
@@ -1233,7 +1244,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;
@@ -1242,7 +1253,7 @@ function createRouter(init) {
     if (initialMatches && !init.hydrationData) {
       let fogOfWar = checkFogOfWar(
         initialMatches,
-        dataRoutes,
+        dataRoutes.activeRoutes,
         init.history.location.pathname
       );
       if (fogOfWar.active) {
@@ -1255,7 +1266,7 @@ function createRouter(init) {
       initialMatches = [];
       let fogOfWar = checkFogOfWar(
         null,
-        dataRoutes,
+        dataRoutes.activeRoutes,
         init.history.location.pathname
       );
       if (fogOfWar.active && fogOfWar.matches) {
@@ -1395,11 +1406,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 = {}) {
@@ -1436,6 +1457,9 @@ function createRouter(init) {
         unmountedFetchers.push(key);
       }
     });
+    if (subscribers.size === 0) {
+      bufferedInitialStateUpdate = { newErrors: newState.errors ?? null };
+    }
     [...subscribers].forEach(
       (subscriber) => subscriber(state, {
         deletedFetchers: unmountedFetchers,
@@ -1444,7 +1468,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(location2, newState, { flushSync: flushSync3 } = {}) {
@@ -1474,10 +1498,7 @@ function createRouter(init) {
     }
     let restoreScrollPosition = isUninterruptedRevalidation ? false : getSavedScrollPosition(location2, newState.matches || state.matches);
     let preventScrollReset = pendingPreventScrollReset === true || state.navigation.formMethod != null && isMutationMethod(state.navigation.formMethod) && location2.state?._isRedirect !== true;
-    if (inFlightDataRoutes) {
-      dataRoutes = inFlightDataRoutes;
-      inFlightDataRoutes = void 0;
-    }
+    dataRoutes.commitHmrRoutes();
     if (isUninterruptedRevalidation) ; else if (pendingAction === "POP") ; else if (pendingAction === "PUSH") {
       init.history.push(location2, location2.state);
     } else if (pendingAction === "REPLACE") {
@@ -1566,10 +1587,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: "",
@@ -1634,7 +1655,7 @@ function createRouter(init) {
       replace: opts && opts.replace,
       enableViewTransition: opts && opts.viewTransition,
       flushSync: flushSync3,
-      callSiteDefaultShouldRevalidate: opts && opts.unstable_defaultShouldRevalidate
+      callSiteDefaultShouldRevalidate: opts && opts.defaultShouldRevalidate
     });
   }
   function revalidate() {
@@ -1672,12 +1693,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, location2, basename);
+    ) : matchRoutesImpl(
+      routesToUse,
+      location2,
+      basename,
+      false,
+      dataRoutes.branches
+    );
     let flushSync3 = (opts && opts.flushSync) === true;
     if (matches && state.initialized && !isRevalidationRequired && isHashChangeOnly(state.location, location2) && !(opts && opts.submission && isMutationMethod(opts.submission.formMethod))) {
       completeNavigation(location2, { matches }, { flushSync: flushSync3 });
@@ -1704,6 +1730,11 @@ function createRouter(init) {
       );
       return;
     }
+    let loadingNavigation = opts && opts.overrideNavigation ? {
+      ...opts.overrideNavigation,
+      matches,
+      historyAction
+    } : void 0;
     pendingNavigationController = new AbortController();
     let request = createClientSideRequest(
       init.history,
@@ -1724,6 +1755,7 @@ function createRouter(init) {
         location2,
         opts.submission,
         matches,
+        historyAction,
         scopedContext,
         fogOfWar.active,
         opts && opts.initialHydration === true,
@@ -1748,7 +1780,12 @@ function createRouter(init) {
       }
       matches = actionResult.matches || matches;
       pendingActionResult = actionResult.pendingActionResult;
-      loadingNavigation = getLoadingNavigation(location2, opts.submission);
+      loadingNavigation = getLoadingNavigation(
+        location2,
+        matches,
+        historyAction,
+        opts.submission
+      );
       flushSync3 = false;
       fogOfWar.active = false;
       request = createClientSideRequest(
@@ -1761,11 +1798,13 @@ function createRouter(init) {
       shortCircuited,
       matches: updatedMatches,
       loaderData,
-      errors
+      errors,
+      workingFetchers
     } = await handleLoaders(
       request,
       location2,
       matches,
+      historyAction,
       scopedContext,
       fogOfWar.active,
       loadingNavigation,
@@ -1785,12 +1824,18 @@ function createRouter(init) {
       matches: updatedMatches || matches,
       ...getActionDataForCommit(pendingActionResult),
       loaderData,
-      errors
+      errors,
+      ...workingFetchers ? { fetchers: workingFetchers } : {}
     });
   }
-  async function handleAction(request, location2, submission, matches, scopedContext, isFogOfWar, initialHydration, opts = {}) {
+  async function handleAction(request, location2, submission, matches, historyAction, scopedContext, isFogOfWar, initialHydration, opts = {}) {
     interruptActiveLoads();
-    let navigation = getSubmittingNavigation(location2, submission);
+    let navigation = getSubmittingNavigation(
+      location2,
+      matches,
+      historyAction,
+      submission
+    );
     updateState({ navigation }, { flushSync: opts.flushSync === true });
     if (isFogOfWar) {
       let discoverResult = await discoverRoutes(
@@ -1802,7 +1847,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: [
@@ -1923,8 +1970,8 @@ function createRouter(init) {
       pendingActionResult: [actionMatch.route.id, result]
     };
   }
-  async function handleLoaders(request, location2, matches, scopedContext, isFogOfWar, overrideNavigation, submission, fetcherSubmission, replace2, initialHydration, flushSync3, pendingActionResult, callSiteDefaultShouldRevalidate) {
-    let loadingNavigation = overrideNavigation || getLoadingNavigation(location2, submission);
+  async function handleLoaders(request, location2, matches, historyAction, scopedContext, isFogOfWar, overrideNavigation, submission, fetcherSubmission, replace2, initialHydration, flushSync3, pendingActionResult, callSiteDefaultShouldRevalidate) {
+    let loadingNavigation = overrideNavigation || getLoadingNavigation(location2, matches, historyAction, submission);
     let activeSubmission = submission || fetcherSubmission || getSubmissionFromNavigation(loadingNavigation);
     let shouldUpdateNavigationState = !isUninterruptedRevalidation && !initialHydration;
     if (isFogOfWar) {
@@ -1949,7 +1996,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: {},
@@ -1981,7 +2030,7 @@ function createRouter(init) {
         matches = discoverResult.matches;
       }
     }
-    let routesToUse = inFlightDataRoutes || dataRoutes;
+    let routesToUse = dataRoutes.activeRoutes;
     let { dsMatches, revalidatingFetchers } = getMatchesToLoad(
       request,
       scopedContext,
@@ -2002,6 +2051,7 @@ function createRouter(init) {
       routesToUse,
       basename,
       init.patchRoutesOnNavigation != null,
+      dataRoutes.branches,
       pendingActionResult,
       callSiteDefaultShouldRevalidate
     );
@@ -2009,7 +2059,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(
         location2,
         {
@@ -2018,7 +2069,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: flushSync3 }
       );
@@ -2083,25 +2134,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) {
@@ -2118,20 +2174,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, href2, opts) {
     abortFetcher(key);
     let flushSync3 = (opts && opts.flushSync) === true;
-    let routesToUse = inFlightDataRoutes || dataRoutes;
+    let routesToUse = dataRoutes.activeRoutes;
     let normalizedPath = normalizeTo(
       state.location,
       state.matches,
@@ -2140,7 +2197,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;
@@ -2176,7 +2239,7 @@ function createRouter(init) {
         flushSync3,
         preventScrollReset,
         submission,
-        opts && opts.unstable_defaultShouldRevalidate
+        opts && opts.defaultShouldRevalidate
       );
       return;
     }
@@ -2306,13 +2369,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,
@@ -2333,23 +2400,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",
@@ -2372,12 +2443,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,
@@ -2388,6 +2463,7 @@ function createRouter(init) {
     redirect2 = findRedirect(fetcherResults);
     if (redirect2) {
       fetchRedirectIds.add(redirect2.key);
+      state = getRedirectStateWithDoneFetcher(state);
       return startRedirectNavigation(
         revalidationRequest,
         redirect2.result,
@@ -2395,15 +2471,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();
@@ -2411,7 +2492,7 @@ function createRouter(init) {
         matches,
         loaderData,
         errors,
-        fetchers: new Map(state.fetchers)
+        fetchers: finalFetchers
       });
     } else {
       updateState({
@@ -2422,7 +2503,7 @@ function createRouter(init) {
           matches,
           errors
         ),
-        fetchers: new Map(state.fetchers)
+        fetchers: finalFetchers
       });
       isRevalidationRequired = false;
     }
@@ -2488,6 +2569,14 @@ function createRouter(init) {
       key
     );
     let result = results[match.route.id];
+    if (!result) {
+      for (let match2 of matches) {
+        if (results[match2.route.id]) {
+          result = results[match2.route.id];
+          break;
+        }
+      }
+    }
     if (fetchControllers.get(key) === abortController) {
       fetchControllers.delete(key);
     }
@@ -2579,6 +2668,8 @@ function createRouter(init) {
     } else {
       let overrideNavigation = getLoadingNavigation(
         redirectLocation,
+        [],
+        redirectNavigationType,
         submission
       );
       await startNavigation(redirectNavigationType, redirectLocation, {
@@ -2702,21 +2793,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 }
     );
@@ -2732,7 +2825,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);
@@ -2742,7 +2835,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;
@@ -2761,33 +2854,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);
@@ -2796,7 +2890,7 @@ function createRouter(init) {
         }
       }
     }
-    markFetchersDone(yeetedKeys);
+    markFetchersDone(yeetedKeys, fetchers);
     return yeetedKeys.length > 0;
   }
   function getBlocker(key, fn) {
@@ -2843,7 +2937,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 };
   }
@@ -2892,12 +2986,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 {
@@ -2906,7 +3002,8 @@ function createRouter(init) {
             routesToUse,
             pathname,
             basename,
-            true
+            true,
+            activeBranches
           );
           return { active: true, matches: partialMatches };
         }
@@ -2920,8 +3017,6 @@ function createRouter(init) {
     }
     let partialMatches = matches;
     while (true) {
-      let isNonHMR = inFlightDataRoutes == null;
-      let routesToUse = inFlightDataRoutes || dataRoutes;
       let localManifest = manifest;
       try {
         await init.patchRoutesOnNavigation({
@@ -2934,7 +3029,7 @@ function createRouter(init) {
             patchRoutesImpl(
               routeId,
               children,
-              routesToUse,
+              dataRoutes,
               localManifest,
               mapRouteProperties2,
               false
@@ -2943,25 +3038,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,
@@ -2974,10 +3073,11 @@ function createRouter(init) {
       }
       if (!newPartialMatches) {
         newPartialMatches = matchRoutesImpl(
-          routesToUse,
+          dataRoutes.activeRoutes,
           pathname,
           basename,
-          true
+          true,
+          activeBranches
         );
       }
       if (!newPartialMatches || compareMatches(partialMatches, newPartialMatches)) {
@@ -2991,26 +3091,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({});
     }
   }
@@ -3025,7 +3124,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;
@@ -3055,10 +3160,10 @@ function createRouter(init) {
       updateState(newState);
     }
   };
-  if (init.unstable_instrumentations) {
+  if (init.instrumentations) {
     router2 = instrumentClientSideRouter(
       router2,
-      init.unstable_instrumentations.map((i) => i.router).filter(Boolean)
+      init.instrumentations.map((i) => i.router).filter(Boolean)
     );
   }
   return router2;
@@ -3073,11 +3178,10 @@ function createStaticHandler(routes, opts) {
   let _mapRouteProperties = opts?.mapRouteProperties || defaultMapRouteProperties;
   let mapRouteProperties2 = _mapRouteProperties;
   ({
-    // 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),
@@ -3094,6 +3198,7 @@ function createStaticHandler(routes, opts) {
     void 0,
     manifest
   );
+  let routeBranches = flattenAndRankRoutes(dataRoutes);
   async function query(request, {
     requestContext,
     filterMatchesToLoad,
@@ -3101,12 +3206,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 location2 = createLocation("", normalizePath(request), null, "default");
-    let matches = matchRoutes(dataRoutes, location2, basename);
+    let location2 = createLocation(
+      "",
+      normalizePathImpl(request),
+      null,
+      "default"
+    );
+    let matches = matchRoutesImpl(
+      dataRoutes,
+      location2,
+      basename,
+      false,
+      routeBranches
+    );
     requestContext = requestContext != null ? requestContext : new RouterContextProvider();
     if (!isValidMethod(method) && method !== "HEAD") {
       let error = getInternalRouterError(405, { method });
@@ -3158,8 +3274,8 @@ function createStaticHandler(routes, opts) {
         let response = await runServerMiddlewarePipeline(
           {
             request,
-            unstable_url: createDataFunctionUrl(request, location2),
-            unstable_pattern: getRoutePattern(matches),
+            url: createDataFunctionUrl(request, location2),
+            pattern: getRoutePattern(matches),
             matches,
             params: matches[0].params,
             // If we're calling middleware then it must be enabled so we can cast
@@ -3276,12 +3392,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 location2 = createLocation("", normalizePath(request), null, "default");
-    let matches = matchRoutes(dataRoutes, location2, basename);
+    let location2 = createLocation(
+      "",
+      normalizePathImpl(request),
+      null,
+      "default"
+    );
+    let matches = matchRoutesImpl(
+      dataRoutes,
+      location2,
+      basename,
+      false,
+      routeBranches
+    );
     requestContext = requestContext != null ? requestContext : new RouterContextProvider();
     if (!isValidMethod(method) && method !== "HEAD" && method !== "OPTIONS") {
       throw getInternalRouterError(405, { method });
@@ -3306,8 +3433,8 @@ function createStaticHandler(routes, opts) {
       let response = await runServerMiddlewarePipeline(
         {
           request,
-          unstable_url: createDataFunctionUrl(request, location2),
-          unstable_pattern: getRoutePattern(matches),
+          url: createDataFunctionUrl(request, location2),
+          pattern: getRoutePattern(matches),
           matches,
           params: matches[0].params,
           // If we're calling middleware then it must be enabled so we can cast
@@ -3693,6 +3820,7 @@ function createStaticHandler(routes, opts) {
   }
   return {
     dataRoutes,
+    _internalRouteBranches: routeBranches,
     query,
     queryRoute
   };
@@ -3878,7 +4006,7 @@ function normalizeNavigateOptions(isFetcher, path, opts) {
   parsedPath.search = `?${searchParams}`;
   return { path: createPath(parsedPath), submission };
 }
-function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest, history, state, matches, submission, location2, lazyRoutePropertiesToSkip, initialHydration, isRevalidationRequired, cancelledFetcherLoads, fetchersQueuedForDeletion, fetchLoadMatches, fetchRedirectIds, routesToUse, basename, hasPatchRoutesOnNavigation, pendingActionResult, callSiteDefaultShouldRevalidate) {
+function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest, history, state, matches, submission, location2, 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(location2);
@@ -3974,7 +4102,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;
@@ -4115,7 +4249,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];
@@ -4128,7 +4262,7 @@ function patchRoutesImpl(routeId, children, routesToUse, manifest, mapRoutePrope
     }
     childrenToPatch = route.children;
   } else {
-    childrenToPatch = routesToUse;
+    childrenToPatch = dataRoutes.activeRoutes;
   }
   let uniqueChildren = [];
   let existingChildren = [];
@@ -4171,6 +4305,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) {
@@ -4454,7 +4591,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,
@@ -4495,7 +4632,7 @@ function getDataStrategyMatch(mapRouteProperties2, manifest, request, path, unst
         return callLoaderOrAction({
           request,
           path,
-          unstable_pattern,
+          pattern,
           match,
           lazyHandlerPromise: _lazyPromises?.handler,
           lazyRoutePromise: _lazyPromises?.route,
@@ -4545,8 +4682,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
@@ -4588,7 +4725,7 @@ async function callDataStrategyImpl(dataStrategyImpl, request, path, matches, fe
 async function callLoaderOrAction({
   request,
   path,
-  unstable_pattern,
+  pattern,
   match,
   lazyHandlerPromise,
   lazyRoutePromise,
@@ -4615,8 +4752,8 @@ async function callLoaderOrAction({
       return handler(
         {
           request,
-          unstable_url: createDataFunctionUrl(request, path),
-          unstable_pattern,
+          url: createDataFunctionUrl(request, path),
+          pattern,
           params: match.params,
           context: scopedContext
         },
@@ -4782,7 +4919,7 @@ function normalizeRedirectLocation(location2, currentUrl, basename, historyInsta
     }
     let isSameBasename = stripBasename(url.pathname, basename) != null;
     if (url.origin === currentUrl.origin && isSameBasename) {
-      return url.pathname + url.search + url.hash;
+      return removeDoubleSlashes(url.pathname) + url.search + url.hash;
     }
   }
   try {
@@ -4910,7 +5047,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,
@@ -4931,12 +5068,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 };
@@ -5143,11 +5280,13 @@ function getSubmissionFromNavigation(navigation) {
     };
   }
 }
-function getLoadingNavigation(location2, submission) {
+function getLoadingNavigation(location2, matches, historyAction, submission) {
   if (submission) {
     let navigation = {
       state: "loading",
       location: location2,
+      matches,
+      historyAction,
       formMethod: submission.formMethod,
       formAction: submission.formAction,
       formEncType: submission.formEncType,
@@ -5160,6 +5299,8 @@ function getLoadingNavigation(location2, submission) {
     let navigation = {
       state: "loading",
       location: location2,
+      matches,
+      historyAction,
       formMethod: void 0,
       formAction: void 0,
       formEncType: void 0,
@@ -5170,10 +5311,12 @@ function getLoadingNavigation(location2, submission) {
     return navigation;
   }
 }
-function getSubmittingNavigation(location2, submission) {
+function getSubmittingNavigation(location2, matches, historyAction, submission) {
   let navigation = {
     state: "submitting",
     location: location2,
+    matches,
+    historyAction,
     formMethod: submission.formMethod,
     formAction: submission.formAction,
     formEncType: submission.formEncType,
@@ -5444,7 +5587,7 @@ function useOutlet(context) {
 function useParams() {
   let { matches } = React10.useContext(RouteContext);
   let routeMatch = matches[matches.length - 1];
-  return routeMatch ? routeMatch.params : {};
+  return routeMatch?.params ?? {};
 }
 function useResolvedPath(to, { relative } = {}) {
   let { matches } = React10.useContext(RouteContext);
@@ -5506,7 +5649,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,
@@ -5557,7 +5708,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
             hash: "",
             state: null,
             key: "default",
-            unstable_mask: void 0,
+            mask: void 0,
             ...location2
           },
           navigationType: "POP"
@@ -5690,7 +5841,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;
@@ -5799,7 +5950,10 @@ function useNavigation() {
     "useNavigation"
     /* UseNavigation */
   );
-  return state.navigation;
+  return React10.useMemo(() => {
+    let { matches, historyAction, ...rest } = state.navigation;
+    return rest;
+  }, [state.navigation]);
 }
 function useRevalidator() {
   let dataRouterContext = useDataRouterContext(
@@ -5976,6 +6130,68 @@ 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: location2,
+    historyAction: type,
+    matches,
+    navigation
+  } = useDataRouterState(
+    "unstable_useRouterState"
+    /* UseRouterState */
+  );
+  let active = React10.useMemo(
+    () => ({
+      type,
+      location: location2,
+      searchParams: new URLSearchParams(location2.search),
+      params: matches[matches.length - 1]?.params ?? {},
+      matches: matches.map((m) => toRouterStateMatch(m))
+    }),
+    [location2, matches, type]
+  );
+  let pending = React10.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 React10.useMemo(
+    () => ({ active, pending }),
+    [active, pending]
+  );
+}
 function warnOnce(condition, message) {
   if (!condition && !alreadyWarned2[message]) {
     alreadyWarned2[message] = true;
@@ -6054,17 +6270,17 @@ function createMemoryRouter(routes, opts) {
     mapRouteProperties,
     dataStrategy: opts?.dataStrategy,
     patchRoutesOnNavigation: opts?.patchRoutesOnNavigation,
-    unstable_instrumentations: opts?.unstable_instrumentations
+    instrumentations: opts?.instrumentations
   }).initialize();
 }
 function RouterProvider2({
   router: router2,
   flushSync: reactDomFlushSyncImpl,
   onError,
-  unstable_useTransitions
+  useTransitions
 }) {
   let unstable_rsc = useIsRSCRouterContext();
-  unstable_useTransitions = unstable_rsc || unstable_useTransitions;
+  useTransitions = unstable_rsc || useTransitions;
   let [_state, setStateImpl] = React10.useState(router2.state);
   let [state, setOptimisticState] = useOptimisticSafe(_state);
   let [pendingState, setPendingState] = React10.useState();
@@ -6082,7 +6298,7 @@ function RouterProvider2({
           (error) => onError(error, {
             location: newState.location,
             params: newState.matches[0]?.params ?? {},
-            unstable_pattern: getRoutePattern(newState.matches)
+            pattern: getRoutePattern(newState.matches)
           })
         );
       }
@@ -6104,11 +6320,11 @@ function RouterProvider2({
       if (!viewTransitionOpts || !isViewTransitionAvailable) {
         if (reactDomFlushSyncImpl && flushSync3) {
           reactDomFlushSyncImpl(() => setStateImpl(newState));
-        } else if (unstable_useTransitions === false) {
+        } else if (useTransitions === false) {
           setStateImpl(newState);
         } else {
           React10.startTransition(() => {
-            if (unstable_useTransitions === true) {
+            if (useTransitions === true) {
               setOptimisticState((s) => getOptimisticRouterState(s, newState));
             }
             setStateImpl(newState);
@@ -6166,7 +6382,7 @@ function RouterProvider2({
       reactDomFlushSyncImpl,
       transition,
       renderDfd,
-      unstable_useTransitions,
+      useTransitions,
       setOptimisticState,
       onError
     ]
@@ -6182,11 +6398,11 @@ function RouterProvider2({
       let newState = pendingState;
       let renderPromise = renderDfd.promise;
       let transition2 = router2.window.document.startViewTransition(async () => {
-        if (unstable_useTransitions === false) {
+        if (useTransitions === false) {
           setStateImpl(newState);
         } else {
           React10.startTransition(() => {
-            if (unstable_useTransitions === true) {
+            if (useTransitions === true) {
               setOptimisticState((s) => getOptimisticRouterState(s, newState));
             }
             setStateImpl(newState);
@@ -6206,7 +6422,7 @@ function RouterProvider2({
     pendingState,
     renderDfd,
     router2.window,
-    unstable_useTransitions,
+    useTransitions,
     setOptimisticState
   ]);
   React10.useEffect(() => {
@@ -6260,12 +6476,13 @@ function RouterProvider2({
       location: state.location,
       navigationType: state.historyAction,
       navigator,
-      unstable_useTransitions
+      useTransitions
     },
     /* @__PURE__ */ React10.createElement(
       MemoizedDataRoutes,
       {
         routes: router2.routes,
+        manifest: router2.manifest,
         future: router2.future,
         state,
         isStatic: false,
@@ -6288,21 +6505,26 @@ function getOptimisticRouterState(currentState, newState) {
     fetchers: newState.fetchers
   };
 }
-function DataRoutes({
+function DataRoutes2({
   routes,
+  manifest,
   future,
   state,
   isStatic,
   onError
 }) {
-  return useRoutesImpl(routes, void 0, { state, isStatic, onError});
+  return useRoutesImpl(routes, void 0, {
+    manifest,
+    state,
+    isStatic,
+    onError});
 }
 function MemoryRouter({
   basename,
   children,
   initialEntries,
   initialIndex,
-  unstable_useTransitions
+  useTransitions
 }) {
   let historyRef = React10.useRef();
   if (historyRef.current == null) {
@@ -6319,13 +6541,13 @@ function MemoryRouter({
   });
   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(
@@ -6336,7 +6558,7 @@ function MemoryRouter({
       location: state.location,
       navigationType: state.action,
       navigator: history,
-      unstable_useTransitions
+      useTransitions
     }
   );
 }
@@ -6388,7 +6610,7 @@ function Router({
   navigationType = "POP",
   navigator,
   static: staticProp = false,
-  unstable_useTransitions
+  useTransitions
 }) {
   invariant(
     !useInRouterContext(),
@@ -6400,10 +6622,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);
@@ -6414,7 +6636,7 @@ function Router({
     hash = "",
     state = null,
     key = "default",
-    unstable_mask
+    mask
   } = locationProp;
   let locationContext = React10.useMemo(() => {
     let trailingPathname = stripBasename(pathname, basename);
@@ -6428,20 +6650,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.`
@@ -6470,7 +6683,7 @@ function Await({
         dataRouterContext.onError(error, {
           location: dataRouterStateContext.location,
           params: dataRouterStateContext.matches[0]?.params || {},
-          unstable_pattern: getRoutePattern(dataRouterStateContext.matches),
+          pattern: getRoutePattern(dataRouterStateContext.matches),
           errorInfo
         });
       }
@@ -7069,7 +7282,7 @@ function hydrate(index) {
             continue;
           case TYPE_ERROR:
             const [, message, errorType] = value;
-            let error = errorType && globalObj && globalObj[errorType] ? new globalObj[errorType](message) : new Error(message);
+            let error = errorType && globalObj && SUPPORTED_ERROR_TYPES.includes(errorType) && errorType in globalObj && typeof globalObj[errorType] === "function" ? new globalObj[errorType](message) : new Error(message);
             hydrated[index2] = error;
             set(error);
             continue;
@@ -7481,11 +7694,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,
@@ -7605,13 +7816,12 @@ async function singleFetchLoaderNavigationStrategy(args, router2, getRouteInfo,
       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) {
@@ -7752,9 +7962,9 @@ function singleFetchUrl(reqUrl, basename, trailingSlashAware, extension) {
     if (url.pathname === "/") {
       url.pathname = `_root.${extension}`;
     } else if (basename && stripBasename(url.pathname, basename) === "/") {
-      url.pathname = `${basename.replace(/\/$/, "")}/_root.${extension}`;
+      url.pathname = `${removeTrailingSlash(basename)}/_root.${extension}`;
     } else {
-      url.pathname = `${url.pathname.replace(/\/$/, "")}.${extension}`;
+      url.pathname = `${removeTrailingSlash(url.pathname)}.${extension}`;
     }
   }
   return url;
@@ -7829,7 +8039,8 @@ function decodeViaTurboStream(body, global2) {
         if (type === "SanitizedError") {
           let [name, message, stack] = rest;
           let Constructor = Error;
-          if (name && name in global2 && typeof global2[name] === "function") {
+          if (name && SUPPORTED_ERROR_TYPES.includes(name) && name in global2 && // @ts-expect-error
+          typeof global2[name] === "function") {
             Constructor = global2[name];
           }
           let error = new Constructor(message);
@@ -8325,46 +8536,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,
@@ -8372,13 +8575,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,
@@ -8394,8 +8591,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);
@@ -8584,7 +8781,13 @@ function getPartialManifest({ sri, ...manifest }, router2) {
     segments.pop();
   }
   paths.forEach((path) => {
-    let matches = matchRoutes(router2.routes, path, router2.basename);
+    let matches = matchRoutesImpl(
+      router2.routes,
+      path,
+      router2.basename || "/",
+      false,
+      router2.branches
+    );
     if (matches) {
       matches.forEach((m) => routeIds.add(m.route.id));
     }
@@ -8682,10 +8885,7 @@ function useFogOFWarDiscovery(router2, manifest, routeModules, ssr, routeDiscove
 }
 function getManifestPath(_manifestPath, basename) {
   let manifestPath = _manifestPath || "/__manifest";
-  if (basename == null) {
-    return manifestPath;
-  }
-  return `${basename}${manifestPath}`.replace(/\/+/g, "/");
+  return basename == null ? manifestPath : joinPaths([basename, manifestPath]);
 }
 async function fetchAndApplyManifestPatches(paths, errorReloadPath, manifest, routeModules, ssr, isSpaMode, basename, manifestPath, patchRoutes, signal) {
   const searchParams = new URLSearchParams();
@@ -9180,7 +9380,7 @@ function Meta() {
             dangerouslySetInnerHTML: { __html: escapeHtml(json) }
           }
         );
-      } catch (err) {
+      } catch (e) {
         return null;
       }
     }
@@ -9295,13 +9495,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,
@@ -9327,6 +9530,7 @@ import(${JSON.stringify(manifest.entry.module)});`;
       href: manifest.url,
       crossOrigin: scriptProps.crossOrigin,
       integrity: sri[manifest.url],
+      nonce: scriptProps.nonce,
       suppressHydrationWarning: true
     }
   ) : null, /* @__PURE__ */ React10.createElement(
@@ -9336,6 +9540,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__ */ React10.createElement(
@@ -9346,13 +9551,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) => {
@@ -9444,7 +9647,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) {
@@ -9460,7 +9663,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() {
@@ -9511,7 +9714,7 @@ function deserializeErrors(errors) {
 function BrowserRouter({
   basename,
   children,
-  unstable_useTransitions,
+  useTransitions,
   window: window2
 }) {
   let historyRef = React10.useRef();
@@ -9525,13 +9728,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(
@@ -9542,14 +9745,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();
@@ -9563,13 +9766,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(
@@ -9580,7 +9783,7 @@ function HashRouter({
       location: state.location,
       navigationType: state.action,
       navigator: history,
-      unstable_useTransitions
+      useTransitions
     }
   );
 }
@@ -9588,7 +9791,7 @@ function HistoryRouter({
   basename,
   children,
   history,
-  unstable_useTransitions
+  useTransitions
 }) {
   let [state, setStateImpl] = React10.useState({
     action: history.action,
@@ -9596,13 +9799,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(
@@ -9613,7 +9816,7 @@ function HistoryRouter({
       location: state.location,
       navigationType: state.action,
       navigator: history,
-      unstable_useTransitions
+      useTransitions
     }
   );
 }
@@ -9690,13 +9893,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 location2 = useLocation();
@@ -9708,14 +9911,14 @@ function useLinkClickHandler(to, {
         let replace2 = replaceProp !== void 0 ? replaceProp : createPath(location2) === 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();
@@ -9727,15 +9930,15 @@ function useLinkClickHandler(to, {
       navigate,
       path,
       replaceProp,
-      unstable_mask,
+      mask,
       state,
       target,
       to,
       preventScrollReset,
       relative,
       viewTransition,
-      unstable_defaultShouldRevalidate,
-      unstable_useTransitions
+      defaultShouldRevalidate,
+      useTransitions
     ]
   );
 }
@@ -9790,7 +9993,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,
@@ -9800,7 +10003,7 @@ function useSubmit() {
         });
       } else {
         await routerNavigate(options.action || action, {
-          unstable_defaultShouldRevalidate: options.unstable_defaultShouldRevalidate,
+          defaultShouldRevalidate: options.defaultShouldRevalidate,
           preventScrollReset: options.preventScrollReset,
           formData,
           body,
@@ -9925,10 +10128,13 @@ function useFetchers() {
     "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]
+  );
 }
 function getScrollRestorationKey(location2, matches, basename, getKey) {
   let key = null;
@@ -10119,7 +10325,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__ */ React10.createElement(
@@ -10131,7 +10337,7 @@ function StaticRouter({
       navigationType: action,
       navigator: staticNavigator,
       static: true,
-      unstable_useTransitions: false
+      useTransitions: false
     }
   );
 }
@@ -10172,11 +10378,12 @@ function StaticRouterProvider({
       navigationType: state.historyAction,
       navigator: dataRouterContext.navigator,
       static: dataRouterContext.static,
-      unstable_useTransitions: false
+      useTransitions: false
     },
     /* @__PURE__ */ React10.createElement(
-      DataRoutes,
+      DataRoutes2,
       {
+        manifest: router2.manifest,
         routes: router2.routes,
         future: router2.future,
         state,
@@ -10275,7 +10482,7 @@ function createStaticRouter(routes, context, opts = {}) {
     get future() {
       return {
         v8_middleware: false,
-        unstable_passThroughRequests: false,
+        v8_passThroughRequests: false,
         ...opts?.future
       };
     },
@@ -10300,6 +10507,12 @@ function createStaticRouter(routes, context, opts = {}) {
     get routes() {
       return dataRoutes;
     },
+    get branches() {
+      return opts.branches;
+    },
+    get manifest() {
+      return manifest;
+    },
     get window() {
       return void 0;
     },
@@ -10366,15 +10579,16 @@ function encodeLocation(to) {
     hash: encoded.hash
   };
 }
-var __typeError, __accessCheck, __privateGet, __privateAdd, Action, PopStateEventType, _map, RouterContextProvider, unsupportedLazyRouteObjectKeys, unsupportedLazyRouteFunctionKeys, paramRe, dynamicSegmentValue, indexRouteValue, emptySegmentValue, staticSegmentValue, splatPenalty, isSplat, ABSOLUTE_URL_REGEX, isAbsoluteUrl, joinPaths, normalizePathname, normalizeSearch, normalizeHash, DataWithResponseInit, redirect, redirectDocument, replace, ErrorResponseImpl, isBrowser, UninstrumentedSymbol, objectProtoNames, validMutationMethodsArr, validMutationMethods, validRequestMethodsArr, validRequestMethods, redirectStatusCodes, redirectPreserveMethodStatusCodes, IDLE_NAVIGATION, IDLE_FETCHER, IDLE_BLOCKER, defaultMapRouteProperties, TRANSITIONS_STORAGE_KEY, ResetLoaderDataSymbol, lazyRoutePropertyCache, loadLazyRouteProperty, lazyRouteFunctionCache, invalidProtocols, DataRouterContext, DataRouterStateContext, RSCRouterContext, ViewTransitionContext, FetchersContext, AwaitContext, AwaitContextProvider, NavigationContext, LocationContext, RouteContext, RouteErrorContext, ENABLE_DEV_WARNINGS, ERROR_DIGEST_BASE, ERROR_DIGEST_REDIRECT, ERROR_DIGEST_ROUTE_ERROR_RESPONSE, navigateEffectWarning, OutletContext, defaultErrorElement, RenderErrorBoundary, errorRedirectHandledMap, blockerId, alreadyWarned, alreadyWarned2, USE_OPTIMISTIC, useOptimisticImpl, stableUseOptimisticSetter, hydrationRouteProperties, Deferred, MemoizedDataRoutes, AwaitErrorBoundary, createRoutesFromElements, defaultMethod, defaultEncType, _formDataSupportsSubmitter, supportedFormEncTypes, HOLE, NAN, NEGATIVE_INFINITY, NEGATIVE_ZERO, NULL, POSITIVE_INFINITY, UNDEFINED, TYPE_BIGINT, TYPE_DATE, TYPE_ERROR, TYPE_MAP, TYPE_NULL_OBJECT, TYPE_PROMISE, TYPE_REGEXP, TYPE_SET, TYPE_SYMBOL, TYPE_URL, TYPE_PREVIOUS_RESOLVED, Deferred2, TIME_LIMIT_MS, getNow, yieldToMain, objectProtoNames2, globalObj, ESCAPE_LOOKUP, ESCAPE_REGEX, SingleFetchRedirectSymbol, SingleFetchNoResultError, SINGLE_FETCH_REDIRECT_STATUS, NO_BODY_STATUS_CODES, _isPreloadSupported, nextPaths, discoveredPathsMaxSize, discoveredPaths, URL_LIMIT, MANIFEST_VERSION_STORAGE_KEY, FrameworkContext, CRITICAL_CSS_DATA_ATTRIBUTE, isHydrated, RemixErrorBoundary, isBrowser2, ABSOLUTE_URL_REGEX2, Link, NavLink, Form, fetcherId, getUniqueFetcherId, SCROLL_RESTORATION_STORAGE_KEY, savedScrollPositions, ABSOLUTE_URL_REGEX3;
-var init_chunk_QFMPRPBF = __esm({
-  "../../node_modules/.pnpm/react-router@7.14.0_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/react-router/dist/development/chunk-QFMPRPBF.mjs"() {
+var __typeError, __accessCheck, __privateGet, __privateAdd, __privateSet, Action, PopStateEventType, _map, RouterContextProvider, unsupportedLazyRouteObjectKeys, unsupportedLazyRouteFunctionKeys, paramRe, dynamicSegmentValue, indexRouteValue, emptySegmentValue, staticSegmentValue, splatPenalty, isSplat, ABSOLUTE_URL_REGEX, isAbsoluteUrl, removeDoubleSlashes, joinPaths, removeTrailingSlash, normalizePathname, normalizeSearch, normalizeHash, DataWithResponseInit, redirect, redirectDocument, replace, ErrorResponseImpl, isBrowser, UninstrumentedSymbol, objectProtoNames, validMutationMethodsArr, validMutationMethods, validRequestMethodsArr, validRequestMethods, redirectStatusCodes, redirectPreserveMethodStatusCodes, IDLE_NAVIGATION, IDLE_FETCHER, IDLE_BLOCKER, defaultMapRouteProperties, TRANSITIONS_STORAGE_KEY, ResetLoaderDataSymbol, _routes, _branches, _hmrRoutes, _hmrBranches, DataRoutes, lazyRoutePropertyCache, loadLazyRouteProperty, lazyRouteFunctionCache, invalidProtocols, DataRouterContext, DataRouterStateContext, RSCRouterContext, ViewTransitionContext, FetchersContext, AwaitContext, AwaitContextProvider, NavigationContext, LocationContext, RouteContext, RouteErrorContext, ENABLE_DEV_WARNINGS, ERROR_DIGEST_BASE, ERROR_DIGEST_REDIRECT, ERROR_DIGEST_ROUTE_ERROR_RESPONSE, navigateEffectWarning, OutletContext, defaultErrorElement, RenderErrorBoundary, errorRedirectHandledMap, blockerId, alreadyWarned, alreadyWarned2, USE_OPTIMISTIC, useOptimisticImpl, stableUseOptimisticSetter, hydrationRouteProperties, Deferred, MemoizedDataRoutes, AwaitErrorBoundary, createRoutesFromElements, defaultMethod, defaultEncType, _formDataSupportsSubmitter, supportedFormEncTypes, HOLE, NAN, NEGATIVE_INFINITY, NEGATIVE_ZERO, NULL, POSITIVE_INFINITY, UNDEFINED, TYPE_BIGINT, TYPE_DATE, TYPE_ERROR, TYPE_MAP, TYPE_NULL_OBJECT, TYPE_PROMISE, TYPE_REGEXP, TYPE_SET, TYPE_SYMBOL, TYPE_URL, TYPE_PREVIOUS_RESOLVED, SUPPORTED_ERROR_TYPES, Deferred2, TIME_LIMIT_MS, getNow, yieldToMain, objectProtoNames2, globalObj, ESCAPE_LOOKUP, ESCAPE_REGEX, SingleFetchRedirectSymbol, SingleFetchNoResultError, SINGLE_FETCH_REDIRECT_STATUS, NO_BODY_STATUS_CODES, _isPreloadSupported, nextPaths, discoveredPathsMaxSize, discoveredPaths, URL_LIMIT, MANIFEST_VERSION_STORAGE_KEY, FrameworkContext, CRITICAL_CSS_DATA_ATTRIBUTE, isHydrated, RemixErrorBoundary, isBrowser2, ABSOLUTE_URL_REGEX2, Link, NavLink, Form, fetcherId, getUniqueFetcherId, SCROLL_RESTORATION_STORAGE_KEY, savedScrollPositions, ABSOLUTE_URL_REGEX3;
+var init_chunk_4N6VE7H7 = __esm({
+  "../../node_modules/.pnpm/react-router@7.15.1_react-dom@19.2.5_react@19.2.5__react@19.2.5/node_modules/react-router/dist/development/chunk-4N6VE7H7.mjs"() {
     __typeError = (msg) => {
       throw TypeError(msg);
     };
     __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
     __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
     __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);
+    __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), setter ? setter.call(obj, value) : member.set(obj, value), value);
     Action = /* @__PURE__ */ ((Action2) => {
       Action2["Pop"] = "POP";
       Action2["Push"] = "PUSH";
@@ -10451,8 +10665,10 @@ var init_chunk_QFMPRPBF = __esm({
     isSplat = (s) => s === "*";
     ABSOLUTE_URL_REGEX = /^(?:[a-z][a-z0-9+.-]*:|\/\/)/i;
     isAbsoluteUrl = (url) => ABSOLUTE_URL_REGEX.test(url);
-    joinPaths = (paths) => paths.join("/").replace(/\/\/+/g, "/");
-    normalizePathname = (pathname) => pathname.replace(/\/+$/, "").replace(/^\/*/, "/");
+    removeDoubleSlashes = (path) => path.replace(/\/\/+/g, "/");
+    joinPaths = (paths) => removeDoubleSlashes(paths.join("/"));
+    removeTrailingSlash = (path) => path.replace(/\/+$/, "");
+    normalizePathname = (pathname) => removeTrailingSlash(pathname).replace(/^\/*/, "/");
     normalizeSearch = (search) => !search || search === "?" ? "" : search.startsWith("?") ? search : "?" + search;
     normalizeHash = (hash) => !hash || hash === "#" ? "" : hash.startsWith("#") ? hash : "#" + hash;
     DataWithResponseInit = class {
@@ -10518,6 +10734,8 @@ var init_chunk_QFMPRPBF = __esm({
     IDLE_NAVIGATION = {
       state: "idle",
       location: void 0,
+      matches: void 0,
+      historyAction: void 0,
       formMethod: void 0,
       formAction: void 0,
       formEncType: void 0,
@@ -10546,6 +10764,54 @@ var init_chunk_QFMPRPBF = __esm({
     });
     TRANSITIONS_STORAGE_KEY = "remix-router-transitions";
     ResetLoaderDataSymbol = /* @__PURE__ */ Symbol("ResetLoaderData");
+    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 = /* @__PURE__ */ new WeakMap();
+    _branches = /* @__PURE__ */ new WeakMap();
+    _hmrRoutes = /* @__PURE__ */ new WeakMap();
+    _hmrBranches = /* @__PURE__ */ new WeakMap();
     lazyRoutePropertyCache = /* @__PURE__ */ new WeakMap();
     loadLazyRouteProperty = ({
       key,
@@ -10742,7 +11008,7 @@ var init_chunk_QFMPRPBF = __esm({
         });
       }
     };
-    MemoizedDataRoutes = React10.memo(DataRoutes);
+    MemoizedDataRoutes = React10.memo(DataRoutes2);
     AwaitErrorBoundary = class extends React10.Component {
       constructor(props) {
         super(props);
@@ -10831,6 +11097,14 @@ var init_chunk_QFMPRPBF = __esm({
     TYPE_SYMBOL = "Y";
     TYPE_URL = "U";
     TYPE_PREVIOUS_RESOLVED = "Z";
+    SUPPORTED_ERROR_TYPES = [
+      "EvalError",
+      "RangeError",
+      "ReferenceError",
+      "SyntaxError",
+      "TypeError",
+      "URIError"
+    ];
     Deferred2 = class {
       constructor() {
         this.promise = new Promise((resolve, reject) => {
@@ -10898,7 +11172,7 @@ var init_chunk_QFMPRPBF = __esm({
     try {
       if (isBrowser2) {
         window.__reactRouterVersion = // @ts-expect-error
-        "7.14.0";
+        "7.15.1";
       }
     } catch (e) {
     }
@@ -10912,27 +11186,27 @@ var init_chunk_QFMPRPBF = __esm({
         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 href2 = useHref(to, { relative });
         let location2 = useLocation();
         let maskedHref = null;
-        if (unstable_mask) {
+        if (mask) {
           let resolved = resolveTo(
-            unstable_mask,
+            mask,
             [],
-            location2.unstable_mask ? location2.unstable_mask.pathname : "/",
+            location2.mask ? location2.mask.pathname : "/",
             true
           );
           if (basename !== "/") {
@@ -10946,14 +11220,14 @@ var init_chunk_QFMPRPBF = __esm({
         );
         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);
@@ -11062,10 +11336,10 @@ var init_chunk_QFMPRPBF = __esm({
         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";
@@ -11085,9 +11359,9 @@ var init_chunk_QFMPRPBF = __esm({
             relative,
             preventScrollReset,
             viewTransition,
-            unstable_defaultShouldRevalidate
+            defaultShouldRevalidate
           });
-          if (unstable_useTransitions && navigate !== false) {
+          if (useTransitions && navigate !== false) {
             React10.startTransition(() => doSubmit());
           } else {
             doSubmit();
@@ -11118,16 +11392,16 @@ var init_chunk_QFMPRPBF = __esm({
 
 // ../../node_modules/.pnpm/cookie@1.1.1/node_modules/cookie/dist/index.js
 var require_dist = __commonJS({
-  "../../node_modules/.pnpm/cookie@1.1.1/node_modules/cookie/dist/index.js"(exports$1) {
-    Object.defineProperty(exports$1, "__esModule", { value: true });
-    exports$1.parseCookie = parseCookie;
-    exports$1.parse = parseCookie;
-    exports$1.stringifyCookie = stringifyCookie;
-    exports$1.stringifySetCookie = stringifySetCookie;
-    exports$1.serialize = stringifySetCookie;
-    exports$1.parseSetCookie = parseSetCookie;
-    exports$1.stringifySetCookie = stringifySetCookie;
-    exports$1.serialize = stringifySetCookie;
+  "../../node_modules/.pnpm/cookie@1.1.1/node_modules/cookie/dist/index.js"(exports) {
+    Object.defineProperty(exports, "__esModule", { value: true });
+    exports.parseCookie = parseCookie;
+    exports.parse = parseCookie;
+    exports.stringifyCookie = stringifyCookie;
+    exports.stringifySetCookie = stringifySetCookie;
+    exports.serialize = stringifySetCookie;
+    exports.parseSetCookie = parseSetCookie;
+    exports.stringifySetCookie = stringifySetCookie;
+    exports.serialize = stringifySetCookie;
     var cookieNameRegExp = /^[\u0021-\u003A\u003C\u003E-\u007E]+$/;
     var cookieValueRegExp = /^[\u0021-\u003A\u003C-\u007E]*$/;
     var domainValueRegExp = /^([.]?[a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?)([.][a-z0-9]([a-z0-9-]{0,61}[a-z0-9])?)*$/i;
@@ -11366,7 +11640,7 @@ var require_dist = __commonJS({
 
 // ../../node_modules/.pnpm/set-cookie-parser@2.7.2/node_modules/set-cookie-parser/lib/set-cookie.js
 var require_set_cookie = __commonJS({
-  "../../node_modules/.pnpm/set-cookie-parser@2.7.2/node_modules/set-cookie-parser/lib/set-cookie.js"(exports$1, module) {
+  "../../node_modules/.pnpm/set-cookie-parser@2.7.2/node_modules/set-cookie-parser/lib/set-cookie.js"(exports, module) {
     var defaultParseOptions = {
       decodeValues: true,
       map: false,
@@ -11576,7 +11850,9 @@ function ServerRouter({
       delete context.staticHandlerContext.loaderData[routeId];
     }
   }
-  let router2 = createStaticRouter(routes, context.staticHandlerContext);
+  let router2 = createStaticRouter(routes, context.staticHandlerContext, {
+    branches: context.branches
+  });
   return /* @__PURE__ */ React10.createElement(React10.Fragment, null, /* @__PURE__ */ React10.createElement(
     FrameworkContext.Provider,
     {
@@ -11624,8 +11900,7 @@ function createRoutesStub(routes, _context) {
     if (routerRef.current == null) {
       frameworkContextRef.current = {
         future: {
-          unstable_passThroughRequests: future?.unstable_passThroughRequests === true,
-          unstable_subResourceIntegrity: future?.unstable_subResourceIntegrity === true,
+          v8_passThroughRequests: future?.v8_passThroughRequests === true,
           v8_middleware: future?.v8_middleware === true,
           unstable_trailingSlashAwareDataRequests: future?.unstable_trailingSlashAwareDataRequests === true
         },
@@ -11756,7 +12031,7 @@ function encodeData(value) {
 function decodeData(value) {
   try {
     return JSON.parse(decodeURIComponent(myEscape(atob(value))));
-  } catch (error) {
+  } catch (e) {
     return {};
   }
 }
@@ -11878,26 +12153,43 @@ function serializeErrors2(errors, serverMode) {
   }
   return serialized;
 }
-function matchServerRoutes(routes, pathname, basename) {
-  let matches = matchRoutes(
-    routes,
+function invariant3(value, message) {
+  if (value === false || value === null || typeof value === "undefined") {
+    console.error(
+      "The following error is a bug in React Router; please open an issue! https://github.com/remix-run/react-router/issues/new/choose"
+    );
+    throw new Error(message);
+  }
+}
+function matchServerRoutes(manifest, dataRoutes, branches, pathname, basename) {
+  let matches = matchRoutesImpl(
+    dataRoutes,
     pathname,
-    basename
+    basename ?? "/",
+    false,
+    branches
   );
   if (!matches) return null;
-  return matches.map((match) => ({
-    params: match.params,
-    pathname: match.pathname,
-    route: match.route
-  }));
+  return matches.map((match) => {
+    let route = manifest[match.route.id];
+    invariant3(
+      route,
+      `Route with id "${match.route.id}" not found in manifest.`
+    );
+    return {
+      params: match.params,
+      pathname: match.pathname,
+      route
+    };
+  });
 }
 async function callRouteHandler(handler, args, future) {
   let result = await handler({
-    request: future.unstable_passThroughRequests ? args.request : stripRoutesParam(stripIndexParam2(args.request)),
-    unstable_url: args.unstable_url,
+    request: future.v8_passThroughRequests ? args.request : stripRoutesParam(stripIndexParam2(args.request)),
+    url: args.url,
     params: args.params,
     context: args.context,
-    unstable_pattern: args.unstable_pattern
+    pattern: args.pattern
   });
   if (isDataWithResponseInit(result) && result.init && result.init.status && isRedirectStatusCode(result.init.status)) {
     throw new Response(null, result.init);
@@ -11942,14 +12234,6 @@ function stripRoutesParam(request) {
   }
   return new Request(url.href, init);
 }
-function invariant3(value, message) {
-  if (value === false || value === null || typeof value === "undefined") {
-    console.error(
-      "The following error is a bug in React Router; please open an issue! https://github.com/remix-run/react-router/issues/new/choose"
-    );
-    throw new Error(message);
-  }
-}
 function setDevServerHooks(devServerHooks) {
   globalThis[globalDevServerHooksKey] = devServerHooks;
 }
@@ -11959,7 +12243,7 @@ function getDevServerHooks() {
 function getBuildTimeHeader(request, headerName) {
   if (typeof process !== "undefined") {
     try {
-      if (process.env?.IS_RR_BUILD_REQUEST === "yes") {
+      if (process.env.hasOwnProperty("IS_RR_BUILD_REQUEST") && process.env.IS_RR_BUILD_REQUEST === "yes") {
         return request.headers.get(headerName);
       }
     } catch (e) {
@@ -11980,12 +12264,6 @@ function groupRoutesByParentId2(manifest) {
   });
   return routes;
 }
-function createRoutes(manifest, parentId = "", routesByParentId = groupRoutesByParentId2(manifest)) {
-  return (routesByParentId[parentId] || []).map((route) => ({
-    ...route,
-    children: createRoutes(manifest, route.id, routesByParentId)
-  }));
-}
 function createStaticHandlerDataRoutes(manifest, future, parentId = "", routesByParentId = groupRoutesByParentId2(manifest)) {
   return (routesByParentId[parentId] || []).map((route) => {
     let commonRoute = {
@@ -12257,7 +12535,7 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
     } catch (e) {
       return handleQueryError(new Error("Bad Request"), 400);
     }
-    let handlerRequest = build.future.unstable_passThroughRequests ? request : new Request(handlerUrl, {
+    let handlerRequest = build.future.v8_passThroughRequests ? request : new Request(handlerUrl, {
       method: request.method,
       body: request.body,
       headers: request.headers,
@@ -12276,7 +12554,7 @@ async function singleFetchAction(build, serverMode, staticHandler, request, hand
           return handleQueryError(error);
         }
       } : void 0,
-      unstable_normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
+      normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
     });
     return handleQueryResult(result);
   } catch (error) {
@@ -12325,7 +12603,7 @@ async function singleFetchLoaders(build, serverMode, staticHandler, request, han
   let routesParam = new URL(request.url).searchParams.get("_routes");
   let loadRouteIds = routesParam ? new Set(routesParam.split(",")) : null;
   try {
-    let handlerRequest = build.future.unstable_passThroughRequests ? request : new Request(handlerUrl, {
+    let handlerRequest = build.future.v8_passThroughRequests ? request : new Request(handlerUrl, {
       headers: request.headers,
       signal: request.signal
     });
@@ -12341,7 +12619,7 @@ async function singleFetchLoaders(build, serverMode, staticHandler, request, han
           return handleQueryError(error);
         }
       } : void 0,
-      unstable_normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
+      normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
     });
     return handleQueryResult(result);
   } catch (error) {
@@ -12506,12 +12784,12 @@ function encodeViaTurboStream(data2, requestSignal, streamTimeout, serverMode) {
   });
 }
 function derive(build, mode) {
-  let routes = createRoutes(build.routes);
   let dataRoutes = createStaticHandlerDataRoutes(build.routes, build.future);
   let serverMode = isServerMode(mode) ? mode : "production";
   let staticHandler = createStaticHandler(dataRoutes, {
     basename: build.basename,
-    unstable_instrumentations: build.entry.module.unstable_instrumentations
+    instrumentations: build.entry.module.instrumentations,
+    future: build.future
   });
   let errorHandler = build.entry.module.handleError || ((error, { request }) => {
     if (serverMode !== "test" && !request.signal.aborted) {
@@ -12608,24 +12886,30 @@ function derive(build, mode) {
     );
     if (requestUrl.pathname === manifestUrl) {
       try {
-        let res = await handleManifestRequest(build, routes, requestUrl);
+        let res = await handleManifestRequest(
+          build,
+          staticHandler.dataRoutes,
+          staticHandler._internalRouteBranches,
+          requestUrl
+        );
         return res;
       } catch (e) {
         handleError(e);
         return new Response("Unknown Server Error", { status: 500 });
       }
     }
-    let matches = matchServerRoutes(routes, normalizedPathname, build.basename);
+    let matches = matchServerRoutes(
+      build.routes,
+      staticHandler.dataRoutes,
+      staticHandler._internalRouteBranches,
+      normalizedPathname,
+      build.basename
+    );
     if (matches && matches.length > 0) {
       Object.assign(params, matches[0].params);
     }
     let response;
     if (requestUrl.pathname.endsWith(".data")) {
-      let singleFetchMatches = matchServerRoutes(
-        routes,
-        normalizedPathname,
-        build.basename
-      );
       response = await handleSingleFetchRequest(
         serverMode,
         build,
@@ -12646,7 +12930,7 @@ function derive(build, mode) {
       if (build.entry.module.handleDataRequest) {
         response = await build.entry.module.handleDataRequest(response, {
           context: loadContext,
-          params: singleFetchMatches ? singleFetchMatches[0].params : {},
+          params: matches ? matches[0].params : {},
           request
         });
         if (isRedirectResponse(response)) {
@@ -12696,22 +12980,20 @@ function derive(build, mode) {
     }
     return response;
   };
-  if (build.entry.module.unstable_instrumentations) {
+  if (build.entry.module.instrumentations) {
     requestHandler = instrumentHandler(
       requestHandler,
-      build.entry.module.unstable_instrumentations.map((i) => i.handler).filter(Boolean)
+      build.entry.module.instrumentations.map((i) => i.handler).filter(Boolean)
     );
   }
   return {
-    routes,
-    dataRoutes,
     serverMode,
     staticHandler,
     errorHandler,
     requestHandler
   };
 }
-async function handleManifestRequest(build, routes, url) {
+async function handleManifestRequest(build, dataRoutes, branches, url) {
   if (build.assets.version !== url.searchParams.get("version")) {
     return new Response(null, {
       status: 204,
@@ -12720,6 +13002,12 @@ async function handleManifestRequest(build, routes, url) {
       }
     });
   }
+  if (url.toString().length > URL_LIMIT) {
+    return new Response(null, {
+      statusText: "Bad Request",
+      status: 400
+    });
+  }
   let patches = {};
   if (url.searchParams.has("paths")) {
     let paths = /* @__PURE__ */ new Set();
@@ -12736,7 +13024,13 @@ async function handleManifestRequest(build, routes, url) {
       });
     });
     for (let path of paths) {
-      let matches = matchServerRoutes(routes, path, build.basename);
+      let matches = matchServerRoutes(
+        build.routes,
+        dataRoutes,
+        branches,
+        path,
+        build.basename
+      );
       if (matches) {
         for (let match of matches) {
           let routeId = match.route.id;
@@ -12758,7 +13052,7 @@ async function handleManifestRequest(build, routes, url) {
 async function handleSingleFetchRequest(serverMode, build, staticHandler, request, normalizedPath, loadContext, handleError) {
   let handlerUrl = new URL(request.url);
   handlerUrl.pathname = normalizedPath;
-  let response = request.method !== "GET" ? await singleFetchAction(
+  let response = isMutationMethod(request.method) ? await singleFetchAction(
     build,
     serverMode,
     staticHandler,
@@ -12779,7 +13073,7 @@ async function handleSingleFetchRequest(serverMode, build, staticHandler, reques
 }
 async function handleDocumentRequest(serverMode, build, staticHandler, request, loadContext, handleError, isSpaMode, criticalCss) {
   try {
-    if (request.method === "POST") {
+    if (isMutationMethod(request.method)) {
       try {
         throwIfPotentialCSRFAttack(
           request.headers,
@@ -12804,7 +13098,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
           return new Response(null, { status: 500 });
         }
       } : void 0,
-      unstable_normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
+      normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
     });
     if (!isResponse(result)) {
       result = await renderHtml(result, isSpaMode);
@@ -12841,6 +13135,7 @@ async function handleDocumentRequest(serverMode, build, staticHandler, request,
     };
     let entryContext = {
       manifest: build.assets,
+      branches: staticHandler._internalRouteBranches,
       routeModules: createEntryRouteModules(build.routes),
       staticHandlerContext: context,
       criticalCss,
@@ -12937,7 +13232,7 @@ async function handleResourceRequest(serverMode, build, staticHandler, routeId,
           return handleQueryRouteError(error);
         }
       } : void 0,
-      unstable_normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
+      normalizePath: (r) => getNormalizedPath(r, build.basename, build.future)
     });
     return handleQueryRouteResult(result);
   } catch (error) {
@@ -13190,7 +13485,7 @@ async function writeRSCStream(rscStream, controller) {
           JSON.stringify(decoder.decode(chunk, { stream: true })),
           controller
         );
-      } catch (err) {
+      } catch (e) {
         let base64 = JSON.stringify(btoa(String.fromCodePoint(...chunk)));
         writeChunk(
           `Uint8Array.from(atob(${base64}), m => m.codePointAt(0))`,
@@ -13477,9 +13772,9 @@ async function routeRSCServerRequest({
       statusText,
       headers
     });
-  } catch (reason) {
-    if (reason instanceof Response) {
-      return reason;
+  } catch (error) {
+    if (error instanceof Response) {
+      return error;
     }
     if (renderRedirect) {
       return new Response(`Redirect: ${renderRedirect.location}`, {
@@ -13490,8 +13785,8 @@ async function routeRSCServerRequest({
       });
     }
     try {
-      reason = renderError ?? reason;
-      let [status, statusText] = isRouteErrorResponse(reason) ? [reason.status, reason.statusText] : [500, ""];
+      let normalizedError = renderError ?? error;
+      let [status, statusText] = isRouteErrorResponse(normalizedError) ? [normalizedError.status, normalizedError.statusText] : [500, ""];
       let retryRedirect;
       let reactHeaders = new Headers();
       const html = await renderHTML(
@@ -13503,7 +13798,7 @@ async function routeRSCServerRequest({
             (payload) => Object.assign(payload, {
               status,
               errors: deepestRenderedBoundaryId ? {
-                [deepestRenderedBoundaryId]: reason
+                [deepestRenderedBoundaryId]: normalizedError
               } : {}
             })
           );
@@ -13526,19 +13821,19 @@ async function routeRSCServerRequest({
           });
         },
         {
-          onError(error) {
-            if (typeof error === "object" && error && "digest" in error && typeof error.digest === "string") {
-              retryRedirect = decodeRedirectErrorDigest(error.digest);
+          onError(error2) {
+            if (typeof error2 === "object" && error2 && "digest" in error2 && typeof error2.digest === "string") {
+              retryRedirect = decodeRedirectErrorDigest(error2.digest);
               if (retryRedirect) {
-                return error.digest;
+                return error2.digest;
               }
               let routeErrorResponse = decodeRouteErrorResponseDigest(
-                error.digest
+                error2.digest
               );
               if (routeErrorResponse) {
                 status = routeErrorResponse.status;
                 statusText = routeErrorResponse.statusText;
-                return error.digest;
+                return error2.digest;
               }
             }
           },
@@ -13588,9 +13883,9 @@ async function routeRSCServerRequest({
         statusText,
         headers
       });
-    } catch {
+    } catch (error2) {
     }
-    throw reason;
+    throw error;
   }
 }
 function RSCStaticRouter({ getPayload }) {
@@ -13674,10 +13969,9 @@ function RSCStaticRouter({ getPayload }) {
       // These flags have no runtime impact so can always be false.  If we add
       // flags that drive runtime behavior they'll need to be proxied through.
       v8_middleware: false,
-      unstable_subResourceIntegrity: false,
       unstable_trailingSlashAwareDataRequests: true,
       // always on for RSC
-      unstable_passThroughRequests: true
+      v8_passThroughRequests: true
       // always on for RSC
     },
     isSpaMode: false,
@@ -13781,9 +14075,9 @@ function getHydrationData({
   return hydrationData;
 }
 var import_cookie, import_set_cookie_parser, encoder, sign, unsign, createKey2, createCookie, isCookie, ServerMode, globalDevServerHooksKey, SERVER_NO_BODY_STATUS_CODES, createRequestHandler, createSession, isSession, encoder2, trailer, RSCRouterGlobalErrorBoundary, noopComponent, defaultManifestPath, REACT_USE, useImpl;
-var init_chunk_2UH5WJXA = __esm({
-  "../../node_modules/.pnpm/react-router@7.14.0_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/react-router/dist/development/chunk-2UH5WJXA.mjs"() {
-    init_chunk_QFMPRPBF();
+var init_chunk_RJYABSBD = __esm({
+  "../../node_modules/.pnpm/react-router@7.15.1_react-dom@19.2.5_react@19.2.5__react@19.2.5/node_modules/react-router/dist/development/chunk-RJYABSBD.mjs"() {
+    init_chunk_4N6VE7H7();
     import_cookie = __toESM(require_dist(), 1);
     import_set_cookie_parser = __toESM(require_set_cookie(), 1);
     encoder = /* @__PURE__ */ new TextEncoder();
@@ -13807,7 +14101,7 @@ var init_chunk_2UH5WJXA = __esm({
         let signature = byteStringToUint8Array(atob(hash));
         let valid = await crypto.subtle.verify("HMAC", key, signature, data2);
         return valid ? value : false;
-      } catch (error) {
+      } catch (e) {
         return false;
       }
     };
@@ -13878,7 +14172,6 @@ var init_chunk_2UH5WJXA = __esm({
     ]);
     createRequestHandler = (build, mode) => {
       let _build;
-      let routes;
       let serverMode;
       let staticHandler;
       let errorHandler;
@@ -13887,14 +14180,12 @@ var init_chunk_2UH5WJXA = __esm({
         _build = typeof build === "function" ? await build() : build;
         if (typeof build === "function") {
           let derived = derive(_build, mode);
-          routes = derived.routes;
           serverMode = derived.serverMode;
           staticHandler = derived.staticHandler;
           errorHandler = derived.errorHandler;
           _requestHandler = derived.requestHandler;
-        } else if (!routes || !serverMode || !staticHandler || !errorHandler || !_requestHandler) {
+        } else if (!serverMode || !staticHandler || !errorHandler || !_requestHandler) {
           let derived = derive(_build, mode);
-          routes = derived.routes;
           serverMode = derived.serverMode;
           staticHandler = derived.staticHandler;
           errorHandler = derived.errorHandler;
@@ -13976,7 +14267,7 @@ var init_chunk_2UH5WJXA = __esm({
   }
 });
 
-// ../../node_modules/.pnpm/react-router@7.14.0_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/react-router/dist/development/dom-export.mjs
+// ../../node_modules/.pnpm/react-router@7.15.1_react-dom@19.2.5_react@19.2.5__react@19.2.5/node_modules/react-router/dist/development/dom-export.mjs
 var dom_export_exports = {};
 __export(dom_export_exports, {
   HydratedRouter: () => HydratedRouter2,
@@ -14014,7 +14305,7 @@ function initSsrInfo() {
 }
 function createHydratedRouter({
   getContext,
-  unstable_instrumentations
+  instrumentations
 }) {
   initSsrInfo();
   if (!ssrInfo) {
@@ -14087,10 +14378,10 @@ function createHydratedRouter({
     getContext,
     hydrationData,
     hydrationRouteProperties,
-    unstable_instrumentations,
+    instrumentations,
     mapRouteProperties,
     future: {
-      unstable_passThroughRequests: ssrInfo.context.future.unstable_passThroughRequests
+      v8_passThroughRequests: ssrInfo.context.future.v8_passThroughRequests
     },
     dataStrategy: getTurboStreamSingleFetchDataStrategy(
       () => router2,
@@ -14124,7 +14415,7 @@ function HydratedRouter2(props) {
   if (!router) {
     router = createHydratedRouter({
       getContext: props.getContext,
-      unstable_instrumentations: props.unstable_instrumentations
+      instrumentations: props.instrumentations
     });
   }
   let [criticalCss, setCriticalCss] = React10.useState(
@@ -14185,7 +14476,7 @@ function HydratedRouter2(props) {
         RouterProvider22,
         {
           router,
-          unstable_useTransitions: props.unstable_useTransitions,
+          useTransitions: props.useTransitions,
           onError: props.onError
         }
       ))
@@ -14464,8 +14755,7 @@ function getRSCSingleFetchDataStrategy(getRouter, ssr, basename, createFromReada
         hasClientLoader: M.route.hasClientLoader,
         hasComponent: M.route.hasComponent,
         hasAction: M.route.hasAction,
-        hasClientAction: M.route.hasClientAction,
-        hasShouldRevalidate: M.route.hasShouldRevalidate
+        hasClientAction: M.route.hasClientAction
       };
     },
     // pass map into fetchAndDecode so it can add payloads
@@ -14668,10 +14958,9 @@ function RSCHydratedRouter({
       // These flags have no runtime impact so can always be false.  If we add
       // flags that drive runtime behavior they'll need to be proxied through.
       v8_middleware: false,
-      unstable_subResourceIntegrity: false,
       unstable_trailingSlashAwareDataRequests: true,
       // always on for RSC
-      unstable_passThroughRequests: true
+      v8_passThroughRequests: true
       // always on for RSC
     },
     isSpaMode: false,
@@ -14720,30 +15009,28 @@ function createRouteFromServerManifest(match, payload) {
     hydrateFallbackElement: match.hydrateFallbackElement,
     index: match.index,
     loader: match.clientLoader ? async (args, singleFetch) => {
-      try {
-        let result = await match.clientLoader({
-          ...args,
-          serverLoader: () => {
-            preventInvalidServerHandlerCall2(
-              "loader",
-              match.id,
-              match.hasLoader
-            );
-            if (isHydrationRequest) {
-              if (hasInitialData) {
-                return initialData;
-              }
-              if (hasInitialError) {
-                throw initialError;
-              }
+      let _isHydrationRequest = isHydrationRequest;
+      isHydrationRequest = false;
+      let result = await match.clientLoader({
+        ...args,
+        serverLoader: () => {
+          preventInvalidServerHandlerCall2(
+            "loader",
+            match.id,
+            match.hasLoader
+          );
+          if (_isHydrationRequest) {
+            if (hasInitialData) {
+              return initialData;
+            }
+            if (hasInitialError) {
+              throw initialError;
             }
-            return callSingleFetch(singleFetch);
           }
-        });
-        return result;
-      } finally {
-        isHydrationRequest = false;
-      }
+          return callSingleFetch(singleFetch);
+        }
+      });
+      return result;
     } : (
       // We always make the call in this RSC world since even if we don't
       // have a `loader` we may need to get the `element` implementation
@@ -14769,8 +15056,7 @@ function createRouteFromServerManifest(match, payload) {
     hasLoader: true,
     hasClientLoader: match.clientLoader != null,
     hasAction: match.hasAction,
-    hasClientAction: match.clientAction != null,
-    hasShouldRevalidate: match.shouldRevalidate != null
+    hasClientAction: match.clientAction != null
   };
   if (typeof dataRoute.loader === "function") {
     dataRoute.loader.hydrate = shouldHydrateRouteLoader(
@@ -14815,7 +15101,7 @@ async function fetchAndApplyManifestPatches2(paths, createFromReadableStream, fe
   if (url == null) {
     return;
   }
-  if (url.toString().length > URL_LIMIT2) {
+  if (url.toString().length > URL_LIMIT) {
     nextPaths2.clear();
     return;
   }
@@ -14924,12 +15210,12 @@ function getRSCStream() {
   }
   return rscStream;
 }
-var ssrInfo, router, defaultManifestPath2, renderedRoutesContext, nextPaths2, discoveredPathsMaxSize2, discoveredPaths2, URL_LIMIT2;
+var ssrInfo, router, defaultManifestPath2, renderedRoutesContext, nextPaths2, discoveredPathsMaxSize2, discoveredPaths2;
 var init_dom_export = __esm({
-  "../../node_modules/.pnpm/react-router@7.14.0_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/react-router/dist/development/dom-export.mjs"() {
+  "../../node_modules/.pnpm/react-router@7.15.1_react-dom@19.2.5_react@19.2.5__react@19.2.5/node_modules/react-router/dist/development/dom-export.mjs"() {
     "use client";
-    init_chunk_2UH5WJXA();
-    init_chunk_QFMPRPBF();
+    init_chunk_RJYABSBD();
+    init_chunk_4N6VE7H7();
     ssrInfo = null;
     router = null;
     defaultManifestPath2 = "/__manifest";
@@ -14937,11 +15223,10 @@ var init_dom_export = __esm({
     nextPaths2 = /* @__PURE__ */ new Set();
     discoveredPathsMaxSize2 = 1e3;
     discoveredPaths2 = /* @__PURE__ */ new Set();
-    URL_LIMIT2 = 7680;
   }
 });
 
-// ../../node_modules/.pnpm/react-router@7.14.0_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/react-router/dist/development/index.mjs
+// ../../node_modules/.pnpm/react-router@7.15.1_react-dom@19.2.5_react@19.2.5__react@19.2.5/node_modules/react-router/dist/development/index.mjs
 var development_exports = {};
 __export(development_exports, {
   Await: () => Await,
@@ -15044,6 +15329,7 @@ __export(development_exports, {
   unstable_setDevServerHooks: () => setDevServerHooks,
   unstable_usePrompt: () => usePrompt,
   unstable_useRoute: () => useRoute,
+  unstable_useRouterState: () => useRouterState,
   useActionData: () => useActionData,
   useAsyncError: () => useAsyncError,
   useAsyncValue: () => useAsyncValue,
@@ -15075,16 +15361,16 @@ __export(development_exports, {
   useViewTransitionState: () => useViewTransitionState
 });
 var init_development = __esm({
-  "../../node_modules/.pnpm/react-router@7.14.0_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/react-router/dist/development/index.mjs"() {
+  "../../node_modules/.pnpm/react-router@7.15.1_react-dom@19.2.5_react@19.2.5__react@19.2.5/node_modules/react-router/dist/development/index.mjs"() {
     "use client";
-    init_chunk_2UH5WJXA();
-    init_chunk_QFMPRPBF();
+    init_chunk_RJYABSBD();
+    init_chunk_4N6VE7H7();
   }
 });
 
-// ../../node_modules/.pnpm/react-router-dom@7.14.0_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/react-router-dom/dist/index.js
+// ../../node_modules/.pnpm/react-router-dom@7.15.1_react-dom@19.2.5_react@19.2.5__react@19.2.5/node_modules/react-router-dom/dist/index.js
 var require_dist2 = __commonJS({
-  "../../node_modules/.pnpm/react-router-dom@7.14.0_react-dom@19.2.4_react@19.2.4__react@19.2.4/node_modules/react-router-dom/dist/index.js"(exports$1, module) {
+  "../../node_modules/.pnpm/react-router-dom@7.15.1_react-dom@19.2.5_react@19.2.5__react@19.2.5/node_modules/react-router-dom/dist/index.js"(exports, module) {
     var __defProp = Object.defineProperty;
     var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
     var __getOwnPropNames = Object.getOwnPropertyNames;
@@ -15925,10 +16211,12 @@ function DefaultNavItem({ item, showText, depth, active }) {
           ListItemText2,
           {
             primary: item.title,
-            primaryTypographyProps: {
-              variant: "body2",
-              fontWeight: active ? 600 : 500,
-              noWrap: true
+            slotProps: {
+              primary: {
+                variant: "body2",
+                noWrap: true,
+                sx: { fontWeight: active ? 600 : 500 }
+              }
             }
           }
         ),
@@ -16472,12 +16760,12 @@ function SimpleCompactContent({ children, sx }) {
 }
 /*! Bundled license information:
 
-react-router/dist/development/chunk-QFMPRPBF.mjs:
-react-router/dist/development/chunk-2UH5WJXA.mjs:
+react-router/dist/development/chunk-4N6VE7H7.mjs:
+react-router/dist/development/chunk-RJYABSBD.mjs:
 react-router/dist/development/dom-export.mjs:
 react-router/dist/development/index.mjs:
   (**
-   * react-router v7.14.0
+   * react-router v7.15.1
    *
    * Copyright (c) Remix Software Inc.
    *
@@ -16489,7 +16777,7 @@ react-router/dist/development/index.mjs:
 
 react-router-dom/dist/index.js:
   (**
-   * react-router-dom v7.14.0
+   * react-router-dom v7.15.1
    *
    * Copyright (c) Remix Software Inc.
    *
@@ -16501,5 +16789,5 @@ react-router-dom/dist/index.js:
 */
 
 export { AuthCenteredContent, AuthCenteredLayout, AuthSimpleLayout, AuthSplitContent, AuthSplitIllustration, AuthSplitLayout, DEFAULT_LAYOUT_CSS_VARS, DRAWER_WIDTHS, DashboardContent, DashboardLayout, HEADER_HEIGHTS, HeaderSection, HeaderToolbar, LAYOUT_CSS_VARS, LayoutContext, LayoutGlobalStyles, LayoutProvider, LayoutSection, MainSection, MobileSidenav, Sidenav, SimpleCompactContent, defaultLayoutConfig, getBaseLayoutCssVars, getNavColorCssVars, mergeLayoutCssVars, useLayoutConfig, useLayoutContext, useNavActive, useSidenavVisible, useTopnavVisible };
-//# sourceMappingURL=chunk-GYDT5EKX.js.map
-//# sourceMappingURL=chunk-GYDT5EKX.js.map
+//# sourceMappingURL=chunk-XQXGE2PW.js.map
+//# sourceMappingURL=chunk-XQXGE2PW.js.map