@react-router/dev 0.0.0-experimental-701a32801 → 0.0.0-experimental-b571356c3

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # `@react-router/dev`
 
+## 7.5.3
+
+### Patch Changes
+
+- Updated dependencies:
+  - `react-router@7.5.3`
+  - `@react-router/node@7.5.3`
+  - `@react-router/serve@7.5.3`
+
 ## 7.5.2
 
 ### Patch Changes

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-701a32801
+ * @react-router/dev v0.0.0-experimental-b571356c3
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -143,6 +143,15 @@ async function createContext({
     optimizeDeps: {
       noDiscovery: true
     },
+    css: {
+      // This empty PostCSS config object prevents the PostCSS config file from
+      // being loaded. We don't need it in a React Router config context, and
+      // there's also an issue in Vite 5 when using a .ts PostCSS config file in
+      // an ESM project: https://github.com/vitejs/vite/issues/15869. Consumers
+      // can work around this in their own Vite config file, but they can't
+      // configure this internal usage of vite-node.
+      postcss: {}
+    },
     configFile: false,
     envFile: false,
     plugins: []
@@ -339,12 +348,17 @@ async function resolveConfig({
     serverModuleFormat: "esm",
     ssr: true
   };
+  let userAndPresetConfigs = mergeReactRouterConfig(
+    ...presets,
+    reactRouterUserConfig
+  );
   let {
     appDirectory: userAppDirectory,
     basename: basename2,
     buildDirectory: userBuildDirectory,
     buildEnd,
     prerender,
+    routeDiscovery: userRouteDiscovery,
     serverBuildFile,
     serverBundles,
     serverModuleFormat,
@@ -352,7 +366,7 @@ async function resolveConfig({
   } = {
     ...defaults,
     // Default values should be completely overridden by user/preset config, not merged
-    ...mergeReactRouterConfig(...presets, reactRouterUserConfig)
+    ...userAndPresetConfigs
   };
   if (!ssr && serverBundles) {
     serverBundles = void 0;
@@ -363,6 +377,32 @@ async function resolveConfig({
       "The `prerender` config must be a boolean, an array of string paths, or a function returning a boolean or array of string paths"
     );
   }
+  let routeDiscovery;
+  if (userRouteDiscovery == null) {
+    if (ssr) {
+      routeDiscovery = {
+        mode: "lazy",
+        manifestPath: "/__manifest"
+      };
+    } else {
+      routeDiscovery = { mode: "initial" };
+    }
+  } else if (userRouteDiscovery.mode === "initial") {
+    routeDiscovery = userRouteDiscovery;
+  } else if (userRouteDiscovery.mode === "lazy") {
+    if (!ssr) {
+      return err(
+        'The `routeDiscovery.mode` config cannot be set to "lazy" when setting `ssr:false`'
+      );
+    }
+    let { manifestPath } = userRouteDiscovery;
+    if (manifestPath != null && !manifestPath.startsWith("/")) {
+      return err(
+        'The `routeDiscovery.manifestPath` config must be a root-relative pathname beginning with a slash (i.e., "/__manifest")'
+      );
+    }
+    routeDiscovery = userRouteDiscovery;
+  }
   let appDirectory = import_pathe3.default.resolve(root, userAppDirectory || "app");
   let buildDirectory = import_pathe3.default.resolve(root, userBuildDirectory);
   let rootRouteFile = findEntry(appDirectory, "root");
@@ -430,6 +470,7 @@ async function resolveConfig({
     future,
     prerender,
     routes: routes2,
+    routeDiscovery,
     serverBuildFile,
     serverBundles,
     serverModuleFormat,
@@ -442,12 +483,13 @@ async function resolveConfig({
 }
 async function createConfigLoader({
   rootDirectory: root,
-  watch: watch2
+  watch: watch2,
+  mode
 }) {
   root = root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
   let viteNodeContext = await createContext({
     root,
-    mode: watch2 ? "development" : "production"
+    mode
   });
   let reactRouterConfigFile = findEntry(root, "react-router.config", {
     absolute: true
@@ -523,9 +565,13 @@ async function createConfigLoader({
     }
   };
 }
-async function loadConfig({ rootDirectory }) {
+async function loadConfig({
+  rootDirectory,
+  mode
+}) {
   let configLoader = await createConfigLoader({
     rootDirectory,
+    mode,
     watch: false
   });
   let config = await configLoader.getConfig();
@@ -533,13 +579,24 @@ async function loadConfig({ rootDirectory }) {
   return config;
 }
 function findEntry(dir, basename2, options) {
-  for (let ext of entryExts) {
-    let file = import_pathe3.default.resolve(dir, basename2 + ext);
-    if (import_node_fs.default.existsSync(file)) {
-      return options?.absolute ?? false ? file : import_pathe3.default.relative(dir, file);
+  let currentDir = import_pathe3.default.resolve(dir);
+  let { root } = import_pathe3.default.parse(currentDir);
+  while (true) {
+    for (let ext of options?.extensions ?? entryExts) {
+      let file = import_pathe3.default.resolve(currentDir, basename2 + ext);
+      if (import_node_fs.default.existsSync(file)) {
+        return options?.absolute ?? false ? file : import_pathe3.default.relative(dir, file);
+      }
+    }
+    if (!options?.walkParents) {
+      return void 0;
     }
+    let parentDir = import_pathe3.default.dirname(currentDir);
+    if (currentDir === root || parentDir === currentDir) {
+      return void 0;
+    }
+    currentDir = parentDir;
   }
-  return void 0;
 }
 var import_node_fs, import_node_child_process, import_package_json, import_pathe3, import_chokidar, import_picocolors, import_pick2, import_omit, import_cloneDeep, import_isEqual, excludedConfigPresetKeys, mergeReactRouterConfig, deepFreeze, entryExts;
 var init_config = __esm({
@@ -808,12 +865,12 @@ var init_generate = __esm({
 });
 
 // typegen/index.ts
-async function run(rootDirectory) {
-  const ctx = await createContext2({ rootDirectory, watch: false });
+async function run(rootDirectory, { mode }) {
+  const ctx = await createContext2({ rootDirectory, mode, watch: false });
   await writeAll(ctx);
 }
-async function watch(rootDirectory, { logger } = {}) {
-  const ctx = await createContext2({ rootDirectory, watch: true });
+async function watch(rootDirectory, { mode, logger }) {
+  const ctx = await createContext2({ rootDirectory, mode, watch: true });
   await writeAll(ctx);
   logger?.info(import_picocolors3.default.green("generated types"), { timestamp: true, clear: true });
   ctx.configLoader.onChange(async ({ result, routeConfigChanged }) => {
@@ -836,9 +893,10 @@ async function watch(rootDirectory, { logger } = {}) {
 }
 async function createContext2({
   rootDirectory,
-  watch: watch2
+  watch: watch2,
+  mode
 }) {
-  const configLoader = await createConfigLoader({ rootDirectory, watch: watch2 });
+  const configLoader = await createConfigLoader({ rootDirectory, mode, watch: watch2 });
   const configResult = await configLoader.getConfig();
   if (!configResult.ok) {
     throw new Error(configResult.error);
@@ -875,18 +933,21 @@ function register(ctx) {
     }
   `;
   const { t: t2 } = babel_exports;
-  const indexPaths = new Set(
-    Object.values(ctx.config.routes).filter((route) => route.index).map((route) => route.path)
-  );
+  const fullpaths = {};
+  for (const route of Object.values(ctx.config.routes)) {
+    if (route.id !== "root" && !route.path) continue;
+    const lineage2 = lineage(ctx.config.routes, route);
+    const fullpath2 = fullpath(lineage2);
+    const existing = fullpaths[fullpath2];
+    if (!existing || existing.length < lineage2.length) {
+      fullpaths[fullpath2] = lineage2;
+    }
+  }
   const typeParams = t2.tsTypeAliasDeclaration(
     t2.identifier("Params"),
     null,
     t2.tsTypeLiteral(
-      Object.values(ctx.config.routes).map((route) => {
-        if (route.id !== "root" && !route.path) return void 0;
-        if (!route.index && indexPaths.has(route.path)) return void 0;
-        const lineage2 = lineage(ctx.config.routes, route);
-        const fullpath2 = fullpath(lineage2);
+      Object.keys(fullpaths).map((fullpath2) => {
         const params = parse2(fullpath2);
         return t2.tsPropertySignature(
           t2.stringLiteral(fullpath2),
@@ -903,7 +964,7 @@ function register(ctx) {
             )
           )
         );
-      }).filter((x) => x !== void 0)
+      })
     )
   );
   return [register2, generate(typeParams).code].join("\n\n");
@@ -933,6 +994,7 @@ var init_typegen = __esm({
     export const isSpaMode: ServerBuild["isSpaMode"];
     export const prerender: ServerBuild["prerender"];
     export const publicPath: ServerBuild["publicPath"];
+    export const routeDiscovery: ServerBuild["routeDiscovery"];
     export const routes: ServerBuild["routes"];
     export const ssr: ServerBuild["ssr"];
     export const unstable_getCriticalCss: ServerBuild["unstable_getCriticalCss"];
@@ -1257,8 +1319,9 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
                 ""
               ) : null;
               let routeChunkSuffix = routeChunkName ? `-${(0, import_kebabCase.default)(routeChunkName)}` : "";
+              let assetsDir = (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.assetsDir : null) ?? viteUserConfig?.build?.assetsDir ?? "assets";
               return path7.posix.join(
-                (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.assetsDir : viteUserConfig?.build?.assetsDir) ?? "assets",
+                assetsDir,
                 `[name]${routeChunkSuffix}-[hash].js`
               );
             }
@@ -1412,7 +1475,10 @@ __export(build_exports, {
 async function build(root, viteBuildOptions) {
   await preloadVite();
   let vite2 = getVite();
-  let configResult = await loadConfig({ rootDirectory: root });
+  let configResult = await loadConfig({
+    rootDirectory: root,
+    mode: viteBuildOptions.mode ?? "production"
+  });
   if (!configResult.ok) {
     throw new Error(configResult.error);
   }
@@ -1738,9 +1804,12 @@ function transpile(tsx, options = {}) {
 init_profiler();
 init_typegen();
 init_vite();
-async function routes(reactRouterRoot, flags = {}) {
-  let rootDirectory = reactRouterRoot ?? process.cwd();
-  let configResult = await loadConfig({ rootDirectory });
+async function routes(rootDirectory, flags = {}) {
+  rootDirectory = resolveRootDirectory(rootDirectory, flags);
+  let configResult = await loadConfig({
+    rootDirectory,
+    mode: flags.mode ?? "production"
+  });
   if (!configResult.ok) {
     console.error(import_picocolors7.default.red(configResult.error));
     process.exit(1);
@@ -1749,9 +1818,7 @@ async function routes(reactRouterRoot, flags = {}) {
   console.log(formatRoutes(configResult.value.routes, format));
 }
 async function build2(root, options = {}) {
-  if (!root) {
-    root = process.env.REACT_ROUTER_ROOT || process.cwd();
-  }
+  root = resolveRootDirectory(root, options);
   let { build: build3 } = await Promise.resolve().then(() => (init_build(), build_exports));
   if (options.profile) {
     await start();
@@ -1768,6 +1835,7 @@ async function dev2(root, options = {}) {
     await start();
   }
   (0, import_exit_hook.default)(() => stop(console.info));
+  root = resolveRootDirectory(root, options);
   await dev3(root, options);
   await new Promise(() => {
   });
@@ -1779,14 +1847,17 @@ var conjunctionListFormat = new Intl.ListFormat("en", {
   style: "long",
   type: "conjunction"
 });
-async function generateEntry(entry, reactRouterRoot, flags = {}) {
+async function generateEntry(entry, rootDirectory, flags = {}) {
   if (!entry) {
-    await generateEntry("entry.client", reactRouterRoot, flags);
-    await generateEntry("entry.server", reactRouterRoot, flags);
+    await generateEntry("entry.client", rootDirectory, flags);
+    await generateEntry("entry.server", rootDirectory, flags);
     return;
   }
-  let rootDirectory = reactRouterRoot ?? process.cwd();
-  let configResult = await loadConfig({ rootDirectory });
+  rootDirectory = resolveRootDirectory(rootDirectory, flags);
+  let configResult = await loadConfig({
+    rootDirectory,
+    mode: flags.mode ?? "production"
+  });
   if (!configResult.ok) {
     console.error(import_picocolors7.default.red(configResult.error));
     return;
@@ -1841,6 +1912,12 @@ async function generateEntry(entry, reactRouterRoot, flags = {}) {
     )
   );
 }
+function resolveRootDirectory(root, flags) {
+  if (root) {
+    return path8.resolve(root);
+  }
+  return process.env.REACT_ROUTER_ROOT || (flags?.config ? path8.dirname(path8.resolve(flags.config)) : process.cwd());
+}
 async function checkForEntry(rootDirectory, appDirectory, entries2) {
   for (let entry of entries2) {
     let entryPath = path8.resolve(appDirectory, entry);
@@ -1863,17 +1940,22 @@ async function createClientEntry(rootDirectory, appDirectory, inputFile) {
   return contents;
 }
 async function typegen(root, flags) {
-  root ??= process.cwd();
+  root = resolveRootDirectory(root, flags);
   if (flags.watch) {
     await preloadVite();
     const vite2 = getVite();
     const logger = vite2.createLogger("info", { prefix: "[react-router]" });
-    await watch(root, { logger });
+    await watch(root, {
+      mode: flags.mode ?? "development",
+      logger
+    });
     await new Promise(() => {
     });
     return;
   }
-  await run(root);
+  await run(root, {
+    mode: flags.mode ?? "production"
+  });
 }
 
 // cli/run.ts

package/dist/config.d.ts

@@ -102,6 +102,22 @@ type ReactRouterConfig = {
      * other platforms and tools.
      */
     presets?: Array<Preset>;
+    /**
+     * Control the "Lazy Route Discovery" behavior
+     *
+     * - `routeDiscovery.mode`: By default, this resolves to `lazy` which will
+     *   lazily discover routes as the user navigates around your application.
+     *   You can set this to `initial` to opt-out of this behavior and load all
+     *   routes with the initial HTML document load.
+     * - `routeDiscovery.manifestPath`: The path to serve the manifest file from.
+     *    Only applies to `mode: "lazy"` and defaults to `/__manifest`.
+     */
+    routeDiscovery?: {
+        mode: "lazy";
+        manifestPath?: string;
+    } | {
+        mode: "initial";
+    };
     /**
      * The file name of the server build output. This file
      * should end in a `.js` extension and should be deployed to your server.
@@ -148,6 +164,17 @@ type ResolvedReactRouterConfig = Readonly<{
      * function returning an array to dynamically generate URLs.
      */
     prerender: ReactRouterConfig["prerender"];
+    /**
+     * Control the "Lazy Route Discovery" behavior
+     *
+     * - `routeDiscovery.mode`: By default, this resolves to `lazy` which will
+     *   lazily discover routes as the user navigates around your application.
+     *   You can set this to `initial` to opt-out of this behavior and load all
+     *   routes with the initial HTML document load.
+     * - `routeDiscovery.manifestPath`: The path to serve the manifest file from.
+     *    Only applies to `mode: "lazy"` and defaults to `/__manifest`.
+     */
+    routeDiscovery: ReactRouterConfig["routeDiscovery"];
     /**
      * An object of all available routes, keyed by route id.
      */

package/dist/config.js

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

package/dist/routes.js

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

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-701a32801
+ * @react-router/dev v0.0.0-experimental-b571356c3
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -113,7 +113,9 @@ function fromNodeRequest(nodeReq, nodeRes) {
 }
 async function toNodeRequest(res, nodeRes) {
   nodeRes.statusCode = res.status;
-  nodeRes.statusMessage = res.statusText;
+  if (!nodeRes.req || nodeRes.req.httpVersionMajor < 2) {
+    nodeRes.statusMessage = res.statusText;
+  }
   let cookiesStrings = [];
   for (let [name, value] of res.headers) {
     if (name === "set-cookie") {
@@ -213,6 +215,15 @@ async function createContext({
     optimizeDeps: {
       noDiscovery: true
     },
+    css: {
+      // This empty PostCSS config object prevents the PostCSS config file from
+      // being loaded. We don't need it in a React Router config context, and
+      // there's also an issue in Vite 5 when using a .ts PostCSS config file in
+      // an ESM project: https://github.com/vitejs/vite/issues/15869. Consumers
+      // can work around this in their own Vite config file, but they can't
+      // configure this internal usage of vite-node.
+      postcss: {}
+    },
     configFile: false,
     envFile: false,
     plugins: []
@@ -432,12 +443,17 @@ async function resolveConfig({
     serverModuleFormat: "esm",
     ssr: true
   };
+  let userAndPresetConfigs = mergeReactRouterConfig(
+    ...presets,
+    reactRouterUserConfig
+  );
   let {
     appDirectory: userAppDirectory,
     basename,
     buildDirectory: userBuildDirectory,
     buildEnd,
     prerender,
+    routeDiscovery: userRouteDiscovery,
     serverBuildFile,
     serverBundles,
     serverModuleFormat,
@@ -445,7 +461,7 @@ async function resolveConfig({
   } = {
     ...defaults,
     // Default values should be completely overridden by user/preset config, not merged
-    ...mergeReactRouterConfig(...presets, reactRouterUserConfig)
+    ...userAndPresetConfigs
   };
   if (!ssr && serverBundles) {
     serverBundles = void 0;
@@ -456,6 +472,32 @@ async function resolveConfig({
       "The `prerender` config must be a boolean, an array of string paths, or a function returning a boolean or array of string paths"
     );
   }
+  let routeDiscovery;
+  if (userRouteDiscovery == null) {
+    if (ssr) {
+      routeDiscovery = {
+        mode: "lazy",
+        manifestPath: "/__manifest"
+      };
+    } else {
+      routeDiscovery = { mode: "initial" };
+    }
+  } else if (userRouteDiscovery.mode === "initial") {
+    routeDiscovery = userRouteDiscovery;
+  } else if (userRouteDiscovery.mode === "lazy") {
+    if (!ssr) {
+      return err(
+        'The `routeDiscovery.mode` config cannot be set to "lazy" when setting `ssr:false`'
+      );
+    }
+    let { manifestPath } = userRouteDiscovery;
+    if (manifestPath != null && !manifestPath.startsWith("/")) {
+      return err(
+        'The `routeDiscovery.manifestPath` config must be a root-relative pathname beginning with a slash (i.e., "/__manifest")'
+      );
+    }
+    routeDiscovery = userRouteDiscovery;
+  }
   let appDirectory = import_pathe3.default.resolve(root, userAppDirectory || "app");
   let buildDirectory = import_pathe3.default.resolve(root, userBuildDirectory);
   let rootRouteFile = findEntry(appDirectory, "root");
@@ -523,6 +565,7 @@ async function resolveConfig({
     future,
     prerender,
     routes,
+    routeDiscovery,
     serverBuildFile,
     serverBundles,
     serverModuleFormat,
@@ -535,12 +578,13 @@ async function resolveConfig({
 }
 async function createConfigLoader({
   rootDirectory: root,
-  watch
+  watch,
+  mode
 }) {
   root = root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
   let viteNodeContext = await createContext({
     root,
-    mode: watch ? "development" : "production"
+    mode
   });
   let reactRouterConfigFile = findEntry(root, "react-router.config", {
     absolute: true
@@ -616,9 +660,13 @@ async function createConfigLoader({
     }
   };
 }
-async function loadConfig({ rootDirectory }) {
+async function loadConfig({
+  rootDirectory,
+  mode
+}) {
   let configLoader = await createConfigLoader({
     rootDirectory,
+    mode,
     watch: false
   });
   let config = await configLoader.getConfig();
@@ -627,13 +675,24 @@ async function loadConfig({ rootDirectory }) {
 }
 var entryExts = [".js", ".jsx", ".ts", ".tsx"];
 function findEntry(dir, basename, options) {
-  for (let ext of entryExts) {
-    let file = import_pathe3.default.resolve(dir, basename + ext);
-    if (import_node_fs.default.existsSync(file)) {
-      return options?.absolute ?? false ? file : import_pathe3.default.relative(dir, file);
+  let currentDir = import_pathe3.default.resolve(dir);
+  let { root } = import_pathe3.default.parse(currentDir);
+  while (true) {
+    for (let ext of options?.extensions ?? entryExts) {
+      let file = import_pathe3.default.resolve(currentDir, basename + ext);
+      if (import_node_fs.default.existsSync(file)) {
+        return options?.absolute ?? false ? file : import_pathe3.default.relative(dir, file);
+      }
+    }
+    if (!options?.walkParents) {
+      return void 0;
+    }
+    let parentDir = import_pathe3.default.dirname(currentDir);
+    if (currentDir === root || parentDir === currentDir) {
+      return void 0;
     }
+    currentDir = parentDir;
   }
-  return void 0;
 }
 
 // vite/cloudflare-dev-proxy.ts
@@ -652,14 +711,15 @@ var cloudflareDevProxyVitePlugin = (options = {}) => {
   let future;
   return {
     name: PLUGIN_NAME,
-    config: async (config) => {
+    config: async (config, configEnv) => {
       await preloadVite();
       const vite2 = getVite();
       const serverConditions = [
         ...vite2.defaultServerConditions ?? []
       ];
       let configResult = await loadConfig({
-        rootDirectory: config.root ?? process.cwd()
+        rootDirectory: config.root ?? process.cwd(),
+        mode: configEnv.mode
       });
       if (!configResult.ok) {
         throw new Error(configResult.error);

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-701a32801
+ * @react-router/dev v0.0.0-experimental-b571356c3
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -154,6 +154,15 @@ async function createContext({
     optimizeDeps: {
       noDiscovery: true
     },
+    css: {
+      // This empty PostCSS config object prevents the PostCSS config file from
+      // being loaded. We don't need it in a React Router config context, and
+      // there's also an issue in Vite 5 when using a .ts PostCSS config file in
+      // an ESM project: https://github.com/vitejs/vite/issues/15869. Consumers
+      // can work around this in their own Vite config file, but they can't
+      // configure this internal usage of vite-node.
+      postcss: {}
+    },
     configFile: false,
     envFile: false,
     plugins: []
@@ -396,12 +405,17 @@ async function resolveConfig({
     serverModuleFormat: "esm",
     ssr: true
   };
+  let userAndPresetConfigs = mergeReactRouterConfig(
+    ...presets,
+    reactRouterUserConfig
+  );
   let {
     appDirectory: userAppDirectory,
     basename: basename2,
     buildDirectory: userBuildDirectory,
     buildEnd,
     prerender,
+    routeDiscovery: userRouteDiscovery,
     serverBuildFile,
     serverBundles,
     serverModuleFormat,
@@ -409,7 +423,7 @@ async function resolveConfig({
   } = {
     ...defaults,
     // Default values should be completely overridden by user/preset config, not merged
-    ...mergeReactRouterConfig(...presets, reactRouterUserConfig)
+    ...userAndPresetConfigs
   };
   if (!ssr && serverBundles) {
     serverBundles = void 0;
@@ -420,6 +434,32 @@ async function resolveConfig({
       "The `prerender` config must be a boolean, an array of string paths, or a function returning a boolean or array of string paths"
     );
   }
+  let routeDiscovery;
+  if (userRouteDiscovery == null) {
+    if (ssr) {
+      routeDiscovery = {
+        mode: "lazy",
+        manifestPath: "/__manifest"
+      };
+    } else {
+      routeDiscovery = { mode: "initial" };
+    }
+  } else if (userRouteDiscovery.mode === "initial") {
+    routeDiscovery = userRouteDiscovery;
+  } else if (userRouteDiscovery.mode === "lazy") {
+    if (!ssr) {
+      return err(
+        'The `routeDiscovery.mode` config cannot be set to "lazy" when setting `ssr:false`'
+      );
+    }
+    let { manifestPath } = userRouteDiscovery;
+    if (manifestPath != null && !manifestPath.startsWith("/")) {
+      return err(
+        'The `routeDiscovery.manifestPath` config must be a root-relative pathname beginning with a slash (i.e., "/__manifest")'
+      );
+    }
+    routeDiscovery = userRouteDiscovery;
+  }
   let appDirectory = import_pathe3.default.resolve(root, userAppDirectory || "app");
   let buildDirectory = import_pathe3.default.resolve(root, userBuildDirectory);
   let rootRouteFile = findEntry(appDirectory, "root");
@@ -487,6 +527,7 @@ async function resolveConfig({
     future,
     prerender,
     routes,
+    routeDiscovery,
     serverBuildFile,
     serverBundles,
     serverModuleFormat,
@@ -499,12 +540,13 @@ async function resolveConfig({
 }
 async function createConfigLoader({
   rootDirectory: root,
-  watch: watch2
+  watch: watch2,
+  mode
 }) {
   root = root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
   let viteNodeContext = await createContext({
     root,
-    mode: watch2 ? "development" : "production"
+    mode
   });
   let reactRouterConfigFile = findEntry(root, "react-router.config", {
     absolute: true
@@ -595,7 +637,18 @@ async function resolveEntryFiles({
   let userEntryServerFile = findEntry(appDirectory, "entry.server");
   let entryServerFile;
   let entryClientFile = userEntryClientFile || "entry.client.tsx";
-  let pkgJson = await import_package_json.default.load(rootDirectory);
+  let packageJsonPath = findEntry(rootDirectory, "package", {
+    extensions: [".json"],
+    absolute: true,
+    walkParents: true
+  });
+  if (!packageJsonPath) {
+    throw new Error(
+      `Could not find package.json in ${rootDirectory} or any of its parent directories`
+    );
+  }
+  let packageJsonDirectory = import_pathe3.default.dirname(packageJsonPath);
+  let pkgJson = await import_package_json.default.load(packageJsonDirectory);
   let deps = pkgJson.content.dependencies ?? {};
   if (userEntryServerFile) {
     entryServerFile = userEntryServerFile;
@@ -618,7 +671,7 @@ async function resolveEntryFiles({
       await pkgJson.save();
       let packageManager = detectPackageManager() ?? "npm";
       (0, import_node_child_process.execSync)(`${packageManager} install`, {
-        cwd: rootDirectory,
+        cwd: packageJsonDirectory,
         stdio: "inherit"
       });
     }
@@ -630,13 +683,24 @@ async function resolveEntryFiles({
 }
 var entryExts = [".js", ".jsx", ".ts", ".tsx"];
 function findEntry(dir, basename2, options) {
-  for (let ext of entryExts) {
-    let file = import_pathe3.default.resolve(dir, basename2 + ext);
-    if (import_node_fs.default.existsSync(file)) {
-      return options?.absolute ?? false ? file : import_pathe3.default.relative(dir, file);
+  let currentDir = import_pathe3.default.resolve(dir);
+  let { root } = import_pathe3.default.parse(currentDir);
+  while (true) {
+    for (let ext of options?.extensions ?? entryExts) {
+      let file = import_pathe3.default.resolve(currentDir, basename2 + ext);
+      if (import_node_fs.default.existsSync(file)) {
+        return options?.absolute ?? false ? file : import_pathe3.default.relative(dir, file);
+      }
+    }
+    if (!options?.walkParents) {
+      return void 0;
+    }
+    let parentDir = import_pathe3.default.dirname(currentDir);
+    if (currentDir === root || parentDir === currentDir) {
+      return void 0;
     }
+    currentDir = parentDir;
   }
-  return void 0;
 }
 
 // vite/babel.ts
@@ -778,8 +842,8 @@ function formatParamProperties(fullpath2) {
 }
 
 // typegen/index.ts
-async function watch(rootDirectory, { logger } = {}) {
-  const ctx = await createContext2({ rootDirectory, watch: true });
+async function watch(rootDirectory, { mode, logger }) {
+  const ctx = await createContext2({ rootDirectory, mode, watch: true });
   await writeAll(ctx);
   logger?.info(import_picocolors2.default.green("generated types"), { timestamp: true, clear: true });
   ctx.configLoader.onChange(async ({ result, routeConfigChanged }) => {
@@ -802,9 +866,10 @@ async function watch(rootDirectory, { logger } = {}) {
 }
 async function createContext2({
   rootDirectory,
-  watch: watch2
+  watch: watch2,
+  mode
 }) {
-  const configLoader = await createConfigLoader({ rootDirectory, watch: watch2 });
+  const configLoader = await createConfigLoader({ rootDirectory, mode, watch: watch2 });
   const configResult = await configLoader.getConfig();
   if (!configResult.ok) {
     throw new Error(configResult.error);
@@ -841,18 +906,21 @@ function register(ctx) {
     }
   `;
   const { t: t2 } = babel_exports;
-  const indexPaths = new Set(
-    Object.values(ctx.config.routes).filter((route) => route.index).map((route) => route.path)
-  );
+  const fullpaths = {};
+  for (const route of Object.values(ctx.config.routes)) {
+    if (route.id !== "root" && !route.path) continue;
+    const lineage2 = lineage(ctx.config.routes, route);
+    const fullpath2 = fullpath(lineage2);
+    const existing = fullpaths[fullpath2];
+    if (!existing || existing.length < lineage2.length) {
+      fullpaths[fullpath2] = lineage2;
+    }
+  }
   const typeParams = t2.tsTypeAliasDeclaration(
     t2.identifier("Params"),
     null,
     t2.tsTypeLiteral(
-      Object.values(ctx.config.routes).map((route) => {
-        if (route.id !== "root" && !route.path) return void 0;
-        if (!route.index && indexPaths.has(route.path)) return void 0;
-        const lineage2 = lineage(ctx.config.routes, route);
-        const fullpath2 = fullpath(lineage2);
+      Object.keys(fullpaths).map((fullpath2) => {
         const params = parse2(fullpath2);
         return t2.tsPropertySignature(
           t2.stringLiteral(fullpath2),
@@ -869,7 +937,7 @@ function register(ctx) {
             )
           )
         );
-      }).filter((x) => x !== void 0)
+      })
     )
   );
   return [register2, generate(typeParams).code].join("\n\n");
@@ -885,6 +953,7 @@ var virtual = import_dedent2.default`
     export const isSpaMode: ServerBuild["isSpaMode"];
     export const prerender: ServerBuild["prerender"];
     export const publicPath: ServerBuild["publicPath"];
+    export const routeDiscovery: ServerBuild["routeDiscovery"];
     export const routes: ServerBuild["routes"];
     export const ssr: ServerBuild["ssr"];
     export const unstable_getCriticalCss: ServerBuild["unstable_getCriticalCss"];
@@ -945,7 +1014,9 @@ function fromNodeRequest(nodeReq, nodeRes) {
 }
 async function toNodeRequest(res, nodeRes) {
   nodeRes.statusCode = res.status;
-  nodeRes.statusMessage = res.statusText;
+  if (!nodeRes.req || nodeRes.req.httpVersionMajor < 2) {
+    nodeRes.statusMessage = res.statusText;
+  }
   let cookiesStrings = [];
   for (let [name, value] of res.headers) {
     if (name === "set-cookie") {
@@ -2354,6 +2425,9 @@ var reactRouterVitePlugin = () => {
       export const ssr = ${ctx.reactRouterConfig.ssr};
       export const isSpaMode = ${isSpaMode};
       export const prerender = ${JSON.stringify(prerenderPaths)};
+      export const routeDiscovery = ${JSON.stringify(
+      ctx.reactRouterConfig.routeDiscovery
+    )};
       export const publicPath = ${JSON.stringify(ctx.publicPath)};
       export const entry = { module: entryServer };
       export const routes = {
@@ -2687,14 +2761,17 @@ var reactRouterVitePlugin = () => {
           prefix: "[react-router]"
         });
         rootDirectory = viteUserConfig.root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
+        let mode = viteConfigEnv.mode;
         if (viteCommand === "serve") {
           typegenWatcherPromise = watch(rootDirectory, {
+            mode,
             // ignore `info` logs from typegen since they are redundant when Vite plugin logs are active
             logger: vite2.createLogger("warn", { prefix: "[react-router]" })
           });
         }
         reactRouterConfigLoader = await createConfigLoader({
           rootDirectory,
+          mode,
           watch: viteCommand === "serve"
         });
         await updatePluginContext();
@@ -4371,8 +4448,9 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
                 ""
               ) : null;
               let routeChunkSuffix = routeChunkName ? `-${(0, import_kebabCase.default)(routeChunkName)}` : "";
+              let assetsDir = (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.assetsDir : null) ?? viteUserConfig?.build?.assetsDir ?? "assets";
               return path6.posix.join(
-                (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.assetsDir : viteUserConfig?.build?.assetsDir) ?? "assets",
+                assetsDir,
                 `[name]${routeChunkSuffix}-[hash].js`
               );
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-701a32801",
+  "version": "0.0.0-experimental-b571356c3",
   "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": "0.0.0-experimental-701a32801"
+    "@react-router/node": "0.0.0-experimental-b571356c3"
   },
   "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": "0.0.0-experimental-701a32801",
-    "react-router": "^0.0.0-experimental-701a32801"
+    "@react-router/serve": "0.0.0-experimental-b571356c3",
+    "react-router": "^0.0.0-experimental-b571356c3"
   },
   "peerDependencies": {
     "typescript": "^5.1.0",
     "vite": "^5.1.0 || ^6.0.0",
     "wrangler": "^3.28.2 || ^4.0.0",
-    "@react-router/serve": "^0.0.0-experimental-701a32801",
-    "react-router": "^0.0.0-experimental-701a32801"
+    "@react-router/serve": "^0.0.0-experimental-b571356c3",
+    "react-router": "^0.0.0-experimental-b571356c3"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {