@react-router/dev 0.0.0-experimental-fde52e515 → 0.0.0-experimental-a2c4d7fad

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-fde52e515
+ * @react-router/dev v0.0.0-experimental-a2c4d7fad
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -635,6 +635,25 @@ var init_profiler = __esm({
   }
 });
 
+// vite/babel.ts
+var babel_exports = {};
+__export(babel_exports, {
+  generate: () => generate,
+  parse: () => import_parser.parse,
+  t: () => t,
+  traverse: () => traverse
+});
+var import_parser, t, traverse, generate;
+var init_babel = __esm({
+  "vite/babel.ts"() {
+    "use strict";
+    import_parser = require("@babel/parser");
+    t = __toESM(require("@babel/types"));
+    traverse = require("@babel/traverse").default;
+    generate = require("@babel/generator").default;
+  }
+});
+
 // typegen/paths.ts
 function getTypesDir(ctx) {
   return Path2.join(ctx.rootDirectory, ".react-router/types");
@@ -657,9 +676,8 @@ var init_paths = __esm({
 });
 
 // typegen/generate.ts
-function generate(ctx, route) {
+function generate2(ctx, route) {
   const lineage = getRouteLineage(ctx.config.routes, route);
-  const urlpath = lineage.map((route2) => route2.path).join("/");
   const typesPath = getTypesPath(ctx, route);
   const parents = lineage.slice(0, -1);
   const parentTypeImports = parents.map((parent, i) => {
@@ -677,22 +695,15 @@ function generate(ctx, route) {
     // ${route.file}
 
     import type * as T from "react-router/route-module"
+    import type { Routes } from "react-router/types"
 
     ${parentTypeImports}
 
-    type Module = typeof import("../${Pathe2.filename(route.file)}.js")
+    type RouteId = "${route.id}"
 
-    export type Info = {
+    export type Info = Routes[RouteId] & {
       parents: [${parents.map((_, i) => `Parent${i}`).join(", ")}],
-      id: "${route.id}"
-      file: "${route.file}"
-      path: "${route.path}"
-      params: {${formatParamProperties(
-    urlpath
-  )}} & { [key: string]: string | undefined }
-      module: Module
-      loaderData: T.CreateLoaderData<Module>
-      actionData: T.CreateActionData<Module>
+      id: RouteId
     }
 
     export namespace Route {
@@ -727,36 +738,6 @@ function getRouteLineage(routes2, route) {
   result.reverse();
   return result;
 }
-function formatParamProperties(urlpath) {
-  const params = parseParams(urlpath);
-  const properties = Object.entries(params).map(([name, values]) => {
-    if (values.length === 1) {
-      const isOptional = values[0];
-      return isOptional ? `"${name}"?: string` : `"${name}": string`;
-    }
-    const items = values.map(
-      (isOptional) => isOptional ? "string | undefined" : "string"
-    );
-    return `"${name}": [${items.join(", ")}]`;
-  });
-  return properties.join("; ");
-}
-function parseParams(urlpath) {
-  const result = {};
-  let segments = urlpath.split("/");
-  segments.forEach((segment) => {
-    const match = segment.match(/^:([\w-]+)(\?)?/);
-    if (!match) return;
-    const param = match[1];
-    const isOptional = match[2] !== void 0;
-    result[param] ??= [];
-    result[param].push(isOptional);
-    return;
-  });
-  const hasSplat = segments.at(-1) === "*";
-  if (hasSplat) result["*"] = [false];
-  return result;
-}
 var import_dedent, Path3, Pathe2, noExtension;
 var init_generate = __esm({
   "typegen/generate.ts"() {
@@ -817,33 +798,110 @@ async function writeAll(ctx) {
   import_node_fs3.default.rmSync(typegenDir, { recursive: true, force: true });
   Object.values(ctx.config.routes).forEach((route) => {
     const typesPath = getTypesPath(ctx, route);
-    const content = generate(ctx, route);
+    const content = generate2(ctx, route);
     import_node_fs3.default.mkdirSync(Path4.dirname(typesPath), { recursive: true });
     import_node_fs3.default.writeFileSync(typesPath, content);
   });
+  Object.values(ctx.config.routes).map(
+    (route) => t2.tsPropertySignature(
+      t2.stringLiteral(route.id),
+      t2.tsTypeAnnotation(
+        t2.tsTypeLiteral([
+          t2.tsPropertySignature(
+            t2.identifier("parentId"),
+            t2.tsTypeAnnotation(
+              route.parentId ? t2.tsLiteralType(t2.stringLiteral(route.parentId)) : t2.tsUndefinedKeyword()
+            )
+          ),
+          t2.tsPropertySignature(
+            t2.identifier("path"),
+            t2.tsTypeAnnotation(
+              route.path ? t2.tsLiteralType(t2.stringLiteral(route.path)) : t2.tsUndefinedKeyword()
+            )
+          ),
+          t2.tsPropertySignature(
+            t2.identifier("module"),
+            t2.tsTypeAnnotation(
+              t2.tsTypeQuery(t2.tsImportType(t2.stringLiteral(route.file)))
+            )
+          )
+        ])
+      )
+    )
+  );
+  const registerPath = Path4.join(typegenDir, "+register.ts");
+  import_node_fs3.default.writeFileSync(registerPath, register(ctx));
+}
+function register(ctx) {
+  const routes2 = generate(
+    t2.tsTypeAliasDeclaration(
+      t2.identifier("Routes"),
+      null,
+      t2.tsTypeLiteral(
+        Object.values(ctx.config.routes).map(
+          (route) => t2.tsPropertySignature(
+            t2.stringLiteral(route.id),
+            t2.tsTypeAnnotation(
+              t2.tsTypeLiteral([
+                t2.tsPropertySignature(
+                  t2.identifier("parentId"),
+                  t2.tsTypeAnnotation(
+                    route.parentId ? t2.tsLiteralType(t2.stringLiteral(route.parentId)) : t2.tsUndefinedKeyword()
+                  )
+                ),
+                t2.tsPropertySignature(
+                  t2.identifier("path"),
+                  t2.tsTypeAnnotation(
+                    route.path ? t2.tsLiteralType(t2.stringLiteral(route.path)) : t2.tsUndefinedKeyword()
+                  )
+                ),
+                t2.tsPropertySignature(
+                  t2.identifier("module"),
+                  t2.tsTypeAnnotation(
+                    t2.tsTypeQuery(
+                      t2.tsImportType(
+                        t2.stringLiteral(compiledModulePath(ctx, route))
+                      )
+                    )
+                  )
+                )
+              ])
+            )
+          )
+        )
+      )
+    )
+  ).code;
+  const registerTypes = import_dedent2.default`
+    import "react-router/types";
+
+    declare module "react-router/types" {
+      interface Register {
+        routes: Routes;
+      }
+    }
+  `;
+  return [registerTypes, routes2].join("\n\n");
+}
+function compiledModulePath(ctx, route) {
+  return "./" + Path4.relative(
+    ctx.rootDirectory,
+    Path4.join(ctx.config.appDirectory, route.file)
+  ).replace(/\.(js|ts)x?$/, ".js");
 }
-var import_node_fs3, Path4, import_picocolors3;
+var import_node_fs3, import_dedent2, Path4, import_picocolors3, t2;
 var init_typegen = __esm({
   "typegen/index.ts"() {
     "use strict";
     import_node_fs3 = __toESM(require("fs"));
+    import_dedent2 = __toESM(require("dedent"));
     Path4 = __toESM(require("pathe"));
     import_picocolors3 = __toESM(require("picocolors"));
     init_config();
+    init_babel();
     init_generate();
     init_paths();
-  }
-});
-
-// vite/babel.ts
-var import_parser, t, traverse, generate2;
-var init_babel = __esm({
-  "vite/babel.ts"() {
-    "use strict";
-    import_parser = require("@babel/parser");
-    t = __toESM(require("@babel/types"));
-    traverse = require("@babel/traverse").default;
-    generate2 = require("@babel/generator").default;
+    ({ t: t2 } = babel_exports);
   }
 });
 
@@ -970,11 +1028,11 @@ var init_route_chunks = __esm({
 });
 
 // vite/with-props.ts
-var import_dedent2, vmod;
+var import_dedent3, vmod;
 var init_with_props = __esm({
   "vite/with-props.ts"() {
     "use strict";
-    import_dedent2 = __toESM(require("dedent"));
+    import_dedent3 = __toESM(require("dedent"));
     init_babel();
     init_virtual_module();
     vmod = create("with-props");
@@ -1577,8 +1635,8 @@ var babel = __toESM(require("@babel/core"));
 var import_plugin_syntax_jsx = __toESM(require("@babel/plugin-syntax-jsx"));
 var import_preset_typescript = __toESM(require("@babel/preset-typescript"));
 var import_prettier = __toESM(require("prettier"));
-function transpile(tsx, options = {}) {
-  let mjs = babel.transformSync(tsx, {
+function transpile(tsx2, options = {}) {
+  let mjs = babel.transformSync(tsx2, {
     compact: false,
     cwd: options.cwd,
     filename: options.filename,
@@ -1702,8 +1760,8 @@ async function checkForEntry(rootDirectory, appDirectory, entries2) {
     let entryPath = path9.resolve(appDirectory, entry);
     let exists = await import_fs_extra2.default.pathExists(entryPath);
     if (exists) {
-      let relative8 = path9.relative(rootDirectory, entryPath);
-      console.error(import_picocolors7.default.red(`Entry file ${relative8} already exists.`));
+      let relative9 = path9.relative(rootDirectory, entryPath);
+      console.error(import_picocolors7.default.red(`Entry file ${relative9} already exists.`));
       return process.exit(1);
     }
   }

package/dist/config.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-fde52e515
+ * @react-router/dev v0.0.0-experimental-a2c4d7fad
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-fde52e515
+ * @react-router/dev v0.0.0-experimental-a2c4d7fad
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-fde52e515
+ * @react-router/dev v0.0.0-experimental-a2c4d7fad
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-fde52e515
+ * @react-router/dev v0.0.0-experimental-a2c4d7fad
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -59,6 +59,7 @@ var import_kebabCase = __toESM(require("lodash/kebabCase"));
 
 // typegen/index.ts
 var import_node_fs2 = __toESM(require("fs"));
+var import_dedent2 = __toESM(require("dedent"));
 var Path4 = __toESM(require("pathe"));
 var import_picocolors2 = __toESM(require("picocolors"));
 
@@ -632,6 +633,19 @@ function findEntry(dir, basename2, options) {
   return void 0;
 }
 
+// vite/babel.ts
+var babel_exports = {};
+__export(babel_exports, {
+  generate: () => generate,
+  parse: () => import_parser.parse,
+  t: () => t,
+  traverse: () => traverse
+});
+var import_parser = require("@babel/parser");
+var t = __toESM(require("@babel/types"));
+var traverse = require("@babel/traverse").default;
+var generate = require("@babel/generator").default;
+
 // typegen/generate.ts
 var import_dedent = __toESM(require("dedent"));
 var Path3 = __toESM(require("pathe"));
@@ -653,9 +667,8 @@ function getTypesPath(ctx, route) {
 }
 
 // typegen/generate.ts
-function generate(ctx, route) {
+function generate2(ctx, route) {
   const lineage = getRouteLineage(ctx.config.routes, route);
-  const urlpath = lineage.map((route2) => route2.path).join("/");
   const typesPath = getTypesPath(ctx, route);
   const parents = lineage.slice(0, -1);
   const parentTypeImports = parents.map((parent, i) => {
@@ -673,22 +686,15 @@ function generate(ctx, route) {
     // ${route.file}
 
     import type * as T from "react-router/route-module"
+    import type { Routes } from "react-router/types"
 
     ${parentTypeImports}
 
-    type Module = typeof import("../${Pathe2.filename(route.file)}.js")
+    type RouteId = "${route.id}"
 
-    export type Info = {
+    export type Info = Routes[RouteId] & {
       parents: [${parents.map((_, i) => `Parent${i}`).join(", ")}],
-      id: "${route.id}"
-      file: "${route.file}"
-      path: "${route.path}"
-      params: {${formatParamProperties(
-    urlpath
-  )}} & { [key: string]: string | undefined }
-      module: Module
-      loaderData: T.CreateLoaderData<Module>
-      actionData: T.CreateActionData<Module>
+      id: RouteId
     }
 
     export namespace Route {
@@ -724,38 +730,9 @@ function getRouteLineage(routes, route) {
   result.reverse();
   return result;
 }
-function formatParamProperties(urlpath) {
-  const params = parseParams(urlpath);
-  const properties = Object.entries(params).map(([name, values]) => {
-    if (values.length === 1) {
-      const isOptional = values[0];
-      return isOptional ? `"${name}"?: string` : `"${name}": string`;
-    }
-    const items = values.map(
-      (isOptional) => isOptional ? "string | undefined" : "string"
-    );
-    return `"${name}": [${items.join(", ")}]`;
-  });
-  return properties.join("; ");
-}
-function parseParams(urlpath) {
-  const result = {};
-  let segments = urlpath.split("/");
-  segments.forEach((segment) => {
-    const match = segment.match(/^:([\w-]+)(\?)?/);
-    if (!match) return;
-    const param = match[1];
-    const isOptional = match[2] !== void 0;
-    result[param] ??= [];
-    result[param].push(isOptional);
-    return;
-  });
-  const hasSplat = segments.at(-1) === "*";
-  if (hasSplat) result["*"] = [false];
-  return result;
-}
 
 // typegen/index.ts
+var { t: t2 } = babel_exports;
 async function watch(rootDirectory, { logger } = {}) {
   const ctx = await createContext2({ rootDirectory, watch: true });
   await writeAll(ctx);
@@ -799,17 +776,97 @@ async function writeAll(ctx) {
   import_node_fs2.default.rmSync(typegenDir, { recursive: true, force: true });
   Object.values(ctx.config.routes).forEach((route) => {
     const typesPath = getTypesPath(ctx, route);
-    const content = generate(ctx, route);
+    const content = generate2(ctx, route);
     import_node_fs2.default.mkdirSync(Path4.dirname(typesPath), { recursive: true });
     import_node_fs2.default.writeFileSync(typesPath, content);
   });
-}
+  Object.values(ctx.config.routes).map(
+    (route) => t2.tsPropertySignature(
+      t2.stringLiteral(route.id),
+      t2.tsTypeAnnotation(
+        t2.tsTypeLiteral([
+          t2.tsPropertySignature(
+            t2.identifier("parentId"),
+            t2.tsTypeAnnotation(
+              route.parentId ? t2.tsLiteralType(t2.stringLiteral(route.parentId)) : t2.tsUndefinedKeyword()
+            )
+          ),
+          t2.tsPropertySignature(
+            t2.identifier("path"),
+            t2.tsTypeAnnotation(
+              route.path ? t2.tsLiteralType(t2.stringLiteral(route.path)) : t2.tsUndefinedKeyword()
+            )
+          ),
+          t2.tsPropertySignature(
+            t2.identifier("module"),
+            t2.tsTypeAnnotation(
+              t2.tsTypeQuery(t2.tsImportType(t2.stringLiteral(route.file)))
+            )
+          )
+        ])
+      )
+    )
+  );
+  const registerPath = Path4.join(typegenDir, "+register.ts");
+  import_node_fs2.default.writeFileSync(registerPath, register(ctx));
+}
+function register(ctx) {
+  const routes = generate(
+    t2.tsTypeAliasDeclaration(
+      t2.identifier("Routes"),
+      null,
+      t2.tsTypeLiteral(
+        Object.values(ctx.config.routes).map(
+          (route) => t2.tsPropertySignature(
+            t2.stringLiteral(route.id),
+            t2.tsTypeAnnotation(
+              t2.tsTypeLiteral([
+                t2.tsPropertySignature(
+                  t2.identifier("parentId"),
+                  t2.tsTypeAnnotation(
+                    route.parentId ? t2.tsLiteralType(t2.stringLiteral(route.parentId)) : t2.tsUndefinedKeyword()
+                  )
+                ),
+                t2.tsPropertySignature(
+                  t2.identifier("path"),
+                  t2.tsTypeAnnotation(
+                    route.path ? t2.tsLiteralType(t2.stringLiteral(route.path)) : t2.tsUndefinedKeyword()
+                  )
+                ),
+                t2.tsPropertySignature(
+                  t2.identifier("module"),
+                  t2.tsTypeAnnotation(
+                    t2.tsTypeQuery(
+                      t2.tsImportType(
+                        t2.stringLiteral(compiledModulePath(ctx, route))
+                      )
+                    )
+                  )
+                )
+              ])
+            )
+          )
+        )
+      )
+    )
+  ).code;
+  const registerTypes = import_dedent2.default`
+    import "react-router/types";
 
-// vite/babel.ts
-var import_parser = require("@babel/parser");
-var t = __toESM(require("@babel/types"));
-var traverse = require("@babel/traverse").default;
-var generate2 = require("@babel/generator").default;
+    declare module "react-router/types" {
+      interface Register {
+        routes: Routes;
+      }
+    }
+  `;
+  return [registerTypes, routes].join("\n\n");
+}
+function compiledModulePath(ctx, route) {
+  return "./" + Path4.relative(
+    ctx.rootDirectory,
+    Path4.join(ctx.config.appDirectory, route.file)
+  ).replace(/\.(js|ts)x?$/, ".js");
+}
 
 // vite/node-adapter.ts
 var import_node_events = require("events");
@@ -1597,7 +1654,7 @@ function getChunkedExport(code, exportName, generateOptions = {}, cache, cacheKe
         }
         throw new Error(`Unknown export node type: ${node.type}`);
       }).filter((node) => node !== null);
-      return generate2(ast, generateOptions);
+      return generate(ast, generateOptions);
     }
   );
 }
@@ -1713,7 +1770,7 @@ function omitChunkedExports(code, exportNames, generateOptions = {}, cache, cach
       if (ast.program.body.length === 0) {
         return void 0;
       }
-      return generate2(ast, generateOptions);
+      return generate(ast, generateOptions);
     }
   );
 }
@@ -1775,7 +1832,7 @@ function getRouteChunkNameFromModuleId(id) {
 }
 
 // vite/with-props.ts
-var import_dedent2 = __toESM(require("dedent"));
+var import_dedent3 = __toESM(require("dedent"));
 var vmod = create("with-props");
 var NAMED_COMPONENT_EXPORTS = ["HydrateFallback", "ErrorBoundary"];
 var plugin = {
@@ -1786,7 +1843,7 @@ var plugin = {
   },
   async load(id) {
     if (id !== vmod.resolvedId) return;
-    return import_dedent2.default`
+    return import_dedent3.default`
       import { createElement as h } from "react";
       import { useActionData, useLoaderData, useMatches, useParams, useRouteError } from "react-router";
 
@@ -1806,8 +1863,6 @@ var plugin = {
         return function Wrapped() {
           const props = {
             params: useParams(),
-            loaderData: useLoaderData(),
-            actionData: useActionData(),
           };
           return h(HydrateFallback, props);
         };
@@ -2168,10 +2223,6 @@ var reactRouterVitePlugin = () => {
       // Otherwise, all routes are imported as usual
       ctx.reactRouterConfig.routes
     );
-    let prerenderPaths = await getPrerenderPaths(
-      ctx.reactRouterConfig.prerender,
-      routes
-    );
     return `
     import * as entryServer from ${JSON.stringify(
       resolveFileUrl(ctx, ctx.entryServerFilePath)
@@ -2198,7 +2249,6 @@ var reactRouterVitePlugin = () => {
       export const future = ${JSON.stringify(ctx.reactRouterConfig.future)};
       export const ssr = ${ctx.reactRouterConfig.ssr};
       export const isSpaMode = ${isSpaModeEnabled(ctx.reactRouterConfig)};
-      export const prerender = ${JSON.stringify(prerenderPaths)};
       export const publicPath = ${JSON.stringify(ctx.publicPath)};
       export const entry = { module: entryServer };
       export const routes = {
@@ -2725,7 +2775,7 @@ var reactRouterVitePlugin = () => {
               ].join("\n")
             );
           }
-          if (isPrerenderingEnabled(ctx.reactRouterConfig)) {
+          if (ctx.reactRouterConfig.prerender != null && ctx.reactRouterConfig.prerender !== false) {
             await handlePrerender(
               viteConfig,
               ctx.reactRouterConfig,
@@ -2999,15 +3049,12 @@ var reactRouterVitePlugin = () => {
         if (!route) return;
         if (!options?.ssr && isSpaModeEnabled(ctx.reactRouterConfig)) {
           let exportNames = getExportNames(code);
-          let serverOnlyExports = exportNames.filter((exp) => {
-            if (route.id === "root" && exp === "loader") {
-              return false;
-            }
-            return SERVER_ONLY_ROUTE_EXPORTS.includes(exp);
-          });
+          let serverOnlyExports = exportNames.filter(
+            (exp) => SERVER_ONLY_ROUTE_EXPORTS.includes(exp)
+          );
           if (serverOnlyExports.length > 0) {
             let str = serverOnlyExports.map((e) => `\`${e}\``).join(", ");
-            let message = `SPA Mode: ${serverOnlyExports.length} invalid route export(s) in \`${route.file}\`: ${str}. See https://reactrouter.com/how-to/spa for more information.`;
+            let message = `SPA Mode: ${serverOnlyExports.length} invalid route export(s) in \`${route.file}\`: ${str}. See https://remix.run/guides/spa-mode for more information.`;
             throw Error(message);
           }
           if (route.id !== "root") {
@@ -3015,7 +3062,7 @@ var reactRouterVitePlugin = () => {
               (exp) => exp === "HydrateFallback"
             );
             if (hasHydrateFallback) {
-              let message = `SPA Mode: Invalid \`HydrateFallback\` export found in \`${route.file}\`. \`HydrateFallback\` is only permitted on the root route in SPA Mode. See https://reactrouter.com/how-to/spa for more information.`;
+              let message = `SPA Mode: Invalid \`HydrateFallback\` export found in \`${route.file}\`. \`HydrateFallback\` is only permitted on the root route in SPA Mode. See https://remix.run/guides/spa-mode for more information.`;
               throw Error(message);
             }
           }
@@ -3026,7 +3073,7 @@ var reactRouterVitePlugin = () => {
           removeExports(ast, SERVER_ONLY_ROUTE_EXPORTS);
         }
         transform(ast);
-        return generate2(ast, {
+        return generate(ast, {
           sourceMaps: true,
           filename: id,
           sourceFileName: filepath
@@ -3308,11 +3355,8 @@ async function getRouteMetadata(cache, ctx, viteChildCompiler, route, readRouteF
   };
   return info;
 }
-function isPrerenderingEnabled(reactRouterConfig) {
-  return reactRouterConfig.prerender != null && reactRouterConfig.prerender !== false;
-}
 function isSpaModeEnabled(reactRouterConfig) {
-  return reactRouterConfig.ssr === false && !isPrerenderingEnabled(reactRouterConfig);
+  return reactRouterConfig.ssr === false && (reactRouterConfig.prerender == null || reactRouterConfig.prerender === false || Array.isArray(reactRouterConfig.prerender) && reactRouterConfig.prerender.length === 1 && reactRouterConfig.prerender[0] === "/");
 }
 async function getPrerenderBuildAndHandler(viteConfig, serverBuildDirectory, serverBuildFile) {
   let serverBuildPath = path6.join(serverBuildDirectory, serverBuildFile);
@@ -3324,44 +3368,20 @@ async function getPrerenderBuildAndHandler(viteConfig, serverBuildDirectory, ser
   };
 }
 async function handleSpaMode(viteConfig, reactRouterConfig, serverBuildDirectory, serverBuildFile, clientBuildDirectory) {
-  let { build, handler } = await getPrerenderBuildAndHandler(
+  let { handler } = await getPrerenderBuildAndHandler(
     viteConfig,
     serverBuildDirectory,
     serverBuildFile
   );
-  let request = new Request(`http://localhost${reactRouterConfig.basename}`, {
-    headers: {
-      // Enable SPA mode in the server runtime and only render down to the root
-      "X-React-Router-SPA-Mode": "yes"
-    }
-  });
+  let request = new Request(`http://localhost${reactRouterConfig.basename}`);
   let response = await handler(request);
   let html = await response.text();
-  let isPrerenderSpaFallback = build.prerender.includes("/");
-  let filename3 = isPrerenderSpaFallback ? "__spa-fallback__.html" : "index.html";
-  if (response.status !== 200) {
-    if (isPrerenderSpaFallback) {
-      throw new Error(
-        `Prerender: Received a ${response.status} status code from \`entry.server.tsx\` while prerendering your \`${filename3}\` file.
-` + html
-      );
-    } else {
-      throw new Error(
-        `SPA Mode: Received a ${response.status} status code from \`entry.server.tsx\` while prerendering your \`${filename3}\` file.
-` + html
-      );
-    }
-  }
-  if (!html.includes("window.__reactRouterContext =") || !html.includes("window.__reactRouterRouteModules =")) {
-    throw new Error(
-      "SPA Mode: Did you forget to include `<Scripts/>` in your root route? Your pre-rendered HTML cannot hydrate without `<Scripts />`."
-    );
-  }
-  await fse.writeFile(path6.join(clientBuildDirectory, filename3), html);
-  let prettyDir = path6.relative(process.cwd(), clientBuildDirectory);
-  let prettyPath = path6.join(prettyDir, filename3);
-  let prefix = isPrerenderSpaFallback ? "Prerender" : "SPA Mode";
-  viteConfig.logger.info(`${prefix}: Generated \`${prettyPath}\``);
+  validatePrerenderedResponse(response, html, "SPA Mode", "/");
+  validatePrerenderedHtml(html, "SPA Mode");
+  await fse.writeFile(path6.join(clientBuildDirectory, "index.html"), html);
+  viteConfig.logger.info(
+    "SPA Mode: index.html has been written to your " + import_picocolors3.default.bold(path6.relative(process.cwd(), clientBuildDirectory)) + " directory"
+  );
 }
 async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirectory, serverBuildPath, clientBuildDirectory) {
   let { build, handler } = await getPrerenderBuildAndHandler(
@@ -3370,22 +3390,29 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
     serverBuildPath
   );
   let routes = createPrerenderRoutes(build.routes);
-  let prerenderedRoutes = /* @__PURE__ */ new Set();
+  let routesToPrerender;
+  if (typeof reactRouterConfig.prerender === "boolean") {
+    invariant(reactRouterConfig.prerender, "Expected prerender:true");
+    routesToPrerender = determineStaticPrerenderRoutes(
+      routes,
+      viteConfig,
+      true
+    );
+  } else if (typeof reactRouterConfig.prerender === "function") {
+    routesToPrerender = await reactRouterConfig.prerender({
+      getStaticPaths: () => determineStaticPrerenderRoutes(routes, viteConfig, false)
+    });
+  } else {
+    routesToPrerender = reactRouterConfig.prerender || ["/"];
+  }
   let headers = {
     // Header that can be used in the loader to know if you're running at
     // build time or runtime
     "X-React-Router-Prerender": "yes"
   };
-  for (let path7 of build.prerender) {
+  for (let path7 of routesToPrerender) {
     let matches = (0, import_react_router2.matchRoutes)(routes, `/${path7}/`.replace(/^\/\/+/, "/"));
-    invariant(
-      matches,
-      `Unable to prerender path because it does not match any routes: ${path7}`
-    );
-    matches.forEach((m) => prerenderedRoutes.add(m.route.id));
-    let hasLoaders = matches.some(
-      (m) => build.assets.routes[m.route.id]?.hasLoader
-    );
+    let hasLoaders = matches?.some((m) => m.route.loader);
     let data;
     if (hasLoaders) {
       data = await prerenderData(
@@ -3425,34 +3452,8 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
       );
     }
   }
-  if (reactRouterConfig.ssr === false) {
-    let errors = [];
-    for (let [routeId, route] of Object.entries(build.routes)) {
-      let invalidApis = [];
-      if (route) {
-        if (route.module.headers) invalidApis.push("headers");
-        if (route.module.action) invalidApis.push("action");
-        if (invalidApis.length > 0) {
-          errors.push(
-            `Prerender: ${invalidApis.length} invalid route export(s) in \`${route.id}\` when prerendering with \`ssr:false\`: ${invalidApis.join(", ")}.  See https://reactrouter.com/how-to/spa for more information.`
-          );
-        }
-        if (route.module.loader && !prerenderedRoutes.has(routeId)) {
-          errors.push(
-            `Prerender: 1 invalid route export in \`${route.id}\` when using \`ssr:false\` with \`prerender\` because the route is never prerendered so the loader will never be called.  See https://reactrouter.com/how-to/spa for more information.`
-          );
-        }
-      }
-    }
-    if (errors.length > 0) {
-      viteConfig.logger.error(errors.join("\n"));
-      throw new Error(
-        "Invalid route exports found when prerendering with `ssr:false`"
-      );
-    }
-  }
 }
-function getStaticPrerenderPaths(routes) {
+function determineStaticPrerenderRoutes(routes, viteConfig, isBooleanUsage = false) {
   let paths = ["/"];
   let paramRoutes = [];
   function recurse(subtree, prefix = "") {
@@ -3472,29 +3473,28 @@ function getStaticPrerenderPaths(routes) {
     }
   }
   recurse(routes);
-  return {
-    paths: paths.map((p) => p.replace(/\/\/+/g, "/").replace(/(.+)\/$/, "$1")),
-    paramRoutes
-  };
+  if (isBooleanUsage && paramRoutes.length > 0) {
+    viteConfig.logger.warn(
+      [
+        "\u26A0\uFE0F Paths with dynamic/splat params cannot be prerendered when using `prerender: true`.",
+        "You may want to use the `prerender()` API to prerender the following paths:",
+        ...paramRoutes.map((p) => "  - " + p)
+      ].join("\n")
+    );
+  }
+  return paths.map((p) => p.replace(/\/\/+/g, "/").replace(/(.+)\/$/, "$1"));
 }
 async function prerenderData(handler, prerenderPath, clientBuildDirectory, reactRouterConfig, viteConfig, requestInit) {
   let normalizedPath = `${reactRouterConfig.basename}${prerenderPath === "/" ? "/_root.data" : `${prerenderPath.replace(/\/$/, "")}.data`}`.replace(/\/\/+/g, "/");
   let request = new Request(`http://localhost${normalizedPath}`, requestInit);
   let response = await handler(request);
   let data = await response.text();
-  if (response.status !== 200) {
-    throw new Error(
-      `Prerender: Received a ${response.status} status code from \`entry.server.tsx\` while prerendering the \`${path6}\` path.
-${normalizedPath}`
-    );
-  }
+  validatePrerenderedResponse(response, data, "Prerender", normalizedPath);
   let outdir = path6.relative(process.cwd(), clientBuildDirectory);
   let outfile = path6.join(outdir, ...normalizedPath.split("/"));
   await fse.ensureDir(path6.dirname(outfile));
   await fse.outputFile(outfile, data);
-  viteConfig.logger.info(
-    `Prerender Data: ${prerenderPath} -> ${import_picocolors3.default.bold(outfile)}`
-  );
+  viteConfig.logger.info(`Prerender: Generated ${import_picocolors3.default.bold(outfile)}`);
   return data;
 }
 async function prerenderRoute(handler, prerenderPath, clientBuildDirectory, reactRouterConfig, viteConfig, requestInit) {
@@ -3505,83 +3505,42 @@ 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) {
-    throw new Error(
-      `Prerender: Received a ${response.status} status code from \`entry.server.tsx\` while prerendering the \`${normalizedPath}\` path.
-${html}`
-    );
+  validatePrerenderedResponse(response, html, "Prerender", normalizedPath);
+  if (!reactRouterConfig.ssr) {
+    validatePrerenderedHtml(html, "Prerender");
   }
   let outdir = path6.relative(process.cwd(), clientBuildDirectory);
   let outfile = path6.join(outdir, ...normalizedPath.split("/"), "index.html");
   await fse.ensureDir(path6.dirname(outfile));
   await fse.outputFile(outfile, html);
-  viteConfig.logger.info(
-    `Prerender: ${prerenderPath} -> ${import_picocolors3.default.bold(outfile)}`
-  );
+  viteConfig.logger.info(`Prerender: Generated ${import_picocolors3.default.bold(outfile)}`);
 }
 async function prerenderResourceRoute(handler, prerenderPath, clientBuildDirectory, reactRouterConfig, viteConfig, requestInit) {
   let normalizedPath = `${reactRouterConfig.basename}${prerenderPath}/`.replace(/\/\/+/g, "/").replace(/\/$/g, "");
   let request = new Request(`http://localhost${normalizedPath}`, requestInit);
   let response = await handler(request);
   let text = await response.text();
-  if (response.status !== 200) {
-    throw new Error(
-      `Prerender: Received a ${response.status} status code from \`entry.server.tsx\` while prerendering the \`${normalizedPath}\` path.
-${text}`
-    );
-  }
+  validatePrerenderedResponse(response, text, "Prerender", normalizedPath);
   let outdir = path6.relative(process.cwd(), clientBuildDirectory);
   let outfile = path6.join(outdir, ...normalizedPath.split("/"));
   await fse.ensureDir(path6.dirname(outfile));
   await fse.outputFile(outfile, text);
-  viteConfig.logger.info(
-    `Prerender: ${prerenderPath} -> ${import_picocolors3.default.bold(outfile)}`
-  );
+  viteConfig.logger.info(`Prerender: Generated ${import_picocolors3.default.bold(outfile)}`);
 }
-async function getPrerenderPaths(prerender, routes) {
-  let prerenderPaths = [];
-  if (prerender != null && prerender !== false) {
-    let prerenderRoutes = createPrerenderRoutes(routes);
-    if (prerender === true) {
-      let { paths, paramRoutes } = getStaticPrerenderPaths(prerenderRoutes);
-      if (paramRoutes.length > 0) {
-        console.warn(
-          import_picocolors3.default.yellow(
-            [
-              "\u26A0\uFE0F Paths with dynamic/splat params cannot be prerendered when using `prerender: true`. You may want to use the `prerender()` API to prerender the following paths:",
-              ...paramRoutes.map((p) => "  - " + p)
-            ].join("\n")
-          )
-        );
-      }
-      prerenderPaths = paths;
-    } else if (typeof prerender === "function") {
-      prerenderPaths = await prerender({
-        getStaticPaths: () => getStaticPrerenderPaths(prerenderRoutes).paths
-      });
-    } else {
-      prerenderPaths = prerender || ["/"];
-    }
+function validatePrerenderedResponse(response, html, prefix, path7) {
+  if (response.status !== 200) {
+    throw new Error(
+      `${prefix}: Received a ${response.status} status code from \`entry.server.tsx\` while prerendering the \`${path7}\` path.
+${html}`
+    );
   }
-  return prerenderPaths;
 }
-function createPrerenderRoutes(manifest, parentId = "", routesByParentId = groupRoutesByParentId2(manifest)) {
-  return (routesByParentId[parentId] || []).map((route) => {
-    let commonRoute = {
-      id: route.id,
-      path: route.path
-    };
-    if (route.index) {
-      return {
-        index: true,
-        ...commonRoute
-      };
-    }
-    return {
-      children: createPrerenderRoutes(manifest, route.id, routesByParentId),
-      ...commonRoute
-    };
-  });
+function validatePrerenderedHtml(html, prefix) {
+  if (!html.includes("window.__reactRouterContext =") || !html.includes("window.__reactRouterRouteModules =")) {
+    throw new Error(
+      `${prefix}: Did you forget to include <Scripts/> in your root route? Your pre-rendered HTML files cannot hydrate without \`<Scripts />\`.`
+    );
+  }
 }
 function groupRoutesByParentId2(manifest) {
   let routes = {};
@@ -3596,6 +3555,27 @@ function groupRoutesByParentId2(manifest) {
   });
   return routes;
 }
+function createPrerenderRoutes(manifest, parentId = "", routesByParentId = groupRoutesByParentId2(manifest)) {
+  return (routesByParentId[parentId] || []).map((route) => {
+    let commonRoute = {
+      // Always include root due to default boundaries
+      hasErrorBoundary: route.id === "root" || route.module.ErrorBoundary != null,
+      id: route.id,
+      path: route.path,
+      loader: route.module.loader ? () => null : void 0,
+      action: void 0,
+      handle: route.module.handle
+    };
+    return route.index ? {
+      index: true,
+      ...commonRoute
+    } : {
+      caseSensitive: route.caseSensitive,
+      children: createPrerenderRoutes(manifest, route.id, routesByParentId),
+      ...commonRoute
+    };
+  });
+}
 function getAddressableRoutes(routes) {
   let nonAddressableIds = /* @__PURE__ */ new Set();
   for (let id in routes) {

package/package.json

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