@remix-run/router 1.17.1 → 1.18.0

package/dist/utils.d.ts

@@ -167,7 +167,7 @@ export interface ShouldRevalidateFunctionArgs {
     text?: Submission["text"];
     formData?: Submission["formData"];
     json?: Submission["json"];
-    unstable_actionStatus?: number;
+    actionStatus?: number;
     actionResult?: any;
     defaultShouldRevalidate: boolean;
 }
@@ -393,6 +393,7 @@ export interface PathMatch<ParamKey extends string = string> {
  * @see https://reactrouter.com/utils/match-path
  */
 export declare function matchPath<ParamKey extends ParamParseKey<Path>, Path extends string>(pattern: PathPattern<Path> | Path, pathname: string): PathMatch<ParamKey> | null;
+export declare function decodePath(value: string): string;
 /**
  * @private
  */

package/index.ts

@@ -92,6 +92,7 @@ export {
   ErrorResponseImpl as UNSAFE_ErrorResponseImpl,
   convertRoutesToDataRoutes as UNSAFE_convertRoutesToDataRoutes,
   convertRouteMatchToUiMatch as UNSAFE_convertRouteMatchToUiMatch,
+  decodePath as UNSAFE_decodePath,
   getResolveToMatches as UNSAFE_getResolveToMatches,
 } from "./utils";
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@remix-run/router",
-  "version": "1.17.1",
+  "version": "1.18.0",
   "description": "Nested/Data-driven/Framework-agnostic Routing",
   "keywords": [
     "remix",

package/router.ts

@@ -372,7 +372,7 @@ export interface FutureConfig {
   v7_partialHydration: boolean;
   v7_prependBasename: boolean;
   v7_relativeSplatPath: boolean;
-  unstable_skipActionErrorRevalidation: boolean;
+  v7_skipActionErrorRevalidation: boolean;
 }
 
 /**
@@ -806,7 +806,7 @@ export function createRouter(init: RouterInit): Router {
     v7_partialHydration: false,
     v7_prependBasename: false,
     v7_relativeSplatPath: false,
-    unstable_skipActionErrorRevalidation: false,
+    v7_skipActionErrorRevalidation: false,
     ...init.future,
   };
   // Cleanup function for history
@@ -841,10 +841,13 @@ export function createRouter(init: RouterInit): Router {
     initialErrors = { [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) {
+  // 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,
@@ -1680,14 +1683,14 @@ export function createRouter(init: RouterInit): Router {
       if (discoverResult.type === "aborted") {
         return { shortCircuited: true };
       } else if (discoverResult.type === "error") {
-        let { error, notFoundMatches, route } = handleDiscoverRouteError(
+        let { boundaryId, error } = handleDiscoverRouteError(
           location.pathname,
           discoverResult
         );
         return {
-          matches: notFoundMatches,
+          matches: discoverResult.partialMatches,
           pendingActionResult: [
-            route.id,
+            boundaryId,
             {
               type: ResultType.error,
               error,
@@ -1856,15 +1859,15 @@ export function createRouter(init: RouterInit): Router {
       if (discoverResult.type === "aborted") {
         return { shortCircuited: true };
       } else if (discoverResult.type === "error") {
-        let { error, notFoundMatches, route } = handleDiscoverRouteError(
+        let { boundaryId, error } = handleDiscoverRouteError(
           location.pathname,
           discoverResult
         );
         return {
-          matches: notFoundMatches,
+          matches: discoverResult.partialMatches,
           loaderData: {},
           errors: {
-            [route.id]: error,
+            [boundaryId]: error,
           },
         };
       } else if (!discoverResult.matches) {
@@ -1891,7 +1894,7 @@ export function createRouter(init: RouterInit): Router {
       activeSubmission,
       location,
       future.v7_partialHydration && initialHydration === true,
-      future.unstable_skipActionErrorRevalidation,
+      future.v7_skipActionErrorRevalidation,
       isRevalidationRequired,
       cancelledDeferredRoutes,
       cancelledFetcherLoads,
@@ -2350,7 +2353,7 @@ export function createRouter(init: RouterInit): Router {
       submission,
       nextLocation,
       false,
-      future.unstable_skipActionErrorRevalidation,
+      future.v7_skipActionErrorRevalidation,
       isRevalidationRequired,
       cancelledDeferredRoutes,
       cancelledFetcherLoads,
@@ -3064,18 +3067,17 @@ export function createRouter(init: RouterInit): Router {
     pathname: string,
     discoverResult: DiscoverRoutesErrorResult
   ) {
-    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 };
+    return {
+      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(
@@ -4384,7 +4386,7 @@ function getMatchesToLoad(
       nextParams: nextRouteMatch.params,
       ...submission,
       actionResult,
-      unstable_actionStatus: actionStatus,
+      actionStatus,
       defaultShouldRevalidate: shouldSkipRevalidation
         ? false
         : // Forced revalidation due to submission, useRevalidator, or X-Remix-Revalidate
@@ -4463,7 +4465,7 @@ function getMatchesToLoad(
         nextParams: matches[matches.length - 1].params,
         ...submission,
         actionResult,
-        unstable_actionStatus: actionStatus,
+        actionStatus,
         defaultShouldRevalidate: shouldSkipRevalidation
           ? false
           : isRevalidationRequired,
@@ -5364,8 +5366,8 @@ function getInternalRouterError(
     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}`;
+        `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 ` +

package/utils.ts

@@ -210,7 +210,7 @@ export interface ShouldRevalidateFunctionArgs {
   text?: Submission["text"];
   formData?: Submission["formData"];
   json?: Submission["json"];
-  unstable_actionStatus?: number;
+  actionStatus?: number;
   actionResult?: any;
   defaultShouldRevalidate: boolean;
 }
@@ -1075,7 +1075,7 @@ function compilePath(
   return [matcher, params];
 }
 
-function decodePath(value: string) {
+export function decodePath(value: string) {
   try {
     return value
       .split("/")