@react-router/dev 0.0.0-experimental-ab0e85b04 → 0.0.0-experimental-e56aa53bc

package/dist/cli/index.js

@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 /**
- * @react-router/dev v0.0.0-experimental-ab0e85b04
+ * @react-router/dev v0.0.0-experimental-e56aa53bc
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -125,15 +125,13 @@ var init_ssr_externals = __esm({
 // vite/vite-node.ts
 async function createContext({
   root,
-  mode,
-  customLogger
+  mode
 }) {
   await preloadVite();
   const vite2 = getVite();
   const devServer = await vite2.createServer({
     root,
     mode,
-    customLogger,
     server: {
       preTransformRequests: false,
       hmr: false,
@@ -145,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: []
@@ -216,7 +205,7 @@ function validateRouteConfig({
         `Route config in "${routeConfigFile}" is invalid.`,
         root ? `${root}` : [],
         nested ? Object.entries(nested).map(
-          ([path8, message]) => `Path: routes.${path8}
+          ([path9, message]) => `Path: routes.${path9}
 ${message}`
         ) : []
       ].flat().join("\n\n")
@@ -301,8 +290,7 @@ function err(error) {
 async function resolveConfig({
   root,
   viteNodeContext,
-  reactRouterConfigFile,
-  skipRoutes
+  reactRouterConfigFile
 }) {
   let reactRouterUserConfig = {};
   if (reactRouterConfigFile) {
@@ -351,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,
@@ -369,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;
@@ -380,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");
@@ -418,50 +375,45 @@ async function resolveConfig({
       `Could not find a root route module in the app directory as "${rootRouteDisplayPath}"`
     );
   }
-  let routes2 = {};
-  if (!skipRoutes) {
-    routes2 = {
-      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);
-      }
-      routes2 = {
-        ...routes2,
-        ...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 routes2 = {
+    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);
     }
+    routes2 = {
+      ...routes2,
+      ...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,
@@ -478,7 +430,6 @@ async function resolveConfig({
     future,
     prerender,
     routes: routes2,
-    routeDiscovery,
     serverBuildFile,
     serverBundles,
     serverModuleFormat,
@@ -491,35 +442,24 @@ async function resolveConfig({
 }
 async function createConfigLoader({
   rootDirectory: root,
-  watch: watch2,
-  mode,
-  skipRoutes
+  watch: watch2
 }) {
-  root = import_pathe3.default.normalize(root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd());
-  let vite2 = await import("vite");
+  root = root ?? process.env.REACT_ROUTER_ROOT ?? process.cwd();
   let viteNodeContext = await createContext({
     root,
-    mode,
-    // Filter out any info level logs from vite-node
-    customLogger: vite2.createLogger("warn", {
-      prefix: "[react-router]"
-    })
+    mode: watch2 ? "development" : "production"
   });
-  let reactRouterConfigFile;
-  let updateReactRouterConfigFile = () => {
-    reactRouterConfigFile = findEntry(root, "react-router.config", {
-      absolute: true
-    });
-  };
-  updateReactRouterConfigFile();
-  let getConfig = () => resolveConfig({ root, viteNodeContext, reactRouterConfigFile, skipRoutes });
+  let reactRouterConfigFile = findEntry(root, "react-router.config", {
+    absolute: true
+  });
+  let getConfig = () => resolveConfig({ root, viteNodeContext, reactRouterConfigFile });
   let appDirectory;
   let initialConfigResult = await getConfig();
   if (!initialConfigResult.ok) {
     throw new Error(initialConfigResult.error);
   }
-  appDirectory = import_pathe3.default.normalize(initialConfigResult.value.appDirectory);
-  let currentConfig = initialConfigResult.value;
+  appDirectory = initialConfigResult.value.appDirectory;
+  let lastConfig = initialConfigResult.value;
   let fsWatcher;
   let changeHandlers = [];
   return {
@@ -532,71 +472,41 @@ async function createConfigLoader({
       }
       changeHandlers.push(handler);
       if (!fsWatcher) {
-        fsWatcher = import_chokidar.default.watch([root, appDirectory], {
-          ignoreInitial: true,
-          ignored: (path8) => {
-            let dirname6 = import_pathe3.default.dirname(path8);
-            return !dirname6.startsWith(appDirectory) && // Ensure we're only watching files outside of the app directory
-            // that are at the root level, not nested in subdirectories
-            path8 !== root && // Watch the root directory itself
-            dirname6 !== root;
-          }
-        });
+        fsWatcher = import_chokidar.default.watch(
+          [
+            ...reactRouterConfigFile ? [reactRouterConfigFile] : [],
+            appDirectory
+          ],
+          { ignoreInitial: true }
+        );
         fsWatcher.on("all", async (...args) => {
           let [event, rawFilepath] = args;
           let filepath = import_pathe3.default.normalize(rawFilepath);
-          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(
+          let appFileAddedOrRemoved = appDirectory && (event === "add" || event === "unlink") && filepath.startsWith(import_pathe3.default.normalize(appDirectory));
+          let configCodeUpdated = Boolean(
             viteNodeContext.devServer?.moduleGraph.getModuleById(filepath)
           );
-          if (!moduleGraphChanged && !appFileAddedOrRemoved) {
-            return;
-          }
-          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);
+          if (configCodeUpdated || appFileAddedOrRemoved) {
+            viteNodeContext.devServer?.moduleGraph.invalidateAll();
+            viteNodeContext.runner?.moduleCache.clear();
           }
-          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;
+          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;
+            }
           }
         });
       }
@@ -613,73 +523,23 @@ async function createConfigLoader({
     }
   };
 }
-async function loadConfig({
-  rootDirectory,
-  mode,
-  skipRoutes
-}) {
+async function loadConfig({ rootDirectory }) {
   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: {}
-  };
-}
-function isEntryFile(entryBasename, filename3) {
-  return entryExts.some((ext) => filename3 === `${entryBasename}${ext}`);
-}
 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;
-    }
-    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;
+  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);
     }
   }
-  return false;
+  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({
@@ -801,21 +661,21 @@ var init_babel = __esm({
 
 // typegen/paths.ts
 function getTypesDir(ctx) {
-  return Path3.join(ctx.rootDirectory, ".react-router/types");
+  return Path2.join(ctx.rootDirectory, ".react-router/types");
 }
 function getTypesPath(ctx, route) {
-  return Path3.join(
+  return Path2.join(
     getTypesDir(ctx),
-    Path3.relative(ctx.rootDirectory, ctx.config.appDirectory),
-    Path3.dirname(route.file),
+    Path2.relative(ctx.rootDirectory, ctx.config.appDirectory),
+    Path2.dirname(route.file),
     "+types/" + Pathe.filename(route.file) + ".ts"
   );
 }
-var Path3, Pathe;
+var Path2, Pathe;
 var init_paths = __esm({
   "typegen/paths.ts"() {
     "use strict";
-    Path3 = __toESM(require("pathe"));
+    Path2 = __toESM(require("pathe"));
     Pathe = __toESM(require("pathe/utils"));
   }
 });
@@ -855,7 +715,7 @@ function lineage(routes2, route) {
 }
 function fullpath(lineage2) {
   if (lineage2.length === 1 && lineage2[0].id === "root") return "/";
-  return "/" + lineage2.map((route) => route.path?.replace(/^\//, "")?.replace(/\/$/, "")).filter((path8) => path8 !== void 0 && path8 !== "").join("/");
+  return "/" + lineage2.map((route) => route.path?.replace(/^\//, "")?.replace(/\/$/, "")).filter((path9) => path9 !== void 0 && path9 !== "").join("/");
 }
 var init_route = __esm({
   "typegen/route.ts"() {
@@ -870,8 +730,8 @@ function generate2(ctx, route) {
   const typesPath = getTypesPath(ctx, route);
   const parents = lineage2.slice(0, -1);
   const parentTypeImports = parents.map((parent, i) => {
-    const rel = Path4.relative(
-      Path4.dirname(typesPath),
+    const rel = Path3.relative(
+      Path3.dirname(typesPath),
       getTypesPath(ctx, parent)
     );
     const indent = i === 0 ? "" : "  ".repeat(2);
@@ -933,55 +793,52 @@ function formatParamProperties(fullpath2) {
   );
   return properties.join("; ");
 }
-var import_dedent, Path4, Pathe2, noExtension;
+var import_dedent, Path3, Pathe2, noExtension;
 var init_generate = __esm({
   "typegen/generate.ts"() {
     "use strict";
     import_dedent = __toESM(require("dedent"));
-    Path4 = __toESM(require("pathe"));
+    Path3 = __toESM(require("pathe"));
     Pathe2 = __toESM(require("pathe/utils"));
     init_paths();
     init_params();
     init_route();
-    noExtension = (path8) => Path4.join(Path4.dirname(path8), Pathe2.filename(path8));
+    noExtension = (path9) => Path3.join(Path3.dirname(path9), Pathe2.filename(path9));
   }
 });
 
 // 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, configChanged, routeConfigChanged }) => {
-      if (!result.ok) {
-        logger?.error(import_picocolors3.default.red(result.error), { timestamp: true, clear: true });
-        return;
-      }
-      ctx.config = result.value;
-      if (configChanged || routeConfigChanged) {
-        await writeAll(ctx);
-        logger?.info(import_picocolors3.default.green("regenerated types"), {
-          timestamp: true,
-          clear: true
-        });
-      }
+  ctx.configLoader.onChange(async ({ result, routeConfigChanged }) => {
+    if (!result.ok) {
+      logger?.error(import_picocolors3.default.red(result.error), { timestamp: true, clear: true });
+      return;
     }
-  );
+    ctx.config = result.value;
+    if (routeConfigChanged) {
+      await writeAll(ctx);
+      logger?.info(import_picocolors3.default.green("regenerated types"), {
+        timestamp: true,
+        clear: true
+      });
+    }
+  });
   return {
     close: async () => await ctx.configLoader.close()
   };
 }
 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);
@@ -999,12 +856,12 @@ async function writeAll(ctx) {
   Object.values(ctx.config.routes).forEach((route) => {
     const typesPath = getTypesPath(ctx, route);
     const content = generate2(ctx, route);
-    import_node_fs3.default.mkdirSync(Path5.dirname(typesPath), { recursive: true });
+    import_node_fs3.default.mkdirSync(Path4.dirname(typesPath), { recursive: true });
     import_node_fs3.default.writeFileSync(typesPath, content);
   });
-  const registerPath = Path5.join(typegenDir, "+register.ts");
+  const registerPath = Path4.join(typegenDir, "+register.ts");
   import_node_fs3.default.writeFileSync(registerPath, register(ctx));
-  const virtualPath = Path5.join(typegenDir, "+virtual.d.ts");
+  const virtualPath = Path4.join(typegenDir, "+virtual.d.ts");
   import_node_fs3.default.writeFileSync(virtualPath, virtual);
 }
 function register(ctx) {
@@ -1015,25 +872,21 @@ function register(ctx) {
       interface Register {
         params: Params;
       }
-
-      interface Future {
-        unstable_middleware: ${ctx.config.future.unstable_middleware}
-      }
     }
   `;
   const { t: t2 } = babel_exports;
-  const fullpaths = /* @__PURE__ */ new Set();
-  Object.values(ctx.config.routes).forEach((route) => {
-    if (route.id !== "root" && !route.path) return;
-    const lineage2 = lineage(ctx.config.routes, route);
-    const fullpath2 = fullpath(lineage2);
-    fullpaths.add(fullpath2);
-  });
+  const indexPaths = new Set(
+    Object.values(ctx.config.routes).filter((route) => route.index).map((route) => route.path)
+  );
   const typeParams = t2.tsTypeAliasDeclaration(
     t2.identifier("Params"),
     null,
     t2.tsTypeLiteral(
-      Array.from(fullpaths).map((fullpath2) => {
+      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);
         const params = parse2(fullpath2);
         return t2.tsPropertySignature(
           t2.stringLiteral(fullpath2),
@@ -1050,18 +903,18 @@ function register(ctx) {
             )
           )
         );
-      })
+      }).filter((x) => x !== void 0)
     )
   );
   return [register2, generate(typeParams).code].join("\n\n");
 }
