Limit prerendered resource route .data files to only the target route

Author: brophdawg11

.changeset/rotten-numbers-bathe.md

@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+Limit prerendered resource route `.data` files to only the target route

integration/vite-prerender-test.ts

@@ -421,9 +421,6 @@ test.describe("Prerendering", () => {
 
       let dataRes = await fixture.requestSingleFetchData("/json.json.data");
       expect(dataRes.data).toEqual({
-        root: {
-          data: null,
-        },
         "routes/json[.json]": {
           data: {
             hello: "world",
@@ -436,9 +433,6 @@ test.describe("Prerendering", () => {
 
       dataRes = await fixture.requestSingleFetchData("/text.txt.data");
       expect(dataRes.data).toEqual({
-        root: {
-          data: null,
-        },
         "routes/text[.txt]": {
           data: "Hello, world",
         },

packages/react-router-dev/vite/plugin.ts

@@ -2317,21 +2317,6 @@ async function handlePrerender(
       matches,
       `Unable to prerender path because it does not match any routes: ${path}`
     );
-    let hasLoaders = matches.some(
-      (m) => build.assets.routes[m.route.id]?.hasLoader
-    );
-    let data: string | undefined;
-    if (hasLoaders) {
-      data = await prerenderData(
-        handler,
-        path,
-        clientBuildDirectory,
-        reactRouterConfig,
-        viteConfig,
-        { headers }
-      );
-    }
-
     // When prerendering a resource route, we don't want to pass along the
     // `.data` file since we want to prerender the raw Response returned from
     // the loader.  Presumably this is for routes where a file extension is
@@ -2343,7 +2328,20 @@ async function handlePrerender(
       manifestRoute && !manifestRoute.default && !manifestRoute.ErrorBoundary;
 
     if (isResourceRoute) {
-      if (manifestRoute?.loader) {
+      invariant(leafRoute);
+      invariant(manifestRoute);
+      if (manifestRoute.loader) {
+        // Prerender a .data file for turbo-stream consumption
+        await prerenderData(
+          handler,
+          path,
+          [leafRoute.id],
+          clientBuildDirectory,
+          reactRouterConfig,
+          viteConfig,
+          { headers }
+        );
+        // Prerender a raw file for external consumption
         await prerenderResourceRoute(
           handler,
           path,
@@ -2358,6 +2356,22 @@ async function handlePrerender(
         );
       }
     } else {
+      let hasLoaders = matches.some(
+        (m) => build.assets.routes[m.route.id]?.hasLoader
+      );
+      let data: string | undefined;
+      if (!isResourceRoute && hasLoaders) {
+        data = await prerenderData(
+          handler,
+          path,
+          null,
+          clientBuildDirectory,
+          reactRouterConfig,
+          viteConfig,
+          { headers }
+        );
+      }
+
       await prerenderRoute(
         handler,
         path,
@@ -2411,6 +2425,7 @@ function getStaticPrerenderPaths(routes: DataRouteObject[]) {
 async function prerenderData(
   handler: RequestHandler,
   prerenderPath: string,
+  onlyRoutes: string[] | null,
   clientBuildDirectory: string,
   reactRouterConfig: ResolvedReactRouterConfig,
   viteConfig: Vite.ResolvedConfig,
@@ -2421,7 +2436,11 @@ async function prerenderData(
       ? "/_root.data"
       : `${prerenderPath.replace(/\/$/, "")}.data`
   }`.replace(/\/\/+/g, "/");
-  let request = new Request(`http://localhost${normalizedPath}`, requestInit);
+  let url = new URL(`http://localhost${normalizedPath}`);
+  if (onlyRoutes?.length) {
+    url.searchParams.set("_routes", onlyRoutes.join(","));
+  }
+  let request = new Request(url, requestInit);
   let response = await handler(request);
   let data = await response.text();