@nx/eslint 17.1.0-beta.2 → 17.1.0-beta.4

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "17.1.0-beta.2",
+  "version": "17.1.0-beta.4",
   "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,10 +34,10 @@
   },
   "dependencies": {
     "tslib": "^2.3.0",
-    "@nx/devkit": "17.1.0-beta.2",
-    "@nx/js": "17.1.0-beta.2",
-    "typescript": "~5.1.3",
-    "@nx/linter": "17.1.0-beta.2"
+    "@nx/devkit": "17.1.0-beta.4",
+    "@nx/js": "17.1.0-beta.4",
+    "typescript": "~5.2.2",
+    "@nx/linter": "17.1.0-beta.4"
   },
   "peerDependenciesMeta": {
     "eslint": {

package/src/executors/lint/lint.impl.js

@@ -34,10 +34,6 @@ async function run(options, context) {
      * their root ESLint config to use eslint.config.js
      */
     const hasFlatConfig = (0, fs_1.existsSync)((0, devkit_1.joinPathFragments)(devkit_1.workspaceRoot, 'eslint.config.js'));
-    if (!eslintConfigPath && hasFlatConfig) {
-        const projectRoot = context.projectsConfigurations.projects[context.projectName].root;
-        eslintConfigPath = (0, devkit_1.joinPathFragments)(projectRoot, 'eslint.config.js');
-    }
     const { eslint, ESLint } = await (0, eslint_utils_1.resolveAndInstantiateESLint)(eslintConfigPath, normalizedOptions, hasFlatConfig);
     const version = ESLint.version?.split('.');
     if (!version ||

package/src/generators/convert-to-flat-config/converters/json-converter.d.ts

@@ -3,4 +3,4 @@ import { Tree } from '@nx/devkit';
  * Converts an ESLint JSON config to a flat config.
  * Deletes the original file along with .eslintignore if it exists.
  */
-export declare function convertEslintJsonToFlatConfig(tree: Tree, root: string, sourceFile: string, destinationFile: string): void;
+export declare function convertEslintJsonToFlatConfig(tree: Tree, root: string, sourceFile: string, destinationFile: string, ignorePaths: string[]): void;

package/src/generators/convert-to-flat-config/converters/json-converter.js

@@ -11,7 +11,7 @@ const eslint_file_1 = require("../../utils/eslint-file");
  * Converts an ESLint JSON config to a flat config.
  * Deletes the original file along with .eslintignore if it exists.
  */
-function convertEslintJsonToFlatConfig(tree, root, sourceFile, destinationFile) {
+function convertEslintJsonToFlatConfig(tree, root, sourceFile, destinationFile, ignorePaths) {
     const importsMap = new Map();
     const exportElements = [];
     let isFlatCompatNeeded = false;
@@ -83,18 +83,19 @@ function convertEslintJsonToFlatConfig(tree, root, sourceFile, destinationFile)
             }));
         }
     }
-    if (tree.exists(`${root}/.eslintignore`)) {
-        const patterns = tree
-            .read(`${root}/.eslintignore`, 'utf-8')
-            .split('\n')
-            .filter((line) => line.length > 0 && line !== 'node_modules')
-            .map((path) => (0, ast_utils_1.mapFilePath)(path, root));
-        if (patterns.length > 0) {
-            exportElements.push((0, ast_utils_1.generateAst)({ ignores: patterns }));
+    for (const ignorePath of ignorePaths) {
+        if (tree.exists(ignorePath)) {
+            const patterns = tree
+                .read(ignorePath, 'utf-8')
+                .split('\n')
+                .filter((line) => line.length > 0 && line !== 'node_modules')
+                .map((path) => (0, ast_utils_1.mapFilePath)(path, root));
+            if (patterns.length > 0) {
+                exportElements.push((0, ast_utils_1.generateAst)({ ignores: patterns }));
+            }
         }
     }
     tree.delete((0, path_1.join)(root, sourceFile));
-    tree.delete((0, path_1.join)(root, '.eslintignore'));
     // create the node list and print it to new file
     const nodeList = (0, ast_utils_1.createNodeList)(importsMap, exportElements, isFlatCompatNeeded);
     const content = (0, ast_utils_1.stringifyNodeList)(nodeList, root, destinationFile);

package/src/generators/convert-to-flat-config/generator.js

@@ -12,12 +12,17 @@ async function convertToFlatConfigGenerator(tree, options) {
     if (!eslintFile.endsWith('.json')) {
         throw new Error('Only json eslint config files are supported for conversion');
     }
-    // rename root eslint config to eslint.config.js
+    const eslintIgnoreFiles = new Set(['.eslintignore']);
+    // convert root eslint config to eslint.config.js
     convertRootToFlatConfig(tree, eslintFile);
-    // rename and map files
+    // convert project eslint files to eslint.config.js
     const projects = (0, devkit_1.getProjects)(tree);
     for (const [project, projectConfig] of projects) {
-        convertProjectToFlatConfig(tree, project, projectConfig, (0, devkit_1.readNxJson)(tree));
+        convertProjectToFlatConfig(tree, project, projectConfig, (0, devkit_1.readNxJson)(tree), eslintIgnoreFiles);
+    }
+    // delete all .eslintignore files
+    for (const ignoreFile of eslintIgnoreFiles) {
+        tree.delete(ignoreFile);
     }
     // replace references in nx.json
     updateNxJsonConfig(tree);
@@ -34,22 +39,31 @@ function convertRootToFlatConfig(tree, eslintFile) {
     }
     convertConfigToFlatConfig(tree, '', '.eslintrc.json', 'eslint.config.js');
 }
-function convertProjectToFlatConfig(tree, project, projectConfig, nxJson) {
+function convertProjectToFlatConfig(tree, project, projectConfig, nxJson, eslintIgnoreFiles) {
     if (tree.exists(`${projectConfig.root}/.eslintrc.json`)) {
         if (projectConfig.targets) {
             const eslintTargets = Object.keys(projectConfig.targets || {}).filter((t) => projectConfig.targets[t].executor === '@nx/eslint:lint');
+            let ignorePath;
             for (const target of eslintTargets) {
                 // remove any obsolete `eslintConfig` options pointing to the old config file
                 if (projectConfig.targets[target].options?.eslintConfig) {
                     delete projectConfig.targets[target].options.eslintConfig;
                 }
+                if (projectConfig.targets[target].options?.ignorePath) {
+                    ignorePath = projectConfig.targets[target].options.ignorePath;
+                    delete projectConfig.targets[target].options.ignorePath;
+                }
                 (0, devkit_1.updateProjectConfiguration)(tree, project, projectConfig);
             }
             const nxHasLintTargets = Object.keys(nxJson.targetDefaults || {}).some((t) => (t === '@nx/eslint:lint' ||
                 nxJson.targetDefaults[t].executor === '@nx/eslint:lint') &&
                 projectConfig.targets?.[t]);
             if (nxHasLintTargets || eslintTargets.length > 0) {
-                convertConfigToFlatConfig(tree, projectConfig.root, '.eslintrc.json', 'eslint.config.js');
+                convertConfigToFlatConfig(tree, projectConfig.root, '.eslintrc.json', 'eslint.config.js', ignorePath);
+                eslintIgnoreFiles.add(`${projectConfig.root}/.eslintignore`);
+                if (ignorePath) {
+                    eslintIgnoreFiles.add(ignorePath);
+                }
             }
         }
     }
@@ -78,6 +92,9 @@ function updateNxJsonConfig(tree) {
         });
     }
 }
-function convertConfigToFlatConfig(tree, root, source, target) {
-    (0, json_converter_1.convertEslintJsonToFlatConfig)(tree, root, source, target);
+function convertConfigToFlatConfig(tree, root, source, target, ignorePath) {
+    const ignorePaths = ignorePath
+        ? [ignorePath, `${root}/.eslintignore`]
+        : [`${root}/.eslintignore`];
+    (0, json_converter_1.convertEslintJsonToFlatConfig)(tree, root, source, target, ignorePaths);
 }