@vercel/remix-builder 5.8.4 → 5.8.5

package/dist/index.js

@@ -2641,6 +2641,18 @@ function findPrerenderedHtmlFile(path, staticFileKeys) {
   const candidates = path === "index" ? ["index.html"] : [`${path}.html`, `${path}/index.html`];
   return candidates.find((c) => staticFileKeys.has(c));
 }
+function getPrerenderDocumentRewrite(path, htmlFile) {
+  return {
+    src: path === "index" ? "^/$" : `^/${path}/?$`,
+    dest: `/${htmlFile}`
+  };
+}
+function shouldRegisterSsrForPrerenderedRoute(path) {
+  return path === "index";
+}
+function getReactRouterCatchAllDest() {
+  return "index";
+}
 async function chdirAndReadConfig(remixRunDevPath, dir, packageJsonPath) {
   const { readConfig } = await import((0, import_path.join)(remixRunDevPath, "dist/config.js"));
   const originalCwd = process.cwd();
@@ -3178,13 +3190,10 @@ var build = async ({
     if (isReactRouter) {
       const htmlFile = findPrerenderedHtmlFile(path, staticFileKeys);
       if (htmlFile) {
-        if (path !== "index") {
-          prerenderRewrites.push({
-            src: `^/${path}/?$`,
-            dest: `/${htmlFile}`
-          });
+        prerenderRewrites.push(getPrerenderDocumentRewrite(path, htmlFile));
+        if (!shouldRegisterSsrForPrerenderedRoute(path)) {
+          continue;
         }
-        continue;
       }
     }
     const func = functionsMap.get(functionId);
@@ -3194,7 +3203,9 @@ var build = async ({
     output[path] = func;
     if (isReactRouter) {
       for (const dataPath of getReactRouterDataPaths(path)) {
-        output[dataPath] = func;
+        if (!staticFileKeys.has(dataPath)) {
+          output[dataPath] = func;
+        }
       }
     }
     const re = getRegExpFromPath(rePath);
@@ -3217,7 +3228,7 @@ var build = async ({
   routes.unshift(...prerenderRewrites, { handle: "filesystem" });
   routes.push({
     src: "/(.*)",
-    dest: "/"
+    dest: isReactRouter ? getReactRouterCatchAllDest() : "/"
   });
   routes.push({
     handle: "hit"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/remix-builder",
-  "version": "5.8.4",
+  "version": "5.8.5",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "homepage": "https://vercel.com/docs",
@@ -19,8 +19,8 @@
     "path-to-regexp-updated": "npm:path-to-regexp@6.3.0",
     "path-to-regexp": "6.1.0",
     "ts-morph": "12.0.0",
-    "@vercel/error-utils": "2.1.0",
-    "@vercel/static-config": "3.4.0"
+    "@vercel/static-config": "3.4.0",
+    "@vercel/error-utils": "2.1.0"
   },
   "devDependencies": {
     "@types/node": "20.11.0",