@nx/eslint 20.5.0-beta.3 → 20.5.0-canary.20250129-3f5e863

package/package.json

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

package/src/generators/init/global-eslint-config.js

@@ -113,8 +113,6 @@ const getGlobalFlatEslintConfiguration = (format, rootProject) => {
         files: [
             '**/*.ts',
             '**/*.tsx',
-            '**/*.cts',
-            '**/*.mts',
             '**/*.js',
             '**/*.jsx',
             '**/*.cjs',

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, '@eslint/eslintrc': versions_1.eslintrcVersion }, undefined, true);
+            return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@eslint/compat': versions_1.eslintCompat }, undefined, true);
         }
-        return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@eslint/eslintrc': versions_1.eslintrcVersion }, undefined, true);
+        return () => { };
     }
     else {
         const plugins = (Array.isArray(plugin) ? plugin : [plugin]).map((p) => typeof p === 'string' ? p : p.name);
@@ -430,26 +430,13 @@ function addIgnoresToLintConfig(tree, root, ignorePatterns) {
                 break;
             }
         }
-        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));
-        }
+        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));
     }
     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,8 +4,6 @@ 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,8 +1,6 @@
 "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;
@@ -75,55 +73,6 @@ 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

@@ -13,18 +13,7 @@ const semver_1 = require("semver");
 const config_file_1 = require("../utils/config-file");
 const resolve_eslint_class_1 = require("../utils/resolve-eslint-class");
 const pmc = (0, devkit_1.getPackageManagerCommand)();
-const DEFAULT_EXTENSIONS = [
-    'ts',
-    'cts',
-    'mts',
-    'tsx',
-    'js',
-    'cjs',
-    'mjs',
-    'jsx',
-    'html',
-    'vue',
-];
+const DEFAULT_EXTENSIONS = ['ts', 'tsx', 'js', 'jsx', 'html', 'vue'];
 const PROJECT_CONFIG_FILENAMES = ['project.json', 'package.json'];
 const ESLINT_CONFIG_GLOB_V1 = (0, globs_1.combineGlobPatterns)(config_file_1.ESLINT_CONFIG_FILENAMES.map((f) => `**/${f}`));
 const ESLINT_CONFIG_GLOB_V2 = (0, globs_1.combineGlobPatterns)([
@@ -107,7 +96,7 @@ const internalCreateNodes = async (configFilePath, options, context, projectsCac
         projects,
     };
 };
-const internalCreateNodesV2 = async (configFilePath, options, context, projectRootsByEslintRoots, lintableFilesPerProjectRoot, projectsCache, hashByRoot) => {
+const internalCreateNodesV2 = async (configFilePath, options, context, eslintConfigFiles, projectRootsByEslintRoots, lintableFilesPerProjectRoot, projectsCache) => {
     const configDir = (0, posix_1.dirname)(configFilePath);
     const ESLint = await (0, resolve_eslint_class_1.resolveESLintClass)({
         useFlatConfigOverrideVal: (0, config_file_1.isFlatConfig)(configFilePath),
@@ -115,7 +104,12 @@ const internalCreateNodesV2 = async (configFilePath, options, context, projectRo
     const eslintVersion = ESLint.version;
     const projects = {};
     await Promise.all(projectRootsByEslintRoots.get(configDir).map(async (projectRoot) => {
-        const hash = hashByRoot.get(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')]);
         if (projectsCache[hash]) {
             // We can reuse the projects in the cache.
             Object.assign(projects, projectsCache[hash]);
@@ -160,13 +154,8 @@ 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, projectRootsByEslintRoots, lintableFilesPerProjectRoot, targetsCache, hashByRoot), eslintConfigFiles, options, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => internalCreateNodesV2(configFile, options, context, eslintConfigFiles, projectRootsByEslintRoots, lintableFilesPerProjectRoot, targetsCache), eslintConfigFiles, options, context);
         }
         finally {
             writeTargetsToCache(cachePath, targetsCache);