fix: resolve multiple GitHub issues (#71, #72, #76, #77, #83, #84, #86, #87, #89, #92, #93, #94)

aidenybai · claude · aidenybai · commit c405f4a378cf · 2026-03-06T21:26:52.000-08:00
- Bun workspace catalog: version resolution (#87) - Leading / in glob ignore patterns (#86) - Inline suppression comments (#72) - Offline score calculation fallback (#89) - Suppress share link when offline (#92) - Actionable oxlint crash messages (#84, #77) - EISDIR/EACCES crash in readPackageJson (#71) - Custom React Native text components (#93) - Misleading redirect rule message (#83) - @expo/vector-icons deprecation update (#76) - MotionConfig/reducedMotion detection (#94) - Extract shared isPlainObject util, remove unnecessary casts Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
diff --git a/packages/react-doctor/src/constants.ts b/packages/react-doctor/src/constants.ts
@@ -37,8 +37,6 @@ export const SPAWN_ARGS_MAX_LENGTH_CHARS = 24_000;
 export const OFFLINE_MESSAGE =
   "You are offline, could not calculate score. Reconnect to calculate.";
 
-export const OFFLINE_FLAG_MESSAGE = "Score not calculated. Remove --offline to calculate score.";
-
 export const DEFAULT_BRANCH_CANDIDATES = ["main", "master"];
 
 export const ERROR_RULE_PENALTY = 1.5;
diff --git a/packages/react-doctor/src/plugin/constants.ts b/packages/react-doctor/src/plugin/constants.ts
@@ -286,7 +286,8 @@ export const DEPRECATED_RN_MODULE_REPLACEMENTS: Record<string, string> = {
 export const LEGACY_EXPO_PACKAGE_REPLACEMENTS: Record<string, string> = {
   "expo-av": "expo-audio for audio and expo-video for video",
   "expo-permissions": "the permissions API in each module (e.g. Camera.requestPermissionsAsync())",
-  "@expo/vector-icons": "expo-image with sf: source URIs",
+  "@expo/vector-icons":
+    "expo-symbols or expo-image (see https://docs.expo.dev/versions/latest/sdk/symbols/)",
 };
 
 export const REACT_NATIVE_LIST_COMPONENTS = new Set([
diff --git a/packages/react-doctor/src/plugin/rules/nextjs.ts b/packages/react-doctor/src/plugin/rules/nextjs.ts
@@ -213,7 +213,7 @@ export const nextjsNoClientSideRedirect: Rule = {
           context.report({
             node: child,
             message:
-              "Client-side redirect in useEffect — use redirect() in a server component or middleware instead",
+              "Client-side redirect in useEffect — use redirect() from next/navigation or handle in middleware instead",
           });
         }
       });
diff --git a/packages/react-doctor/src/plugin/rules/react-native.ts b/packages/react-doctor/src/plugin/rules/react-native.ts
@@ -65,7 +65,11 @@ export const rnNoRawText: Rule = {
         if (isDomComponentFile) return;
 
         const elementName = resolveJsxElementName(node.openingElement);
-        if (elementName && REACT_NATIVE_TEXT_COMPONENTS.has(elementName)) return;
+        if (
+          elementName &&
+          (REACT_NATIVE_TEXT_COMPONENTS.has(elementName) || elementName.endsWith("Text"))
+        )
+          return;
 
         for (const child of node.children ?? []) {
           if (!isRawTextContent(child)) continue;
diff --git a/packages/react-doctor/src/scan.ts b/packages/react-doctor/src/scan.ts
@@ -5,7 +5,6 @@ import { join } from "node:path";
 import { performance } from "node:perf_hooks";
 import {
   MILLISECONDS_PER_SECOND,
-  OFFLINE_FLAG_MESSAGE,
   OFFLINE_MESSAGE,
   OXLINT_NODE_REQUIREMENT,
   OXLINT_RECOMMENDED_NODE_MAJOR,
@@ -23,7 +22,7 @@ import type {
   ScanResult,
   ScoreResult,
 } from "./types.js";
-import { calculateScore } from "./utils/calculate-score.js";
+import { calculateScore, calculateScoreLocally } from "./utils/calculate-score.js";
 import { colorizeByScore } from "./utils/colorize-by-score.js";
 import { combineDiagnostics, computeJsxIncludePaths } from "./utils/combine-diagnostics.js";
 import { discoverProject, formatFrameworkName } from "./utils/discover-project.js";
@@ -319,6 +318,7 @@ const printSummary = (
   projectName: string,
   totalSourceFileCount: number,
   noScoreMessage: string,
+  isOffline: boolean,
 ): void => {
   const summaryFramedLines = [
     ...buildBrandingLines(scoreResult, noScoreMessage),
@@ -334,9 +334,11 @@ const printSummary = (
     logger.break();
   }
 
-  const shareUrl = buildShareUrl(diagnostics, scoreResult, projectName);
-  logger.break();
-  logger.dim(`  Share your results: ${highlighter.info(shareUrl)}`);
+  if (!isOffline) {
+    const shareUrl = buildShareUrl(diagnostics, scoreResult, projectName);
+    logger.break();
+    logger.dim(`  Share your results: ${highlighter.info(shareUrl)}`);
+  }
 };
 
 const resolveOxlintNode = async (
@@ -554,8 +556,10 @@ export const scan = async (
   if (didDeadCodeFail) skippedChecks.push("dead code");
   const hasSkippedChecks = skippedChecks.length > 0;
 
-  const scoreResult = options.offline ? null : await calculateScore(diagnostics);
-  const noScoreMessage = options.offline ? OFFLINE_FLAG_MESSAGE : OFFLINE_MESSAGE;
+  const scoreResult = options.offline
+    ? calculateScoreLocally(diagnostics)
+    : await calculateScore(diagnostics);
+  const noScoreMessage = OFFLINE_MESSAGE;
 
   if (options.scoreOnly) {
     if (scoreResult) {
@@ -599,6 +603,7 @@ export const scan = async (
     projectInfo.projectName,
     displayedSourceFileCount,
     noScoreMessage,
+    options.offline,
   );
 
   if (hasSkippedChecks) {
diff --git a/packages/react-doctor/src/utils/calculate-score.ts b/packages/react-doctor/src/utils/calculate-score.ts
@@ -64,6 +64,11 @@ const estimateScoreLocally = (diagnostics: Diagnostic[]): EstimatedScoreResult =
   };
 };
 
+export const calculateScoreLocally = (diagnostics: Diagnostic[]): ScoreResult => {
+  const { currentScore, currentLabel } = estimateScoreLocally(diagnostics);
+  return { score: currentScore, label: currentLabel };
+};
+
 export const calculateScore = async (diagnostics: Diagnostic[]): Promise<ScoreResult | null> => {
   try {
     const response = await proxyFetch(SCORE_API_URL, {
@@ -72,11 +77,11 @@ export const calculateScore = async (diagnostics: Diagnostic[]): Promise<ScoreRe
       body: JSON.stringify({ diagnostics }),
     });
 
-    if (!response.ok) return null;
+    if (!response.ok) return calculateScoreLocally(diagnostics);
 
     return (await response.json()) as ScoreResult;
   } catch {
-    return null;
+    return calculateScoreLocally(diagnostics);
   }
 };
 
diff --git a/packages/react-doctor/src/utils/check-reduced-motion.ts b/packages/react-doctor/src/utils/check-reduced-motion.ts
@@ -5,7 +5,8 @@ import type { Diagnostic } from "../types.js";
 import { isFile } from "./is-file.js";
 import { readPackageJson } from "./read-package-json.js";
 
-const REDUCED_MOTION_GREP_PATTERN = "prefers-reduced-motion|useReducedMotion";
+const REDUCED_MOTION_GREP_PATTERN =
+  "prefers-reduced-motion|useReducedMotion|MotionConfig|reducedMotion";
 const REDUCED_MOTION_FILE_GLOBS = '"*.ts" "*.tsx" "*.js" "*.jsx" "*.css" "*.scss"';
 
 const MISSING_REDUCED_MOTION_DIAGNOSTIC: Diagnostic = {
diff --git a/packages/react-doctor/src/utils/combine-diagnostics.ts b/packages/react-doctor/src/utils/combine-diagnostics.ts
@@ -1,7 +1,7 @@
 import { JSX_FILE_PATTERN } from "../constants.js";
 import type { Diagnostic, ReactDoctorConfig } from "../types.js";
 import { checkReducedMotion } from "./check-reduced-motion.js";
-import { filterIgnoredDiagnostics } from "./filter-diagnostics.js";
+import { filterIgnoredDiagnostics, filterInlineSuppressions } from "./filter-diagnostics.js";
 
 export const computeJsxIncludePaths = (includePaths: string[]): string[] | undefined =>
   includePaths.length > 0
@@ -15,10 +15,11 @@ export const combineDiagnostics = (
   isDiffMode: boolean,
   userConfig: ReactDoctorConfig | null,
 ): Diagnostic[] => {
-  const allDiagnostics = [
+  const merged = [
     ...lintDiagnostics,
     ...deadCodeDiagnostics,
     ...(isDiffMode ? [] : checkReducedMotion(directory)),
   ];
-  return userConfig ? filterIgnoredDiagnostics(allDiagnostics, userConfig) : allDiagnostics;
+  const filtered = userConfig ? filterIgnoredDiagnostics(merged, userConfig) : merged;
+  return filterInlineSuppressions(filtered, directory);
 };
diff --git a/packages/react-doctor/src/utils/discover-project.ts b/packages/react-doctor/src/utils/discover-project.ts
@@ -11,6 +11,7 @@ import type {
 } from "../types.js";
 import { findMonorepoRoot, isMonorepoRoot } from "./find-monorepo-root.js";
 import { isFile } from "./is-file.js";
+import { isPlainObject } from "./is-plain-object.js";
 import { readPackageJson } from "./read-package-json.js";
 
 const REACT_COMPILER_PACKAGES = new Set([
@@ -130,10 +131,43 @@ const detectFramework = (dependencies: Record<string, string>): Framework => {
   return "unknown";
 };
 
+const isCatalogReference = (version: string): boolean => version.startsWith("catalog:");
+
+const resolveVersionFromCatalog = (
+  catalog: Record<string, unknown>,
+  packageName: string,
+): string | null => {
+  const version = catalog[packageName];
+  if (typeof version === "string" && !isCatalogReference(version)) return version;
+  return null;
+};
+
+const resolveCatalogVersion = (packageJson: PackageJson, packageName: string): string | null => {
+  const raw = packageJson as Record<string, unknown>;
+
+  if (isPlainObject(raw.catalog)) {
+    const version = resolveVersionFromCatalog(raw.catalog, packageName);
+    if (version) return version;
+  }
+
+  if (isPlainObject(raw.catalogs)) {
+    for (const catalogEntries of Object.values(raw.catalogs)) {
+      if (isPlainObject(catalogEntries)) {
+        const version = resolveVersionFromCatalog(catalogEntries, packageName);
+        if (version) return version;
+      }
+    }
+  }
+
+  return null;
+};
+
 const extractDependencyInfo = (packageJson: PackageJson): DependencyInfo => {
   const allDependencies = collectAllDependencies(packageJson);
+  const rawVersion = allDependencies.react ?? null;
+  const reactVersion = rawVersion && !isCatalogReference(rawVersion) ? rawVersion : null;
   return {
-    reactVersion: allDependencies.react ?? null,
+    reactVersion,
     framework: detectFramework(allDependencies),
   };
 };
@@ -216,10 +250,11 @@ const findDependencyInfoFromMonorepoRoot = (directory: string): DependencyInfo =
 
   const rootPackageJson = readPackageJson(monorepoPackageJsonPath);
   const rootInfo = extractDependencyInfo(rootPackageJson);
+  const catalogVersion = resolveCatalogVersion(rootPackageJson, "react");
   const workspaceInfo = findReactInWorkspaces(monorepoRoot, rootPackageJson);
 
   return {
-    reactVersion: rootInfo.reactVersion ?? workspaceInfo.reactVersion,
+    reactVersion: rootInfo.reactVersion ?? catalogVersion ?? workspaceInfo.reactVersion,
     framework: rootInfo.framework !== "unknown" ? rootInfo.framework : workspaceInfo.framework,
   };
 };
@@ -368,6 +403,10 @@ export const discoverProject = (directory: string): ProjectInfo => {
   const packageJson = readPackageJson(packageJsonPath);
   let { reactVersion, framework } = extractDependencyInfo(packageJson);
 
+  if (!reactVersion) {
+    reactVersion = resolveCatalogVersion(packageJson, "react");
+  }
+
   if (!reactVersion || framework === "unknown") {
     const workspaceInfo = findReactInWorkspaces(directory, packageJson);
     if (!reactVersion && workspaceInfo.reactVersion) {
diff --git a/packages/react-doctor/src/utils/filter-diagnostics.ts b/packages/react-doctor/src/utils/filter-diagnostics.ts
@@ -1,3 +1,5 @@
+import fs from "node:fs";
+import path from "node:path";
 import type { Diagnostic, ReactDoctorConfig } from "../types.js";
 import { compileGlobPattern } from "./match-glob-pattern.js";
 
@@ -28,3 +30,57 @@ export const filterIgnoredDiagnostics = (
     return true;
   });
 };
+
+const DISABLE_NEXT_LINE_PATTERN = /\/\/\s*react-doctor-disable-next-line\b(?:\s+(.+))?/;
+const DISABLE_LINE_PATTERN = /\/\/\s*react-doctor-disable-line\b(?:\s+(.+))?/;
+
+const isRuleSuppressed = (commentRules: string | undefined, ruleId: string): boolean => {
+  if (!commentRules?.trim()) return true;
+  return commentRules.split(/[,\s]+/).some((rule) => rule.trim() === ruleId);
+};
+
+export const filterInlineSuppressions = (
+  diagnostics: Diagnostic[],
+  rootDirectory: string,
+): Diagnostic[] => {
+  const fileLineCache = new Map<string, string[] | null>();
+
+  const getFileLines = (filePath: string): string[] | null => {
+    const cached = fileLineCache.get(filePath);
+    if (cached !== undefined) return cached;
+    const absolutePath = path.isAbsolute(filePath) ? filePath : path.join(rootDirectory, filePath);
+    try {
+      const lines = fs.readFileSync(absolutePath, "utf-8").split("\n");
+      fileLineCache.set(filePath, lines);
+      return lines;
+    } catch {
+      fileLineCache.set(filePath, null);
+      return null;
+    }
+  };
+
+  return diagnostics.filter((diagnostic) => {
+    if (diagnostic.line <= 0) return true;
+
+    const lines = getFileLines(diagnostic.filePath);
+    if (!lines) return true;
+
+    const ruleId = `${diagnostic.plugin}/${diagnostic.rule}`;
+
+    const currentLine = lines[diagnostic.line - 1];
+    if (currentLine) {
+      const lineMatch = currentLine.match(DISABLE_LINE_PATTERN);
+      if (lineMatch && isRuleSuppressed(lineMatch[1], ruleId)) return false;
+    }
+
+    if (diagnostic.line >= 2) {
+      const prevLine = lines[diagnostic.line - 2];
+      if (prevLine) {
+        const nextLineMatch = prevLine.match(DISABLE_NEXT_LINE_PATTERN);
+        if (nextLineMatch && isRuleSuppressed(nextLineMatch[1], ruleId)) return false;
+      }
+    }
+
+    return true;
+  });
+};
diff --git a/packages/react-doctor/src/utils/is-plain-object.ts b/packages/react-doctor/src/utils/is-plain-object.ts
@@ -0,0 +1,2 @@
+export const isPlainObject = (value: unknown): value is Record<string, unknown> =>
+  typeof value === "object" && value !== null && !Array.isArray(value);
diff --git a/packages/react-doctor/src/utils/load-config.ts b/packages/react-doctor/src/utils/load-config.ts
@@ -2,13 +2,11 @@ import fs from "node:fs";
 import path from "node:path";
 import type { ReactDoctorConfig } from "../types.js";
 import { isFile } from "./is-file.js";
+import { isPlainObject } from "./is-plain-object.js";
 
 const CONFIG_FILENAME = "react-doctor.config.json";
 const PACKAGE_JSON_CONFIG_KEY = "reactDoctor";
 
-const isPlainObject = (value: unknown): value is Record<string, unknown> =>
-  typeof value === "object" && value !== null && !Array.isArray(value);
-
 export const loadConfig = (rootDirectory: string): ReactDoctorConfig | null => {
   const configFilePath = path.join(rootDirectory, CONFIG_FILENAME);
 
diff --git a/packages/react-doctor/src/utils/match-glob-pattern.ts b/packages/react-doctor/src/utils/match-glob-pattern.ts
@@ -1,7 +1,7 @@
 const REGEX_SPECIAL_CHARACTERS = /[.+^${}()|[\]\\]/g;
 
 export const compileGlobPattern = (pattern: string): RegExp => {
-  const normalizedPattern = pattern.replace(/\\/g, "/");
+  const normalizedPattern = pattern.replace(/\\/g, "/").replace(/^\//, "");
 
   let regexSource = "^";
   let characterIndex = 0;
diff --git a/packages/react-doctor/src/utils/read-package-json.ts b/packages/react-doctor/src/utils/read-package-json.ts
@@ -1,5 +1,16 @@
 import fs from "node:fs";
 import type { PackageJson } from "../types.js";
 
-export const readPackageJson = (packageJsonPath: string): PackageJson =>
-  JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
+export const readPackageJson = (packageJsonPath: string): PackageJson => {
+  try {
+    return JSON.parse(fs.readFileSync(packageJsonPath, "utf-8"));
+  } catch (error) {
+    if (error instanceof Error && "code" in error) {
+      const { code } = error as { code: string };
+      if (code === "EISDIR" || code === "EACCES") {
+        return {};
+      }
+    }
+    throw error;
+  }
+};
diff --git a/packages/react-doctor/src/utils/run-oxlint.ts b/packages/react-doctor/src/utils/run-oxlint.ts
@@ -100,7 +100,7 @@ const RULE_CATEGORY_MAP: Record<string, string> = {
 
 const RULE_HELP_MAP: Record<string, string> = {
   "no-derived-state-effect":
-    "For derived state, compute inline: `const x = fn(dep)`. For state resets on prop change, use a key prop: `<Component key={prop} />`",
+    "For derived state, compute inline: `const x = fn(dep)`. For state resets on prop change, use a key prop: `<Component key={prop} />`. See https://react.dev/learn/you-might-not-need-an-effect",
   "no-fetch-in-effect":
     "Use `useQuery()` from @tanstack/react-query, `useSWR()`, or fetch in a Server Component instead",
   "no-cascading-set-state":
@@ -187,7 +187,7 @@ const RULE_HELP_MAP: Record<string, string> = {
   "nextjs-missing-metadata":
     "Add `export const metadata = { title: '...', description: '...' }` or `export async function generateMetadata()`",
   "nextjs-no-client-side-redirect":
-    "Use `redirect('/path')` from 'next/navigation' in a Server Component, or handle in middleware",
+    "Use `redirect('/path')` from 'next/navigation' directly (works in both server and client components), or handle in middleware",
   "nextjs-no-redirect-in-try-catch":
     "Move the redirect/notFound call outside the try block, or add `unstable_rethrow(error)` in the catch",
   "nextjs-image-missing-sizes":
@@ -326,7 +326,15 @@ const spawnOxlint = (
     child.stderr.on("data", (buffer: Buffer) => stderrBuffers.push(buffer));
 
     child.on("error", (error) => reject(new Error(`Failed to run oxlint: ${error.message}`)));
-    child.on("close", () => {
+    child.on("close", (code, signal) => {
+      if (signal) {
+        const stderrOutput = Buffer.concat(stderrBuffers).toString("utf-8").trim();
+        const hint =
+          signal === "SIGABRT" ? " (out of memory — try scanning fewer files with --diff)" : "";
+        const detail = stderrOutput ? `: ${stderrOutput}` : "";
+        reject(new Error(`oxlint was killed by ${signal}${hint}${detail}`));
+        return;
+      }
       const output = Buffer.concat(stdoutBuffers).toString("utf-8").trim();
       if (!output) {
         const stderrOutput = Buffer.concat(stderrBuffers).toString("utf-8").trim();

Original file line number	Diff line number	Diff line change
`@@ -213,7 +213,7 @@ export const nextjsNoClientSideRedirect: Rule = {`
`213`	`213`	`context.report({`
`214`	`214`	`node: child,`
`215`	`215`	`message:`
`216`		`- "Client-side redirect in useEffect — use redirect() in a server component or middleware instead",`
	`216`	`+ "Client-side redirect in useEffect — use redirect() from next/navigation or handle in middleware instead",`
`217`	`217`	`});`
`218`	`218`	`}`
`219`	`219`	`});`