Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion packages/react-doctor/src/scan.ts
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,7 @@ export const scan = async (directory: string, inputOptions: ScanOptions = {}): P
includePaths: inputOptions.includePaths,
};

const ignoreFilePatterns = userConfig?.ignore?.files ?? [];
const includePaths = options.includePaths ?? [];
const isDiffMode = includePaths.length > 0;

Expand Down Expand Up @@ -412,6 +413,7 @@ export const scan = async (directory: string, inputOptions: ScanOptions = {}): P
projectInfo.framework,
projectInfo.hasReactCompiler,
jsxIncludePaths,
ignoreFilePatterns,
);
lintSpinner?.succeed("Running lint checks.");
return lintDiagnostics;
Expand All @@ -437,7 +439,7 @@ export const scan = async (directory: string, inputOptions: ScanOptions = {}): P
? null
: spinner("Detecting dead code...").start();
try {
const knipDiagnostics = await runKnip(directory);
const knipDiagnostics = await runKnip(directory, ignoreFilePatterns);
deadCodeSpinner?.succeed("Detecting dead code.");
return knipDiagnostics;
} catch (error) {
Expand Down
11 changes: 10 additions & 1 deletion packages/react-doctor/src/utils/run-knip.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ import path from "node:path";
import { main } from "knip";
import { createOptions } from "knip/session";
import type { Diagnostic, KnipIssueRecords, KnipResults } from "../types.js";
import { compileGlobPattern } from "./match-glob-pattern.js";

const KNIP_CATEGORY_MAP: Record<string, string> = {
files: "Dead Code",
Expand Down Expand Up @@ -135,7 +136,7 @@ const hasNodeModules = (directory: string): boolean => {
return fs.existsSync(nodeModulesPath) && fs.statSync(nodeModulesPath).isDirectory();
};

export const runKnip = async (rootDirectory: string): Promise<Diagnostic[]> => {
export const runKnip = async (rootDirectory: string, ignorePatterns?: string[]): Promise<Diagnostic[]> => {
const monorepoRoot = findMonorepoRoot(rootDirectory);
const hasInstalledDependencies =
hasNodeModules(rootDirectory) || (monorepoRoot !== null && hasNodeModules(monorepoRoot));
Expand Down Expand Up @@ -186,5 +187,13 @@ export const runKnip = async (rootDirectory: string): Promise<Diagnostic[]> => {
diagnostics.push(...collectIssueRecords(issues[issueType], issueType, rootDirectory));
}

if (ignorePatterns && ignorePatterns.length > 0) {
const compiled = ignorePatterns.map(compileGlobPattern);
return diagnostics.filter((diagnostic) => {
const normalized = diagnostic.filePath.replace(/\\/g, "/");
return !compiled.some((pattern) => pattern.test(normalized));
});
}

return diagnostics;
};
7 changes: 7 additions & 0 deletions packages/react-doctor/src/utils/run-oxlint.ts
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,7 @@ export const runOxlint = async (
framework: Framework,
hasReactCompiler: boolean,
includePaths?: string[],
ignorePatterns?: string[],
): Promise<Diagnostic[]> => {
if (includePaths !== undefined && includePaths.length === 0) {
return [];
Expand All @@ -278,6 +279,12 @@ export const runOxlint = async (
args.push("--tsconfig", "./tsconfig.json");
}

if (ignorePatterns) {
for (const pattern of ignorePatterns) {
args.push("--ignore-pattern", pattern);
}
}

if (includePaths !== undefined) {
args.push(...includePaths);
} else {
Expand Down