@remix-run/router 1.17.1 → 1.18.0

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.17.1
+ * @remix-run/router v1.18.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1695,7 +1695,7 @@
       v7_partialHydration: false,
       v7_prependBasename: false,
       v7_relativeSplatPath: false,
-      unstable_skipActionErrorRevalidation: false
+      v7_skipActionErrorRevalidation: false
     }, init.future);
     // Cleanup function for history
     let unlistenHistory = null;
@@ -1732,10 +1732,13 @@
       };
     }
 
-    // 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) {
+    // In SPA apps, 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.
+    // In SSR apps (with `hydrationData`), we expect that the server will send
+    // up the proper matched routes so we don't want to run lazy discovery on
+    // initial hydration and want to hydrate into the splat route.
+    if (initialMatches && patchRoutesOnMissImpl && !init.hydrationData) {
       let fogOfWar = checkFogOfWar(initialMatches, dataRoutes, init.history.location.pathname);
       if (fogOfWar.active) {
         initialMatches = null;
@@ -2407,13 +2410,12 @@
           };
         } else if (discoverResult.type === "error") {
           let {
-            error,
-            notFoundMatches,
-            route
+            boundaryId,
+            error
           } = handleDiscoverRouteError(location.pathname, discoverResult);
           return {
-            matches: notFoundMatches,
-            pendingActionResult: [route.id, {
+            matches: discoverResult.partialMatches,
+            pendingActionResult: [boundaryId, {
               type: ResultType.error,
               error
             }]
@@ -2546,15 +2548,14 @@
           };
         } else if (discoverResult.type === "error") {
           let {
-            error,
-            notFoundMatches,
-            route
+            boundaryId,
+            error
           } = handleDiscoverRouteError(location.pathname, discoverResult);
           return {
-            matches: notFoundMatches,
+            matches: discoverResult.partialMatches,
             loaderData: {},
             errors: {
-              [route.id]: error
+              [boundaryId]: error
             }
           };
         } else if (!discoverResult.matches) {
@@ -2575,7 +2576,7 @@
         }
       }
       let routesToUse = inFlightDataRoutes || dataRoutes;
-      let [matchesToLoad, revalidatingFetchers] = getMatchesToLoad(init.history, state, matches, activeSubmission, location, future.v7_partialHydration && initialHydration === true, future.unstable_skipActionErrorRevalidation, isRevalidationRequired, cancelledDeferredRoutes, cancelledFetcherLoads, deletedFetchers, fetchLoadMatches, fetchRedirectIds, routesToUse, basename, pendingActionResult);
+      let [matchesToLoad, revalidatingFetchers] = getMatchesToLoad(init.history, state, matches, activeSubmission, location, future.v7_partialHydration && initialHydration === true, future.v7_skipActionErrorRevalidation, isRevalidationRequired, cancelledDeferredRoutes, cancelledFetcherLoads, deletedFetchers, fetchLoadMatches, fetchRedirectIds, routesToUse, basename, pendingActionResult);
 
       // Cancel pending deferreds for no-longer-matched routes or routes we're
       // about to reload.  Note that if this is an action reload we would have
@@ -2910,7 +2911,7 @@
       fetchReloadIds.set(key, loadId);
       let loadFetcher = getLoadingFetcher(submission, actionResult.data);
       state.fetchers.set(key, loadFetcher);
-      let [matchesToLoad, revalidatingFetchers] = getMatchesToLoad(init.history, state, matches, submission, nextLocation, false, future.unstable_skipActionErrorRevalidation, isRevalidationRequired, cancelledDeferredRoutes, cancelledFetcherLoads, deletedFetchers, fetchLoadMatches, fetchRedirectIds, routesToUse, basename, [match.route.id, actionResult]);
+      let [matchesToLoad, revalidatingFetchers] = getMatchesToLoad(init.history, state, matches, submission, nextLocation, false, future.v7_skipActionErrorRevalidation, isRevalidationRequired, cancelledDeferredRoutes, cancelledFetcherLoads, deletedFetchers, fetchLoadMatches, fetchRedirectIds, routesToUse, basename, [match.route.id, actionResult]);
 
       // Put all revalidating fetchers into the loading state, except for the
       // current fetcher which we want to keep in it's current loading state which
@@ -3430,18 +3431,13 @@
       };
     }
     function handleDiscoverRouteError(pathname, discoverResult) {
-      let matches = discoverResult.partialMatches;
-      let route = matches[matches.length - 1].route;
-      let error = getInternalRouterError(400, {
-        type: "route-discovery",
-        routeId: route.id,
-        pathname,
-        message: discoverResult.error != null && "message" in discoverResult.error ? discoverResult.error : String(discoverResult.error)
-      });
       return {
-        notFoundMatches: matches,
-        route,
-        error
+        boundaryId: findNearestBoundary(discoverResult.partialMatches).route.id,
+        error: getInternalRouterError(400, {
+          type: "route-discovery",
+          pathname,
+          message: discoverResult.error != null && "message" in discoverResult.error ? discoverResult.error : String(discoverResult.error)
+        })
       };
     }
     function cancelActiveDeferreds(predicate) {
@@ -4363,7 +4359,7 @@
         nextParams: nextRouteMatch.params
       }, submission, {
         actionResult,
-        unstable_actionStatus: actionStatus,
+        actionStatus,
         defaultShouldRevalidate: shouldSkipRevalidation ? false :
         // Forced revalidation due to submission, useRevalidator, or X-Remix-Revalidate
         isRevalidationRequired || currentUrl.pathname + currentUrl.search === nextUrl.pathname + nextUrl.search ||
@@ -4428,7 +4424,7 @@
           nextParams: matches[matches.length - 1].params
         }, submission, {
           actionResult,
-          unstable_actionStatus: actionStatus,
+          actionStatus,
           defaultShouldRevalidate: shouldSkipRevalidation ? false : isRevalidationRequired
         }));
       }
@@ -5074,7 +5070,7 @@
     if (status === 400) {
       statusText = "Bad Request";
       if (type === "route-discovery") {
-        errorMessage = "Unable to match URL \"" + pathname + "\" - the `children()` function for " + ("route `" + routeId + "` threw the following error:\n" + message);
+        errorMessage = "Unable to match URL \"" + pathname + "\" - the `unstable_patchRoutesOnMiss()` " + ("function threw the following error:\n" + message);
       } else if (method && pathname && routeId) {
         errorMessage = "You made a " + method + " request to \"" + pathname + "\" but " + ("did not provide a `loader` for route \"" + routeId + "\", ") + "so there is no way to handle the request.";
       } else if (type === "defer-action") {
@@ -5416,6 +5412,7 @@
   exports.UNSAFE_ErrorResponseImpl = ErrorResponseImpl;
   exports.UNSAFE_convertRouteMatchToUiMatch = convertRouteMatchToUiMatch;
   exports.UNSAFE_convertRoutesToDataRoutes = convertRoutesToDataRoutes;
+  exports.UNSAFE_decodePath = decodePath;
   exports.UNSAFE_getResolveToMatches = getResolveToMatches;
   exports.UNSAFE_invariant = invariant;
   exports.UNSAFE_warning = warning;