react-router 7.6.0 → 7.6.1-pre.0

package/dist/development/index.js

@@ -1,5 +1,5 @@
 /**
- * react-router v7.6.0
+ * react-router v7.6.1-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1830,6 +1830,7 @@ function createRouter(init) {
       fetchRedirectIds,
       routesToUse,
       basename,
+      init.patchRoutesOnNavigation != null,
       pendingActionResult
     );
     pendingNavigationLoadId = ++incrementingLoadId;
@@ -2159,6 +2160,7 @@ function createRouter(init) {
       fetchRedirectIds,
       routesToUse,
       basename,
+      init.patchRoutesOnNavigation != null,
       [match.route.id, actionResult]
     );
     revalidatingFetchers.filter((rf) => rf.key !== key).forEach((rf) => {
@@ -3577,7 +3579,7 @@ function normalizeNavigateOptions(isFetcher, path, opts) {
   parsedPath.search = `?${searchParams}`;
   return { path: createPath(parsedPath), submission };
 }
-function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest, history, state, matches, submission, location, lazyRoutePropertiesToSkip, initialHydration, isRevalidationRequired, cancelledFetcherLoads, fetchersQueuedForDeletion, fetchLoadMatches, fetchRedirectIds, routesToUse, basename, pendingActionResult) {
+function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest, history, state, matches, submission, location, lazyRoutePropertiesToSkip, initialHydration, isRevalidationRequired, cancelledFetcherLoads, fetchersQueuedForDeletion, fetchLoadMatches, fetchRedirectIds, routesToUse, basename, hasPatchRoutesOnNavigation, pendingActionResult) {
   let actionResult = pendingActionResult ? isErrorResult(pendingActionResult[1]) ? pendingActionResult[1].error : pendingActionResult[1].data : void 0;
   let currentUrl = history.createURL(state.location);
   let nextUrl = history.createURL(location);
@@ -3655,8 +3657,13 @@ function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest,
     if (initialHydration || !matches.some((m) => m.route.id === f.routeId) || fetchersQueuedForDeletion.has(key)) {
       return;
     }
+    let fetcher = state.fetchers.get(key);
+    let isMidInitialLoad = fetcher && fetcher.state !== "idle" && fetcher.data === void 0;
     let fetcherMatches = matchRoutes(routesToUse, f.path, basename);
     if (!fetcherMatches) {
+      if (hasPatchRoutesOnNavigation && isMidInitialLoad) {
+        return;
+      }
       revalidatingFetchers.push({
         key,
         routeId: f.routeId,
@@ -3671,7 +3678,6 @@ function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest,
     if (fetchRedirectIds.has(key)) {
       return;
     }
-    let fetcher = state.fetchers.get(key);
     let fetcherMatch = getTargetMatch(fetcherMatches, f.path);
     let fetchController = new AbortController();
     let fetchRequest = createClientSideRequest(
@@ -3691,7 +3697,7 @@ function getMatchesToLoad(request, scopedContext, mapRouteProperties2, manifest,
         lazyRoutePropertiesToSkip,
         scopedContext
       );
-    } else if (fetcher && fetcher.state !== "idle" && fetcher.data === void 0) {
+    } else if (isMidInitialLoad) {
       if (isRevalidationRequired) {
         fetcherDsMatches = getTargetedDataStrategyMatches(
           mapRouteProperties2,
@@ -5098,7 +5104,7 @@ function useRoutesImpl(routes, locationArg, dataRouterState, future) {
     // router loaded. We can help them understand how to avoid that.
     `useRoutes() may be used only in the context of a <Router> component.`
   );
-  let { navigator, static: isStatic } = React2.useContext(NavigationContext);
+  let { navigator } = React2.useContext(NavigationContext);
   let { matches: parentMatches } = React2.useContext(RouteContext);
   let routeMatch = parentMatches[parentMatches.length - 1];
   let parentParams = routeMatch ? routeMatch.params : {};
@@ -5134,7 +5140,7 @@ Please change the parent <Route path="${parentPath}"> to <Route path="${parentPa
     let segments = pathname.replace(/^\//, "").split("/");
     remainingPathname = "/" + segments.slice(parentSegments.length).join("/");
   }
-  let matches = !isStatic && dataRouterState && dataRouterState.matches && dataRouterState.matches.length > 0 ? dataRouterState.matches : matchRoutes(routes, { pathname: remainingPathname });
+  let matches = matchRoutes(routes, { pathname: remainingPathname });
   if (ENABLE_DEV_WARNINGS) {
     warning(
       parentRoute || matches != null,
@@ -8829,7 +8835,7 @@ function mergeRefs(...refs) {
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 try {
   if (isBrowser) {
-    window.__reactRouterVersion = "7.6.0";
+    window.__reactRouterVersion = "7.6.1-pre.0";
   }
 } catch (e) {
 }
@@ -11509,6 +11515,9 @@ function createMemorySessionStorage({ cookie } = {}) {
 function href(path, ...args) {
   let params = args[0];
   return path.split("/").map((segment) => {
+    if (segment === "*") {
+      return params ? params["*"] : void 0;
+    }
     const match = segment.match(/^:([\w-]+)(\?)?/);
     if (!match) return segment;
     const param = match[1];