-var import_node_fs3, import_dedent2, Path5, import_picocolors3, virtual;
+var import_node_fs3, import_dedent2, Path4, import_picocolors3, virtual;
 var init_typegen = __esm({
   "typegen/index.ts"() {
     "use strict";
     import_node_fs3 = __toESM(require("fs"));
     import_dedent2 = __toESM(require("dedent"));
-    Path5 = __toESM(require("pathe"));
+    Path4 = __toESM(require("pathe"));
     import_picocolors3 = __toESM(require("picocolors"));
     init_config();
     init_babel();
@@ -1080,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"];
@@ -1103,24 +955,23 @@ var init_node_adapter = __esm({
 });
 
 // vite/resolve-file-url.ts
-var path4;
+var path5;
 var init_resolve_file_url = __esm({
   "vite/resolve-file-url.ts"() {
     "use strict";
-    path4 = __toESM(require("path"));
+    path5 = __toESM(require("path"));
     init_vite();
   }
 });
 
 // vite/styles.ts
-var path5, import_react_router, cssFileRegExp, cssModulesRegExp;
+var path6, import_react_router, cssFileRegExp, cssModulesRegExp;
 var init_styles = __esm({
   "vite/styles.ts"() {
     "use strict";
-    path5 = __toESM(require("path"));
+    path6 = __toESM(require("path"));
     import_react_router = require("react-router");
     init_resolve_file_url();
-    init_babel();
     cssFileRegExp = /\.(css|less|sass|scss|styl|stylus|pcss|postcss|sss)(?:$|\?)/;
     cssModulesRegExp = new RegExp(`\\.module${cssFileRegExp.source}`);
   }
@@ -1267,8 +1118,8 @@ function getServerBundleIds(ctx) {
 async function cleanBuildDirectory(viteConfig, ctx) {
   let buildDirectory = ctx.reactRouterConfig.buildDirectory;
   let isWithinRoot = () => {
-    let relativePath = path6.relative(ctx.rootDirectory, buildDirectory);
-    return !relativePath.startsWith("..") && !path6.isAbsolute(relativePath);
+    let relativePath = path7.relative(ctx.rootDirectory, buildDirectory);
+    return !relativePath.startsWith("..") && !path7.isAbsolute(relativePath);
   };
   if (viteConfig.build.emptyOutDir ?? isWithinRoot()) {
     await fse.remove(buildDirectory);
@@ -1279,7 +1130,7 @@ async function cleanViteManifests(environmentsOptions, ctx) {
     ([environmentName, options]) => {
       let outDir = options.build?.outDir;
       invariant(outDir, `Expected build.outDir for ${environmentName}`);
-      return path6.join(outDir, ".vite/manifest.json");
+      return path7.join(outDir, ".vite/manifest.json");
     }
   );
   await Promise.all(
@@ -1289,7 +1140,7 @@ async function cleanViteManifests(environmentsOptions, ctx) {
       if (!ctx.viteManifestEnabled) {
         await fse.remove(viteManifestPath);
       }
-      let viteDir = path6.dirname(viteManifestPath);
+      let viteDir = path7.dirname(viteManifestPath);
       let viteDirFiles = await fse.readdir(viteDir);
       if (viteDirFiles.length === 0) {
         await fse.remove(viteDir);
@@ -1306,10 +1157,10 @@ function mergeEnvironmentOptions(base, ...overrides) {
 }
 async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
   let { serverBuildFile, serverModuleFormat } = ctx.reactRouterConfig;
-  let packageRoot = path6.dirname(
+  let packageRoot = path7.dirname(
     require.resolve("@react-router/dev/package.json")
   );
-  let { moduleSyncEnabled } = await import(`file:///${path6.join(packageRoot, "module-sync-enabled/index.mjs")}`);
+  let { moduleSyncEnabled } = await import(`file:///${path7.join(packageRoot, "module-sync-enabled/index.mjs")}`);
   let vite2 = getVite();
   let viteServerConditions = [
     ...vite2.defaultServerConditions ?? [],
@@ -1383,7 +1234,7 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
             ctx.entryClientFilePath,
             ...Object.values(ctx.reactRouterConfig.routes).flatMap(
               (route) => {
-                let routeFilePath = path6.resolve(
+                let routeFilePath = path7.resolve(
                   ctx.reactRouterConfig.appDirectory,
                   route.file
                 );
@@ -1406,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 path6.posix.join(
-                assetsDir,
+              return path7.posix.join(
+                (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi ? viteUserConfig?.environments?.client?.build?.assetsDir : viteUserConfig?.build?.assetsDir) ?? "assets",
                 `[name]${routeChunkSuffix}-[hash].js`
               );
             }
@@ -1443,6 +1293,9 @@ async function getEnvironmentOptionsResolvers(ctx, viteCommand) {
       }
     });
   }
+  if (ctx.reactRouterConfig.future.unstable_viteEnvironmentApi && viteCommand === "serve") {
+    environmentOptionsResolvers[CSS_DEV_HELPER_ENVIRONMENT_NAME] = () => ({});
+  }
   return environmentOptionsResolvers;
 }
 function resolveEnvironmentsOptions(environmentResolvers, resolverOptions) {
@@ -1457,13 +1310,13 @@ function resolveEnvironmentsOptions(environmentResolvers, resolverOptions) {
 function isNonNullable(x) {
   return x != null;
 }
-var import_node_crypto, fs4, path6, url, fse, babel2, import_react_router2, import_es_module_lexer, import_pick3, import_jsesc, import_picocolors4, import_kebabCase, CLIENT_NON_COMPONENT_EXPORTS, CLIENT_ROUTE_EXPORTS, BUILD_CLIENT_ROUTE_QUERY_STRING, SSR_BUNDLE_PREFIX, virtualHmrRuntime, virtualInjectHmrRuntime, virtual2, getServerBuildDirectory, getClientBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
+var import_node_crypto, fs4, path7, url, fse, babel2, import_react_router2, import_es_module_lexer, import_pick3, import_jsesc, import_picocolors4, import_kebabCase, CLIENT_NON_COMPONENT_EXPORTS, CLIENT_ROUTE_EXPORTS, BUILD_CLIENT_ROUTE_QUERY_STRING, SSR_BUNDLE_PREFIX, CSS_DEV_HELPER_ENVIRONMENT_NAME, virtualHmrRuntime, virtualInjectHmrRuntime, virtual2, getServerBuildDirectory, getClientBuildDirectory, defaultEntriesDir, defaultEntries, REACT_REFRESH_HEADER;
 var init_plugin = __esm({
   "vite/plugin.ts"() {
     "use strict";
     import_node_crypto = require("crypto");
     fs4 = __toESM(require("fs"));
-    path6 = __toESM(require("path"));
+    path7 = __toESM(require("path"));
     url = __toESM(require("url"));
     fse = __toESM(require("fs-extra"));
     babel2 = __toESM(require("@babel/core"));
@@ -1505,6 +1358,7 @@ var init_plugin = __esm({
     ];
     BUILD_CLIENT_ROUTE_QUERY_STRING = "?__react-router-build-client-route";
     SSR_BUNDLE_PREFIX = "ssrBundle_";
+    CSS_DEV_HELPER_ENVIRONMENT_NAME = "__react_router_css_dev_helper__";
     virtualHmrRuntime = create("hmr-runtime");
     virtualInjectHmrRuntime = create("inject-hmr-runtime");
     virtual2 = {
@@ -1512,19 +1366,19 @@ var init_plugin = __esm({
       serverManifest: create("server-manifest"),
       browserManifest: create("browser-manifest")
     };
-    getServerBuildDirectory = (reactRouterConfig, { serverBundleId } = {}) => path6.join(
+    getServerBuildDirectory = (reactRouterConfig, { serverBundleId } = {}) => path7.join(
       reactRouterConfig.buildDirectory,
       "server",
       ...serverBundleId ? [serverBundleId] : []
     );
-    getClientBuildDirectory = (reactRouterConfig) => path6.join(reactRouterConfig.buildDirectory, "client");
-    defaultEntriesDir = path6.resolve(
-      path6.dirname(require.resolve("@react-router/dev/package.json")),
+    getClientBuildDirectory = (reactRouterConfig) => path7.join(reactRouterConfig.buildDirectory, "client");
+    defaultEntriesDir = path7.resolve(
+      path7.dirname(require.resolve("@react-router/dev/package.json")),
       "dist",
       "config",
       "defaults"
     );
-    defaultEntries = fse.readdirSync(defaultEntriesDir).map((filename3) => path6.join(defaultEntriesDir, filename3));
+    defaultEntries = fse.readdirSync(defaultEntriesDir).map((filename3) => path7.join(defaultEntriesDir, filename3));
     invariant(defaultEntries.length > 0, "No default entries found");
     REACT_REFRESH_HEADER = `
 import RefreshRuntime from "${virtualHmrRuntime.id}";
@@ -1558,13 +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",
-    // In this scope we only need future flags, so we can skip evaluating
-    // routes.ts until we're within the Vite build context
-    skipRoutes: true
-  });
+  let configResult = await loadConfig({ rootDirectory: root });
   if (!configResult.ok) {
     throw new Error(configResult.error);
   }
@@ -1804,7 +1652,7 @@ var import_semver = __toESM(require("semver"));
 var import_picocolors8 = __toESM(require("picocolors"));
 
 // cli/commands.ts
-var path7 = __toESM(require("path"));
+var path8 = __toESM(require("path"));
 var import_fs_extra = __toESM(require("fs-extra"));
 var import_package_json2 = __toESM(require("@npmcli/package-json"));
 var import_exit_hook = __toESM(require("exit-hook"));
@@ -1890,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);
@@ -1904,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();
@@ -1921,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(() => {
   });
@@ -1933,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;
@@ -1963,14 +1806,14 @@ async function generateEntry(entry, rootDirectory, flags = {}) {
     console.error(import_picocolors7.default.red(`No default server entry detected.`));
     return;
   }
-  let defaultsDirectory = path7.resolve(
-    path7.dirname(require.resolve("@react-router/dev/package.json")),
+  let defaultsDirectory = path8.resolve(
+    path8.dirname(require.resolve("@react-router/dev/package.json")),
     "dist",
     "config",
     "defaults"
   );
-  let defaultEntryClient = path7.resolve(defaultsDirectory, "entry.client.tsx");
-  let defaultEntryServer = path7.resolve(
+  let defaultEntryClient = path8.resolve(defaultsDirectory, "entry.client.tsx");
+  let defaultEntryServer = path8.resolve(
     defaultsDirectory,
     `entry.server.node.tsx`
   );
@@ -1979,7 +1822,7 @@ async function generateEntry(entry, rootDirectory, flags = {}) {
   let useTypeScript = flags.typescript ?? true;
   let outputExtension = useTypeScript ? "tsx" : "jsx";
   let outputEntry = `${entry}.${outputExtension}`;
-  let outputFile2 = path7.resolve(appDirectory, outputEntry);
+  let outputFile2 = path8.resolve(appDirectory, outputEntry);
   if (!useTypeScript) {
     let javascript = transpile(contents, {
       cwd: rootDirectory,
@@ -1991,25 +1834,19 @@ async function generateEntry(entry, rootDirectory, flags = {}) {
   }
   console.log(
     import_picocolors7.default.blue(
-      `Entry file ${entry} created at ${path7.relative(
+      `Entry file ${entry} created at ${path8.relative(
         rootDirectory,
         outputFile2
       )}.`
     )
   );
 }
-function resolveRootDirectory(root, flags) {
-  if (root) {
-    return path7.resolve(root);
-  }
-  return process.env.REACT_ROUTER_ROOT || (flags?.config ? path7.dirname(path7.resolve(flags.config)) : process.cwd());
-}
 async function checkForEntry(rootDirectory, appDirectory, entries2) {
   for (let entry of entries2) {
-    let entryPath = path7.resolve(appDirectory, entry);
+    let entryPath = path8.resolve(appDirectory, entry);
     let exists = await import_fs_extra.default.pathExists(entryPath);
     if (exists) {
-      let relative8 = path7.relative(rootDirectory, entryPath);
+      let relative8 = path8.relative(rootDirectory, entryPath);
       console.error(import_picocolors7.default.red(`Entry file ${relative8} already exists.`));
       return process.exit(1);
     }
@@ -2026,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