@react-router/dev 7.5.0 → 7.5.1

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # `@react-router/dev`
 
+## 7.5.1
+
+### Patch Changes
+
+- Fix prerendering when a loader returns a redirect ([#13365](https://github.com/remix-run/react-router/pull/13365))
+- Updated dependencies:
+  - `react-router@7.5.1`
+  - `@react-router/node@7.5.1`
+  - `@react-router/serve@7.5.1`
+
 ## 7.5.0
 
 ### Patch Changes

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v7.5.0
+ * @react-router/dev v7.5.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -1169,27 +1169,28 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
   function getBaseOptions({
     viteUserConfig
   }) {
+    const rollupOptions = {
+      preserveEntrySignatures: "exports-only",
+      // Silence Rollup "use client" warnings
+      // Adapted from https://github.com/vitejs/vite-plugin-react/pull/144
+      onwarn(warning, defaultHandler) {
+        if (warning.code === "MODULE_LEVEL_DIRECTIVE" && warning.message.includes("use client")) {
+          return;
+        }
+        let userHandler = viteUserConfig.build?.rollupOptions?.onwarn;
+        if (userHandler) {
+          userHandler(warning, defaultHandler);
+        } else {
+          defaultHandler(warning);
+        }
+      }
+    };
     return {
       build: {
         cssMinify: viteUserConfig.build?.cssMinify ?? true,
         manifest: true,
         // The manifest is enabled for all builds to detect SSR-only assets
-        rollupOptions: {
-          preserveEntrySignatures: "exports-only",
-          // Silence Rollup "use client" warnings
-          // Adapted from https://github.com/vitejs/vite-plugin-react/pull/144
-          onwarn(warning, defaultHandler) {
-            if (warning.code === "MODULE_LEVEL_DIRECTIVE" && warning.message.includes("use client")) {
-              return;
-            }
-            let userHandler = viteUserConfig.build?.rollupOptions?.onwarn;
-            if (userHandler) {
-              userHandler(warning, defaultHandler);
-            } else {
-              defaultHandler(warning);
-            }
-          }
-        }
+        rollupOptions
       }
     };
   }

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.5.0
+ * @react-router/dev v7.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.5.0
+ * @react-router/dev v7.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.5.0
+ * @react-router/dev v7.5.1
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.5.0
+ * @react-router/dev v7.5.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -3854,7 +3854,7 @@ async function prerenderData(handler, prerenderPath, onlyRoutes, clientBuildDire
   let request = new Request(url2, requestInit);
   let response = await handler(request);
   let data = await response.text();
-  if (response.status !== 200) {
+  if (response.status !== 200 && response.status !== 202) {
     throw new Error(
       `Prerender (data): Received a ${response.status} status code from \`entry.server.tsx\` while prerendering the \`${prerenderPath}\` path.
 ${normalizedPath}`
@@ -3869,6 +3869,7 @@ ${normalizedPath}`
   );
   return data;
 }
+var redirectStatusCodes = /* @__PURE__ */ new Set([301, 302, 303, 307, 308]);
 async function prerenderRoute(handler, prerenderPath, clientBuildDirectory, reactRouterConfig, viteConfig, requestInit) {
   let normalizedPath = `${reactRouterConfig.basename}${prerenderPath}/`.replace(
     /\/\/+/g,
@@ -3877,7 +3878,22 @@ async function prerenderRoute(handler, prerenderPath, clientBuildDirectory, reac
   let request = new Request(`http://localhost${normalizedPath}`, requestInit);
   let response = await handler(request);
   let html = await response.text();
-  if (response.status !== 200) {
+  if (redirectStatusCodes.has(response.status)) {
+    let location = response.headers.get("Location");
+    let delay = response.status === 302 ? 2 : 0;
+    html = `<!doctype html>
+<head>
+<title>Redirecting to: ${location}</title>
+<meta http-equiv="refresh" content="${delay};url=${location}">
+<meta name="robots" content="noindex">
+</head>
+<body>
+	<a href="${location}">
+    Redirecting from <code>${normalizedPath}</code> to <code>${location}</code>
+  </a>
+</body>
+</html>`;
+  } else if (response.status !== 200) {
     throw new Error(
       `Prerender (html): Received a ${response.status} status code from \`entry.server.tsx\` while prerendering the \`${normalizedPath}\` path.
 ${html}`
@@ -4275,27 +4291,28 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
   function getBaseOptions({
     viteUserConfig
   }) {
+    const rollupOptions = {
+      preserveEntrySignatures: "exports-only",
+      // Silence Rollup "use client" warnings
+      // Adapted from https://github.com/vitejs/vite-plugin-react/pull/144
+      onwarn(warning, defaultHandler) {
+        if (warning.code === "MODULE_LEVEL_DIRECTIVE" && warning.message.includes("use client")) {
+          return;
+        }
+        let userHandler = viteUserConfig.build?.rollupOptions?.onwarn;
+        if (userHandler) {
+          userHandler(warning, defaultHandler);
+        } else {
+          defaultHandler(warning);
+        }
+      }
+    };
     return {
       build: {
         cssMinify: viteUserConfig.build?.cssMinify ?? true,
         manifest: true,
         // The manifest is enabled for all builds to detect SSR-only assets
-        rollupOptions: {
-          preserveEntrySignatures: "exports-only",
-          // Silence Rollup "use client" warnings
-          // Adapted from https://github.com/vitejs/vite-plugin-react/pull/144
-          onwarn(warning, defaultHandler) {
-            if (warning.code === "MODULE_LEVEL_DIRECTIVE" && warning.message.includes("use client")) {
-              return;
-            }
-            let userHandler = viteUserConfig.build?.rollupOptions?.onwarn;
-            if (userHandler) {
-              userHandler(warning, defaultHandler);
-            } else {
-              defaultHandler(warning);
-            }
-          }
-        }
+        rollupOptions
       }
     };
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "7.5.0",
+  "version": "7.5.1",
   "description": "Dev tools and CLI for React Router",
   "homepage": "https://reactrouter.com",
   "bugs": {
@@ -86,7 +86,7 @@
     "set-cookie-parser": "^2.6.0",
     "valibot": "^0.41.0",
     "vite-node": "3.0.0-beta.2",
-    "@react-router/node": "7.5.0"
+    "@react-router/node": "7.5.1"
   },
   "devDependencies": {
     "@types/babel__core": "^7.20.5",
@@ -110,15 +110,15 @@
     "vite": "^6.1.0",
     "wireit": "0.14.9",
     "wrangler": "^4.2.0",
-    "@react-router/serve": "7.5.0",
-    "react-router": "^7.5.0"
+    "@react-router/serve": "7.5.1",
+    "react-router": "^7.5.1"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0",
     "wrangler": "^3.28.2 || ^4.0.0",
-    "@react-router/serve": "^7.5.0",
-    "react-router": "^7.5.0"
+    "@react-router/serve": "^7.5.1",
+    "react-router": "^7.5.1"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {