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

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.16.0-pre.0
+ * @remix-run/router v1.16.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -3351,23 +3351,17 @@
      * propagate that out and return the raw Response so the HTTP server can
      * return it directly.
      *
-     * - `opts.loadRouteIds` is an optional array of routeIds to run only a subset of
-     *   loaders during a query() call
      * - `opts.requestContext` is an optional server context that will be passed
      *   to actions/loaders in the `context` parameter
      * - `opts.skipLoaderErrorBubbling` is an optional parameter that will prevent
      *   the bubbling of errors which allows single-fetch-type implementations
      *   where the client will handle the bubbling and we may need to return data
      *   for the handling route
-     * - `opts.skipLoaders` is an optional parameter that will prevent loaders
-     *   from running after an action
      */
     async function query(request, _temp3) {
       let {
-        loadRouteIds,
         requestContext,
         skipLoaderErrorBubbling,
-        skipLoaders,
         unstable_dataStrategy
       } = _temp3 === void 0 ? {} : _temp3;
       let url = new URL(request.url);
@@ -3421,7 +3415,7 @@
           activeDeferreds: null
         };
       }
-      let result = await queryImpl(request, location, matches, requestContext, unstable_dataStrategy || null, loadRouteIds || null, skipLoaderErrorBubbling === true, skipLoaders === true, null);
+      let result = await queryImpl(request, location, matches, requestContext, unstable_dataStrategy || null, skipLoaderErrorBubbling === true, null);
       if (isResponse(result)) {
         return result;
       }
@@ -3493,7 +3487,7 @@
           pathname: location.pathname
         });
       }
-      let result = await queryImpl(request, location, matches, requestContext, null, null, false, false, match);
+      let result = await queryImpl(request, location, matches, requestContext, null, false, match);
       if (isResponse(result)) {
         return result;
       }
@@ -3520,14 +3514,14 @@
       }
       return undefined;
     }
-    async function queryImpl(request, location, matches, requestContext, unstable_dataStrategy, loadRouteIds, skipLoaderErrorBubbling, skipLoaders, routeMatch) {
+    async function queryImpl(request, location, matches, requestContext, unstable_dataStrategy, skipLoaderErrorBubbling, routeMatch) {
       invariant(request.signal, "query()/queryRoute() requests must contain an AbortController signal");
       try {
         if (isMutationMethod(request.method.toLowerCase())) {
-          let result = await submit(request, matches, routeMatch || getTargetMatch(matches, location), requestContext, unstable_dataStrategy, loadRouteIds, skipLoaderErrorBubbling, skipLoaders, routeMatch != null);
+          let result = await submit(request, matches, routeMatch || getTargetMatch(matches, location), requestContext, unstable_dataStrategy, skipLoaderErrorBubbling, routeMatch != null);
           return result;
         }
-        let result = await loadRouteData(request, matches, requestContext, unstable_dataStrategy, loadRouteIds, skipLoaderErrorBubbling, routeMatch);
+        let result = await loadRouteData(request, matches, requestContext, unstable_dataStrategy, skipLoaderErrorBubbling, routeMatch);
         return isResponse(result) ? result : _extends({}, result, {
           actionData: null,
           actionHeaders: {}
@@ -3550,7 +3544,7 @@
         throw e;
       }
     }
-    async function submit(request, matches, actionMatch, requestContext, unstable_dataStrategy, loadRouteIds, skipLoaderErrorBubbling, skipLoaders, isRouteRequest) {
+    async function submit(request, matches, actionMatch, requestContext, unstable_dataStrategy, skipLoaderErrorBubbling, isRouteRequest) {
       let result;
       if (!actionMatch.route.action && !actionMatch.route.lazy) {
         let error = getInternalRouterError(405, {
@@ -3628,51 +3622,18 @@
         // Store off the pending error - we use it to determine which loaders
         // to call and will commit it when we complete the navigation
         let boundaryMatch = skipLoaderErrorBubbling ? actionMatch : findNearestBoundary(matches, actionMatch.route.id);
-        let statusCode = isRouteErrorResponse(result.error) ? result.error.status : result.statusCode != null ? result.statusCode : 500;
-        let actionHeaders = _extends({}, result.headers ? {
-          [actionMatch.route.id]: result.headers
-        } : {});
-        if (skipLoaders) {
-          return {
-            matches,
-            loaderData: {},
-            actionData: {},
-            errors: {
-              [boundaryMatch.route.id]: result.error
-            },
-            statusCode,
-            loaderHeaders: {},
-            actionHeaders,
-            activeDeferreds: null
-          };
-        }
-        let context = await loadRouteData(loaderRequest, matches, requestContext, unstable_dataStrategy, loadRouteIds, skipLoaderErrorBubbling, null, [boundaryMatch.route.id, result]);
+        let context = await loadRouteData(loaderRequest, matches, requestContext, unstable_dataStrategy, skipLoaderErrorBubbling, null, [boundaryMatch.route.id, result]);
 
         // action status codes take precedence over loader status codes
         return _extends({}, context, {
-          statusCode,
+          statusCode: isRouteErrorResponse(result.error) ? result.error.status : result.statusCode != null ? result.statusCode : 500,
           actionData: null,
-          actionHeaders
+          actionHeaders: _extends({}, result.headers ? {
+            [actionMatch.route.id]: result.headers
+          } : {})
         });
       }
-      let actionHeaders = result.headers ? {
-        [actionMatch.route.id]: result.headers
-      } : {};
-      if (skipLoaders) {
-        return {
-          matches,
-          loaderData: {},
-          actionData: {
-            [actionMatch.route.id]: result.data
-          },
-          errors: null,
-          statusCode: result.statusCode || 200,
-          loaderHeaders: {},
-          actionHeaders,
-          activeDeferreds: null
-        };
-      }
-      let context = await loadRouteData(loaderRequest, matches, requestContext, unstable_dataStrategy, loadRouteIds, skipLoaderErrorBubbling, null);
+      let context = await loadRouteData(loaderRequest, matches, requestContext, unstable_dataStrategy, skipLoaderErrorBubbling, null);
       return _extends({}, context, {
         actionData: {
           [actionMatch.route.id]: result.data
@@ -3685,7 +3646,7 @@
         } : {}
       });
     }
-    async function loadRouteData(request, matches, requestContext, unstable_dataStrategy, loadRouteIds, skipLoaderErrorBubbling, routeMatch, pendingActionResult) {
+    async function loadRouteData(request, matches, requestContext, unstable_dataStrategy, skipLoaderErrorBubbling, routeMatch, pendingActionResult) {
       let isRouteRequest = routeMatch != null;
 
       // Short circuit if we have no loaders to run (queryRoute())
@@ -3698,9 +3659,6 @@
       }
       let requestMatches = routeMatch ? [routeMatch] : pendingActionResult && isErrorResult(pendingActionResult[1]) ? getLoaderMatchesUntilBoundary(matches, pendingActionResult[0]) : matches;
       let matchesToLoad = requestMatches.filter(m => m.route.loader || m.route.lazy);
-      if (loadRouteIds) {
-        matchesToLoad = matchesToLoad.filter(m => loadRouteIds.includes(m.route.id));
-      }
 
       // Short circuit if we have no loaders to run (query())
       if (matchesToLoad.length === 0) {