react-router 7.2.0-pre.1 → 7.2.0-pre.2

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # `react-router`
 
+## 7.2.0-pre.2
+
+### Patch Changes
+
+- Properly handle revalidations to across a prerender/SPA boundary ([#13021](https://github.com/remix-run/react-router/pull/13021))
+
+  - In "hybrid" applications where some routes are pre-rendered and some are served from a SPA fallback, we need to avoid making `.data` requests if the path wasn't pre-rendered because the request will 404
+  - We don't know all the pre-rendered paths client-side, however:
+    - All `loader` data in `ssr:false` mode is static because it's generated at build time
+    - A route must use a `clientLoader` to do anything dynamic
+    - Therefore, if a route only has a `loader` and not a `clientLoader`, we disable revalidation by default because there is no new data to retrieve
+    - We short circuit and skip single fetch `.data` request logic if there are no server loaders with `shouldLoad=true` in our single fetch `dataStrategy`
+    - This ensures that the route doesn't cause a `.data` request that would 404 after a submission
+
+- Error at build time in `ssr:false` + `prerender` apps for the edge case scenario of: ([#13021](https://github.com/remix-run/react-router/pull/13021))
+
+  - A parent route has only a `loader` (does not have a `clientLoader`)
+  - The parent route is pre-rendered
+  - The parent route has children routes which are not prerendered
+  - This means that when the child paths are loaded via the SPA fallback, the parent won't have any `loaderData` because there is no server on which to run the `loader`
+  - This can be resolved by either adding a parent `clientLoader` or pre-rendering the child paths
+  - If you add a `clientLoader`, calling the `serverLoader()` on non-prerendered paths will throw a 404
+
 ## 7.2.0-pre.1
 
 ### Minor Changes

package/dist/development/{chunk-FXE4ZOSB.mjs → chunk-ULARE4JK.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.2.0-pre.1
+ * react-router v7.2.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -5670,10 +5670,10 @@ function getSingleFetchDataStrategy(manifest, routeModules, ssr, getRouter) {
       return singleFetchActionStrategy(request, matches);
     }
     if (!ssr) {
-      let foundLoaderBelowRoot = matches.some(
-        (m) => m.route.id !== "root" && manifest.routes[m.route.id]?.hasLoader
+      let foundRevalidatingServerLoader = matches.some(
+        (m) => m.shouldLoad && manifest.routes[m.route.id]?.hasLoader && !manifest.routes[m.route.id]?.hasClientLoader
       );
-      if (!foundLoaderBelowRoot) {
+      if (!foundRevalidatingServerLoader) {
         let matchesToLoad = matches.filter((m) => m.shouldLoad);
         let results = await Promise.all(matchesToLoad.map((m) => m.resolve()));
         return results.reduce(
@@ -6168,13 +6168,7 @@ function createClientRoutesWithHMRRevalidationOptOut(needsRevalidation, manifest
     needsRevalidation
   );
 }
-function preventInvalidServerHandlerCall(type, route, isSpaMode) {
-  if (isSpaMode) {
-    let fn = type === "action" ? "serverAction()" : "serverLoader()";
-    let msg = `You cannot call ${fn} in SPA Mode (routeId: "${route.id}")`;
-    console.error(msg);
-    throw new ErrorResponseImpl(400, "Bad Request", new Error(msg), true);
-  }
+function preventInvalidServerHandlerCall(type, route) {
   if (type === "loader" && !route.hasLoader || type === "action" && !route.hasAction) {
     let fn = type === "action" ? "serverAction()" : "serverLoader()";
     let msg = `You are trying to call ${fn} on a route that does not have a server ${type} (routeId: "${route.id}")`;
@@ -6268,7 +6262,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
               request,
               params,
               async serverLoader() {
-                preventInvalidServerHandlerCall("loader", route, isSpaMode);
+                preventInvalidServerHandlerCall("loader", route);
                 if (isHydrationRequest) {
                   if (hasInitialData) {
                     return initialData;
@@ -6307,7 +6301,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
             request,
             params,
             async serverAction() {
-              preventInvalidServerHandlerCall("action", route, isSpaMode);
+              preventInvalidServerHandlerCall("action", route);
               return fetchServerAction(singleFetch);
             }
           });
@@ -6329,7 +6323,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           return clientLoader({
             ...args,
             async serverLoader() {
-              preventInvalidServerHandlerCall("loader", route, isSpaMode);
+              preventInvalidServerHandlerCall("loader", route);
               return fetchServerLoader(singleFetch);
             }
           });
@@ -6354,7 +6348,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           return clientAction({
             ...args,
             async serverAction() {
-              preventInvalidServerHandlerCall("action", route, isSpaMode);
+              preventInvalidServerHandlerCall("action", route);
               return fetchServerAction(singleFetch);
             }
           });
@@ -6376,7 +6370,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           lazyRoute.loader = (args, singleFetch) => clientLoader({
             ...args,
             async serverLoader() {
-              preventInvalidServerHandlerCall("loader", route, isSpaMode);
+              preventInvalidServerHandlerCall("loader", route);
               return fetchServerLoader(singleFetch);
             }
           });
@@ -6386,7 +6380,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           lazyRoute.action = (args, singleFetch) => clientAction({
             ...args,
             async serverAction() {
-              preventInvalidServerHandlerCall("action", route, isSpaMode);
+              preventInvalidServerHandlerCall("action", route);
               return fetchServerAction(singleFetch);
             }
           });
@@ -6431,8 +6425,13 @@ function getShouldRevalidateFunction(route, manifestRoute, ssr, needsRevalidatio
       needsRevalidation
     );
   }
-  if (!ssr && manifestRoute.id === "root" && manifestRoute.hasLoader && !manifestRoute.hasClientLoader) {
-    return () => false;
+  if (!ssr && manifestRoute.hasLoader && !manifestRoute.hasClientLoader) {
+    if (route.shouldRevalidate) {
+      let fn = route.shouldRevalidate;
+      return (opts) => fn({ ...opts, defaultShouldRevalidate: false });
+    } else {
+      return () => false;
+    }
   }
   if (ssr && route.shouldRevalidate) {
     let fn = route.shouldRevalidate;
@@ -7108,7 +7107,7 @@ function mergeRefs(...refs) {
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 try {
   if (isBrowser) {
-    window.__reactRouterVersion = "7.2.0-pre.1";
+    window.__reactRouterVersion = "7.2.0-pre.2";
   }
 } catch (e) {
 }

package/dist/development/dom-export.js

@@ -1,5 +1,5 @@
 /**
- * react-router v7.2.0-pre.1
+ * react-router v7.2.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -4359,10 +4359,10 @@ function getSingleFetchDataStrategy(manifest, routeModules, ssr, getRouter) {
       return singleFetchActionStrategy(request, matches);
     }
     if (!ssr) {
-      let foundLoaderBelowRoot = matches.some(
-        (m) => m.route.id !== "root" && manifest.routes[m.route.id]?.hasLoader
+      let foundRevalidatingServerLoader = matches.some(
+        (m) => m.shouldLoad && manifest.routes[m.route.id]?.hasLoader && !manifest.routes[m.route.id]?.hasClientLoader
       );
-      if (!foundLoaderBelowRoot) {
+      if (!foundRevalidatingServerLoader) {
         let matchesToLoad = matches.filter((m) => m.shouldLoad);
         let results = await Promise.all(matchesToLoad.map((m) => m.resolve()));
         return results.reduce(
@@ -4817,13 +4817,7 @@ function createClientRoutesWithHMRRevalidationOptOut(needsRevalidation, manifest
     needsRevalidation
   );
 }
-function preventInvalidServerHandlerCall(type, route, isSpaMode) {
-  if (isSpaMode) {
-    let fn = type === "action" ? "serverAction()" : "serverLoader()";
-    let msg = `You cannot call ${fn} in SPA Mode (routeId: "${route.id}")`;
-    console.error(msg);
-    throw new ErrorResponseImpl(400, "Bad Request", new Error(msg), true);
-  }
+function preventInvalidServerHandlerCall(type, route) {
   if (type === "loader" && !route.hasLoader || type === "action" && !route.hasAction) {
     let fn = type === "action" ? "serverAction()" : "serverLoader()";
     let msg = `You are trying to call ${fn} on a route that does not have a server ${type} (routeId: "${route.id}")`;
@@ -4917,7 +4911,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
               request,
               params,
               async serverLoader() {
-                preventInvalidServerHandlerCall("loader", route, isSpaMode);
+                preventInvalidServerHandlerCall("loader", route);
                 if (isHydrationRequest) {
                   if (hasInitialData) {
                     return initialData;
@@ -4956,7 +4950,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
             request,
             params,
             async serverAction() {
-              preventInvalidServerHandlerCall("action", route, isSpaMode);
+              preventInvalidServerHandlerCall("action", route);
               return fetchServerAction(singleFetch);
             }
           });
@@ -4978,7 +4972,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           return clientLoader({
             ...args,
             async serverLoader() {
-              preventInvalidServerHandlerCall("loader", route, isSpaMode);
+              preventInvalidServerHandlerCall("loader", route);
               return fetchServerLoader(singleFetch);
             }
           });
@@ -5003,7 +4997,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           return clientAction({
             ...args,
             async serverAction() {
-              preventInvalidServerHandlerCall("action", route, isSpaMode);
+              preventInvalidServerHandlerCall("action", route);
               return fetchServerAction(singleFetch);
             }
           });
@@ -5025,7 +5019,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           lazyRoute.loader = (args, singleFetch) => clientLoader({
             ...args,
             async serverLoader() {
-              preventInvalidServerHandlerCall("loader", route, isSpaMode);
+              preventInvalidServerHandlerCall("loader", route);
               return fetchServerLoader(singleFetch);
             }
           });
@@ -5035,7 +5029,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           lazyRoute.action = (args, singleFetch) => clientAction({
             ...args,
             async serverAction() {
-              preventInvalidServerHandlerCall("action", route, isSpaMode);
+              preventInvalidServerHandlerCall("action", route);
               return fetchServerAction(singleFetch);
             }
           });
@@ -5080,8 +5074,13 @@ function getShouldRevalidateFunction(route, manifestRoute, ssr, needsRevalidatio
       needsRevalidation
     );
   }
-  if (!ssr && manifestRoute.id === "root" && manifestRoute.hasLoader && !manifestRoute.hasClientLoader) {
-    return () => false;
+  if (!ssr && manifestRoute.hasLoader && !manifestRoute.hasClientLoader) {
+    if (route.shouldRevalidate) {
+      let fn = route.shouldRevalidate;
+      return (opts) => fn({ ...opts, defaultShouldRevalidate: false });
+    } else {
+      return () => false;
+    }
   }
   if (ssr && route.shouldRevalidate) {
     let fn = route.shouldRevalidate;

package/dist/development/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.2.0-pre.1
+ * react-router v7.2.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -25,7 +25,7 @@ import {
   matchRoutes,
   shouldHydrateRouteLoader,
   useFogOFWarDiscovery
-} from "./chunk-FXE4ZOSB.mjs";
+} from "./chunk-ULARE4JK.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";

package/dist/development/index.js

@@ -1,5 +1,5 @@
 /**
- * react-router v7.2.0-pre.1
+ * react-router v7.2.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -5816,10 +5816,10 @@ function getSingleFetchDataStrategy(manifest, routeModules, ssr, getRouter) {
       return singleFetchActionStrategy(request, matches);
     }
     if (!ssr) {
-      let foundLoaderBelowRoot = matches.some(
-        (m) => m.route.id !== "root" && manifest.routes[m.route.id]?.hasLoader
+      let foundRevalidatingServerLoader = matches.some(
+        (m) => m.shouldLoad && manifest.routes[m.route.id]?.hasLoader && !manifest.routes[m.route.id]?.hasClientLoader
       );
-      if (!foundLoaderBelowRoot) {
+      if (!foundRevalidatingServerLoader) {
         let matchesToLoad = matches.filter((m) => m.shouldLoad);
         let results = await Promise.all(matchesToLoad.map((m) => m.resolve()));
         return results.reduce(
@@ -6314,13 +6314,7 @@ function createClientRoutesWithHMRRevalidationOptOut(needsRevalidation, manifest
     needsRevalidation
   );
 }
-function preventInvalidServerHandlerCall(type, route, isSpaMode) {
-  if (isSpaMode) {
-    let fn = type === "action" ? "serverAction()" : "serverLoader()";
-    let msg = `You cannot call ${fn} in SPA Mode (routeId: "${route.id}")`;
-    console.error(msg);
-    throw new ErrorResponseImpl(400, "Bad Request", new Error(msg), true);
-  }
+function preventInvalidServerHandlerCall(type, route) {
   if (type === "loader" && !route.hasLoader || type === "action" && !route.hasAction) {
     let fn = type === "action" ? "serverAction()" : "serverLoader()";
     let msg = `You are trying to call ${fn} on a route that does not have a server ${type} (routeId: "${route.id}")`;
@@ -6414,7 +6408,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
               request,
               params,
               async serverLoader() {
-                preventInvalidServerHandlerCall("loader", route, isSpaMode);
+                preventInvalidServerHandlerCall("loader", route);
                 if (isHydrationRequest) {
                   if (hasInitialData) {
                     return initialData;
@@ -6453,7 +6447,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
             request,
             params,
             async serverAction() {
-              preventInvalidServerHandlerCall("action", route, isSpaMode);
+              preventInvalidServerHandlerCall("action", route);
               return fetchServerAction(singleFetch);
             }
           });
@@ -6475,7 +6469,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           return clientLoader({
             ...args,
             async serverLoader() {
-              preventInvalidServerHandlerCall("loader", route, isSpaMode);
+              preventInvalidServerHandlerCall("loader", route);
               return fetchServerLoader(singleFetch);
             }
           });
@@ -6500,7 +6494,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           return clientAction({
             ...args,
             async serverAction() {
-              preventInvalidServerHandlerCall("action", route, isSpaMode);
+              preventInvalidServerHandlerCall("action", route);
               return fetchServerAction(singleFetch);
             }
           });
@@ -6522,7 +6516,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           lazyRoute.loader = (args, singleFetch) => clientLoader({
             ...args,
             async serverLoader() {
-              preventInvalidServerHandlerCall("loader", route, isSpaMode);
+              preventInvalidServerHandlerCall("loader", route);
               return fetchServerLoader(singleFetch);
             }
           });
@@ -6532,7 +6526,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           lazyRoute.action = (args, singleFetch) => clientAction({
             ...args,
             async serverAction() {
-              preventInvalidServerHandlerCall("action", route, isSpaMode);
+              preventInvalidServerHandlerCall("action", route);
               return fetchServerAction(singleFetch);
             }
           });
@@ -6577,8 +6571,13 @@ function getShouldRevalidateFunction(route, manifestRoute, ssr, needsRevalidatio
       needsRevalidation
     );
   }
-  if (!ssr && manifestRoute.id === "root" && manifestRoute.hasLoader && !manifestRoute.hasClientLoader) {
-    return () => false;
+  if (!ssr && manifestRoute.hasLoader && !manifestRoute.hasClientLoader) {
+    if (route.shouldRevalidate) {
+      let fn = route.shouldRevalidate;
+      return (opts) => fn({ ...opts, defaultShouldRevalidate: false });
+    } else {
+      return () => false;
+    }
   }
   if (ssr && route.shouldRevalidate) {
     let fn = route.shouldRevalidate;
@@ -7254,7 +7253,7 @@ function mergeRefs(...refs) {
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 try {
   if (isBrowser) {
-    window.__reactRouterVersion = "7.2.0-pre.1";
+    window.__reactRouterVersion = "7.2.0-pre.2";
   }
 } catch (e) {
 }

package/dist/development/index.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.2.0-pre.1
+ * react-router v7.2.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -121,7 +121,7 @@ import {
   useSearchParams,
   useSubmit,
   useViewTransitionState
-} from "./chunk-FXE4ZOSB.mjs";
+} from "./chunk-ULARE4JK.mjs";
 export {
   Await,
   BrowserRouter,

package/dist/development/lib/types/route-module.js

@@ -1,5 +1,5 @@
 /**
- * react-router v7.2.0-pre.1
+ * react-router v7.2.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/development/lib/types/route-module.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.2.0-pre.1
+ * react-router v7.2.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/{chunk-3BG6WSY4.mjs → chunk-QRCLBIUO.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.2.0-pre.1
+ * react-router v7.2.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -5670,10 +5670,10 @@ function getSingleFetchDataStrategy(manifest, routeModules, ssr, getRouter) {
       return singleFetchActionStrategy(request, matches);
     }
     if (!ssr) {
-      let foundLoaderBelowRoot = matches.some(
-        (m) => m.route.id !== "root" && manifest.routes[m.route.id]?.hasLoader
+      let foundRevalidatingServerLoader = matches.some(
+        (m) => m.shouldLoad && manifest.routes[m.route.id]?.hasLoader && !manifest.routes[m.route.id]?.hasClientLoader
       );
-      if (!foundLoaderBelowRoot) {
+      if (!foundRevalidatingServerLoader) {
         let matchesToLoad = matches.filter((m) => m.shouldLoad);
         let results = await Promise.all(matchesToLoad.map((m) => m.resolve()));
         return results.reduce(
@@ -6168,13 +6168,7 @@ function createClientRoutesWithHMRRevalidationOptOut(needsRevalidation, manifest
     needsRevalidation
   );
 }
-function preventInvalidServerHandlerCall(type, route, isSpaMode) {
-  if (isSpaMode) {
-    let fn = type === "action" ? "serverAction()" : "serverLoader()";
-    let msg = `You cannot call ${fn} in SPA Mode (routeId: "${route.id}")`;
-    console.error(msg);
-    throw new ErrorResponseImpl(400, "Bad Request", new Error(msg), true);
-  }
+function preventInvalidServerHandlerCall(type, route) {
   if (type === "loader" && !route.hasLoader || type === "action" && !route.hasAction) {
     let fn = type === "action" ? "serverAction()" : "serverLoader()";
     let msg = `You are trying to call ${fn} on a route that does not have a server ${type} (routeId: "${route.id}")`;
@@ -6268,7 +6262,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
               request,
               params,
               async serverLoader() {
-                preventInvalidServerHandlerCall("loader", route, isSpaMode);
+                preventInvalidServerHandlerCall("loader", route);
                 if (isHydrationRequest) {
                   if (hasInitialData) {
                     return initialData;
@@ -6307,7 +6301,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
             request,
             params,
             async serverAction() {
-              preventInvalidServerHandlerCall("action", route, isSpaMode);
+              preventInvalidServerHandlerCall("action", route);
               return fetchServerAction(singleFetch);
             }
           });
@@ -6329,7 +6323,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           return clientLoader({
             ...args,
             async serverLoader() {
-              preventInvalidServerHandlerCall("loader", route, isSpaMode);
+              preventInvalidServerHandlerCall("loader", route);
               return fetchServerLoader(singleFetch);
             }
           });
@@ -6354,7 +6348,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           return clientAction({
             ...args,
             async serverAction() {
-              preventInvalidServerHandlerCall("action", route, isSpaMode);
+              preventInvalidServerHandlerCall("action", route);
               return fetchServerAction(singleFetch);
             }
           });
@@ -6376,7 +6370,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           lazyRoute.loader = (args, singleFetch) => clientLoader({
             ...args,
             async serverLoader() {
-              preventInvalidServerHandlerCall("loader", route, isSpaMode);
+              preventInvalidServerHandlerCall("loader", route);
               return fetchServerLoader(singleFetch);
             }
           });
@@ -6386,7 +6380,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           lazyRoute.action = (args, singleFetch) => clientAction({
             ...args,
             async serverAction() {
-              preventInvalidServerHandlerCall("action", route, isSpaMode);
+              preventInvalidServerHandlerCall("action", route);
               return fetchServerAction(singleFetch);
             }
           });
@@ -6431,8 +6425,13 @@ function getShouldRevalidateFunction(route, manifestRoute, ssr, needsRevalidatio
       needsRevalidation
     );
   }
-  if (!ssr && manifestRoute.id === "root" && manifestRoute.hasLoader && !manifestRoute.hasClientLoader) {
-    return () => false;
+  if (!ssr && manifestRoute.hasLoader && !manifestRoute.hasClientLoader) {
+    if (route.shouldRevalidate) {
+      let fn = route.shouldRevalidate;
+      return (opts) => fn({ ...opts, defaultShouldRevalidate: false });
+    } else {
+      return () => false;
+    }
   }
   if (ssr && route.shouldRevalidate) {
     let fn = route.shouldRevalidate;
@@ -7108,7 +7107,7 @@ function mergeRefs(...refs) {
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 try {
   if (isBrowser) {
-    window.__reactRouterVersion = "7.2.0-pre.1";
+    window.__reactRouterVersion = "7.2.0-pre.2";
   }
 } catch (e) {
 }

package/dist/production/dom-export.js

@@ -1,5 +1,5 @@
 /**
- * react-router v7.2.0-pre.1
+ * react-router v7.2.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -4359,10 +4359,10 @@ function getSingleFetchDataStrategy(manifest, routeModules, ssr, getRouter) {
       return singleFetchActionStrategy(request, matches);
     }
     if (!ssr) {
-      let foundLoaderBelowRoot = matches.some(
-        (m) => m.route.id !== "root" && manifest.routes[m.route.id]?.hasLoader
+      let foundRevalidatingServerLoader = matches.some(
+        (m) => m.shouldLoad && manifest.routes[m.route.id]?.hasLoader && !manifest.routes[m.route.id]?.hasClientLoader
       );
-      if (!foundLoaderBelowRoot) {
+      if (!foundRevalidatingServerLoader) {
         let matchesToLoad = matches.filter((m) => m.shouldLoad);
         let results = await Promise.all(matchesToLoad.map((m) => m.resolve()));
         return results.reduce(
@@ -4817,13 +4817,7 @@ function createClientRoutesWithHMRRevalidationOptOut(needsRevalidation, manifest
     needsRevalidation
   );
 }
-function preventInvalidServerHandlerCall(type, route, isSpaMode) {
-  if (isSpaMode) {
-    let fn = type === "action" ? "serverAction()" : "serverLoader()";
-    let msg = `You cannot call ${fn} in SPA Mode (routeId: "${route.id}")`;
-    console.error(msg);
-    throw new ErrorResponseImpl(400, "Bad Request", new Error(msg), true);
-  }
+function preventInvalidServerHandlerCall(type, route) {
   if (type === "loader" && !route.hasLoader || type === "action" && !route.hasAction) {
     let fn = type === "action" ? "serverAction()" : "serverLoader()";
     let msg = `You are trying to call ${fn} on a route that does not have a server ${type} (routeId: "${route.id}")`;
@@ -4917,7 +4911,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
               request,
               params,
               async serverLoader() {
-                preventInvalidServerHandlerCall("loader", route, isSpaMode);
+                preventInvalidServerHandlerCall("loader", route);
                 if (isHydrationRequest) {
                   if (hasInitialData) {
                     return initialData;
@@ -4956,7 +4950,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
             request,
             params,
             async serverAction() {
-              preventInvalidServerHandlerCall("action", route, isSpaMode);
+              preventInvalidServerHandlerCall("action", route);
               return fetchServerAction(singleFetch);
             }
           });
@@ -4978,7 +4972,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           return clientLoader({
             ...args,
             async serverLoader() {
-              preventInvalidServerHandlerCall("loader", route, isSpaMode);
+              preventInvalidServerHandlerCall("loader", route);
               return fetchServerLoader(singleFetch);
             }
           });
@@ -5003,7 +4997,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           return clientAction({
             ...args,
             async serverAction() {
-              preventInvalidServerHandlerCall("action", route, isSpaMode);
+              preventInvalidServerHandlerCall("action", route);
               return fetchServerAction(singleFetch);
             }
           });
@@ -5025,7 +5019,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           lazyRoute.loader = (args, singleFetch) => clientLoader({
             ...args,
             async serverLoader() {
-              preventInvalidServerHandlerCall("loader", route, isSpaMode);
+              preventInvalidServerHandlerCall("loader", route);
               return fetchServerLoader(singleFetch);
             }
           });
@@ -5035,7 +5029,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           lazyRoute.action = (args, singleFetch) => clientAction({
             ...args,
             async serverAction() {
-              preventInvalidServerHandlerCall("action", route, isSpaMode);
+              preventInvalidServerHandlerCall("action", route);
               return fetchServerAction(singleFetch);
             }
           });
@@ -5080,8 +5074,13 @@ function getShouldRevalidateFunction(route, manifestRoute, ssr, needsRevalidatio
       needsRevalidation
     );
   }
-  if (!ssr && manifestRoute.id === "root" && manifestRoute.hasLoader && !manifestRoute.hasClientLoader) {
-    return () => false;
+  if (!ssr && manifestRoute.hasLoader && !manifestRoute.hasClientLoader) {
+    if (route.shouldRevalidate) {
+      let fn = route.shouldRevalidate;
+      return (opts) => fn({ ...opts, defaultShouldRevalidate: false });
+    } else {
+      return () => false;
+    }
   }
   if (ssr && route.shouldRevalidate) {
     let fn = route.shouldRevalidate;

package/dist/production/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.2.0-pre.1
+ * react-router v7.2.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -25,7 +25,7 @@ import {
   matchRoutes,
   shouldHydrateRouteLoader,
   useFogOFWarDiscovery
-} from "./chunk-3BG6WSY4.mjs";
+} from "./chunk-QRCLBIUO.mjs";
 
 // lib/dom-export/dom-router-provider.tsx
 import * as React from "react";

package/dist/production/index.js

@@ -1,5 +1,5 @@
 /**
- * react-router v7.2.0-pre.1
+ * react-router v7.2.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -5816,10 +5816,10 @@ function getSingleFetchDataStrategy(manifest, routeModules, ssr, getRouter) {
       return singleFetchActionStrategy(request, matches);
     }
     if (!ssr) {
-      let foundLoaderBelowRoot = matches.some(
-        (m) => m.route.id !== "root" && manifest.routes[m.route.id]?.hasLoader
+      let foundRevalidatingServerLoader = matches.some(
+        (m) => m.shouldLoad && manifest.routes[m.route.id]?.hasLoader && !manifest.routes[m.route.id]?.hasClientLoader
       );
-      if (!foundLoaderBelowRoot) {
+      if (!foundRevalidatingServerLoader) {
         let matchesToLoad = matches.filter((m) => m.shouldLoad);
         let results = await Promise.all(matchesToLoad.map((m) => m.resolve()));
         return results.reduce(
@@ -6314,13 +6314,7 @@ function createClientRoutesWithHMRRevalidationOptOut(needsRevalidation, manifest
     needsRevalidation
   );
 }
-function preventInvalidServerHandlerCall(type, route, isSpaMode) {
-  if (isSpaMode) {
-    let fn = type === "action" ? "serverAction()" : "serverLoader()";
-    let msg = `You cannot call ${fn} in SPA Mode (routeId: "${route.id}")`;
-    console.error(msg);
-    throw new ErrorResponseImpl(400, "Bad Request", new Error(msg), true);
-  }
+function preventInvalidServerHandlerCall(type, route) {
   if (type === "loader" && !route.hasLoader || type === "action" && !route.hasAction) {
     let fn = type === "action" ? "serverAction()" : "serverLoader()";
     let msg = `You are trying to call ${fn} on a route that does not have a server ${type} (routeId: "${route.id}")`;
@@ -6414,7 +6408,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
               request,
               params,
               async serverLoader() {
-                preventInvalidServerHandlerCall("loader", route, isSpaMode);
+                preventInvalidServerHandlerCall("loader", route);
                 if (isHydrationRequest) {
                   if (hasInitialData) {
                     return initialData;
@@ -6453,7 +6447,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
             request,
             params,
             async serverAction() {
-              preventInvalidServerHandlerCall("action", route, isSpaMode);
+              preventInvalidServerHandlerCall("action", route);
               return fetchServerAction(singleFetch);
             }
           });
@@ -6475,7 +6469,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           return clientLoader({
             ...args,
             async serverLoader() {
-              preventInvalidServerHandlerCall("loader", route, isSpaMode);
+              preventInvalidServerHandlerCall("loader", route);
               return fetchServerLoader(singleFetch);
             }
           });
@@ -6500,7 +6494,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           return clientAction({
             ...args,
             async serverAction() {
-              preventInvalidServerHandlerCall("action", route, isSpaMode);
+              preventInvalidServerHandlerCall("action", route);
               return fetchServerAction(singleFetch);
             }
           });
@@ -6522,7 +6516,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           lazyRoute.loader = (args, singleFetch) => clientLoader({
             ...args,
             async serverLoader() {
-              preventInvalidServerHandlerCall("loader", route, isSpaMode);
+              preventInvalidServerHandlerCall("loader", route);
               return fetchServerLoader(singleFetch);
             }
           });
@@ -6532,7 +6526,7 @@ function createClientRoutes(manifest, routeModulesCache, initialState, ssr, isSp
           lazyRoute.action = (args, singleFetch) => clientAction({
             ...args,
             async serverAction() {
-              preventInvalidServerHandlerCall("action", route, isSpaMode);
+              preventInvalidServerHandlerCall("action", route);
               return fetchServerAction(singleFetch);
             }
           });
@@ -6577,8 +6571,13 @@ function getShouldRevalidateFunction(route, manifestRoute, ssr, needsRevalidatio
       needsRevalidation
     );
   }
-  if (!ssr && manifestRoute.id === "root" && manifestRoute.hasLoader && !manifestRoute.hasClientLoader) {
-    return () => false;
+  if (!ssr && manifestRoute.hasLoader && !manifestRoute.hasClientLoader) {
+    if (route.shouldRevalidate) {
+      let fn = route.shouldRevalidate;
+      return (opts) => fn({ ...opts, defaultShouldRevalidate: false });
+    } else {
+      return () => false;
+    }
   }
   if (ssr && route.shouldRevalidate) {
     let fn = route.shouldRevalidate;
@@ -7254,7 +7253,7 @@ function mergeRefs(...refs) {
 var isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
 try {
   if (isBrowser) {
-    window.__reactRouterVersion = "7.2.0-pre.1";
+    window.__reactRouterVersion = "7.2.0-pre.2";
   }
 } catch (e) {
 }

package/dist/production/index.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.2.0-pre.1
+ * react-router v7.2.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -121,7 +121,7 @@ import {
   useSearchParams,
   useSubmit,
   useViewTransitionState
-} from "./chunk-3BG6WSY4.mjs";
+} from "./chunk-QRCLBIUO.mjs";
 export {
   Await,
   BrowserRouter,

package/dist/production/lib/types/route-module.js

@@ -1,5 +1,5 @@
 /**
- * react-router v7.2.0-pre.1
+ * react-router v7.2.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/production/lib/types/route-module.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.2.0-pre.1
+ * react-router v7.2.0-pre.2
  *
  * Copyright (c) Remix Software Inc.
  *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-router",
-  "version": "7.2.0-pre.1",
+  "version": "7.2.0-pre.2",
   "description": "Declarative routing for React",
   "keywords": [
     "react",