@remix-run/router 1.14.2 → 1.15.0

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.14.2
+ * @remix-run/router v1.15.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -3277,7 +3277,8 @@
     }
     // Config driven behavior flags
     let future = _extends({
-      v7_relativeSplatPath: false
+      v7_relativeSplatPath: false,
+      v7_throwAbortReason: false
     }, opts ? opts.future : null);
     let dataRoutes = convertRoutesToDataRoutes(routes, mapRouteProperties, undefined, manifest);
 
@@ -3500,8 +3501,7 @@
           requestContext
         });
         if (request.signal.aborted) {
-          let method = isRouteRequest ? "queryRoute" : "query";
-          throw new Error(method + "() call aborted: " + request.method + " " + request.url);
+          throwStaticHandlerAbortedError(request, isRouteRequest, future);
         }
       }
       if (isRedirectResult(result)) {
@@ -3619,8 +3619,7 @@
         requestContext
       }))]);
       if (request.signal.aborted) {
-        let method = isRouteRequest ? "queryRoute" : "query";
-        throw new Error(method + "() call aborted: " + request.method + " " + request.url);
+        throwStaticHandlerAbortedError(request, isRouteRequest, future);
       }
 
       // Process and commit output from loaders
@@ -3658,13 +3657,20 @@
    */
   function getStaticContextFromError(routes, context, error) {
     let newContext = _extends({}, context, {
-      statusCode: 500,
+      statusCode: isRouteErrorResponse(error) ? error.status : 500,
       errors: {
         [context._deepestRenderedBoundaryId || routes[0].id]: error
       }
     });
     return newContext;
   }
+  function throwStaticHandlerAbortedError(request, isRouteRequest, future) {
+    if (future.v7_throwAbortReason && request.signal.reason !== undefined) {
+      throw request.signal.reason;
+    }
+    let method = isRouteRequest ? "queryRoute" : "query";
+    throw new Error(method + "() call aborted: " + request.method + " " + request.url);
+  }
   function isSubmissionNavigation(opts) {
     return opts != null && ("formData" in opts && opts.formData != null || "body" in opts && opts.body !== undefined);
   }