@nx/eslint 21.0.0-beta.1 → 21.0.0-beta.2

package/migrations.json

@@ -104,6 +104,18 @@
         },
         "@typescript-eslint/utils": {
           "version": "^7.16.0"
+        },
+        "@typescript-eslint/rule-tester": {
+          "version": "^7.16.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@typescript-eslint/scope-manager": {
+          "version": "^7.16.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@typescript-eslint/typescript-estree": {
+          "version": "^7.16.0",
+          "alwaysAddToPackageJson": false
         }
       }
     },
@@ -116,14 +128,26 @@
         "typescript-eslint": {
           "version": "^8.19.0"
         },
-        "@typescript-eslint/parser": {
+        "@typescript-eslint/eslint-plugin": {
           "version": "^8.19.0"
         },
-        "@typescript-eslint/eslint-plugin": {
+        "@typescript-eslint/parser": {
           "version": "^8.19.0"
         },
         "@typescript-eslint/utils": {
           "version": "^8.19.0"
+        },
+        "@typescript-eslint/rule-tester": {
+          "version": "^8.19.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@typescript-eslint/scope-manager": {
+          "version": "^8.19.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@typescript-eslint/typescript-estree": {
+          "version": "^8.19.0",
+          "alwaysAddToPackageJson": false
         }
       }
     },
@@ -136,14 +160,34 @@
         "typescript-eslint": {
           "version": "^8.19.0"
         },
-        "@typescript-eslint/parser": {
+        "@typescript-eslint/eslint-plugin": {
           "version": "^8.19.0"
         },
-        "@typescript-eslint/eslint-plugin": {
+        "@typescript-eslint/parser": {
           "version": "^8.19.0"
         },
         "@typescript-eslint/utils": {
           "version": "^8.19.0"
+        },
+        "@typescript-eslint/rule-tester": {
+          "version": "^8.19.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@typescript-eslint/scope-manager": {
+          "version": "^8.19.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@typescript-eslint/typescript-estree": {
+          "version": "^8.19.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
+    "20.7.0": {
+      "version": "20.7.0-beta.4",
+      "packages": {
+        "eslint-config-prettier": {
+          "version": "^10.0.0"
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "21.0.0-beta.1",
+  "version": "21.0.0-beta.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": "21.0.0-beta.1",
-    "@nx/js": "21.0.0-beta.1",
+    "@nx/devkit": "21.0.0-beta.2",
+    "@nx/js": "21.0.0-beta.2",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.7.2"

package/src/generators/lint-project/lint-project.js

@@ -12,6 +12,7 @@ const flat_config_1 = require("../../utils/flat-config");
 const ast_utils_1 = require("../utils/flat-config/ast-utils");
 const config_file_1 = require("../../utils/config-file");
 const plugin_1 = require("../utils/plugin");
+const versions_1 = require("../../utils/versions");
 const setup_root_eslint_1 = require("./setup-root-eslint");
 const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
 function lintProjectGenerator(tree, options) {
@@ -96,7 +97,12 @@ async function lintProjectGeneratorInternal(tree, options) {
     // additionally, the companion e2e app would have `rootProject: true`
     // so we need to check for the root path as well
     if (!options.rootProject || projectConfig.root !== '.') {
-        createEsLintConfiguration(tree, options, projectConfig, options.setParserOptionsProject, options.rootProject);
+        const addDependencyChecks = options.addPackageJsonDependencyChecks ||
+            isBuildableLibraryProject(tree, projectConfig);
+        createEsLintConfiguration(tree, options, projectConfig, options.setParserOptionsProject, options.rootProject, addDependencyChecks);
+        if (addDependencyChecks) {
+            tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { 'jsonc-eslint-parser': versions_1.jsoncEslintParserVersion }, undefined, true));
+        }
     }
     // Buildable libs need source analysis enabled for linting `package.json`.
     if (isBuildableLibraryProject(tree, projectConfig) &&
@@ -114,7 +120,7 @@ async function lintProjectGeneratorInternal(tree, options) {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-function createEsLintConfiguration(tree, options, projectConfig, setParserOptionsProject, rootProject) {
+function createEsLintConfiguration(tree, options, projectConfig, setParserOptionsProject, rootProject, addDependencyChecks) {
     // we are only extending root for non-standalone projects or their complementary e2e apps
     const extendedRootConfig = rootProject ? undefined : (0, eslint_file_1.findEslintFile)(tree);
     const pathToRootConfig = extendedRootConfig
@@ -132,8 +138,6 @@ function createEsLintConfiguration(tree, options, projectConfig, setParserOption
             options.eslintConfigFormat = (0, eslint_file_1.determineEslintConfigFormat)(tree.read(extendedRootConfig, 'utf-8'));
         }
     }
-    const addDependencyChecks = options.addPackageJsonDependencyChecks ||
-        isBuildableLibraryProject(tree, projectConfig);
     const overrides = (0, flat_config_1.useFlatConfig)(tree)
         ? // For flat configs, we don't need to generate different overrides for each file. Users should add their own overrides as needed.
             []

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

@@ -357,9 +357,9 @@ function addExtendsToLintConfig(tree, root, plugin, insertAtTheEnd = false) {
         }
         tree.write(fileName, content);
         if (shouldImportEslintCompat) {
-            return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@eslint/compat': versions_1.eslintCompat }, undefined, true);
+            return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@eslint/compat': versions_1.eslintCompat, '@eslint/eslintrc': versions_1.eslintrcVersion }, undefined, true);
         }
-        return () => { };
+        return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@eslint/eslintrc': versions_1.eslintrcVersion }, undefined, true);
     }
     else {
         const plugins = (Array.isArray(plugin) ? plugin : [plugin]).map((p) => typeof p === 'string' ? p : p.name);
@@ -430,13 +430,26 @@ function addIgnoresToLintConfig(tree, root, ignorePatterns) {
                 break;
             }
         }
-        const block = (0, ast_utils_1.generateAst)({
-            ignores: ignorePatterns.map((path) => (0, path_utils_1.mapFilePath)(path)),
-        });
-        tree.write(fileName, (0, ast_utils_1.addBlockToFlatConfigExport)(tree.read(fileName, 'utf8'), block));
+        if (!fileName) {
+            return;
+        }
+        let content = tree.read(fileName, 'utf8');
+        if ((0, ast_utils_1.hasFlatConfigIgnoresBlock)(content)) {
+            content = (0, ast_utils_1.addPatternsToFlatConfigIgnoresBlock)(content, ignorePatterns);
+            tree.write(fileName, content);
+        }
+        else {
+            const block = (0, ast_utils_1.generateAst)({
+                ignores: ignorePatterns.map((path) => (0, path_utils_1.mapFilePath)(path)),
+            });
+            tree.write(fileName, (0, ast_utils_1.addBlockToFlatConfigExport)(content, block));
+        }
     }
     else {
         const fileName = (0, devkit_1.joinPathFragments)(root, '.eslintrc.json');
+        if (!tree.exists(fileName)) {
+            return;
+        }
         (0, devkit_1.updateJson)(tree, fileName, (json) => {
             const ignoreSet = new Set([
                 ...(json.ignorePatterns ?? []),

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

@@ -4,6 +4,8 @@ import * as ts from 'typescript';
  * Remove all overrides from the config file
  */
 export declare function removeOverridesFromLintConfig(content: string): string;
+export declare function addPatternsToFlatConfigIgnoresBlock(content: string, ignorePatterns: string[]): string;
+export declare function hasFlatConfigIgnoresBlock(content: string): boolean;
 export declare function hasOverride(content: string, lookup: (override: Linter.ConfigOverride<Linter.RulesRecord>) => boolean): boolean;
 /**
  * Finds an override matching the lookup function and applies the update function to it

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

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.removeOverridesFromLintConfig = removeOverridesFromLintConfig;
+exports.addPatternsToFlatConfigIgnoresBlock = addPatternsToFlatConfigIgnoresBlock;
+exports.hasFlatConfigIgnoresBlock = hasFlatConfigIgnoresBlock;
 exports.hasOverride = hasOverride;
 exports.replaceOverride = replaceOverride;
 exports.addImportToFlatConfig = addImportToFlatConfig;
@@ -73,6 +75,55 @@ function findModuleExports(source) {
         }
     });
 }
+function addPatternsToFlatConfigIgnoresBlock(content, ignorePatterns) {
+    const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
+    const exportsArray = format === 'mjs' ? findExportDefault(source) : findModuleExports(source);
+    if (!exportsArray) {
+        return content;
+    }
+    const changes = [];
+    for (const node of exportsArray) {
+        if (!isFlatConfigIgnoresBlock(node)) {
+            continue;
+        }
+        const start = node.properties.pos + 1; // keep leading line break
+        const data = parseTextToJson(node.getFullText());
+        changes.push({
+            type: devkit_1.ChangeType.Delete,
+            start,
+            length: node.properties.end - start,
+        });
+        data.ignores = Array.from(new Set([...(data.ignores ?? []), ...ignorePatterns]));
+        changes.push({
+            type: devkit_1.ChangeType.Insert,
+            index: start,
+            text: '    ' +
+                JSON.stringify(data, null, 2)
+                    .slice(2, -2) // Remove curly braces and start/end line breaks
+                    .replaceAll(/\n/g, '\n    '), // Maintain indentation
+        });
+        break;
+    }
+    return (0, devkit_1.applyChangesToString)(content, changes);
+}
+function hasFlatConfigIgnoresBlock(content) {
+    const source = ts.createSourceFile('', content, ts.ScriptTarget.Latest, true, ts.ScriptKind.JS);
+    const format = content.includes('export default') ? 'mjs' : 'cjs';
+    const exportsArray = format === 'mjs' ? findExportDefault(source) : findModuleExports(source);
+    if (!exportsArray) {
+        return false;
+    }
+    return exportsArray.some(isFlatConfigIgnoresBlock);
+}
+function isFlatConfigIgnoresBlock(node) {
+    return (ts.isObjectLiteralExpression(node) &&
+        node.properties.length === 1 &&
+        (node.properties[0].name.getText() === 'ignores' ||
+            node.properties[0].name.getText() === '"ignores"') &&
+        ts.isPropertyAssignment(node.properties[0]) &&
+        ts.isArrayLiteralExpression(node.properties[0].initializer));
+}
 function isOverride(node) {
     return ((ts.isObjectLiteralExpression(node) &&
         node.properties.some((p) => p.name.getText() === 'files' || p.name.getText() === '"files"')) ||

package/src/plugins/plugin.js

@@ -107,7 +107,7 @@ const internalCreateNodes = async (configFilePath, options, context, projectsCac
         projects,
     };
 };
-const internalCreateNodesV2 = async (configFilePath, options, context, eslintConfigFiles, projectRootsByEslintRoots, lintableFilesPerProjectRoot, projectsCache) => {
+const internalCreateNodesV2 = async (configFilePath, options, context, projectRootsByEslintRoots, lintableFilesPerProjectRoot, projectsCache, hashByRoot) => {
     const configDir = (0, posix_1.dirname)(configFilePath);
     const ESLint = await (0, resolve_eslint_class_1.resolveESLintClass)({
         useFlatConfigOverrideVal: (0, config_file_1.isFlatConfig)(configFilePath),
@@ -115,12 +115,7 @@ const internalCreateNodesV2 = async (configFilePath, options, context, eslintCon
     const eslintVersion = ESLint.version;
     const projects = {};
     await Promise.all(projectRootsByEslintRoots.get(configDir).map(async (projectRoot) => {
-        const parentConfigs = eslintConfigFiles.filter((eslintConfig) => isSubDir(projectRoot, (0, posix_1.dirname)(eslintConfig)));
-        const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(projectRoot, options, {
-            configFiles: eslintConfigFiles,
-            nxJsonConfiguration: context.nxJsonConfiguration,
-            workspaceRoot: context.workspaceRoot,
-        }, [...parentConfigs, (0, posix_1.join)(projectRoot, '.eslintignore')]);
+        const hash = hashByRoot.get(projectRoot);
         if (projectsCache[hash]) {
             // We can reuse the projects in the cache.
             Object.assign(projects, projectsCache[hash]);
@@ -165,8 +160,13 @@ exports.createNodesV2 = [
         const targetsCache = readTargetsCache(cachePath);
         const { eslintConfigFiles, projectRoots, projectRootsByEslintRoots } = splitConfigFiles(configFiles);
         const lintableFilesPerProjectRoot = await collectLintableFilesByProjectRoot(projectRoots, options, context);
+        const hashes = await (0, calculate_hash_for_create_nodes_1.calculateHashesForCreateNodes)(projectRoots, options, context, projectRoots.map((root) => {
+            const parentConfigs = eslintConfigFiles.filter((eslintConfig) => isSubDir(root, (0, posix_1.dirname)(eslintConfig)));
+            return [...parentConfigs, (0, posix_1.join)(root, '.eslintignore')];
+        }));
+        const hashByRoot = new Map(projectRoots.map((r, i) => [r, hashes[i]]));
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => internalCreateNodesV2(configFile, options, context, eslintConfigFiles, projectRootsByEslintRoots, lintableFilesPerProjectRoot, targetsCache), eslintConfigFiles, options, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => internalCreateNodesV2(configFile, options, context, projectRootsByEslintRoots, lintableFilesPerProjectRoot, targetsCache, hashByRoot), eslintConfigFiles, options, context);
         }
         finally {
             writeTargetsToCache(cachePath, targetsCache);

package/src/utils/versions.d.ts

@@ -1,8 +1,9 @@
 export declare const nxVersion: any;
 export declare const eslintVersion = "~8.57.0";
 export declare const eslintrcVersion = "^2.1.1";
-export declare const eslintConfigPrettierVersion = "^9.0.0";
+export declare const eslintConfigPrettierVersion = "^10.0.0";
 export declare const typescriptESLintVersion = "^7.16.0";
+export declare const jsoncEslintParserVersion = "^2.1.0";
 export declare const eslint9__typescriptESLintVersion = "^8.19.0";
 export declare const eslint9__eslintVersion = "^9.8.0";
 export declare const eslintCompat = "^1.1.1";

package/src/utils/versions.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.eslintCompat = exports.eslint9__eslintVersion = exports.eslint9__typescriptESLintVersion = exports.typescriptESLintVersion = exports.eslintConfigPrettierVersion = exports.eslintrcVersion = exports.eslintVersion = exports.nxVersion = void 0;
+exports.eslintCompat = exports.eslint9__eslintVersion = exports.eslint9__typescriptESLintVersion = exports.jsoncEslintParserVersion = exports.typescriptESLintVersion = exports.eslintConfigPrettierVersion = exports.eslintrcVersion = exports.eslintVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.eslintVersion = '~8.57.0';
 exports.eslintrcVersion = '^2.1.1';
-exports.eslintConfigPrettierVersion = '^9.0.0';
+exports.eslintConfigPrettierVersion = '^10.0.0';
 exports.typescriptESLintVersion = '^7.16.0';
+exports.jsoncEslintParserVersion = '^2.1.0';
 // Updated linting stack for ESLint v9, typescript-eslint v8
 exports.eslint9__typescriptESLintVersion = '^8.19.0';
 exports.eslint9__eslintVersion = '^9.8.0';