@remix-run/router 1.20.0-pre.0 → 1.20.0

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.20.0-pre.0
+ * @remix-run/router v1.20.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2435,15 +2435,12 @@
             shortCircuited: true
           };
         } else if (discoverResult.type === "error") {
-          let {
-            boundaryId,
-            error
-          } = handleDiscoverRouteError(location.pathname, discoverResult);
+          let boundaryId = findNearestBoundary(discoverResult.partialMatches).route.id;
           return {
             matches: discoverResult.partialMatches,
             pendingActionResult: [boundaryId, {
               type: ResultType.error,
-              error
+              error: discoverResult.error
             }]
           };
         } else if (!discoverResult.matches) {
@@ -2573,15 +2570,12 @@
             shortCircuited: true
           };
         } else if (discoverResult.type === "error") {
-          let {
-            boundaryId,
-            error
-          } = handleDiscoverRouteError(location.pathname, discoverResult);
+          let boundaryId = findNearestBoundary(discoverResult.partialMatches).route.id;
           return {
             matches: discoverResult.partialMatches,
             loaderData: {},
             errors: {
-              [boundaryId]: error
+              [boundaryId]: discoverResult.error
             }
           };
         } else if (!discoverResult.matches) {
@@ -2845,10 +2839,7 @@
         if (discoverResult.type === "aborted") {
           return;
         } else if (discoverResult.type === "error") {
-          let {
-            error
-          } = handleDiscoverRouteError(path, discoverResult);
-          setFetcherError(key, routeId, error, {
+          setFetcherError(key, routeId, discoverResult.error, {
             flushSync
           });
           return;
@@ -3034,10 +3025,7 @@
         if (discoverResult.type === "aborted") {
           return;
         } else if (discoverResult.type === "error") {
-          let {
-            error
-          } = handleDiscoverRouteError(path, discoverResult);
-          setFetcherError(key, routeId, error, {
+          setFetcherError(key, routeId, discoverResult.error, {
             flushSync
           });
           return;
@@ -3482,16 +3470,6 @@
         error
       };
     }
-    function handleDiscoverRouteError(pathname, discoverResult) {
-      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(predicate) {
       let cancelledRouteIds = [];
       activeDeferreds.forEach((dfd, routeId) => {
@@ -5192,9 +5170,7 @@
     let errorMessage = "Unknown @remix-run/router error";
     if (status === 400) {
       statusText = "Bad Request";
-      if (type === "route-discovery") {
-        errorMessage = "Unable to match URL \"" + pathname + "\" - the `patchRoutesOnNavigation()` " + ("function threw the following error:\n" + message);
-      } else if (method && pathname && routeId) {
+      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") {
         errorMessage = "defer() is not supported in actions";