@nx/eslint 18.3.0-beta.0 → 18.3.0-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "18.3.0-beta.0",
+  "version": "18.3.0-beta.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": {
@@ -33,12 +33,12 @@
     "js-yaml": "4.1.0"
   },
   "dependencies": {
-    "@nx/devkit": "18.3.0-beta.0",
-    "@nx/js": "18.3.0-beta.0",
+    "@nx/devkit": "18.3.0-beta.2",
+    "@nx/js": "18.3.0-beta.2",
     "eslint": "^8.0.0",
     "tslib": "^2.3.0",
     "typescript": "~5.4.2",
-    "@nx/linter": "18.3.0-beta.0"
+    "@nx/linter": "18.3.0-beta.2"
   },
   "peerDependenciesMeta": {
     "js-yaml": {

package/src/generators/init/init.d.ts

@@ -1,4 +1,4 @@
-import type { GeneratorCallback, Tree } from '@nx/devkit';
+import { GeneratorCallback, Tree } from '@nx/devkit';
 export interface LinterInitOptions {
     skipPackageJson?: boolean;
     keepExistingVersions?: boolean;

package/src/generators/init/init.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lintInitGenerator = exports.initEsLint = void 0;
 const devkit_1 = require("@nx/devkit");
-const update_package_scripts_1 = require("@nx/devkit/src/utils/update-package-scripts");
+const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const versions_1 = require("../../utils/versions");
 const eslint_file_1 = require("../utils/eslint-file");
 const plugin_1 = require("../../plugins/plugin");
@@ -31,24 +31,6 @@ function addTargetDefaults(tree) {
     ];
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
-function addPlugin(tree) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    nxJson.plugins ??= [];
-    for (const plugin of nxJson.plugins) {
-        if (typeof plugin === 'string'
-            ? plugin === '@nx/eslint/plugin'
-            : plugin.plugin === '@nx/eslint/plugin') {
-            return;
-        }
-    }
-    nxJson.plugins.push({
-        plugin: '@nx/eslint/plugin',
-        options: {
-            targetName: 'lint',
-        },
-    });
-    (0, devkit_1.updateNxJson)(tree, nxJson);
-}
 async function initEsLint(tree, options) {
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
@@ -56,11 +38,19 @@ async function initEsLint(tree, options) {
     options.addPlugin ??= addPluginDefault;
     const hasPlugin = (0, plugin_2.hasEslintPlugin)(tree);
     const rootEslintFile = (0, eslint_file_1.findEslintFile)(tree);
+    const graph = await (0, devkit_1.createProjectGraphAsync)();
+    const lintTargetNames = [
+        'lint',
+        'eslint:lint',
+        'eslint-lint',
+        '_lint',
+        '_eslint:lint',
+        '_eslint-lint',
+    ];
     if (rootEslintFile && options.addPlugin && !hasPlugin) {
-        addPlugin(tree);
-        if (options.updatePackageScripts) {
-            await (0, update_package_scripts_1.updatePackageScripts)(tree, plugin_1.createNodes);
-        }
+        await (0, add_plugin_1.addPlugin)(tree, graph, '@nx/eslint/plugin', plugin_1.createNodes, {
+            targetName: lintTargetNames,
+        }, options.updatePackageScripts);
         return () => { };
     }
     if (rootEslintFile) {
@@ -68,7 +58,9 @@ async function initEsLint(tree, options) {
     }
     updateProductionFileset(tree);
     if (options.addPlugin) {
-        addPlugin(tree);
+        await (0, add_plugin_1.addPlugin)(tree, graph, '@nx/eslint/plugin', plugin_1.createNodes, {
+            targetName: lintTargetNames,
+        }, options.updatePackageScripts);
     }
     else {
         addTargetDefaults(tree);
@@ -81,9 +73,6 @@ async function initEsLint(tree, options) {
             eslint: versions_1.eslintVersion,
         }, undefined, options.keepExistingVersions));
     }
-    if (options.updatePackageScripts) {
-        await (0, update_package_scripts_1.updatePackageScripts)(tree, plugin_1.createNodes);
-    }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
 exports.initEsLint = initEsLint;