@remix-run/router 0.0.0-experimental-cbcd94b7 → 0.0.0-experimental-de419c3d

package/dist/router.cjs.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v0.0.0-experimental-cbcd94b7
+ * @remix-run/router v0.0.0-experimental-de419c3d
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1699,7 +1699,7 @@ function createRouter(init) {
     v7_partialHydration: false,
     v7_prependBasename: false,
     v7_relativeSplatPath: false,
-    v7_skipActionErrorRevalidation: true
+    unstable_skipActionErrorRevalidation: true
   }, init.future);
   // Cleanup function for history
   let unlistenHistory = null;
@@ -2421,7 +2421,7 @@ function createRouter(init) {
     // we have it on the loading navigation so use that if available
     let activeSubmission = submission || fetcherSubmission || getSubmissionFromNavigation(loadingNavigation);
     let routesToUse = inFlightDataRoutes || dataRoutes;
-    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);
+    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);
 
     // 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
@@ -2702,7 +2702,7 @@ function createRouter(init) {
     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.v7_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.unstable_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
@@ -3708,9 +3708,8 @@ function createStaticHandler(routes, opts) {
         throw normalizeRelativeRoutingRedirectResponse(result.result, request, matchesToLoad[i].route.id, matches, basename, future.v7_relativeSplatPath);
       }
       if (isResponse(result.result) && isRouteRequest) {
-        // For SSR single-route requests, we want to hand Responses back directly
-        // without unwrapping.  We do this with the QueryRouteResponse wrapper
-        // interface so we can know whether it was returned or thrown
+        // For SSR single-route requests, we want to hand Responses back
+        // directly without unwrapping
         throw result;
       }
       return convertHandlerResultToDataResult(result);
@@ -4108,7 +4107,7 @@ function shouldRevalidateLoader(loaderMatch, arg) {
  */
 async function loadLazyRouteModule(route, mapRouteProperties, manifest) {
   if (!route.lazy) {
-    return route;
+    return;
   }
   let lazyRoute = await route.lazy();
 
@@ -4116,7 +4115,7 @@ async function loadLazyRouteModule(route, mapRouteProperties, manifest) {
   // call then we can return - first lazy() to finish wins because the return
   // value of lazy is expected to be static
   if (!route.lazy) {
-    return route;
+    return;
   }
   let routeToUpdate = manifest[route.id];
   invariant(routeToUpdate, "No route found in manifest");
@@ -4152,7 +4151,6 @@ async function loadLazyRouteModule(route, mapRouteProperties, manifest) {
   Object.assign(routeToUpdate, _extends({}, mapRouteProperties(routeToUpdate), {
     lazy: undefined
   }));
-  return routeToUpdate;
 }
 
 // Default implementation of `dataStrategy` which fetches all loaders in parallel
@@ -4234,7 +4232,7 @@ async function callLoaderOrAction(type, request, match, manifest, mapRouteProper
       if (handler) {
         // Run statically defined handler in parallel with lazy()
         let handlerError;
-        let values = await Promise.all([
+        let [value] = await Promise.all([
         // If the handler throws, don't let it immediately bubble out,
         // since we need to let the lazy() execution finish so we know if this
         // route has a boundary that can handle the error
@@ -4244,7 +4242,7 @@ async function callLoaderOrAction(type, request, match, manifest, mapRouteProper
         if (handlerError !== undefined) {
           throw handlerError;
         }
-        result = values[0];
+        result = value;
       } else {
         // Load lazy route module, then run any returned handler
         await loadLazyRouteModule(match.route, mapRouteProperties, manifest);