Fix root directory resolution logic (#13472)

Author: markdalgleish

.changeset/bright-experts-grab.md

@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+Support project root directories without a `package.json` if it exists in a parent directory

.changeset/cold-seals-count.md

@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+When providing a custom Vite config path via the CLI `--config`/`-c` flag, default the project root directory to the directory containing the Vite config when not explicitly provided

.changeset/forty-ants-teach.md

@@ -0,0 +1,5 @@
+---
+"@react-router/dev": patch
+---
+
+Ensure consistent project root directory resolution logic in CLI commands

packages/react-router-dev/cli/commands.ts

@@ -17,13 +17,13 @@ import * as Typegen from "../typegen";
 import { preloadVite, getVite } from "../vite/vite";
 
 export async function routes(
-  reactRouterRoot?: string,
+  rootDirectory?: string,
   flags: {
     config?: string;
     json?: boolean;
   } = {}
 ): Promise<void> {
-  let rootDirectory = reactRouterRoot ?? process.cwd();
+  rootDirectory = resolveRootDirectory(rootDirectory, flags);
   let configResult = await loadConfig({ rootDirectory });
 
   if (!configResult.ok) {
@@ -39,9 +39,7 @@ export async function build(
   root?: string,
   options: ViteBuildOptions = {}
 ): Promise<void> {
-  if (!root) {
-    root = process.env.REACT_ROUTER_ROOT || process.cwd();
-  }
+  root = resolveRootDirectory(root, options);
 
   let { build } = await import("../vite/build");
   if (options.profile) {
@@ -54,12 +52,14 @@ export async function build(
   }
 }
 
-export async function dev(root: string, options: ViteDevOptions = {}) {
+export async function dev(root?: string, options: ViteDevOptions = {}) {
   let { dev } = await import("../vite/dev");
   if (options.profile) {
     await profiler.start();
   }
   exitHook(() => profiler.stop(console.info));
+
+  root = resolveRootDirectory(root, options);
   await dev(root, options);
 
   // keep `react-router dev` alive by waiting indefinitely
@@ -77,20 +77,20 @@ let conjunctionListFormat = new Intl.ListFormat("en", {
 
 export async function generateEntry(
   entry?: string,
-  reactRouterRoot?: string,
+  rootDirectory?: string,
   flags: {
     typescript?: boolean;
     config?: string;
   } = {}
 ) {
   // if no entry passed, attempt to create both
   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();
+  rootDirectory = resolveRootDirectory(rootDirectory, flags);
   let configResult = await loadConfig({ rootDirectory });
 
   if (!configResult.ok) {
@@ -162,6 +162,17 @@ export async function generateEntry(
   );
 }
 
+function resolveRootDirectory(root?: string, flags?: { config?: string }) {
+  if (root) {
+    return path.resolve(root);
+  }
+
+  return (
+    process.env.REACT_ROUTER_ROOT ||
+    (flags?.config ? path.dirname(path.resolve(flags.config)) : process.cwd())
+  );
+}
+
 async function checkForEntry(
   rootDirectory: string,
   appDirectory: string,
@@ -198,8 +209,14 @@ async function createClientEntry(
   return contents;
 }
 
-export async function typegen(root: string, flags: { watch: boolean }) {
-  root ??= process.cwd();
+export async function typegen(
+  root: string,
+  flags: {
+    watch?: boolean;
+    config?: string;
+  }
+) {
+  root = resolveRootDirectory(root, flags);
 
   if (flags.watch) {
     await preloadVite();

packages/react-router-dev/config/config.ts

@@ -754,7 +754,20 @@ export async function resolveEntryFiles({
   let entryServerFile: string;
   let entryClientFile = userEntryClientFile || "entry.client.tsx";
 
-  let pkgJson = await PackageJson.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 = path.dirname(packageJsonPath);
+  let pkgJson = await PackageJson.load(packageJsonDirectory);
   let deps = pkgJson.content.dependencies ?? {};
 
   if (userEntryServerFile) {
@@ -783,7 +796,7 @@ export async function resolveEntryFiles({
       let packageManager = detectPackageManager() ?? "npm";
 
       execSync(`${packageManager} install`, {
-        cwd: rootDirectory,
+        cwd: packageJsonDirectory,
         stdio: "inherit",
       });
     }
@@ -807,14 +820,34 @@ const entryExts = [".js", ".jsx", ".ts", ".tsx"];
 function findEntry(
   dir: string,
   basename: string,
-  options?: { absolute?: boolean }
+  options?: {
+    absolute?: boolean;
+    extensions?: string[];
+    walkParents?: boolean;
+  }
 ): string | undefined {
-  for (let ext of entryExts) {
-    let file = path.resolve(dir, basename + ext);
-    if (fs.existsSync(file)) {
-      return options?.absolute ?? false ? file : path.relative(dir, file);
+  let currentDir = path.resolve(dir);
+  let { root } = path.parse(currentDir);
+
+  while (true) {
+    for (let ext of options?.extensions ?? entryExts) {
+      let file = path.resolve(currentDir, basename + ext);
+      if (fs.existsSync(file)) {
+        return options?.absolute ?? false ? file : path.relative(dir, file);
+      }
+    }
+
+    if (!options?.walkParents) {
+      return undefined;
     }
-  }
 
-  return undefined;
+    let parentDir = path.dirname(currentDir);
+    // Break out when we've reached the root directory or we're about to get
+    // stuck in a loop where `path.dirname` keeps returning "/"
+    if (currentDir === root || parentDir === currentDir) {
+      return undefined;
+    }
+
+    currentDir = parentDir;
+  }
 }