fix(eslint-patch): fix bulk suppression in polyrepo

Fixes #4454
microsoft · Dec 13, 2023 · 1ab0b46 · 1ab0b46
1 parent d9e0c73
commit 1ab0b46
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/...anges/@rushstack/eslint-patch/fix-4454-bulk-suppression-in-polyrepo_2023-12-13-21-38.json b/...anges/@rushstack/eslint-patch/fix-4454-bulk-suppression-in-polyrepo_2023-12-13-21-38.json
@@ -0,0 +1,10 @@
+{
+  "changes": [
+    {
+      "packageName": "@rushstack/eslint-patch",
+      "comment": "Fix bulk suppression patch's eslintrc detection in polyrepos",
+      "type": "patch"
+    }
+  ],
+  "packageName": "@rushstack/eslint-patch"
+}
diff --git a/eslint/eslint-patch/src/eslint-bulk-suppressions/bulk-suppressions-patch.ts b/eslint/eslint-patch/src/eslint-bulk-suppressions/bulk-suppressions-patch.ts
@@ -74,7 +74,7 @@ export function getGitRootPath(): string {
 export const GitRootPath = getGitRootPath();
 
 function findEslintrcDirectory(fileAbsolutePath: string): string {
-  for (let currentDir = fileAbsolutePath; currentDir !== GitRootPath; currentDir = path.dirname(currentDir))
+  for (let currentDir = fileAbsolutePath; currentDir.startsWith(GitRootPath); currentDir = path.dirname(currentDir))
     if (['.eslintrc.js', '.eslintrc.cjs'].some((eslintrc) => fs.existsSync(path.join(currentDir, eslintrc))))
       return currentDir;
   throw new Error('Cannot locate eslintrc');