@remix-run/router 1.17.0 → 1.17.1

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.17.0
+ * @remix-run/router v1.17.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1218,7 +1218,7 @@
     // match so we include splat values for "." links.  See:
     // https://github.com/remix-run/react-router/issues/11052#issuecomment-1836589329
     if (v7_relativeSplatPath) {
-      return pathMatches.map((match, idx) => idx === matches.length - 1 ? match.pathname : match.pathnameBase);
+      return pathMatches.map((match, idx) => idx === pathMatches.length - 1 ? match.pathname : match.pathnameBase);
     }
     return pathMatches.map(match => match.pathnameBase);
   }
@@ -1731,6 +1731,16 @@
         [route.id]: error
       };
     }
+
+    // If the user provided a patchRoutesOnMiss implementation and our initial
+    // match is a splat route, clear them out so we run through lazy discovery
+    // on hydration in case there's a more accurate lazy route match
+    if (initialMatches && patchRoutesOnMissImpl) {
+      let fogOfWar = checkFogOfWar(initialMatches, dataRoutes, init.history.location.pathname);
+      if (fogOfWar.active) {
+        initialMatches = null;
+      }
+    }
     let initialized;
     if (!initialMatches) {
       // We need to run patchRoutesOnMiss in initialize()
@@ -2060,6 +2070,8 @@
       // Always respect the user flag.  Otherwise don't reset on mutation
       // submission navigations unless they redirect
       let preventScrollReset = pendingPreventScrollReset === true || state.navigation.formMethod != null && isMutationMethod(state.navigation.formMethod) && ((_location$state2 = location.state) == null ? void 0 : _location$state2._isRedirect) !== true;
+
+      // Commit any in-flight routes at the end of the HMR revalidation "navigation"
       if (inFlightDataRoutes) {
         dataRoutes = inFlightDataRoutes;
         inFlightDataRoutes = undefined;
@@ -3505,7 +3517,7 @@
           };
         } else {
           let leafRoute = matches[matches.length - 1].route;
-          if (leafRoute.path === "*") {
+          if (leafRoute.path && (leafRoute.path === "*" || leafRoute.path.endsWith("/*"))) {
             // If we matched a splat, it might only be because we haven't yet fetched
             // the children that would match with a higher score, so let's fetch
             // around and find out
@@ -3526,21 +3538,32 @@
       let partialMatches = matches;
       let route = partialMatches.length > 0 ? partialMatches[partialMatches.length - 1].route : null;
       while (true) {
+        let isNonHMR = inFlightDataRoutes == null;
+        let routesToUse = inFlightDataRoutes || dataRoutes;
         try {
-          await loadLazyRouteChildren(patchRoutesOnMissImpl, pathname, partialMatches, dataRoutes || inFlightDataRoutes, manifest, mapRouteProperties, pendingPatchRoutes, signal);
+          await loadLazyRouteChildren(patchRoutesOnMissImpl, pathname, partialMatches, routesToUse, manifest, mapRouteProperties, pendingPatchRoutes, signal);
         } catch (e) {
           return {
             type: "error",
             error: e,
             partialMatches
           };
+        } finally {
+          // If we are not in the middle of an HMR revalidation and we changed the
+          // routes, provide a new identity so when we `updateState` at the end of
+          // this navigation/fetch `router.routes` will be a new identity and
+          // trigger a re-run of memoized `router.routes` dependencies.
+          // HMR will already update the identity and reflow when it lands
+          // `inFlightDataRoutes` in `completeNavigation`
+          if (isNonHMR) {
+            dataRoutes = [...dataRoutes];
+          }
         }
         if (signal.aborted) {
           return {
             type: "aborted"
           };
         }
-        let routesToUse = inFlightDataRoutes || dataRoutes;
         let newMatches = matchRoutes(routesToUse, pathname, basename);
         let matchedSplat = false;
         if (newMatches) {
@@ -3593,6 +3616,21 @@
       manifest = {};
       inFlightDataRoutes = convertRoutesToDataRoutes(newRoutes, mapRouteProperties, undefined, manifest);
     }
+    function patchRoutes(routeId, children) {
+      let isNonHMR = inFlightDataRoutes == null;
+      let routesToUse = inFlightDataRoutes || dataRoutes;
+      patchRoutesImpl(routeId, children, routesToUse, manifest, mapRouteProperties);
+
+      // If we are not in the middle of an HMR revalidation and we changed the
+      // routes, provide a new identity and trigger a reflow via `updateState`
+      // to re-run memoized `router.routes` dependencies.
+      // HMR will already update the identity and reflow when it lands
+      // `inFlightDataRoutes` in `completeNavigation`
+      if (isNonHMR) {
+        dataRoutes = [...dataRoutes];
+        updateState({});
+      }
+    }
     router = {
       get basename() {
         return basename;
@@ -3624,9 +3662,7 @@
       dispose,
       getBlocker,
       deleteBlocker,
-      patchRoutes(routeId, children) {
-        return patchRoutes(routeId, children, dataRoutes || inFlightDataRoutes, manifest, mapRouteProperties);
-      },
+      patchRoutes,
       _internalFetchControllers: fetchControllers,
       _internalActiveDeferreds: activeDeferreds,
       // TODO: Remove setRoutes, it's temporary to avoid dealing with
@@ -4444,7 +4480,7 @@
   }
 
   /**
-   * Idempotent utility to execute route.children() method to lazily load route
+   * Idempotent utility to execute patchRoutesOnMiss() to lazily load route
    * definitions and update the routes/routeManifest
    */
   async function loadLazyRouteChildren(patchRoutesOnMissImpl, path, matches, routes, manifest, mapRouteProperties, pendingRouteChildren, signal) {
@@ -4457,7 +4493,7 @@
           matches,
           patch: (routeId, children) => {
             if (!signal.aborted) {
-              patchRoutes(routeId, children, routes, manifest, mapRouteProperties);
+              patchRoutesImpl(routeId, children, routes, manifest, mapRouteProperties);
             }
           }
         });
@@ -4470,7 +4506,7 @@
       pendingRouteChildren.delete(key);
     }
   }
-  function patchRoutes(routeId, children, routes, manifest, mapRouteProperties) {
+  function patchRoutesImpl(routeId, children, routesToUse, manifest, mapRouteProperties) {
     if (routeId) {
       var _route$children;
       let route = manifest[routeId];
@@ -4482,8 +4518,8 @@
         route.children = dataChildren;
       }
     } else {
-      let dataChildren = convertRoutesToDataRoutes(children, mapRouteProperties, ["patch", String(routes.length || "0")], manifest);
-      routes.push(...dataChildren);
+      let dataChildren = convertRoutesToDataRoutes(children, mapRouteProperties, ["patch", String(routesToUse.length || "0")], manifest);
+      routesToUse.push(...dataChildren);
     }
   }