@nx/eslint 17.3.0-canary.20231220-b40773c → 17.3.0-canary.20231221-2374d8e

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "17.3.0-canary.20231220-b40773c",
+  "version": "17.3.0-canary.20231221-2374d8e",
   "private": false,
   "description": "The ESLint plugin for Nx contains executors, generators and utilities used for linting JavaScript/TypeScript projects within an Nx workspace.",
   "repository": {
@@ -34,11 +34,11 @@
     "js-yaml": "4.1.0"
   },
   "dependencies": {
-    "@nx/devkit": "17.3.0-canary.20231220-b40773c",
-    "@nx/js": "17.3.0-canary.20231220-b40773c",
+    "@nx/devkit": "17.3.0-canary.20231221-2374d8e",
+    "@nx/js": "17.3.0-canary.20231221-2374d8e",
     "tslib": "^2.3.0",
     "typescript": "~5.2.2",
-    "@nx/linter": "17.3.0-canary.20231220-b40773c"
+    "@nx/linter": "17.3.0-canary.20231221-2374d8e"
   },
   "peerDependenciesMeta": {
     "eslint": {

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

@@ -128,7 +128,7 @@ function addOverrideToLintConfig(tree, root, override, options = {
 }
 exports.addOverrideToLintConfig = addOverrideToLintConfig;
 function overrideNeedsCompat(override) {
-    return (!override.env && !override.extends && !override.plugins && !override.parser);
+    return (override.env || override.extends || override.plugins || override.parser);
 }
 function updateOverrideInLintConfig(tree, root, lookup, update) {
     if ((0, flat_config_1.useFlatConfig)(tree)) {
@@ -142,7 +142,13 @@ function updateOverrideInLintConfig(tree, root, lookup, update) {
         (0, devkit_1.updateJson)(tree, fileName, (json) => {
             const index = json.overrides.findIndex(lookup);
             if (index !== -1) {
-                json.overrides[index] = update(json.overrides[index]);
+                const newOverride = update(json.overrides[index]);
+                if (newOverride) {
+                    json.overrides[index] = newOverride;
+                }
+                else {
+                    json.overrides.splice(index, 1);
+                }
             }
             return json;
         });
@@ -194,7 +200,9 @@ function addExtendsToLintConfig(tree, root, plugin) {
     if ((0, flat_config_1.useFlatConfig)(tree)) {
         const fileName = (0, devkit_1.joinPathFragments)(root, 'eslint.config.js');
         const pluginExtends = (0, ast_utils_1.generatePluginExtendsElement)(plugins);
-        tree.write(fileName, (0, ast_utils_1.addBlockToFlatConfigExport)(tree.read(fileName, 'utf8'), pluginExtends));
+        let content = tree.read(fileName, 'utf8');
+        content = (0, ast_utils_1.addCompatToFlatConfig)(content);
+        tree.write(fileName, (0, ast_utils_1.addBlockToFlatConfigExport)(content, pluginExtends));
     }
     else {
         const fileName = (0, devkit_1.joinPathFragments)(root, '.eslintrc.json');

package/src/generators/utils/flat-config/ast-utils.d.ts

@@ -8,7 +8,7 @@ export declare function hasOverride(content: string, lookup: (override: Linter.C
 /**
  * Finds an override matching the lookup function and applies the update function to it
  */
-export declare function replaceOverride(content: string, root: string, lookup: (override: Linter.ConfigOverride<Linter.RulesRecord>) => boolean, update: (override: Linter.ConfigOverride<Linter.RulesRecord>) => Linter.ConfigOverride<Linter.RulesRecord>): string;
+export declare function replaceOverride(content: string, root: string, lookup: (override: Linter.ConfigOverride<Linter.RulesRecord>) => boolean, update?: (override: Linter.ConfigOverride<Linter.RulesRecord>) => Linter.ConfigOverride<Linter.RulesRecord>): string;
 /**
  * Adding require statement to the top of the file
  */

package/src/generators/utils/flat-config/ast-utils.js

@@ -119,12 +119,14 @@ function replaceOverride(content, root, lookup, update) {
                     length: end - start,
                 });
                 const updatedData = update(data);
-                mapFilePaths(updatedData);
-                changes.push({
-                    type: devkit_1.ChangeType.Insert,
-                    index: start,
-                    text: JSON.stringify(updatedData, null, 2).slice(2, -2), // remove curly braces and start/end line breaks since we are injecting just properties
-                });
+                if (updatedData) {
+                    mapFilePaths(updatedData);
+                    changes.push({
+                        type: devkit_1.ChangeType.Insert,
+                        index: start,
+                        text: JSON.stringify(updatedData, null, 2).slice(2, -2), // remove curly braces and start/end line breaks since we are injecting just properties
+                    });
+                }
             }
         }
     });