@nx/eslint 17.2.0-beta.12 → 17.2.0-beta.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "17.2.0-beta.12",
+  "version": "17.2.0-beta.14",
   "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,11 +34,11 @@
     "js-yaml": "4.1.0"
   },
   "dependencies": {
-    "@nx/devkit": "17.2.0-beta.12",
-    "@nx/js": "17.2.0-beta.12",
+    "@nx/devkit": "17.2.0-beta.14",
+    "@nx/js": "17.2.0-beta.14",
     "tslib": "^2.3.0",
     "typescript": "~5.2.2",
-    "@nx/linter": "17.2.0-beta.12"
+    "@nx/linter": "17.2.0-beta.14"
   },
   "peerDependenciesMeta": {
     "eslint": {

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

@@ -71,13 +71,14 @@ async function run(options, context) {
     }
     catch (err) {
         if (err.message.includes('You must therefore provide a value for the "parserOptions.project" property for @typescript-eslint/parser')) {
+            const ruleName = err.message.match(/rule '([^']+)':/)?.[1];
             let eslintConfigPathForError = `for ${projectName}`;
             if (context.projectsConfigurations?.projects?.[projectName]?.root) {
                 const { root } = context.projectsConfigurations.projects[projectName];
                 eslintConfigPathForError = `\`${root}/.eslintrc.json\``;
             }
             console.error(`
-Error: You have attempted to use a lint rule which requires the full TypeScript type-checker to be available, but you do not have \`parserOptions.project\` configured to point at your project tsconfig.json files in the relevant TypeScript file "overrides" block of your project ESLint config ${eslintConfigPath || eslintConfigPathForError}
+Error: You have attempted to use ${ruleName ? `the lint rule ${ruleName}` : 'a lint rule'} which requires the full TypeScript type-checker to be available, but you do not have \`parserOptions.project\` configured to point at your project tsconfig.json files in the relevant TypeScript file "overrides" block of your project ESLint config ${eslintConfigPath || eslintConfigPathForError}
 
 Please see https://nx.dev/guides/eslint for full guidance on how to resolve this issue.
 `);

package/src/generators/init/init.js

@@ -5,6 +5,7 @@ const devkit_1 = require("@nx/devkit");
 const versions_1 = require("../../utils/versions");
 const eslint_file_1 = require("../utils/eslint-file");
 const global_eslint_config_1 = require("./global-eslint-config");
+const plugin_1 = require("../utils/plugin");
 function updateProductionFileset(tree) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const productionFileSet = nxJson.namedInputs?.production;
@@ -63,7 +64,14 @@ function updateVSCodeExtensions(tree) {
  * Initializes ESLint configuration in a workspace and adds necessary dependencies.
  */
 function initEsLint(tree, options) {
-    if ((0, eslint_file_1.findEslintFile)(tree)) {
+    const addPlugins = process.env.NX_PCV3 === 'true';
+    const hasPlugin = (0, plugin_1.hasEslintPlugin)(tree);
+    const rootEslintFile = (0, eslint_file_1.findEslintFile)(tree);
+    if (rootEslintFile && addPlugins && !hasPlugin) {
+        addPlugin(tree);
+        return () => { };
+    }
+    if (rootEslintFile) {
         return () => { };
     }
     if (!options.skipPackageJson) {
@@ -72,7 +80,6 @@ function initEsLint(tree, options) {
     (0, devkit_1.writeJson)(tree, '.eslintrc.json', (0, global_eslint_config_1.getGlobalEsLintConfiguration)(options.unitTestRunner, options.rootProject));
     tree.write('.eslintignore', 'node_modules\n');
     updateProductionFileset(tree);
-    const addPlugins = process.env.NX_PCV3 === 'true';
     if (addPlugins) {
         addPlugin(tree);
     }

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

@@ -10,6 +10,7 @@ const project_configuration_1 = require("nx/src/generators/utils/project-configu
 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");
 async function lintProjectGenerator(tree, options) {
     const installTask = (0, init_1.lintInitGenerator)(tree, {
         linter: options.linter,
@@ -28,10 +29,7 @@ async function lintProjectGenerator(tree, options) {
         isBuildableLibraryProject(projectConfig)) {
         lintFilePatterns.push(`{projectRoot}/package.json`);
     }
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    const hasPlugin = nxJson.plugins?.some((p) => typeof p === 'string'
-        ? p === '@nx/eslint/plugin'
-        : p.plugin === '@nx/eslint/plugin');
+    const hasPlugin = (0, plugin_1.hasEslintPlugin)(tree);
     if (hasPlugin) {
         if (lintFilePatterns &&
             lintFilePatterns.length &&

package/src/generators/utils/plugin.d.ts

@@ -0,0 +1,2 @@
+import { Tree } from '@nx/devkit';
+export declare function hasEslintPlugin(tree: Tree): boolean;

package/src/generators/utils/plugin.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hasEslintPlugin = void 0;
+const devkit_1 = require("@nx/devkit");
+function hasEslintPlugin(tree) {
+    const nxJson = (0, devkit_1.readNxJson)(tree);
+    return nxJson.plugins?.some((p) => typeof p === 'string'
+        ? p === '@nx/eslint/plugin'
+        : p.plugin === '@nx/eslint/plugin');
+}
+exports.hasEslintPlugin = hasEslintPlugin;