fix

Author: aidenybai

packages/react-doctor/src/constants.ts

@@ -62,7 +62,20 @@ export const OXLINT_RECOMMENDED_NODE_MAJOR = 24;
 
 export const GIT_SHOW_MAX_BUFFER_BYTES = 10 * 1024 * 1024;
 
-export const IGNORED_DIRECTORIES = new Set(["node_modules", "dist", "build", "coverage"]);
+export const IGNORED_DIRECTORIES = new Set([
+  ".git",
+  ".next",
+  ".nuxt",
+  ".output",
+  ".svelte-kit",
+  ".turbo",
+  "build",
+  "coverage",
+  "dist",
+  "node_modules",
+  "out",
+  "storybook-static",
+]);
 
 export const CANONICAL_GITHUB_URL = "https://github.com/millionco/react-doctor";
 

packages/react-doctor/src/utils/discover-project.ts

@@ -518,41 +518,82 @@ const hasReactDependency = (packageJson: PackageJson): boolean => {
   );
 };
 
-export const discoverReactSubprojects = (rootDirectory: string): WorkspacePackage[] => {
-  if (!fs.existsSync(rootDirectory) || !fs.statSync(rootDirectory).isDirectory()) return [];
-
+const toReactWorkspacePackages = (directories: string[]): WorkspacePackage[] => {
   const packages: WorkspacePackage[] = [];
 
-  const rootPackageJsonPath = path.join(rootDirectory, "package.json");
-  if (isFile(rootPackageJsonPath)) {
-    const rootPackageJson = readPackageJson(rootPackageJsonPath);
-    if (hasReactDependency(rootPackageJson)) {
-      const name = rootPackageJson.name ?? path.basename(rootDirectory);
-      packages.push({ name, directory: rootDirectory });
-    }
+  for (const directory of directories) {
+    const packageJsonPath = path.join(directory, "package.json");
+    if (!isFile(packageJsonPath)) continue;
+
+    const packageJson = readPackageJson(packageJsonPath);
+    if (!hasReactDependency(packageJson)) continue;
+
+    const name = packageJson.name ?? path.basename(directory);
+    packages.push({ name, directory });
   }
 
-  const entries = fs.readdirSync(rootDirectory, { withFileTypes: true });
+  return packages;
+};
 
-  for (const entry of entries) {
-    if (!entry.isDirectory() || entry.name.startsWith(".") || entry.name === "node_modules") {
-      continue;
+const listManifestWorkspacePackages = (rootDirectory: string): WorkspacePackage[] => {
+  const packageJsonPath = path.join(rootDirectory, "package.json");
+  if (isFile(packageJsonPath)) return listWorkspacePackages(rootDirectory);
+
+  const patterns = parsePnpmWorkspacePatterns(rootDirectory);
+  const nxPatterns = patterns.length > 0 ? [] : getNxWorkspaceDirectories(rootDirectory);
+  const directories = (patterns.length > 0 ? patterns : nxPatterns).flatMap((pattern) =>
+    resolveWorkspaceDirectories(rootDirectory, pattern),
+  );
+
+  return toReactWorkspacePackages(directories);
+};
+
+const discoverReactSubprojectsByFilesystem = (rootDirectory: string): WorkspacePackage[] => {
+  const packages: WorkspacePackage[] = [];
+  const pendingDirectories = [rootDirectory];
+
+  while (pendingDirectories.length > 0) {
+    const currentDirectory = pendingDirectories.shift();
+    if (!currentDirectory) continue;
+
+    const packageJsonPath = path.join(currentDirectory, "package.json");
+    if (isFile(packageJsonPath)) {
+      const packageJson = readPackageJson(packageJsonPath);
+      if (hasReactDependency(packageJson)) {
+        const name = packageJson.name ?? path.basename(currentDirectory);
+        packages.push({ name, directory: currentDirectory });
+      }
     }
 
-    const subdirectory = path.join(rootDirectory, entry.name);
-    const packageJsonPath = path.join(subdirectory, "package.json");
-    if (!isFile(packageJsonPath)) continue;
+    const entries = fs
+      .readdirSync(currentDirectory, { withFileTypes: true })
+      .toSorted((firstEntry, secondEntry) => firstEntry.name.localeCompare(secondEntry.name));
 
-    const packageJson = readPackageJson(packageJsonPath);
-    if (!hasReactDependency(packageJson)) continue;
+    for (const entry of entries) {
+      if (
+        !entry.isDirectory() ||
+        entry.name.startsWith(".") ||
+        IGNORED_DIRECTORIES.has(entry.name)
+      ) {
+        continue;
+      }
 
-    const name = packageJson.name ?? entry.name;
-    packages.push({ name, directory: subdirectory });
+      pendingDirectories.push(path.join(currentDirectory, entry.name));
+    }
   }
 
   return packages;
 };
 
+export const discoverReactSubprojects = (rootDirectory: string): WorkspacePackage[] => {
+  if (!fs.existsSync(rootDirectory) || !fs.statSync(rootDirectory).isDirectory()) return [];
+
+  const manifestPackages = listManifestWorkspacePackages(rootDirectory);
+  if (manifestPackages.length > 0) return manifestPackages;
+
+  return discoverReactSubprojectsByFilesystem(rootDirectory);
+};
+
 export const listWorkspacePackages = (rootDirectory: string): WorkspacePackage[] => {
   const packageJsonPath = path.join(rootDirectory, "package.json");
   if (!isFile(packageJsonPath)) return [];

packages/react-doctor/src/utils/resolve-diagnose-target.ts

@@ -10,8 +10,8 @@ export const resolveDiagnoseTarget = (directory: string): string | null => {
   if (reactSubprojects.length === 0) return null;
   if (reactSubprojects.length === 1) return reactSubprojects[0].directory;
 
-  const relativeCandidates = reactSubprojects.map((subproject) =>
-    path.relative(directory, subproject.directory),
-  );
+  const relativeCandidates = reactSubprojects
+    .map((subproject) => path.relative(directory, subproject.directory))
+    .toSorted();
   throw new AmbiguousProjectError(directory, relativeCandidates);
 };

packages/react-doctor/tests/diagnose.test.ts

@@ -91,6 +91,16 @@ export const Debounced = ({ onChange }: { onChange: (value: string) => void }) =
     expect(result.project.reactVersion).toBe("^19.0.0");
   });
 
+  it("falls back to a deeply nested React subproject when the requested directory has no root package.json", async () => {
+    const wrapperDir = path.join(tempRoot, "diagnose-no-root-package-deep");
+    fs.mkdirSync(wrapperDir, { recursive: true });
+    setupReactProject(wrapperDir, "apps/web");
+
+    const result = await diagnose(wrapperDir, { lint: false, deadCode: false });
+    expect(result.project.rootDirectory).toBe(path.join(wrapperDir, "apps", "web"));
+    expect(result.project.reactVersion).toBe("^19.0.0");
+  });
+
   it("throws a clear error when the directory has no root package.json and no nested React project", async () => {
     const emptyDir = path.join(tempRoot, "diagnose-no-react-anywhere");
     fs.mkdirSync(emptyDir, { recursive: true });

packages/react-doctor/tests/discover-project.test.ts

@@ -274,6 +274,52 @@ describe("discoverReactSubprojects", () => {
     expect(packages[1]).toEqual({ name: "my-extension", directory: subdirectory });
   });
 
+  it("includes deeply nested React packages", () => {
+    const rootDirectory = path.join(tempDirectory, "deep-react-package");
+    const subdirectory = path.join(rootDirectory, "apps", "web");
+    fs.mkdirSync(subdirectory, { recursive: true });
+    fs.writeFileSync(
+      path.join(subdirectory, "package.json"),
+      JSON.stringify({ name: "web", dependencies: { react: "^19.0.0" } }),
+    );
+
+    const packages = discoverReactSubprojects(rootDirectory);
+    expect(packages).toContainEqual({ name: "web", directory: subdirectory });
+  });
+
+  it("prefers pnpm workspace packages over filesystem recursion", () => {
+    const rootDirectory = path.join(tempDirectory, "pnpm-workspace-preferred");
+    const workspaceDirectory = path.join(rootDirectory, "apps", "web");
+    const unlistedDirectory = path.join(rootDirectory, "examples", "preview");
+    fs.mkdirSync(workspaceDirectory, { recursive: true });
+    fs.mkdirSync(unlistedDirectory, { recursive: true });
+    fs.writeFileSync(path.join(rootDirectory, "pnpm-workspace.yaml"), "packages:\n  - apps/*\n");
+    fs.writeFileSync(
+      path.join(workspaceDirectory, "package.json"),
+      JSON.stringify({ name: "web", dependencies: { react: "^19.0.0" } }),
+    );
+    fs.writeFileSync(
+      path.join(unlistedDirectory, "package.json"),
+      JSON.stringify({ name: "preview", dependencies: { react: "^19.0.0" } }),
+    );
+
+    const packages = discoverReactSubprojects(rootDirectory);
+    expect(packages).toEqual([{ name: "web", directory: workspaceDirectory }]);
+  });
+
+  it("skips ignored generated directories during filesystem recursion", () => {
+    const rootDirectory = path.join(tempDirectory, "ignored-generated-directories");
+    const ignoredDirectory = path.join(rootDirectory, "node_modules", "preview");
+    fs.mkdirSync(ignoredDirectory, { recursive: true });
+    fs.writeFileSync(
+      path.join(ignoredDirectory, "package.json"),
+      JSON.stringify({ name: "preview", dependencies: { react: "^19.0.0" } }),
+    );
+
+    const packages = discoverReactSubprojects(rootDirectory);
+    expect(packages).toHaveLength(0);
+  });
+
   it("does not match packages with only @types/react", () => {
     const rootDirectory = path.join(tempDirectory, "types-only");
     fs.mkdirSync(rootDirectory, { recursive: true });