@nx/eslint 24.0.0-beta.3 → 24.0.0-beta.4

package/dist/internal.d.ts

@@ -4,4 +4,3 @@ export { useFlatConfig } from './src/utils/flat-config';
 export { javaScriptOverride, typeScriptOverride, } from './src/generators/init/global-eslint-config';
 export { setupRootEsLint } from './src/generators/lint-project/setup-root-eslint';
 export { getInstalledEslintVersion, typescriptESLintVersion, versions, } from './src/utils/versions';
-export type { Schema } from './src/executors/lint/schema';

package/dist/src/generators/init/init-migration.d.ts

@@ -1,3 +1,2 @@
-import { GeneratorCallback, ProjectConfiguration, TargetConfiguration, Tree } from '@nx/devkit';
+import { GeneratorCallback, ProjectConfiguration, Tree } from '@nx/devkit';
 export declare function migrateConfigToMonorepoStyle(projects: ProjectConfiguration[], tree: Tree, unitTestRunner: string, eslintConfigFormat: 'mjs' | 'cjs', keepExistingVersions?: boolean): GeneratorCallback;
-export declare function findLintTarget(project: ProjectConfiguration): TargetConfiguration;

package/dist/src/generators/init/init-migration.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.migrateConfigToMonorepoStyle = migrateConfigToMonorepoStyle;
-exports.findLintTarget = findLintTarget;
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
 const eslint_file_1 = require("../utils/eslint-file");
@@ -50,14 +49,8 @@ function migrateConfigToMonorepoStyle(projects, tree, unitTestRunner, eslintConf
     // update extends in all projects' eslint configs
     projects.forEach((project) => {
         let eslintFile;
-        const lintTarget = findLintTarget(project);
-        if (lintTarget) {
-            // If target is configured in project.json, read file from target options.
-            eslintFile =
-                lintTarget.options?.eslintConfig || (0, eslint_file_1.findEslintFile)(tree, project.root);
-        }
-        else if ((0, plugin_1.hasEslintPlugin)(tree)) {
-            // Otherwise, if `@nx/eslint/plugin` is used, match any of the known config files.
+        if ((0, plugin_1.hasEslintPlugin)(tree)) {
+            // If `@nx/eslint/plugin` is used, match any of the known config files.
             for (const f of config_file_1.ESLINT_CONFIG_FILENAMES) {
                 if (tree.exists((0, devkit_1.joinPathFragments)(project.root, f))) {
                     eslintFile = f;
@@ -80,10 +73,6 @@ function migrateConfigToMonorepoStyle(projects, tree, unitTestRunner, eslintConf
         '@nx/eslint-plugin': versions_1.nxVersion,
     }, undefined, keepExistingVersions ?? true);
 }
-function findLintTarget(project) {
-    return Object.values(project.targets ?? {}).find((target) => target.executor === '@nx/eslint:lint' ||
-        target.executor === '@nx/linter:eslint');
-}
 function migrateEslintFile(projectEslintPath, tree) {
     const baseFile = (0, eslint_file_1.findEslintFile)(tree);
     if ((0, eslint_file_1.isEslintConfigSupported)(tree)) {

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

@@ -252,10 +252,9 @@ function rootHasEslintLintTarget(targets) {
         return false;
     }
     for (const targetConfig of Object.values(targets)) {
-        if (['@nx/eslint:lint', '@nx/linter:eslint'].includes(targetConfig.executor) ||
-            (targetConfig.executor === 'nx:run-commands' &&
-                targetConfig.options?.command &&
-                targetConfig.options?.command.startsWith('eslint '))) {
+        if (targetConfig.executor === 'nx:run-commands' &&
+            targetConfig.options?.command &&
+            targetConfig.options?.command.startsWith('eslint ')) {
             return true;
         }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "24.0.0-beta.3",
+  "version": "24.0.0-beta.4",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -71,19 +71,19 @@
     }
   },
   "peerDependencies": {
-    "@nx/jest": "24.0.0-beta.3",
+    "@nx/jest": "24.0.0-beta.4",
     "@zkochan/js-yaml": "0.0.7",
     "eslint": "^9.0.0 || ^10.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "24.0.0-beta.3",
-    "@nx/js": "24.0.0-beta.3",
+    "@nx/devkit": "24.0.0-beta.4",
+    "@nx/js": "24.0.0-beta.4",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "typescript": "~6.0.3"
   },
   "devDependencies": {
-    "nx": "24.0.0-beta.3"
+    "nx": "24.0.0-beta.4"
   },
   "peerDependenciesMeta": {
     "@nx/jest": {

package/dist/src/executors/lint/schema.d.ts

@@ -1,32 +0,0 @@
-import type { JsonObject } from '@angular-devkit/core';
-import type { Linter } from 'eslint';
-
-export interface Schema extends JsonObject {
-  eslintConfig: string | null;
-  lintFilePatterns: string[];
-  format: Formatter;
-  force: boolean;
-  silent: boolean;
-  fix: boolean;
-  cache: boolean;
-  noEslintrc: boolean;
-  outputFile: string | null;
-  cacheLocation: string | null;
-  maxWarnings: number;
-  quiet: boolean;
-  ignorePath: string | null;
-
-  /** @deprecated No longer has any effect. Will be removed in Nx v23. */
-  hasTypeAwareRules?: boolean;
-  cacheStrategy: 'content' | 'metadata' | null;
-  rulesdir: string[];
-  resolvePluginsRelativeTo: string | null;
-  reportUnusedDisableDirectives: Linter.StringSeverity | null;
-  printConfig?: string | null;
-  errorOnUnmatchedPattern?: boolean;
-  suppressAll?: boolean;
-  suppressRule?: string[];
-  suppressionsLocation?: string;
-}
-
-type Formatter = 'stylish' | 'html' | 'json' | 'json-with-metadata';

package/dist/src/generators/utils/eslint-targets.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export declare function getEslintTargets(tree: Tree): Set<string>;

package/dist/src/generators/utils/eslint-targets.js

@@ -1,17 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEslintTargets = getEslintTargets;
-const internal_1 = require("@nx/devkit/internal");
-function getEslintTargets(tree) {
-    const eslintTargetNames = new Set();
-    (0, internal_1.forEachExecutorOptions)(tree, '@nx/eslint:lint', (_, __, target) => {
-        eslintTargetNames.add(target);
-    });
-    (0, internal_1.forEachExecutorOptions)(tree, '@nx/linter:eslint', (_, __, target) => {
-        eslintTargetNames.add(target);
-    });
-    (0, internal_1.forEachExecutorOptions)(tree, '@nrwl/linter:eslint', (_, __, target) => {
-        eslintTargetNames.add(target);
-    });
-    return eslintTargetNames;
-}