@remix-run/router 1.1.0 → 1.2.0

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.1.0
+ * @remix-run/router v1.2.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1417,8 +1417,10 @@
     // we don't get the saved positions from <ScrollRestoration /> until _after_
     // the initial render, we need to manually trigger a separate updateState to
     // send along the restoreScrollPosition
+    // Set to true if we have `hydrationData` since we assume we were SSR'd and that
+    // SSR did the initial scroll restoration.
 
-    let initialScrollRestored = false;
+    let initialScrollRestored = init.hydrationData != null;
     let initialMatches = matchRoutes(dataRoutes, init.history.location, init.basename);
     let initialErrors = null;
 
@@ -1446,7 +1448,8 @@
       matches: initialMatches,
       initialized,
       navigation: IDLE_NAVIGATION,
-      restoreScrollPosition: null,
+      // Don't restore on initial updateState() if we were SSR'd
+      restoreScrollPosition: init.hydrationData != null ? false : null,
       preventScrollReset: false,
       revalidation: "idle",
       loaderData: init.hydrationData && init.hydrationData.loaderData || {},
@@ -1555,14 +1558,30 @@
       //   location, indicating we redirected from the action (avoids false
       //   positives for loading/submissionRedirect when actionData returned
       //   on a prior submission)
-      let isActionReload = state.actionData != null && state.navigation.formMethod != null && state.navigation.state === "loading" && ((_state$navigation$for = state.navigation.formAction) == null ? void 0 : _state$navigation$for.split("?")[0]) === location.pathname; // Always preserve any existing loaderData from re-used routes
-
-      let newLoaderData = newState.loaderData ? {
-        loaderData: mergeLoaderData(state.loaderData, newState.loaderData, newState.matches || [])
-      } : {};
-      updateState(_extends({}, isActionReload ? {} : {
-        actionData: null
-      }, newState, newLoaderData, {
+      let isActionReload = state.actionData != null && state.navigation.formMethod != null && state.navigation.state === "loading" && ((_state$navigation$for = state.navigation.formAction) == null ? void 0 : _state$navigation$for.split("?")[0]) === location.pathname;
+      let actionData;
+
+      if (newState.actionData) {
+        if (Object.keys(newState.actionData).length > 0) {
+          actionData = newState.actionData;
+        } else {
+          // Empty actionData -> clear prior actionData due to an action error
+          actionData = null;
+        }
+      } else if (isActionReload) {
+        // Keep the current data if we're wrapping up the action reload
+        actionData = state.actionData;
+      } else {
+        // Clear actionData on any other completed navigations
+        actionData = null;
+      } // Always preserve any existing loaderData from re-used routes
+
+
+      let loaderData = newState.loaderData ? mergeLoaderData(state.loaderData, newState.loaderData, newState.matches || [], newState.errors) : state.loaderData;
+      updateState(_extends({}, newState, {
+        // matches, errors, fetchers go through as-is
+        actionData,
+        loaderData,
         historyAction: pendingAction,
         location,
         initialized: true,
@@ -1608,7 +1627,19 @@
       // without having to touch history
 
       location = _extends({}, location, init.history.encodeLocation(location));
-      let historyAction = (opts && opts.replace) === true || submission != null && isMutationMethod(submission.formMethod) ? exports.Action.Replace : exports.Action.Push;
+      let userReplace = opts && opts.replace != null ? opts.replace : undefined;
+      let historyAction = exports.Action.Push;
+
+      if (userReplace === true) {
+        historyAction = exports.Action.Replace;
+      } else if (userReplace === false) ; else if (submission != null && isMutationMethod(submission.formMethod) && submission.formAction === state.location.pathname + state.location.search) {
+        // By default on submissions to the current location we REPLACE so that
+        // users don't have to double-click the back button to get to the prior
+        // location.  If the user redirects to a different location from the
+        // action/loader this will be ignored and the redirect will be a PUSH
+        historyAction = exports.Action.Replace;
+      }
+
       let preventScrollReset = opts && "preventScrollReset" in opts ? opts.preventScrollReset === true : undefined;
       return await startNavigation(historyAction, location, {
         submission,
@@ -1752,11 +1783,14 @@
 
 
       pendingNavigationController = null;
-      completeNavigation(location, {
-        matches,
+      completeNavigation(location, _extends({
+        matches
+      }, pendingActionData ? {
+        actionData: pendingActionData
+      } : {}, {
         loaderData,
         errors
-      });
+      }));
     } // Call the action matched by the leaf route for this navigation and handle
     // redirects/errors
 
@@ -1796,7 +1830,18 @@
       }
 
       if (isRedirectResult(result)) {
-        await startRedirectNavigation(state, result, opts && opts.replace === true);
+        let replace;
+
+        if (opts && opts.replace != null) {
+          replace = opts.replace;
+        } else {
+          // If the user didn't explicity indicate replace behavior, replace if
+          // we redirected to the exact same location we're currently at to avoid
+          // double back-buttons
+          replace = result.location === state.location.pathname + state.location.search;
+        }
+
+        await startRedirectNavigation(state, result, replace);
         return {
           shortCircuited: true
         };
@@ -1815,6 +1860,8 @@
         }
 
         return {
+          // Send back an empty object we can use to clear out any prior actionData
+          pendingActionData: {},
           pendingActionError: {
             [boundaryMatch.route.id]: result.error
           }
@@ -1858,13 +1905,14 @@
       cancelActiveDeferreds(routeId => !(matches && matches.some(m => m.route.id === routeId)) || matchesToLoad && matchesToLoad.some(m => m.route.id === routeId)); // Short circuit if we have no loaders to run
 
       if (matchesToLoad.length === 0 && revalidatingFetchers.length === 0) {
-        completeNavigation(location, {
+        completeNavigation(location, _extends({
           matches,
-          loaderData: mergeLoaderData(state.loaderData, {}, matches),
+          loaderData: {},
           // Commit pending error if we're short circuiting
-          errors: pendingError || null,
-          actionData: pendingActionData || null
-        });
+          errors: pendingError || null
+        }, pendingActionData ? {
+          actionData: pendingActionData
+        } : {}));
         return {
           shortCircuited: true
         };
@@ -1884,14 +1932,19 @@
             formMethod: undefined,
             formAction: undefined,
             formEncType: undefined,
-            formData: undefined
+            formData: undefined,
+            " _hasFetcherDoneAnything ": true
           };
           state.fetchers.set(key, revalidatingFetcher);
         });
+        let actionData = pendingActionData || state.actionData;
         updateState(_extends({
-          navigation: loadingNavigation,
-          actionData: pendingActionData || state.actionData || null
-        }, revalidatingFetchers.length > 0 ? {
+          navigation: loadingNavigation
+        }, actionData ? Object.keys(actionData).length === 0 ? {
+          actionData: null
+        } : {
+          actionData
+        } : {}, revalidatingFetchers.length > 0 ? {
           fetchers: new Map(state.fetchers)
         } : {}));
       }
@@ -2015,7 +2068,8 @@
       let fetcher = _extends({
         state: "submitting"
       }, submission, {
-        data: existingFetcher && existingFetcher.data
+        data: existingFetcher && existingFetcher.data,
+        " _hasFetcherDoneAnything ": true
       });
 
       state.fetchers.set(key, fetcher);
@@ -2045,14 +2099,15 @@
         let loadingFetcher = _extends({
           state: "loading"
         }, submission, {
-          data: undefined
+          data: undefined,
+          " _hasFetcherDoneAnything ": true
         });
 
         state.fetchers.set(key, loadingFetcher);
         updateState({
           fetchers: new Map(state.fetchers)
         });
-        return startRedirectNavigation(state, actionResult);
+        return startRedirectNavigation(state, actionResult, false, true);
       } // Process any non-redirect errors thrown
 
 
@@ -2077,7 +2132,9 @@
       let loadFetcher = _extends({
         state: "loading",
         data: actionResult.data
-      }, submission);
+      }, submission, {
+        " _hasFetcherDoneAnything ": true
+      });
 
       state.fetchers.set(key, loadFetcher);
       let [matchesToLoad, revalidatingFetchers] = getMatchesToLoad(state, matches, submission, nextLocation, isRevalidationRequired, cancelledDeferredRoutes, cancelledFetcherLoads, {
@@ -2099,7 +2156,8 @@
           formMethod: undefined,
           formAction: undefined,
           formEncType: undefined,
-          formData: undefined
+          formData: undefined,
+          " _hasFetcherDoneAnything ": true
         };
         state.fetchers.set(staleKey, revalidatingFetcher);
         fetchControllers.set(staleKey, abortController);
@@ -2140,7 +2198,8 @@
         formMethod: undefined,
         formAction: undefined,
         formEncType: undefined,
-        formData: undefined
+        formData: undefined,
+        " _hasFetcherDoneAnything ": true
       };
       state.fetchers.set(key, doneFetcher);
       let didAbortFetchLoads = abortStaleFetchLoads(loadId); // If we are currently in a navigation loading state and this fetcher is
@@ -2162,7 +2221,7 @@
         // manually merge here since we aren't going through completeNavigation
         updateState(_extends({
           errors,
-          loaderData: mergeLoaderData(state.loaderData, loaderData, matches)
+          loaderData: mergeLoaderData(state.loaderData, loaderData, matches, errors)
         }, didAbortFetchLoads ? {
           fetchers: new Map(state.fetchers)
         } : {}));
@@ -2181,7 +2240,8 @@
         formEncType: undefined,
         formData: undefined
       }, submission, {
-        data: existingFetcher && existingFetcher.data
+        data: existingFetcher && existingFetcher.data,
+        " _hasFetcherDoneAnything ": true
       });
 
       state.fetchers.set(key, loadingFetcher);
