react-router 7.2.0-pre.4 → 7.2.0-pre.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # `react-router`
 
+## 7.2.0-pre.5
+
+### Patch Changes
+
+- [REMOVE] Fix prerender calls to serverLoader from clientLoader ([#13047](https://github.com/remix-run/react-router/pull/13047))
+
 ## 7.2.0-pre.4
 
 ## 7.2.0-pre.3

package/dist/development/{chunk-N43MPAHC.mjs → chunk-FCWNNWGU.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.2.0-pre.4
+ * react-router v7.2.0-pre.5
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -5675,11 +5675,22 @@ function getSingleFetchDataStrategy(manifest, routeModules, ssr, getRouter) {
       );
       if (!foundRevalidatingServerLoader) {
         let matchesToLoad = matches.filter((m) => m.shouldLoad);
-        let results = await Promise.all(matchesToLoad.map((m) => m.resolve()));
-        return results.reduce(
-          (acc, result, i) => Object.assign(acc, { [matchesToLoad[i].route.id]: result }),
-          {}
+        let url = stripIndexParam(singleFetchUrl(request.url));
+        let init = await createRequestInit(request);
+        let results = {};
+        await Promise.all(
+          matchesToLoad.map(
+            (m) => m.resolve(async (handler) => {
+              try {
+                let result = manifest.routes[m.route.id]?.hasClientLoader ? await fetchSingleLoader(handler, url, init, m.route.id) : await handler();
+                results[m.route.id] = { type: "data", result };
+              } catch (e) {
+                results[m.route.id] = { type: "error", result: e };
+              }
+            })
+          )
         );
+        return results;
       }
     }
     if (fetcherKey) {
@@ -7107,7 +7118,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.4";
+    window.__reactRouterVersion = "7.2.0-pre.5";
   }
 } catch (e) {
 }

package/dist/development/dom-export.js

@@ -1,5 +1,5 @@
 /**
- * react-router v7.2.0-pre.4
+ * react-router v7.2.0-pre.5
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -4364,11 +4364,22 @@ function getSingleFetchDataStrategy(manifest, routeModules, ssr, getRouter) {
       );
       if (!foundRevalidatingServerLoader) {
         let matchesToLoad = matches.filter((m) => m.shouldLoad);
-        let results = await Promise.all(matchesToLoad.map((m) => m.resolve()));
-        return results.reduce(
-          (acc, result, i) => Object.assign(acc, { [matchesToLoad[i].route.id]: result }),
-          {}
+        let url = stripIndexParam(singleFetchUrl(request.url));
+        let init = await createRequestInit(request);
+        let results = {};
+        await Promise.all(
+          matchesToLoad.map(
+            (m) => m.resolve(async (handler) => {
+              try {
+                let result = manifest.routes[m.route.id]?.hasClientLoader ? await fetchSingleLoader(handler, url, init, m.route.id) : await handler();
+                results[m.route.id] = { type: "data", result };
+              } catch (e) {
+                results[m.route.id] = { type: "error", result: e };
+              }
+            })
+          )
         );
+        return results;
       }
     }
     if (fetcherKey) {

package/dist/development/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.2.0-pre.4
+ * react-router v7.2.0-pre.5
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -25,7 +25,7 @@ import {
   matchRoutes,
   shouldHydrateRouteLoader,
   useFogOFWarDiscovery
-} from "./chunk-N43MPAHC.mjs";
+} from "./chunk-FCWNNWGU.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.4
+ * react-router v7.2.0-pre.5
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -5821,11 +5821,22 @@ function getSingleFetchDataStrategy(manifest, routeModules, ssr, getRouter) {
       );
       if (!foundRevalidatingServerLoader) {
         let matchesToLoad = matches.filter((m) => m.shouldLoad);
-        let results = await Promise.all(matchesToLoad.map((m) => m.resolve()));
-        return results.reduce(
-          (acc, result, i) => Object.assign(acc, { [matchesToLoad[i].route.id]: result }),
-          {}
+        let url = stripIndexParam(singleFetchUrl(request.url));
+        let init = await createRequestInit(request);
+        let results = {};
+        await Promise.all(
+          matchesToLoad.map(
+            (m) => m.resolve(async (handler) => {
+              try {
+                let result = manifest.routes[m.route.id]?.hasClientLoader ? await fetchSingleLoader(handler, url, init, m.route.id) : await handler();
+                results[m.route.id] = { type: "data", result };
+              } catch (e) {
+                results[m.route.id] = { type: "error", result: e };
+              }
+            })
+          )
         );
+        return results;
       }
     }
     if (fetcherKey) {
@@ -7253,7 +7264,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.4";
+    window.__reactRouterVersion = "7.2.0-pre.5";
   }
 } catch (e) {
 }

package/dist/development/index.mjs

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

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

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

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

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

package/dist/production/{chunk-WSLSTL6H.mjs → chunk-7XNVUWNN.mjs}

@@ -1,5 +1,5 @@
 /**
- * react-router v7.2.0-pre.4
+ * react-router v7.2.0-pre.5
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -5675,11 +5675,22 @@ function getSingleFetchDataStrategy(manifest, routeModules, ssr, getRouter) {
       );
       if (!foundRevalidatingServerLoader) {
         let matchesToLoad = matches.filter((m) => m.shouldLoad);
-        let results = await Promise.all(matchesToLoad.map((m) => m.resolve()));
-        return results.reduce(
-          (acc, result, i) => Object.assign(acc, { [matchesToLoad[i].route.id]: result }),
-          {}
+        let url = stripIndexParam(singleFetchUrl(request.url));
+        let init = await createRequestInit(request);
+        let results = {};
+        await Promise.all(
+          matchesToLoad.map(
+            (m) => m.resolve(async (handler) => {
+              try {
+                let result = manifest.routes[m.route.id]?.hasClientLoader ? await fetchSingleLoader(handler, url, init, m.route.id) : await handler();
+                results[m.route.id] = { type: "data", result };
+              } catch (e) {
+                results[m.route.id] = { type: "error", result: e };
+              }
+            })
+          )
         );
+        return results;
       }
     }
     if (fetcherKey) {
@@ -7107,7 +7118,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.4";
+    window.__reactRouterVersion = "7.2.0-pre.5";
   }
 } catch (e) {
 }

package/dist/production/dom-export.js

@@ -1,5 +1,5 @@
 /**
- * react-router v7.2.0-pre.4
+ * react-router v7.2.0-pre.5
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -4364,11 +4364,22 @@ function getSingleFetchDataStrategy(manifest, routeModules, ssr, getRouter) {
       );
       if (!foundRevalidatingServerLoader) {
         let matchesToLoad = matches.filter((m) => m.shouldLoad);
-        let results = await Promise.all(matchesToLoad.map((m) => m.resolve()));
-        return results.reduce(
-          (acc, result, i) => Object.assign(acc, { [matchesToLoad[i].route.id]: result }),
-          {}
+        let url = stripIndexParam(singleFetchUrl(request.url));
+        let init = await createRequestInit(request);
+        let results = {};
+        await Promise.all(
+          matchesToLoad.map(
+            (m) => m.resolve(async (handler) => {
+              try {
+                let result = manifest.routes[m.route.id]?.hasClientLoader ? await fetchSingleLoader(handler, url, init, m.route.id) : await handler();
+                results[m.route.id] = { type: "data", result };
+              } catch (e) {
+                results[m.route.id] = { type: "error", result: e };
+              }
+            })
+          )
         );
+        return results;
       }
     }
     if (fetcherKey) {

package/dist/production/dom-export.mjs

@@ -1,5 +1,5 @@
 /**
- * react-router v7.2.0-pre.4
+ * react-router v7.2.0-pre.5
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -25,7 +25,7 @@ import {
   matchRoutes,
   shouldHydrateRouteLoader,
   useFogOFWarDiscovery
-} from "./chunk-WSLSTL6H.mjs";
+} from "./chunk-7XNVUWNN.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.4
+ * react-router v7.2.0-pre.5
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -5821,11 +5821,22 @@ function getSingleFetchDataStrategy(manifest, routeModules, ssr, getRouter) {
       );
       if (!foundRevalidatingServerLoader) {
         let matchesToLoad = matches.filter((m) => m.shouldLoad);
-        let results = await Promise.all(matchesToLoad.map((m) => m.resolve()));
-        return results.reduce(
-          (acc, result, i) => Object.assign(acc, { [matchesToLoad[i].route.id]: result }),
-          {}
+        let url = stripIndexParam(singleFetchUrl(request.url));
+        let init = await createRequestInit(request);
+        let results = {};
+        await Promise.all(
+          matchesToLoad.map(
+            (m) => m.resolve(async (handler) => {
+              try {
+                let result = manifest.routes[m.route.id]?.hasClientLoader ? await fetchSingleLoader(handler, url, init, m.route.id) : await handler();
+                results[m.route.id] = { type: "data", result };
+              } catch (e) {
+                results[m.route.id] = { type: "error", result: e };
+              }
+            })
+          )
         );
+        return results;
       }
     }
     if (fetcherKey) {
@@ -7253,7 +7264,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.4";
+    window.__reactRouterVersion = "7.2.0-pre.5";
   }
 } catch (e) {
 }

package/dist/production/index.mjs

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

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

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

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

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

package/package.json

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