@vercel/remix-builder 5.8.0 → 5.8.2

package/dist/index.js

@@ -2630,6 +2630,17 @@ function getRegExpFromPath(rePath) {
   const re = pathToRegexp("923", rePath, keys);
   return keys.length > 0 ? re : false;
 }
+function getReactRouterDataPaths(path) {
+  const paths = [`${path}.data`];
+  if (path === "index") {
+    paths.push("_root.data");
+  }
+  return paths;
+}
+function findPrerenderedHtmlFile(path, staticFileKeys) {
+  const candidates = path === "index" ? ["index.html"] : [`${path}.html`, `${path}/index.html`];
+  return candidates.find((c) => staticFileKeys.has(c));
+}
 async function chdirAndReadConfig(remixRunDevPath, dir, packageJsonPath) {
   const { readConfig } = await import((0, import_path.join)(remixRunDevPath, "dist/config.js"));
   const originalCwd = process.cwd();
@@ -3152,11 +3163,10 @@ var build = async ({
   }
   const output = staticFiles;
   const assetsDir = viteConfig?.build?.assetsDir || "assets";
-  const routes = [
-    {
-      handle: "filesystem"
-    }
-  ];
+  const isReactRouter = frameworkSettings.slug === "react-router";
+  const staticFileKeys = new Set(Object.keys(staticFiles));
+  const prerenderRewrites = [];
+  const routes = [];
   for (const [id, functionId] of Object.entries(
     buildManifest.routeIdToServerBundleId ?? {}
   )) {
@@ -3165,19 +3175,46 @@ var build = async ({
     if (!path) {
       continue;
     }
+    if (isReactRouter) {
+      const htmlFile = findPrerenderedHtmlFile(path, staticFileKeys);
+      if (htmlFile) {
+        if (path !== "index") {
+          prerenderRewrites.push({
+            src: `^/${path}/?$`,
+            dest: `/${htmlFile}`
+          });
+        }
+        continue;
+      }
+    }
     const func = functionsMap.get(functionId);
     if (!func) {
       throw new Error(`Could not determine server bundle for "${id}"`);
     }
     output[path] = func;
+    if (isReactRouter) {
+      for (const dataPath of getReactRouterDataPaths(path)) {
+        output[dataPath] = func;
+      }
+    }
     const re = getRegExpFromPath(rePath);
     if (re) {
+      if (isReactRouter) {
+        const reData = getRegExpFromPath(`${rePath}.data`);
+        if (reData) {
+          routes.push({
+            src: reData.source,
+            dest: `${path}.data`
+          });
+        }
+      }
       routes.push({
         src: re.source,
         dest: path
       });
     }
   }
+  routes.unshift(...prerenderRewrites, { handle: "filesystem" });
   routes.push({
     src: "/(.*)",
     dest: "/"
@@ -3190,7 +3227,11 @@ var build = async ({
     headers: { "cache-control": "public, max-age=31536000, immutable" },
     continue: true
   });
-  return { routes, output, framework: { version: frameworkVersion } };
+  return {
+    routes,
+    output,
+    framework: { slug: "remix", version: frameworkVersion }
+  };
 };
 async function traceEdgeFiles({
   handlerPath,
@@ -3847,7 +3888,11 @@ module.exports = config;`;
     headers: { "cache-control": "public, max-age=31536000, immutable" },
     continue: true
   });
-  return { routes, output, framework: { version: remixVersion } };
+  return {
+    routes,
+    output,
+    framework: { slug: "remix", version: remixVersion }
+  };
 };
 function hasScript2(scriptName, pkg) {
   const scripts = pkg && pkg.scripts || {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vercel/remix-builder",
-  "version": "5.8.0",
+  "version": "5.8.2",
   "license": "Apache-2.0",
   "main": "./dist/index.js",
   "homepage": "https://vercel.com/docs",
@@ -23,19 +23,17 @@
     "@vercel/static-config": "3.3.0"
   },
   "devDependencies": {
-    "@types/jest": "27.5.1",
     "@types/node": "20.11.0",
     "@types/semver": "7.3.13",
     "glob": "10.3.16",
-    "jest-junit": "16.0.0",
     "semver": "7.5.2",
     "vitest": "2.0.1",
-    "@vercel/build-utils": "13.21.0"
+    "@vercel/build-utils": "13.26.0"
   },
   "VERCEL_REMIX_RUN_DEV_MAX_VERSION": "2.16.6",
   "scripts": {
     "build": "node ../../utils/build-builder.mjs",
-    "test": "jest --reporters=default --reporters=jest-junit --env node --verbose --bail --runInBand",
+    "test": "vitest run --config ../../vitest.config.mts",
     "vitest-run": "vitest -c ../../vitest.config.mts",
     "vitest-unit": "glob --absolute 'test/unit.*.test.ts'",
     "vitest-e2e": "glob --absolute 'test/integration-*.test.ts'",