@@ -2241,7 +2301,8 @@
         formMethod: undefined,
         formAction: undefined,
         formEncType: undefined,
-        formData: undefined
+        formData: undefined,
+        " _hasFetcherDoneAnything ": true
       };
       state.fetchers.set(key, doneFetcher);
       updateState({
@@ -2269,14 +2330,19 @@
      */
 
 
-    async function startRedirectNavigation(state, redirect, replace) {
+    async function startRedirectNavigation(state, redirect, replace, isFetchActionRedirect) {
       var _window;
 
       if (redirect.revalidate) {
         isRevalidationRequired = true;
       }
 
-      let redirectLocation = createLocation(state.location, redirect.location);
+      let redirectLocation = createLocation(state.location, redirect.location, // TODO: This can be removed once we get rid of useTransition in Remix v2
+      _extends({
+        _isRedirect: true
+      }, isFetchActionRedirect ? {
+        _isFetchActionRedirect: true
+      } : {}));
       invariant(redirectLocation, "Expected a location on the redirect navigation"); // Check if this an external redirect that goes to a new origin
 
       if (typeof ((_window = window) == null ? void 0 : _window.location) !== "undefined") {
@@ -2402,7 +2468,8 @@
           formMethod: undefined,
           formAction: undefined,
           formEncType: undefined,
-          formData: undefined
+          formData: undefined,
+          " _hasFetcherDoneAnything ": true
         };
         state.fetchers.set(key, doneFetcher);
       }
@@ -2545,8 +2612,8 @@
   //#region createStaticHandler
   ////////////////////////////////////////////////////////////////////////////////
 
-  function unstable_createStaticHandler(routes, opts) {
-    invariant(routes.length > 0, "You must provide a non-empty routes array to unstable_createStaticHandler");
+  function createStaticHandler(routes, opts) {
+    invariant(routes.length > 0, "You must provide a non-empty routes array to createStaticHandler");
     let dataRoutes = convertRoutesToDataRoutes(routes);
     let basename = (opts ? opts.basename : null) || "/";
     /**
@@ -2868,7 +2935,10 @@
       if (matchesToLoad.length === 0) {
         return {
           matches,
-          loaderData: {},
+          // Add a null for all matched routes for proper revalidation on the client
+          loaderData: matches.reduce((acc, m) => Object.assign(acc, {
+            [m.route.id]: null
+          }), {}),
           errors: pendingActionError || null,
           statusCode: 200,
           loaderHeaders: {}
@@ -2880,17 +2950,25 @@
       if (request.signal.aborted) {
         let method = isRouteRequest ? "queryRoute" : "query";
         throw new Error(method + "() call aborted");
-      } // Can't do anything with these without the Remix side of things, so just
-      // cancel them for now
+      }
 
+      let executedLoaders = new Set();
+      results.forEach((result, i) => {
+        executedLoaders.add(matchesToLoad[i].route.id); // Can't do anything with these without the Remix side of things, so just
+        // cancel them for now
 
-      results.forEach(result => {
         if (isDeferredResult(result)) {
           result.deferredData.cancel();
         }
       }); // Process and commit output from loaders
 
-      let context = processRouteLoaderData(matches, matchesToLoad, results, pendingActionError);
+      let context = processRouteLoaderData(matches, matchesToLoad, results, pendingActionError); // Add a null for any non-loader matches for proper revalidation on the client
+
+      matches.forEach(match => {
+        if (!executedLoaders.has(match.route.id)) {
+          context.loaderData[match.route.id] = null;
+        }
+      });
       return _extends({}, context, {
         matches
       });
@@ -3012,7 +3090,7 @@
   }
 
   function getMatchesToLoad(state, matches, submission, location, isRevalidationRequired, cancelledDeferredRoutes, cancelledFetcherLoads, pendingActionData, pendingError, fetchLoadMatches) {
-    let actionResult = pendingError ? Object.values(pendingError)[0] : pendingActionData ? Object.values(pendingActionData)[0] : null; // Pick navigation matches that are net-new or qualify for revalidation
+    let actionResult = pendingError ? Object.values(pendingError)[0] : pendingActionData ? Object.values(pendingActionData)[0] : undefined; // Pick navigation matches that are net-new or qualify for revalidation
 
     let boundaryId = pendingError ? Object.keys(pendingError)[0] : undefined;
     let boundaryMatches = getLoaderMatchesUntilBoundary(matches, boundaryId);
@@ -3182,9 +3260,10 @@
       }
 
       let data;
-      let contentType = result.headers.get("Content-Type");
+      let contentType = result.headers.get("Content-Type"); // Check between word boundaries instead of startsWith() due to the last
+      // paragraph of https://httpwg.org/specs/rfc9110.html#field.content-type
 
-      if (contentType && contentType.startsWith("application/json")) {
+      if (contentType && /\bapplication\/json\b/.test(contentType)) {
         data = await result.json();
       } else {
         data = await result.text();
@@ -3289,9 +3368,11 @@
 
         if (errors[boundaryMatch.route.id] == null) {
           errors[boundaryMatch.route.id] = error;
-        } // Once we find our first (highest) error, we set the status code and
-        // prevent deeper status codes from overriding
+        } // Clear our any prior loaderData for the throwing route
+
 
+        loaderData[id] = undefined; // Once we find our first (highest) error, we set the status code and
+        // prevent deeper status codes from overriding
 
         if (!foundError) {
           foundError = true;
@@ -3317,10 +3398,12 @@
         }
       }
     }); // If we didn't consume the pending action error (i.e., all loaders
-    // resolved), then consume it here
+    // resolved), then consume it here.  Also clear out any loaderData for the
+    // throwing route
 
     if (pendingError) {
       errors = pendingError;
+      loaderData[Object.keys(pendingError)[0]] = undefined;
     }
 
     return {
@@ -3367,7 +3450,8 @@
           formMethod: undefined,
           formAction: undefined,
           formEncType: undefined,
-          formData: undefined
+          formData: undefined,
+          " _hasFetcherDoneAnything ": true
         };
         state.fetchers.set(key, doneFetcher);
       }
@@ -3379,16 +3463,26 @@
     };
   }
 
-  function mergeLoaderData(loaderData, newLoaderData, matches) {
+  function mergeLoaderData(loaderData, newLoaderData, matches, errors) {
     let mergedLoaderData = _extends({}, newLoaderData);
 
-    matches.forEach(match => {
+    for (let match of matches) {
       let id = match.route.id;
 
-      if (newLoaderData[id] === undefined && loaderData[id] !== undefined) {
+      if (newLoaderData.hasOwnProperty(id)) {
+        if (newLoaderData[id] !== undefined) {
+          mergedLoaderData[id] = newLoaderData[id];
+        }
+      } else if (loaderData[id] !== undefined) {
         mergedLoaderData[id] = loaderData[id];
       }
-    });
+
+      if (errors && errors.hasOwnProperty(id)) {
+        // Don't keep any loader data below the boundary
+        break;
+      }
+    }
+
     return mergedLoaderData;
   } // Find the nearest error boundary, looking upwards from the leaf route (or the
   // route specified by routeId) for the closest ancestor error boundary,
@@ -3610,6 +3704,7 @@
   exports.createMemoryHistory = createMemoryHistory;
   exports.createPath = createPath;
   exports.createRouter = createRouter;
+  exports.createStaticHandler = createStaticHandler;
   exports.defer = defer;
   exports.generatePath = generatePath;
   exports.getStaticContextFromError = getStaticContextFromError;
@@ -3626,7 +3721,6 @@
   exports.resolvePath = resolvePath;
   exports.resolveTo = resolveTo;
   exports.stripBasename = stripBasename;
-  exports.unstable_createStaticHandler = unstable_createStaticHandler;
   exports.warning = warning;
 
   Object.defineProperty(exports, '__esModule', { value: true });