@react-router/dev 7.5.3-pre.0 → 7.6.0-pre.0

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 v7.5.3-pre.0
+ * @react-router/dev v7.6.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/routes.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.5.3-pre.0
+ * @react-router/dev v7.6.0-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *

package/dist/vite/cloudflare.js

@@ -1,5 +1,5 @@
 /**
- * @react-router/dev v7.5.3-pre.0
+ * @react-router/dev v7.6.0-pre.0
  *
  * 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") {
@@ -195,13 +197,15 @@ var ssrExternals = isReactRouterRepo() ? [
 // vite/vite-node.ts
 async function createContext({
   root,
-  mode
+  mode,
+  customLogger
 }) {
   await preloadVite();
   const vite2 = getVite();
   const devServer = await vite2.createServer({
     root,
     mode,
+    customLogger,
     server: {
       preTransformRequests: false,
       hmr: false,
@@ -213,6 +217,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: []
@@ -290,7 +303,7 @@ function validateRouteConfig({
         `Route config in "${routeConfigFile}" is invalid.`,
         root ? `${root}` : [],
         nested ? Object.entries(nested).map(
-          ([path4, message]) => `Path: routes.${path4}
+          ([path3, message]) => `Path: routes.${path3}
 ${message}`
         ) : []
       ].flat().join("\n\n")
@@ -383,7 +396,8 @@ function err(error) {
 async function resolveConfig({
   root,
   viteNodeContext,
-  reactRouterConfigFile
+  reactRouterConfigFile,
+  skipRoutes
 }) {
   let reactRouterUserConfig = {};
   if (reactRouterConfigFile) {
@@ -432,12 +446,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 +464,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 +475,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");
@@ -468,45 +513,50 @@ async function resolveConfig({
       `Could not find a root route module in the app directory as "${rootRouteDisplayPath}"`
     );
   }
-  let routes = {
-    root: { path: "", id: "root", file: rootRouteFile }
-  };
-  let routeConfigFile = findEntry(appDirectory, "routes");
-  try {
-    if (!routeConfigFile) {
-      let routeConfigDisplayPath = import_pathe3.default.relative(
-        root,
-        import_pathe3.default.join(appDirectory, "routes.ts")
-      );
-      return err(`Route config file not found at "${routeConfigDisplayPath}".`);
-    }
-    setAppDirectory(appDirectory);
-    let routeConfigExport = (await viteNodeContext.runner.executeFile(
-      import_pathe3.default.join(appDirectory, routeConfigFile)
-    )).default;
-    let routeConfig = await routeConfigExport;
-    let result = validateRouteConfig({
-      routeConfigFile,
-      routeConfig
-    });
-    if (!result.valid) {
-      return err(result.message);
-    }
+  let routes = {};
+  if (!skipRoutes) {
     routes = {
-      ...routes,
-      ...configRoutesToRouteManifest(appDirectory, routeConfig)
+      root: { path: "", id: "root", file: rootRouteFile }
     };
-  } catch (error) {
-    return err(
-      [
-        import_picocolors.default.red(`Route config in "${routeConfigFile}" is invalid.`),
-        "",
-        error.loc?.file && error.loc?.column && error.frame ? [
-          import_pathe3.default.relative(appDirectory, error.loc.file) + ":" + error.loc.line + ":" + error.loc.column,
-          error.frame.trim?.()
-        ] : error.stack
-      ].flat().join("\n")
-    );
+    let routeConfigFile = findEntry(appDirectory, "routes");
+    try {
+      if (!routeConfigFile) {
+        let routeConfigDisplayPath = import_pathe3.default.relative(
+          root,
+          import_pathe3.default.join(appDirectory, "routes.ts")
+        );
+        return err(
+          `Route config file not found at "${routeConfigDisplayPath}".`
+        );
+      }
+      setAppDirectory(appDirectory);
+      let routeConfigExport = (await viteNodeContext.runner.executeFile(
+        import_pathe3.default.join(appDirectory, routeConfigFile)
+      )).default;
+      let routeConfig = await routeConfigExport;
+      let result = validateRouteConfig({
+        routeConfigFile,
+        routeConfig
+      });
+      if (!result.valid) {
+        return err(result.message);
+      }
+      routes = {
+        ...routes,
+        ...configRoutesToRouteManifest(appDirectory, routeConfig)
+      };
+    } catch (error) {
+      return err(
+        [
+          import_picocolors.default.red(`Route config in "${routeConfigFile}" is invalid.`),
+          "",
+          error.loc?.file && error.loc?.column && error.frame ? [
+            import_pathe3.default.relative(appDirectory, error.loc.file) + ":" + error.loc.line + ":" + error.loc.column,
+            error.frame.trim?.()
+          ] : error.stack
+        ].flat().join("\n")
+      );
+    }
   }
   let future = {
     unstable_middleware: reactRouterUserConfig.future?.unstable_middleware ?? false,
@@ -523,6 +573,7 @@ async function resolveConfig({
     future,
     prerender,
     routes,
+    routeDiscovery,
     serverBuildFile,
     serverBundles,
     serverModuleFormat,
@@ -535,24 +586,35 @@ async function resolveConfig({
 }
 async function createConfigLoader({
   rootDirectory: root,
-  watch
+  watch,
+  mode,
+  skipRoutes
 }) {
-  root = root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
+  root = import_pathe3.default.normalize(root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd());
+  let vite2 = await import("vite");
   let viteNodeContext = await createContext({
     root,
-    mode: watch ? "development" : "production"
-  });
-  let reactRouterConfigFile = findEntry(root, "react-router.config", {
-    absolute: true
+    mode,
+    // Filter out any info level logs from vite-node
+    customLogger: vite2.createLogger("warn", {
+      prefix: "[react-router]"
+    })
   });
-  let getConfig = () => resolveConfig({ root, viteNodeContext, reactRouterConfigFile });
+  let reactRouterConfigFile;
+  let updateReactRouterConfigFile = () => {
+    reactRouterConfigFile = findEntry(root, "react-router.config", {
+      absolute: true
+    });
+  };
+  updateReactRouterConfigFile();
+  let getConfig = () => resolveConfig({ root, viteNodeContext, reactRouterConfigFile, skipRoutes });
   let appDirectory;
   let initialConfigResult = await getConfig();
   if (!initialConfigResult.ok) {
     throw new Error(initialConfigResult.error);
   }
-  appDirectory = initialConfigResult.value.appDirectory;
-  let lastConfig = initialConfigResult.value;
+  appDirectory = import_pathe3.default.normalize(initialConfigResult.value.appDirectory);
+  let currentConfig = initialConfigResult.value;
   let fsWatcher;
   let changeHandlers = [];
   return {
@@ -565,41 +627,71 @@ async function createConfigLoader({
       }
       changeHandlers.push(handler);
       if (!fsWatcher) {
-        fsWatcher = import_chokidar.default.watch(
-          [
-            ...reactRouterConfigFile ? [reactRouterConfigFile] : [],
-            appDirectory
-          ],
-          { ignoreInitial: true }
-        );
+        fsWatcher = import_chokidar.default.watch([root, appDirectory], {
+          ignoreInitial: true,
+          ignored: (path3) => {
+            let dirname = import_pathe3.default.dirname(path3);
+            return !dirname.startsWith(appDirectory) && // Ensure we're only watching files outside of the app directory
+            // that are at the root level, not nested in subdirectories
+            path3 !== root && // Watch the root directory itself
+            dirname !== root;
+          }
+        });
         fsWatcher.on("all", async (...args) => {
           let [event, rawFilepath] = args;
           let filepath = import_pathe3.default.normalize(rawFilepath);
-          let appFileAddedOrRemoved = appDirectory && (event === "add" || event === "unlink") && filepath.startsWith(import_pathe3.default.normalize(appDirectory));
-          let configCodeUpdated = Boolean(
+          let fileAddedOrRemoved = event === "add" || event === "unlink";
+          let appFileAddedOrRemoved = fileAddedOrRemoved && filepath.startsWith(import_pathe3.default.normalize(appDirectory));
+          let rootRelativeFilepath = import_pathe3.default.relative(root, filepath);
+          let configFileAddedOrRemoved = fileAddedOrRemoved && isEntryFile("react-router.config", rootRelativeFilepath);
+          if (configFileAddedOrRemoved) {
+            updateReactRouterConfigFile();
+          }
+          let moduleGraphChanged = configFileAddedOrRemoved || Boolean(
             viteNodeContext.devServer?.moduleGraph.getModuleById(filepath)
           );
-          if (configCodeUpdated || appFileAddedOrRemoved) {
-            viteNodeContext.devServer?.moduleGraph.invalidateAll();
-            viteNodeContext.runner?.moduleCache.clear();
+          if (!moduleGraphChanged && !appFileAddedOrRemoved) {
+            return;
           }
-          if (appFileAddedOrRemoved || configCodeUpdated) {
-            let result = await getConfig();
-            let configChanged = result.ok && !(0, import_isEqual.default)(lastConfig, result.value);
-            let routeConfigChanged = result.ok && !(0, import_isEqual.default)(lastConfig?.routes, result.value.routes);
-            for (let handler2 of changeHandlers) {
-              handler2({
-                result,
-                configCodeUpdated,
-                configChanged,
-                routeConfigChanged,
-                path: filepath,
-                event
-              });
-            }
-            if (result.ok) {
-              lastConfig = result.value;
-            }
+          viteNodeContext.devServer?.moduleGraph.invalidateAll();
+          viteNodeContext.runner?.moduleCache.clear();
+          let result = await getConfig();
+          let prevAppDirectory = appDirectory;
+          appDirectory = import_pathe3.default.normalize(
+            (result.value ?? currentConfig).appDirectory
+          );
+          if (appDirectory !== prevAppDirectory) {
+            fsWatcher.unwatch(prevAppDirectory);
+            fsWatcher.add(appDirectory);
+          }
+          let configCodeChanged = configFileAddedOrRemoved || reactRouterConfigFile !== void 0 && isEntryFileDependency(
+            viteNodeContext.devServer.moduleGraph,
+            reactRouterConfigFile,
+            filepath
+          );
+          let routeConfigFile = !skipRoutes ? findEntry(appDirectory, "routes", {
+            absolute: true
+          }) : void 0;
+          let routeConfigCodeChanged = routeConfigFile !== void 0 && isEntryFileDependency(
+            viteNodeContext.devServer.moduleGraph,
+            routeConfigFile,
+            filepath
+          );
+          let configChanged = result.ok && !(0, import_isEqual.default)(omitRoutes(currentConfig), omitRoutes(result.value));
+          let routeConfigChanged = result.ok && !(0, import_isEqual.default)(currentConfig?.routes, result.value.routes);
+          for (let handler2 of changeHandlers) {
+            handler2({
+              result,
+              configCodeChanged,
+              routeConfigCodeChanged,
+              configChanged,
+              routeConfigChanged,
+              path: filepath,
+              event
+            });
+          }
+          if (result.ok) {
+            currentConfig = result.value;
           }
         });
       }
@@ -616,24 +708,74 @@ async function createConfigLoader({
     }
   };
 }
-async function loadConfig({ rootDirectory }) {
+async function loadConfig({
+  rootDirectory,
+  mode,
+  skipRoutes
+}) {
   let configLoader = await createConfigLoader({
     rootDirectory,
+    mode,
+    skipRoutes,
     watch: false
   });
   let config = await configLoader.getConfig();
   await configLoader.close();
   return config;
 }
+function omitRoutes(config) {
+  return {
+    ...config,
+    routes: {}
+  };
+}
 var entryExts = [".js", ".jsx", ".ts", ".tsx"];
+function isEntryFile(entryBasename, filename) {
+  return entryExts.some((ext) => filename === `${entryBasename}${ext}`);
+}
 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;
+  }
+}
+function isEntryFileDependency(moduleGraph, entryFilepath, filepath, visited = /* @__PURE__ */ new Set()) {
+  entryFilepath = import_pathe3.default.normalize(entryFilepath);
+  filepath = import_pathe3.default.normalize(filepath);
+  if (visited.has(filepath)) {
+    return false;
+  }
+  visited.add(filepath);
+  if (filepath === entryFilepath) {
+    return true;
+  }
+  let mod = moduleGraph.getModuleById(filepath);
+  if (!mod) {
+    return false;
+  }
+  for (let importer of mod.importers) {
+    if (!importer.id) {
+      continue;
+    }
+    if (importer.id === entryFilepath || isEntryFileDependency(moduleGraph, entryFilepath, importer.id, visited)) {
+      return true;
     }
   }
-  return void 0;
+  return false;
 }
 
 // vite/cloudflare-dev-proxy.ts
@@ -652,14 +794,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);