@react-router/dev 0.0.0-experimental-818f8e08d → 0.0.0-experimental-e56aa53bc

package/CHANGELOG.md

@@ -1,24 +1,5 @@
 # `@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
-
-- Adjust approach for Prerendering/SPA Mode via headers ([#13453](https://github.com/remix-run/react-router/pull/13453))
-- Updated dependencies:
-  - `react-router@7.5.2`
-  - `@react-router/node@7.5.2`
-  - `@react-router/serve@7.5.2`
-
 ## 7.5.1
 
 ### Patch Changes

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-818f8e08d
+ * @react-router/dev v0.0.0-experimental-e56aa53bc
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -143,15 +143,6 @@ 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: []
@@ -348,17 +339,12 @@ 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,
@@ -366,7 +352,7 @@ async function resolveConfig({
   } = {
     ...defaults,
     // Default values should be completely overridden by user/preset config, not merged
-    ...userAndPresetConfigs
+    ...mergeReactRouterConfig(...presets, reactRouterUserConfig)
   };
   if (!ssr && serverBundles) {
     serverBundles = void 0;
@@ -377,32 +363,6 @@ 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");
@@ -470,7 +430,6 @@ async function resolveConfig({
     future,
     prerender,
     routes: routes2,
-    routeDiscovery,
     serverBuildFile,
     serverBundles,
     serverModuleFormat,
@@ -483,13 +442,12 @@ async function resolveConfig({
 }
 async function createConfigLoader({
   rootDirectory: root,
-  watch: watch2,
-  mode
+  watch: watch2
 }) {
   root = root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
   let viteNodeContext = await createContext({
     root,
-    mode
+    mode: watch2 ? "development" : "production"
   });
   let reactRouterConfigFile = findEntry(root, "react-router.config", {
     absolute: true
@@ -565,13 +523,9 @@ async function createConfigLoader({
     }
   };
 }
-async function loadConfig({
-  rootDirectory,
-  mode
-}) {
+async function loadConfig({ rootDirectory }) {
   let configLoader = await createConfigLoader({
     rootDirectory,
-    mode,
     watch: false
   });
   let config = await configLoader.getConfig();
@@ -579,24 +533,13 @@ async function loadConfig({
   return config;
 }
 function findEntry(dir, basename2, options) {
-  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;
+  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 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({
@@ -865,12 +808,12 @@ var init_generate = __esm({
 });
 
 // typegen/index.ts
-async function run(rootDirectory, { mode }) {
-  const ctx = await createContext2({ rootDirectory, mode, watch: false });
+async function run(rootDirectory) {
+  const ctx = await createContext2({ rootDirectory, watch: false });
   await writeAll(ctx);
 }
-async function watch(rootDirectory, { mode, logger }) {
-  const ctx = await createContext2({ rootDirectory, mode, watch: true });
+async function watch(rootDirectory, { logger } = {}) {
+  const ctx = await createContext2({ rootDirectory, watch: true });
   await writeAll(ctx);
   logger?.info(import_picocolors3.default.green("generated types"), { timestamp: true, clear: true });
   ctx.configLoader.onChange(async ({ result, routeConfigChanged }) => {
@@ -893,10 +836,9 @@ async function watch(rootDirectory, { mode, logger }) {
 }
 async function createContext2({
   rootDirectory,
-  watch: watch2,
-  mode
+  watch: watch2
 }) {
-  const configLoader = await createConfigLoader({ rootDirectory, mode, watch: watch2 });
+  const configLoader = await createConfigLoader({ rootDirectory, watch: watch2 });
   const configResult = await configLoader.getConfig();
   if (!configResult.ok) {
     throw new Error(configResult.error);
@@ -991,7 +933,6 @@ 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"];
@@ -1316,9 +1257,8 @@ 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(
-                assetsDir,
+                (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.assetsDir : viteUserConfig?.build?.assetsDir) ?? "assets",
                 `[name]${routeChunkSuffix}-[hash].js`
               );
             }
@@ -1472,10 +1412,7 @@ __export(build_exports, {
 async function build(root, viteBuildOptions) {
   await preloadVite();
   let vite2 = getVite();
-  let configResult = await loadConfig({
-    rootDirectory: root,
-    mode: viteBuildOptions.mode ?? "production"
-  });
+  let configResult = await loadConfig({ rootDirectory: root });
   if (!configResult.ok) {
     throw new Error(configResult.error);
   }
@@ -1801,12 +1738,9 @@ function transpile(tsx, options = {}) {
 init_profiler();
 init_typegen();
 init_vite();
-async function routes(rootDirectory, flags = {}) {
-  rootDirectory = resolveRootDirectory(rootDirectory, flags);
-  let configResult = await loadConfig({
-    rootDirectory,
-    mode: flags.mode ?? "production"
-  });
+async function routes(reactRouterRoot, flags = {}) {
+  let rootDirectory = reactRouterRoot ?? process.cwd();
+  let configResult = await loadConfig({ rootDirectory });
   if (!configResult.ok) {
     console.error(import_picocolors7.default.red(configResult.error));
     process.exit(1);
@@ -1815,7 +1749,9 @@ async function routes(rootDirectory, flags = {}) {
   console.log(formatRoutes(configResult.value.routes, format));
 }
 async function build2(root, options = {}) {
-  root = resolveRootDirectory(root, options);
+  if (!root) {
+    root = process.env.REACT_ROUTER_ROOT || process.cwd();
+  }
   let { build: build3 } = await Promise.resolve().then(() => (init_build(), build_exports));
   if (options.profile) {
     await start();
@@ -1832,7 +1768,6 @@ 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(() => {
   });
@@ -1844,17 +1779,14 @@ var conjunctionListFormat = new Intl.ListFormat("en", {
   style: "long",
   type: "conjunction"
 });
-async function generateEntry(entry, rootDirectory, flags = {}) {
+async function generateEntry(entry, reactRouterRoot, flags = {}) {
   if (!entry) {
-    await generateEntry("entry.client", rootDirectory, flags);
-    await generateEntry("entry.server", rootDirectory, flags);
+    await generateEntry("entry.client", reactRouterRoot, flags);
+    await generateEntry("entry.server", reactRouterRoot, flags);
     return;
   }
-  rootDirectory = resolveRootDirectory(rootDirectory, flags);
-  let configResult = await loadConfig({
-    rootDirectory,
-    mode: flags.mode ?? "production"
-  });
+  let rootDirectory = reactRouterRoot ?? process.cwd();
+  let configResult = await loadConfig({ rootDirectory });
   if (!configResult.ok) {
     console.error(import_picocolors7.default.red(configResult.error));
     return;
@@ -1909,12 +1841,6 @@ async function generateEntry(entry, rootDirectory, 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);
@@ -1937,22 +1863,17 @@ async function createClientEntry(rootDirectory, appDirectory, inputFile) {
   return contents;
 }
 async function typegen(root, flags) {
-  root = resolveRootDirectory(root, flags);
+  root ??= process.cwd();
   if (flags.watch) {
     await preloadVite();
     const vite2 = getVite();
     const logger = vite2.createLogger("info", { prefix: "[react-router]" });
-    await watch(root, {
-      mode: flags.mode ?? "development",
-      logger
-    });
+    await watch(root, { logger });
     await new Promise(() => {
     });
     return;
   }
-  await run(root, {
-    mode: flags.mode ?? "production"
-  });
+  await run(root);
 }
 
 // cli/run.ts

package/dist/config.d.ts

@@ -102,22 +102,6 @@ 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.
@@ -164,17 +148,6 @@ 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-818f8e08d
+ * @react-router/dev v0.0.0-experimental-e56aa53bc
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

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

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-818f8e08d
+ * @react-router/dev v0.0.0-experimental-e56aa53bc
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -113,9 +113,7 @@ function fromNodeRequest(nodeReq, nodeRes) {
 }
 async function toNodeRequest(res, nodeRes) {
   nodeRes.statusCode = res.status;
-  if (!nodeRes.req || nodeRes.req.httpVersionMajor < 2) {
-    nodeRes.statusMessage = res.statusText;
-  }
+  nodeRes.statusMessage = res.statusText;
   let cookiesStrings = [];
   for (let [name, value] of res.headers) {
     if (name === "set-cookie") {
@@ -215,15 +213,6 @@ 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: []
@@ -443,17 +432,12 @@ 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,
@@ -461,7 +445,7 @@ async function resolveConfig({
   } = {
     ...defaults,
     // Default values should be completely overridden by user/preset config, not merged
-    ...userAndPresetConfigs
+    ...mergeReactRouterConfig(...presets, reactRouterUserConfig)
   };
   if (!ssr && serverBundles) {
     serverBundles = void 0;
@@ -472,32 +456,6 @@ 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");
@@ -565,7 +523,6 @@ async function resolveConfig({
     future,
     prerender,
     routes,
-    routeDiscovery,
     serverBuildFile,
     serverBundles,
     serverModuleFormat,
@@ -578,13 +535,12 @@ async function resolveConfig({
 }
 async function createConfigLoader({
   rootDirectory: root,
-  watch,
-  mode
+  watch
 }) {
   root = root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
   let viteNodeContext = await createContext({
     root,
-    mode
+    mode: watch ? "development" : "production"
   });
   let reactRouterConfigFile = findEntry(root, "react-router.config", {
     absolute: true
@@ -660,13 +616,9 @@ async function createConfigLoader({
     }
   };
 }
-async function loadConfig({
-  rootDirectory,
-  mode
-}) {
+async function loadConfig({ rootDirectory }) {
   let configLoader = await createConfigLoader({
     rootDirectory,
-    mode,
     watch: false
   });
   let config = await configLoader.getConfig();
@@ -675,24 +627,13 @@ async function loadConfig({
 }
 var entryExts = [".js", ".jsx", ".ts", ".tsx"];
 function findEntry(dir, basename, options) {
-  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;
+  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);
     }
-    currentDir = parentDir;
   }
+  return void 0;
 }
 
 // vite/cloudflare-dev-proxy.ts
@@ -711,15 +652,14 @@ var cloudflareDevProxyVitePlugin = (options = {}) => {
   let future;
   return {
     name: PLUGIN_NAME,
-    config: async (config, configEnv) => {
+    config: async (config) => {
       await preloadVite();
       const vite2 = getVite();
       const serverConditions = [
         ...vite2.defaultServerConditions ?? []
       ];
       let configResult = await loadConfig({
-        rootDirectory: config.root ?? process.cwd(),
-        mode: configEnv.mode
+        rootDirectory: config.root ?? process.cwd()
       });
       if (!configResult.ok) {
         throw new Error(configResult.error);

package/dist/vite.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v0.0.0-experimental-818f8e08d
+ * @react-router/dev v0.0.0-experimental-e56aa53bc
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -154,15 +154,6 @@ 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: []
@@ -405,17 +396,12 @@ 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,
@@ -423,7 +409,7 @@ async function resolveConfig({
   } = {
     ...defaults,
     // Default values should be completely overridden by user/preset config, not merged
-    ...userAndPresetConfigs
+    ...mergeReactRouterConfig(...presets, reactRouterUserConfig)
   };
   if (!ssr && serverBundles) {
     serverBundles = void 0;
@@ -434,32 +420,6 @@ 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");
@@ -527,7 +487,6 @@ async function resolveConfig({
     future,
     prerender,
     routes,
-    routeDiscovery,
     serverBuildFile,
     serverBundles,
     serverModuleFormat,
@@ -540,13 +499,12 @@ async function resolveConfig({
 }
 async function createConfigLoader({
   rootDirectory: root,
-  watch: watch2,
-  mode
+  watch: watch2
 }) {
   root = root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
   let viteNodeContext = await createContext({
     root,
-    mode
+    mode: watch2 ? "development" : "production"
   });
   let reactRouterConfigFile = findEntry(root, "react-router.config", {
     absolute: true
@@ -637,18 +595,7 @@ async function resolveEntryFiles({
   let userEntryServerFile = findEntry(appDirectory, "entry.server");
   let entryServerFile;
   let entryClientFile = userEntryClientFile || "entry.client.tsx";
-  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 pkgJson = await import_package_json.default.load(rootDirectory);
   let deps = pkgJson.content.dependencies ?? {};
   if (userEntryServerFile) {
     entryServerFile = userEntryServerFile;
@@ -671,7 +618,7 @@ async function resolveEntryFiles({
       await pkgJson.save();
       let packageManager = detectPackageManager() ?? "npm";
       (0, import_node_child_process.execSync)(`${packageManager} install`, {
-        cwd: packageJsonDirectory,
+        cwd: rootDirectory,
         stdio: "inherit"
       });
     }
@@ -683,24 +630,13 @@ async function resolveEntryFiles({
 }
 var entryExts = [".js", ".jsx", ".ts", ".tsx"];
 function findEntry(dir, basename2, options) {
-  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;
+  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 parentDir = import_pathe3.default.dirname(currentDir);
-    if (currentDir === root || parentDir === currentDir) {
-      return void 0;
-    }
-    currentDir = parentDir;
   }
+  return void 0;
 }
 
 // vite/babel.ts
@@ -842,8 +778,8 @@ function formatParamProperties(fullpath2) {
 }
 
 // typegen/index.ts
-async function watch(rootDirectory, { mode, logger }) {
-  const ctx = await createContext2({ rootDirectory, mode, watch: true });
+async function watch(rootDirectory, { logger } = {}) {
+  const ctx = await createContext2({ rootDirectory, watch: true });
   await writeAll(ctx);
   logger?.info(import_picocolors2.default.green("generated types"), { timestamp: true, clear: true });
   ctx.configLoader.onChange(async ({ result, routeConfigChanged }) => {
@@ -866,10 +802,9 @@ async function watch(rootDirectory, { mode, logger }) {
 }
 async function createContext2({
   rootDirectory,
-  watch: watch2,
-  mode
+  watch: watch2
 }) {
-  const configLoader = await createConfigLoader({ rootDirectory, mode, watch: watch2 });
+  const configLoader = await createConfigLoader({ rootDirectory, watch: watch2 });
   const configResult = await configLoader.getConfig();
   if (!configResult.ok) {
     throw new Error(configResult.error);
@@ -950,7 +885,6 @@ 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"];
@@ -1011,9 +945,7 @@ function fromNodeRequest(nodeReq, nodeRes) {
 }
 async function toNodeRequest(res, nodeRes) {
   nodeRes.statusCode = res.status;
-  if (!nodeRes.req || nodeRes.req.httpVersionMajor < 2) {
-    nodeRes.statusMessage = res.statusText;
-  }
+  nodeRes.statusMessage = res.statusText;
   let cookiesStrings = [];
   for (let [name, value] of res.headers) {
     if (name === "set-cookie") {
@@ -2422,9 +2354,6 @@ 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 = {
@@ -2758,17 +2687,14 @@ 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();
@@ -3161,7 +3087,6 @@ var reactRouterVitePlugin = () => {
               ].join("\n")
             );
           }
-          process.env.IS_RR_BUILD_REQUEST = "yes";
           if (isPrerenderingEnabled(ctx.reactRouterConfig)) {
             await handlePrerender(
               viteConfig,
@@ -3824,6 +3749,11 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
     }
   }
   let buildRoutes = createPrerenderRoutes(build.routes);
+  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) {
     let matches = (0, import_react_router2.matchRoutes)(buildRoutes, `/${path7}/`.replace(/^\/\/+/, "/"));
     if (!matches) {
@@ -3842,14 +3772,16 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
           [leafRoute.id],
           clientBuildDirectory,
           reactRouterConfig,
-          viteConfig
+          viteConfig,
+          { headers }
         );
         await prerenderResourceRoute(
           handler,
           path7,
           clientBuildDirectory,
           reactRouterConfig,
-          viteConfig
+          viteConfig,
+          { headers }
         );
       } else {
         viteConfig.logger.warn(
@@ -3868,7 +3800,8 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
           null,
           clientBuildDirectory,
           reactRouterConfig,
-          viteConfig
+          viteConfig,
+          { headers }
         );
       }
       await prerenderRoute(
@@ -3879,9 +3812,10 @@ async function handlePrerender(viteConfig, reactRouterConfig, serverBuildDirecto
         viteConfig,
         data ? {
           headers: {
+            ...headers,
             "X-React-Router-Prerender-Data": encodeURI(data)
           }
-        } : void 0
+        } : { headers }
       );
     }
   }
@@ -4445,9 +4379,8 @@ 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(
-                assetsDir,
+                (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.assetsDir : viteUserConfig?.build?.assetsDir) ?? "assets",
                 `[name]${routeChunkSuffix}-[hash].js`
               );
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@react-router/dev",
-  "version": "0.0.0-experimental-818f8e08d",
+  "version": "0.0.0-experimental-e56aa53bc",
   "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-818f8e08d"
+    "@react-router/node": "0.0.0-experimental-e56aa53bc"
   },
   "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": "^0.0.0-experimental-818f8e08d",
-    "@react-router/serve": "0.0.0-experimental-818f8e08d"
+    "react-router": "^0.0.0-experimental-e56aa53bc",
+    "@react-router/serve": "0.0.0-experimental-e56aa53bc"
   },
   "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-818f8e08d",
-    "react-router": "^0.0.0-experimental-818f8e08d"
+    "@react-router/serve": "^0.0.0-experimental-e56aa53bc",
+    "react-router": "^0.0.0-experimental-e56aa53bc"
   },
   "peerDependenciesMeta": {
     "@react-router/serve": {