@nx/eslint 20.0.7 → 20.1.0-beta.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "20.0.7",
+  "version": "20.1.0-beta.0",
   "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,8 +35,8 @@
     "eslint": "^8.0.0 || ^9.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "20.0.7",
-    "@nx/js": "20.0.7",
+    "@nx/devkit": "20.1.0-beta.0",
+    "@nx/js": "20.1.0-beta.0",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.4.2"

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveAndInstantiateESLint = resolveAndInstantiateESLint;
+const semver_1 = require("semver");
 const config_file_1 = require("../../../utils/config-file");
 const resolve_eslint_class_1 = require("../../../utils/resolve-eslint-class");
 async function resolveAndInstantiateESLint(eslintConfigPath, options, useFlatConfig = false) {
@@ -12,6 +13,7 @@ async function resolveAndInstantiateESLint(eslintConfigPath, options, useFlatCon
     const ESLint = await (0, resolve_eslint_class_1.resolveESLintClass)({
         useFlatConfigOverrideVal: useFlatConfig,
     });
+    // ruleFilter exist only in eslint 9+, remove this type when eslint 8 support dropped
     const eslintOptions = {
         overrideConfigFile: eslintConfigPath,
         fix: !!options.fix,
@@ -57,6 +59,10 @@ async function resolveAndInstantiateESLint(eslintConfigPath, options, useFlatCon
         eslintOptions.reportUnusedDisableDirectives =
             options.reportUnusedDisableDirectives || undefined;
     }
+    // pass --quiet to eslint 9+ directly: filter only errors
+    if (options.quiet && (0, semver_1.gte)(ESLint.version, '9.0.0')) {
+        eslintOptions.ruleFilter = (rule) => rule.severity === 2;
+    }
     const eslint = new ESLint(eslintOptions);
     return {
         ESLint,

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

@@ -71,8 +71,7 @@ function migrateConfigToMonorepoStyle(projects, tree, unitTestRunner, keepExisti
 }
 function findLintTarget(project) {
     return Object.values(project.targets ?? {}).find((target) => target.executor === '@nx/eslint:lint' ||
-        target.executor === '@nx/linter:eslint' ||
-        target.executor === '@nrwl/linter:eslint');
+        target.executor === '@nx/linter:eslint');
 }
 function migrateEslintFile(projectEslintPath, tree) {
     const baseFile = (0, eslint_file_1.findEslintFile)(tree);
@@ -88,8 +87,6 @@ function migrateEslintFile(projectEslintPath, tree) {
             config = (0, ast_utils_1.removeCompatExtends)(config, [
                 'plugin:@nx/typescript',
                 'plugin:@nx/javascript',
-                'plugin:@nrwl/typescript',
-                'plugin:@nrwl/javascript',
             ]);
             config = (0, ast_utils_1.removePredefinedConfigs)(config, '@nx/eslint-plugin', 'nx', [
                 'flat/base',
@@ -104,7 +101,7 @@ function migrateEslintFile(projectEslintPath, tree) {
                 delete json.root;
                 // remove nrwl/nx plugins
                 if (json.plugins) {
-                    json.plugins = json.plugins.filter((p) => p !== '@nx' && p !== '@nrwl/nx');
+                    json.plugins = json.plugins.filter((p) => p !== '@nx');
                     if (json.plugins.length === 0) {
                         delete json.plugins;
                     }
@@ -124,9 +121,7 @@ function migrateEslintFile(projectEslintPath, tree) {
                     json.overrides.forEach((override) => {
                         if (override.extends) {
                             override.extends = override.extends.filter((ext) => ext !== 'plugin:@nx/typescript' &&
-                                ext !== 'plugin:@nrwl/nx/typescript' &&
-                                ext !== 'plugin:@nx/javascript' &&
-                                ext !== 'plugin:@nrwl/nx/javascript');
+                                ext !== 'plugin:@nx/javascript');
                             if (override.extends.length === 0) {
                                 delete override.extends;
                             }

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

@@ -224,7 +224,7 @@ function isMigrationToMonorepoNeeded(tree, graph) {
         return false;
     }
     for (const targetConfig of Object.values(rootProject.data.targets ?? {})) {
-        if (['@nx/eslint:lint', '@nrwl/linter:eslint', '@nx/linter:eslint'].includes(targetConfig.executor) ||
+        if (['@nx/eslint:lint', '@nx/linter:eslint'].includes(targetConfig.executor) ||
             (targetConfig.executor === 'nx:run-commands' &&
                 targetConfig.options?.command &&
                 targetConfig.options?.command.startsWith('eslint '))) {

package/src/generators/utils/flat-config/ast-utils.js

@@ -729,14 +729,14 @@ function addTSObjectProperty(elements, key, value) {
  */
 function generateAst(input, propertyAssignmentReplacer) {
     if (Array.isArray(input)) {
-        return ts.factory.createArrayLiteralExpression(input.map((item) => generateAst(item, propertyAssignmentReplacer)), input.length > 1 // multiline only if more than one item
+        return ts.factory.createArrayLiteralExpression(input.map((item) => generateAst(item, propertyAssignmentReplacer)), true // Always treat as multiline, using item.length does not work in all cases
         );
     }
     if (input === null) {
         return ts.factory.createNull();
     }
     if (typeof input === 'object') {
-        return ts.factory.createObjectLiteralExpression(generatePropertyAssignmentsFromObjectEntries(input, propertyAssignmentReplacer), Object.keys(input).length > 1 // multiline only if more than one property
+        return ts.factory.createObjectLiteralExpression(generatePropertyAssignmentsFromObjectEntries(input, propertyAssignmentReplacer), true // Always treat as multiline, using  Object.keys(input).length > 1 does not work in all cases
         );
     }
     if (typeof input === 'string') {