@remix-run/router 0.0.0-experimental-178bc9ee → 0.0.0-experimental-4841e12b

package/dist/router.cjs.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v0.0.0-experimental-178bc9ee
+ * @remix-run/router v0.0.0-experimental-4841e12b
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1901,7 +1901,7 @@ function createRouter(init) {
     // in the normal navigation flow.  For SSR it's expected that lazy modules are
     // resolved prior to router creation since we can't go into a fallbackElement
     // UI for SSR'd apps
-    if (!state.initialized || future.v7_partialHydration && state.matches.some(m => m.route.loader && state.loaderData[m.route.id] === undefined)) {
+    if (!state.initialized || future.v7_partialHydration && state.matches.some(m => isUnhydratedRoute(state, m.route))) {
       startNavigation(Action.Pop, state.location, {
         initialHydration: true
       });
@@ -3837,8 +3837,8 @@ function getMatchesToLoad(history, state, matches, submission, location, isIniti
   let navigationMatches = boundaryMatches.filter((match, index) => {
     if (isInitialLoad) {
       // On initial hydration we don't do any shouldRevalidate stuff - we just
-      // call the loaders that don't have hydration data
-      return match.route.loader && state.loaderData[match.route.id] === undefined;
+      // call the unhydrated loaders
+      return isUnhydratedRoute(state, match.route);
     }
     if (match.route.lazy) {
       // We haven't loaded this route yet so we don't know if it's got a loader!
@@ -3948,6 +3948,14 @@ function getMatchesToLoad(history, state, matches, submission, location, isIniti
   });
   return [navigationMatches, revalidatingFetchers];
 }
+
+// Is this route unhydrated (when v7_partialHydration=true) such that we need
+// to call it's loader on the initial router creation
+function isUnhydratedRoute(state, route) {
+  return route.loader != null && state.loaderData[route.id] === undefined && (!state.errors ||
+  // Loader ran but errored - don't re-run
+  state.errors[route.id] === undefined);
+}
 function isNewLoader(currentLoaderData, currentMatch, match) {
   let isNew =
   // [a] -> [a, b]