@nx/eslint 20.2.0 → 20.2.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "20.2.0",
+  "version": "20.2.2",
   "private": false,
   "description": "The ESLint plugin for Nx contains executors, generators and utilities used for linting JavaScript/TypeScript projects within an Nx workspace.",
   "repository": {
@@ -35,8 +35,8 @@
     "eslint": "^8.0.0 || ^9.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "20.2.0",
-    "@nx/js": "20.2.0",
+    "@nx/devkit": "20.2.2",
+    "@nx/js": "20.2.2",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.6.2"

package/src/generators/utils/eslint-file.d.ts

@@ -7,8 +7,8 @@ export declare function addOverrideToLintConfig(tree: Tree, root: string, overri
     insertAtTheEnd?: boolean;
     checkBaseConfig?: boolean;
 }): void;
-export declare function updateOverrideInLintConfig(tree: Tree, root: string, lookup: (override: Linter.ConfigOverride<Linter.RulesRecord>) => boolean, update: (override: Linter.ConfigOverride<Linter.RulesRecord>) => Linter.ConfigOverride<Linter.RulesRecord>): void;
-export declare function lintConfigHasOverride(tree: Tree, root: string, lookup: (override: Linter.ConfigOverride<Linter.RulesRecord>) => boolean, checkBaseConfig?: boolean): boolean;
+export declare function updateOverrideInLintConfig(tree: Tree, rootOrFile: string, lookup: (override: Linter.ConfigOverride<Linter.RulesRecord>) => boolean, update: (override: Linter.ConfigOverride<Linter.RulesRecord>) => Linter.ConfigOverride<Linter.RulesRecord>): void;
+export declare function lintConfigHasOverride(tree: Tree, rootOrFile: string, lookup: (override: Linter.ConfigOverride<Linter.RulesRecord>) => boolean, checkBaseConfig?: boolean): boolean;
 export declare function replaceOverridesInLintConfig(tree: Tree, root: string, overrides: Linter.ConfigOverride<Linter.RulesRecord>[]): void;
 export declare function addExtendsToLintConfig(tree: Tree, root: string, plugin: string | {
     name: string;

package/src/generators/utils/eslint-file.js

@@ -20,6 +20,7 @@ const version_utils_1 = require("../../utils/version-utils");
 const versions_1 = require("../../utils/versions");
 const ast_utils_1 = require("./flat-config/ast-utils");
 const path_utils_1 = require("./flat-config/path-utils");
+const posix_1 = require("node:path/posix");
 function findEslintFile(tree, projectRoot) {
     if (projectRoot === undefined && tree.exists(config_file_1.baseEsLintConfigFile)) {
         return config_file_1.baseEsLintConfigFile;
@@ -139,15 +140,21 @@ function addOverrideToLintConfig(tree, root, override, options = {
         });
     }
 }
-function updateOverrideInLintConfig(tree, root, lookup, update) {
+function updateOverrideInLintConfig(tree, rootOrFile, lookup, update) {
+    let fileName;
+    let root = rootOrFile;
+    if (tree.exists(rootOrFile) && tree.isFile(rootOrFile)) {
+        fileName = rootOrFile;
+        root = (0, posix_1.dirname)(rootOrFile);
+    }
     if ((0, flat_config_1.useFlatConfig)(tree)) {
-        const fileName = (0, devkit_1.joinPathFragments)(root, (0, flat_config_1.getRootESLintFlatConfigFilename)(tree));
+        fileName ??= (0, devkit_1.joinPathFragments)(root, (0, flat_config_1.getRootESLintFlatConfigFilename)(tree));
         let content = tree.read(fileName, 'utf8');
         content = (0, ast_utils_1.replaceOverride)(content, root, lookup, update);
         tree.write(fileName, content);
     }
     else {
-        const fileName = (0, devkit_1.joinPathFragments)(root, '.eslintrc.json');
+        fileName ??= (0, devkit_1.joinPathFragments)(root, '.eslintrc.json');
         if (!tree.exists(fileName)) {
             return;
         }
@@ -170,18 +177,26 @@ function updateOverrideInLintConfig(tree, root, lookup, update) {
         });
     }
 }
-function lintConfigHasOverride(tree, root, lookup, checkBaseConfig = false) {
-    if (!isEslintConfigSupported(tree, root)) {
+function lintConfigHasOverride(tree, rootOrFile, lookup, checkBaseConfig = false) {
+    let fileName;
+    let root = rootOrFile;
+    if (tree.exists(rootOrFile) && tree.isFile(rootOrFile)) {
+        fileName = rootOrFile;
+        root = (0, posix_1.dirname)(rootOrFile);
+    }
+    if (!fileName && !isEslintConfigSupported(tree, root)) {
         return false;
     }
-    const isBase = checkBaseConfig && findEslintFile(tree, root).includes('.base');
+    const isBase = !fileName &&
+        checkBaseConfig &&
+        findEslintFile(tree, root).includes('.base');
     if ((0, flat_config_1.useFlatConfig)(tree)) {
-        const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? config_file_1.baseEsLintFlatConfigFile : (0, flat_config_1.getRootESLintFlatConfigFilename)(tree));
+        fileName ??= (0, devkit_1.joinPathFragments)(root, isBase ? config_file_1.baseEsLintFlatConfigFile : (0, flat_config_1.getRootESLintFlatConfigFilename)(tree));
         const content = tree.read(fileName, 'utf8');
         return (0, ast_utils_1.hasOverride)(content, lookup);
     }
     else {
-        const fileName = (0, devkit_1.joinPathFragments)(root, isBase ? config_file_1.baseEsLintConfigFile : '.eslintrc.json');
+        fileName ??= (0, devkit_1.joinPathFragments)(root, isBase ? config_file_1.baseEsLintConfigFile : '.eslintrc.json');
         return (0, devkit_1.readJson)(tree, fileName).overrides?.some(lookup) || false;
     }
 }