@remix-run/router 0.0.0-experimental-ce5294fc → 0.0.0-experimental-35fa15e5

package/dist/router.cjs.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v0.0.0-experimental-ce5294fc
+ * @remix-run/router v0.0.0-experimental-35fa15e5
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -2258,7 +2258,7 @@ function createRouter(init) {
 
     // Create a controller/Request for this navigation
     pendingNavigationController = new AbortController();
-    let request = createClientSideRequest(init.history, location, pendingNavigationController.signal, opts && opts.initialHydration === true, opts && opts.submission);
+    let request = createClientSideRequest(init.history, location, pendingNavigationController.signal, opts && opts.submission);
     let pendingActionData;
     let pendingError;
     if (opts && opts.pendingError) {
@@ -2614,7 +2614,7 @@ function createRouter(init) {
 
     // Call the action for the fetcher
     let abortController = new AbortController();
-    let fetchRequest = createClientSideRequest(init.history, path, abortController.signal, false, submission);
+    let fetchRequest = createClientSideRequest(init.history, path, abortController.signal, submission);
     fetchControllers.set(key, abortController);
     let originatingLoadId = incrementingLoadId;
     let actionResult = await callLoaderOrAction("action", fetchRequest, match, requestMatches, manifest, mapRouteProperties, basename);
@@ -2662,7 +2662,7 @@ function createRouter(init) {
     // Start the data load for current matches, or the next location if we're
     // in the middle of a navigation
     let nextLocation = state.navigation.location || state.location;
-    let revalidationRequest = createClientSideRequest(init.history, nextLocation, abortController.signal, false);
+    let revalidationRequest = createClientSideRequest(init.history, nextLocation, abortController.signal);
     let routesToUse = inFlightDataRoutes || dataRoutes;
     let matches = state.navigation.state !== "idle" ? matchRoutes(routesToUse, state.navigation.location, basename) : state.matches;
     invariant(matches, "Didn't find any matches after fetcher action");
@@ -2767,7 +2767,7 @@ function createRouter(init) {
 
     // Call the loader for this fetcher route match
     let abortController = new AbortController();
-    let fetchRequest = createClientSideRequest(init.history, path, abortController.signal, false);
+    let fetchRequest = createClientSideRequest(init.history, path, abortController.signal);
     fetchControllers.set(key, abortController);
     let originatingLoadId = incrementingLoadId;
     let result = await callLoaderOrAction("loader", fetchRequest, match, matches, manifest, mapRouteProperties, basename);
@@ -2920,7 +2920,7 @@ function createRouter(init) {
     // accordingly
     let results = await Promise.all([...matchesToLoad.map(match => callLoaderOrAction("loader", request, match, matches, manifest, mapRouteProperties, basename)), ...fetchersToLoad.map(f => {
       if (f.matches && f.match && f.controller) {
-        return callLoaderOrAction("loader", createClientSideRequest(init.history, f.path, f.controller.signal, false), f.match, f.matches, manifest, mapRouteProperties, basename);
+        return callLoaderOrAction("loader", createClientSideRequest(init.history, f.path, f.controller.signal), f.match, f.matches, manifest, mapRouteProperties, basename);
       } else {
         let error = {
           type: ResultType.error,
@@ -3954,7 +3954,13 @@ function getMatchesToLoad(history, state, matches, submission, location, isIniti
 // 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 ||
+  if (!route.loader) {
+    return false;
+  }
+  if (route.loader.hydrate) {
+    return true;
+  }
+  return state.loaderData[route.id] === undefined && (!state.errors ||
   // Loader ran but errored - don't re-run
   state.errors[route.id] === undefined);
 }
@@ -4221,16 +4227,11 @@ async function callLoaderOrAction(type, request, match, matches, manifest, mapRo
 // Utility method for creating the Request instances for loaders/actions during
 // client-side navigations and fetches.  During SSR we will always have a
 // Request instance from the static handler (query/queryRoute)
-function createClientSideRequest(history, location, signal, initial, submission) {
+function createClientSideRequest(history, location, signal, submission) {
   let url = history.createURL(stripHashFromPath(location)).toString();
   let init = {
     signal
   };
-  if (initial) {
-    init.headers = {
-      "X-Remix-Initial-Load": "yes"
-    };
-  }
   if (submission && isMutationMethod(submission.formMethod)) {
     let {
       formMethod,