@nx/eslint 17.3.1 → 17.3.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "17.3.1",
+  "version": "17.3.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": {
@@ -30,20 +30,17 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "peerDependencies": {
-    "eslint": "^8.0.0",
     "js-yaml": "4.1.0"
   },
   "dependencies": {
-    "@nx/devkit": "17.3.1",
-    "@nx/js": "17.3.1",
+    "@nx/devkit": "17.3.2",
+    "@nx/js": "17.3.2",
+    "eslint": "^8.0.0",
     "tslib": "^2.3.0",
     "typescript": "~5.3.2",
-    "@nx/linter": "17.3.1"
+    "@nx/linter": "17.3.2"
   },
   "peerDependenciesMeta": {
-    "eslint": {
-      "optional": true
-    },
     "js-yaml": {
       "optional": true
     }

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

@@ -118,14 +118,6 @@ Please see https://nx.dev/guides/eslint for full guidance on how to resolve this
         lintResults = ESLint.getErrorResults(lintResults);
     }
     const formatter = await eslint.loadFormatter(normalizedOptions.format);
-    let totalErrors = 0;
-    let totalWarnings = 0;
-    for (const result of lintResults) {
-        if (result.errorCount || result.warningCount) {
-            totalErrors += result.errorCount;
-            totalWarnings += result.warningCount;
-        }
-    }
     const formattedResults = await formatter.format(lintResults);
     if (normalizedOptions.outputFile) {
         const pathToOutputFile = (0, devkit_1.joinPathFragments)(context.root, normalizedOptions.outputFile);
@@ -135,20 +127,48 @@ Please see https://nx.dev/guides/eslint for full guidance on how to resolve this
     else {
         console.info(formattedResults);
     }
-    if (totalWarnings > 0 && printInfo) {
-        console.warn('Lint warnings found in the listed files.\n');
-    }
-    if (totalErrors > 0 && printInfo) {
-        console.error('Lint errors found in the listed files.\n');
-    }
-    if (totalWarnings === 0 && totalErrors === 0 && printInfo) {
-        console.info('All files pass linting.\n');
+    const totals = getTotals(lintResults);
+    if (printInfo) {
+        outputPrintInfo(totals);
     }
     return {
         success: normalizedOptions.force ||
-            (totalErrors === 0 &&
+            (totals.errors === 0 &&
                 (normalizedOptions.maxWarnings === -1 ||
-                    totalWarnings <= normalizedOptions.maxWarnings)),
+                    totals.warnings <= normalizedOptions.maxWarnings)),
     };
 }
 exports.default = run;
+function getTotals(lintResults) {
+    let errors = 0;
+    let warnings = 0;
+    let fixableErrors = 0;
+    let fixableWarnings = 0;
+    for (const result of lintResults) {
+        errors += result.errorCount || 0;
+        warnings += result.warningCount || 0;
+        fixableErrors += result.fixableErrorCount || 0;
+        fixableWarnings += result.fixableWarningCount || 0;
+    }
+    return {
+        errors,
+        warnings,
+        fixableErrors,
+        fixableWarnings,
+    };
+}
+function pluralizedOutput(word, count) {
+    return `${count} ${word}${count === 1 ? '' : 's'}`;
+}
+function outputPrintInfo({ errors, warnings, fixableErrors, fixableWarnings, }) {
+    const total = warnings + errors;
+    const totalFixable = fixableErrors + fixableWarnings;
+    if (total <= 0) {
+        console.info('\u2714 All files pass linting\n');
+        return;
+    }
+    console.info(`\u2716 ${pluralizedOutput('problem', total)} (${pluralizedOutput('error', errors)}, ${pluralizedOutput('warning', warnings)})\n`);
+    if (totalFixable <= 0)
+        return;
+    console.info(`  ${pluralizedOutput('error', fixableErrors)} and ${pluralizedOutput('warning', fixableWarnings)} are potentially fixable with the \`--fix\` option.\n`);
+}

package/src/executors/lint/utility/eslint-utils.js

@@ -38,7 +38,6 @@ async function resolveAndInstantiateESLint(eslintConfigPath, options, useFlatCon
          * not be any html files in the project, so keeping it true would break linting every time
          */
         errorOnUnmatchedPattern: false,
-        reportUnusedDisableDirectives: options.reportUnusedDisableDirectives || undefined,
     };
     if (useFlatConfig) {
         if (typeof options.useEslintrc !== 'undefined') {
@@ -50,6 +49,9 @@ async function resolveAndInstantiateESLint(eslintConfigPath, options, useFlatCon
         if (options.ignorePath !== undefined) {
             throw new Error('For Flat Config, ESLint removed `ignorePath` and so it is not supported as an option. See https://eslint.org/docs/latest/use/configure/configuration-files-new');
         }
+        if (options.reportUnusedDisableDirectives) {
+            throw new Error('For Flat Config, ESLint removed `reportedUnusedDisableDirectives` and so it is not supported as an option. See https://eslint.org/docs/latest/use/configure/configuration-files-new');
+        }
     }
     else {
         eslintOptions.rulePaths = options.rulesdir || [];
@@ -61,6 +63,8 @@ async function resolveAndInstantiateESLint(eslintConfigPath, options, useFlatCon
          * merge the provided config with others it finds automatically.
          */
         eslintOptions.useEslintrc = !options.noEslintrc;
+        eslintOptions.reportUnusedDisableDirectives =
+            options.reportUnusedDisableDirectives || undefined;
     }
     const eslint = new ESLint(eslintOptions);
     return {

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

@@ -46,7 +46,8 @@ function convertProjectToFlatConfig(tree, project, projectConfig, nxJson, eslint
     const eslintFile = (0, eslint_file_1.findEslintFile)(tree, projectConfig.root);
     if (eslintFile && !eslintFile.endsWith('.js')) {
         if (projectConfig.targets) {
-            const eslintTargets = Object.keys(projectConfig.targets || {}).filter((t) => projectConfig.targets[t].executor === '@nx/eslint:lint');
+            const eslintTargets = Object.keys(projectConfig.targets || {}).filter((t) => projectConfig.targets[t].executor === '@nx/eslint:lint' ||
+                projectConfig.targets[t].command?.includes('eslint'));
             let ignorePath;
             for (const target of eslintTargets) {
                 // remove any obsolete `eslintConfig` options pointing to the old config file
@@ -59,10 +60,14 @@ function convertProjectToFlatConfig(tree, project, projectConfig, nxJson, eslint
                 }
                 (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') &&
+            const nxHasEsLintTargets = Object.keys(nxJson.targetDefaults || {}).some((t) => (t === '@nx/eslint:lint' ||
+                nxJson.targetDefaults[t].executor === '@nx/eslint:lint' ||
+                nxJson.targetDefaults[t].command?.includes('eslint')) &&
                 projectConfig.targets?.[t]);
-            if (nxHasLintTargets || eslintTargets.length > 0) {
+            const nxHasEsLintPlugin = (nxJson.plugins || []).some((p) => typeof p === 'string'
+                ? p === '@nx/eslint/plugin'
+                : p.plugin === '@nx/eslint/plugin');
+            if (nxHasEsLintTargets || nxHasEsLintPlugin || eslintTargets.length > 0) {
                 convertConfigToFlatConfig(tree, projectConfig.root, eslintFile, 'eslint.config.js', ignorePath);
                 eslintIgnoreFiles.add(`${projectConfig.root}/.eslintignore`);
                 if (ignorePath) {