@nx/eslint 19.6.0-canary.20240719-83b88a1 → 19.6.0-canary.20240723-c4f9d89

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "19.6.0-canary.20240719-83b88a1",
+  "version": "19.6.0-canary.20240723-c4f9d89",
   "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,12 +35,12 @@
     "eslint": "^8.0.0 || ^9.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "19.6.0-canary.20240719-83b88a1",
-    "@nx/js": "19.6.0-canary.20240719-83b88a1",
+    "@nx/devkit": "19.6.0-canary.20240723-c4f9d89",
+    "@nx/js": "19.6.0-canary.20240723-c4f9d89",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.4.2",
-    "@nx/linter": "19.6.0-canary.20240719-83b88a1"
+    "@nx/linter": "19.6.0-canary.20240723-c4f9d89"
   },
   "peerDependenciesMeta": {
     "@zkochan/js-yaml": {

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

@@ -137,6 +137,9 @@ Please see https://nx.dev/recipes/tips-n-tricks/eslint for full guidance on how
     if (printInfo) {
         outputPrintInfo(totals);
     }
+    if (totals.warnings > options.maxWarnings) {
+        console.info(`ESLint found too many warnings (maximum: ${options.maxWarnings}).`);
+    }
     return {
         success: normalizedOptions.force ||
             (totals.errors === 0 &&

package/src/generators/convert-to-inferred/convert-to-inferred.js

@@ -2,11 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToInferred = convertToInferred;
 const devkit_1 = require("@nx/devkit");
-const plugin_1 = require("../../plugins/plugin");
 const executor_to_plugin_migrator_1 = require("@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator");
-const target_options_map_1 = require("./lib/target-options-map");
-const utils_1 = require("nx/src/tasks-runner/utils");
 const plugin_migration_utils_1 = require("@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils");
+const posix_1 = require("node:path/posix");
+const utils_1 = require("nx/src/tasks-runner/utils");
+const plugin_1 = require("../../plugins/plugin");
+const config_file_1 = require("../../utils/config-file");
+const target_options_map_1 = require("./lib/target-options-map");
 async function convertToInferred(tree, options) {
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
     const migratedProjects = await (0, executor_to_plugin_migrator_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/eslint/plugin', plugin_1.createNodesV2, { targetName: 'lint' }, [
@@ -14,6 +16,7 @@ async function convertToInferred(tree, options) {
             executors: ['@nx/eslint:lint', '@nrwl/linter:eslint'],
             postTargetTransformer,
             targetPluginOptionMapper: (targetName) => ({ targetName }),
+            skipTargetFilter,
         },
     ], options.project);
     if (migratedProjects.size === 0) {
@@ -64,10 +67,9 @@ function postTargetTransformer(target, tree, projectDetails, inferredTargetConfi
     return target;
 }
 function handlePropertiesInOptions(options, projectDetails, target) {
-    if ('eslintConfig' in options) {
-        options.config = (0, plugin_migration_utils_1.toProjectRelativePath)(options.eslintConfig, projectDetails.root);
-        delete options.eslintConfig;
-    }
+    // inferred targets are only identified after known files that ESLint would
+    // pick up, so we can remove the eslintConfig option
+    delete options.eslintConfig;
     if ('force' in options) {
         delete options.force;
     }
@@ -96,16 +98,40 @@ function handlePropertiesInOptions(options, projectDetails, target) {
     }
     if ('lintFilePatterns' in options) {
         const normalizedLintFilePatterns = options.lintFilePatterns.map((pattern) => {
-            return (0, utils_1.interpolate)(pattern, {
+            const interpolatedPattern = (0, utils_1.interpolate)(pattern, {
                 workspaceRoot: '',
                 projectRoot: projectDetails.root,
                 projectName: projectDetails.projectName,
             });
+            if (interpolatedPattern === projectDetails.root) {
+                return '.';
+            }
+            return interpolatedPattern.replace(new RegExp(`^(?:\./)?${projectDetails.root}/`), '');
         });
-        options.args = normalizedLintFilePatterns.map((pattern) => pattern.startsWith(projectDetails.root)
-            ? pattern.replace(new RegExp(`^${projectDetails.root}/`), './')
-            : pattern);
+        options.args = normalizedLintFilePatterns
+            // the @nx/eslint/plugin automatically infers these, so we don't need to pass them in
+            .filter((p) => projectDetails.root === '.'
+            ? !['.', 'src', './src', 'lib', './lib'].includes(p)
+            : p !== '.');
+        if (options.args.length === 0) {
+            delete options.args;
+        }
         delete options.lintFilePatterns;
     }
 }
 exports.default = convertToInferred;
+function skipTargetFilter(targetOptions, project) {
+    if (targetOptions.eslintConfig) {
+        // check that the eslintConfig option is a default config file known by ESLint
+        if (!config_file_1.ESLINT_CONFIG_FILENAMES.includes((0, posix_1.basename)(targetOptions.eslintConfig))) {
+            return `The "eslintConfig" option value (${targetOptions.eslintConfig}) is not a default config file known by ESLint.`;
+        }
+        // check that it is at the project root or in a parent directory
+        const eslintConfigPath = (0, posix_1.relative)(project.root, targetOptions.eslintConfig);
+        if ((0, posix_1.dirname)(eslintConfigPath) !== '.' &&
+            !eslintConfigPath.startsWith('../')) {
+            return `The "eslintConfig" option value (${targetOptions.eslintConfig}) must point to a file in the project root or a parent directory.`;
+        }
+    }
+    return false;
+}

package/src/utils/config-file.js

@@ -32,7 +32,6 @@ function findFlatConfigFile(directory, workspaceRoot) {
     while (true) {
         const configFilePath = getConfigFileInDirectory(currentDir, exports.ESLINT_FLAT_CONFIG_FILENAMES);
         if (configFilePath) {
-            console.log(`Found eslint flat config file at: ${configFilePath}`);
             return configFilePath;
         }
         if (currentDir === workspaceRoot) {