@nx/eslint 23.0.0-beta.20 → 23.0.0-beta.22

package/dist/internal.d.ts

@@ -3,6 +3,5 @@ export { addImportToFlatConfig } from './src/generators/utils/flat-config/ast-ut
 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, getTypeScriptEslintVersionToInstall, } from './src/utils/version-utils';
-export { eslint9__typescriptESLintVersion } from './src/utils/versions';
+export { getInstalledEslintVersion, typescriptESLintVersion, versions, } from './src/utils/versions';
 export type { Schema } from './src/executors/lint/schema';

package/dist/internal.js

@@ -5,7 +5,7 @@
 // internal consumers and may change without semver protection. Mirrors
 // `@nx/devkit/internal`.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.eslint9__typescriptESLintVersion = exports.getTypeScriptEslintVersionToInstall = exports.getInstalledEslintVersion = exports.setupRootEsLint = exports.typeScriptOverride = exports.javaScriptOverride = exports.useFlatConfig = exports.addImportToFlatConfig = exports.updateRelativePathsInConfig = exports.updateOverrideInLintConfig = exports.replaceOverridesInLintConfig = exports.lintConfigHasOverride = exports.isEslintConfigSupported = exports.findEslintFile = exports.addPredefinedConfigToFlatLintConfig = exports.addPluginsToLintConfig = exports.addOverrideToLintConfig = exports.addIgnoresToLintConfig = exports.addExtendsToLintConfig = void 0;
+exports.versions = exports.typescriptESLintVersion = exports.getInstalledEslintVersion = exports.setupRootEsLint = exports.typeScriptOverride = exports.javaScriptOverride = exports.useFlatConfig = exports.addImportToFlatConfig = exports.updateRelativePathsInConfig = exports.updateOverrideInLintConfig = exports.replaceOverridesInLintConfig = exports.lintConfigHasOverride = exports.isEslintConfigSupported = exports.findEslintFile = exports.addPredefinedConfigToFlatLintConfig = exports.addPluginsToLintConfig = exports.addOverrideToLintConfig = exports.addIgnoresToLintConfig = exports.addExtendsToLintConfig = void 0;
 var eslint_file_1 = require("./src/generators/utils/eslint-file");
 Object.defineProperty(exports, "addExtendsToLintConfig", { enumerable: true, get: function () { return eslint_file_1.addExtendsToLintConfig; } });
 Object.defineProperty(exports, "addIgnoresToLintConfig", { enumerable: true, get: function () { return eslint_file_1.addIgnoresToLintConfig; } });
@@ -27,8 +27,7 @@ Object.defineProperty(exports, "javaScriptOverride", { enumerable: true, get: fu
 Object.defineProperty(exports, "typeScriptOverride", { enumerable: true, get: function () { return global_eslint_config_1.typeScriptOverride; } });
 var setup_root_eslint_1 = require("./src/generators/lint-project/setup-root-eslint");
 Object.defineProperty(exports, "setupRootEsLint", { enumerable: true, get: function () { return setup_root_eslint_1.setupRootEsLint; } });
-var version_utils_1 = require("./src/utils/version-utils");
-Object.defineProperty(exports, "getInstalledEslintVersion", { enumerable: true, get: function () { return version_utils_1.getInstalledEslintVersion; } });
-Object.defineProperty(exports, "getTypeScriptEslintVersionToInstall", { enumerable: true, get: function () { return version_utils_1.getTypeScriptEslintVersionToInstall; } });
 var versions_1 = require("./src/utils/versions");
-Object.defineProperty(exports, "eslint9__typescriptESLintVersion", { enumerable: true, get: function () { return versions_1.eslint9__typescriptESLintVersion; } });
+Object.defineProperty(exports, "getInstalledEslintVersion", { enumerable: true, get: function () { return versions_1.getInstalledEslintVersion; } });
+Object.defineProperty(exports, "typescriptESLintVersion", { enumerable: true, get: function () { return versions_1.typescriptESLintVersion; } });
+Object.defineProperty(exports, "versions", { enumerable: true, get: function () { return versions_1.versions; } });

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

@@ -2,12 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = run;
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
 const fs_1 = require("fs");
 const utils_1 = require("nx/src/tasks-runner/utils");
 const path_1 = require("path");
+const semver_1 = require("semver");
 const config_file_1 = require("../../utils/config-file");
-const eslint_utils_1 = require("./utility/eslint-utils");
 const deprecation_1 = require("../../utils/deprecation");
+const versions_1 = require("../../utils/versions");
+const eslint_utils_1 = require("./utility/eslint-utils");
 async function run(options, context) {
     (0, deprecation_1.warnEslintExecutorDeprecation)();
     // hasTypeAwareRules is deprecated and no longer used, delete it so it's not passed to ESLint
@@ -44,12 +47,10 @@ async function run(options, context) {
         ? (0, path_1.resolve)(systemRoot, normalizedOptions.eslintConfig)
         : undefined;
     const { eslint, ESLint } = await (0, eslint_utils_1.resolveAndInstantiateESLint)(eslintConfigPath, normalizedOptions, hasFlatConfig);
-    const version = ESLint.version?.split('.');
-    if (!version ||
-        version.length < 2 ||
-        Number(version[0]) < 7 ||
-        (Number(version[0]) === 7 && Number(version[1]) < 6)) {
-        throw new Error('ESLint must be version 7.6 or higher.');
+    (0, internal_1.assertSupportedInstalledPackageVersion)('eslint', versions_1.minSupportedEslintVersion);
+    const installedEslintVersion = (0, internal_1.getInstalledPackageVersion)('eslint');
+    if (installedEslintVersion && (0, semver_1.major)(installedEslintVersion) === 8) {
+        (0, deprecation_1.warnEslintV8Deprecation)();
     }
     if (printConfig) {
         try {

package/dist/src/generators/convert-to-flat-config/generator.js

@@ -5,9 +5,11 @@ const devkit_1 = require("@nx/devkit");
 const eslint_file_1 = require("../utils/eslint-file");
 const plugin_1 = require("../utils/plugin");
 const path_1 = require("path");
+const assert_supported_eslint_version_1 = require("../../utils/assert-supported-eslint-version");
 const versions_1 = require("../../utils/versions");
 const json_converter_1 = require("./converters/json-converter");
 async function convertToFlatConfigGenerator(tree, options) {
+    (0, assert_supported_eslint_version_1.assertSupportedEslintVersion)(tree);
     const eslintFile = (0, eslint_file_1.findEslintFile)(tree);
     if (!eslintFile) {
         throw new Error('Could not find root eslint file');
@@ -230,21 +232,22 @@ function processConvertedConfig(tree, root, source, target, { content, addESLint
     tree.delete((0, path_1.join)(root, source));
     // save new
     tree.write((0, path_1.join)(root, target), content);
-    // These dependencies are required for flat configs that are generated by subsequent app/lib generators.
+    // Once converted to flat config, the workspace is on the v9 ESLint stack —
+    // install the latest typescript-eslint v8 lane explicitly rather than
+    // routing through `versions(tree)` which would pick the legacy lane based
+    // on the pre-conversion `eslintrc` workspace state.
     const devDependencies = {
-        eslint: versions_1.eslint9__eslintVersion,
+        eslint: versions_1.eslintVersion,
         'eslint-config-prettier': versions_1.eslintConfigPrettierVersion,
-        'typescript-eslint': versions_1.eslint9__typescriptESLintVersion,
-        '@typescript-eslint/eslint-plugin': versions_1.eslint9__typescriptESLintVersion,
-        '@typescript-eslint/parser': versions_1.eslint9__typescriptESLintVersion,
+        'typescript-eslint': versions_1.typescriptESLintVersion,
+        '@typescript-eslint/eslint-plugin': versions_1.typescriptESLintVersion,
+        '@typescript-eslint/parser': versions_1.typescriptESLintVersion,
     };
     if ((0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@typescript-eslint/utils')) {
-        devDependencies['@typescript-eslint/utils'] =
-            versions_1.eslint9__typescriptESLintVersion;
+        devDependencies['@typescript-eslint/utils'] = versions_1.typescriptESLintVersion;
     }
     if ((0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@typescript-eslint/type-utils')) {
-        devDependencies['@typescript-eslint/type-utils'] =
-            versions_1.eslint9__typescriptESLintVersion;
+        devDependencies['@typescript-eslint/type-utils'] = versions_1.typescriptESLintVersion;
     }
     // add missing packages
     if (addESLintRC) {
@@ -253,5 +256,7 @@ function processConvertedConfig(tree, root, source, target, { content, addESLint
     if (addESLintJS) {
         devDependencies['@eslint/js'] = versions_1.eslintVersion;
     }
+    // Convert-to-flat-config is an opt-in "upgrade" — we intentionally overwrite
+    // existing pins to land the workspace on the latest flat-config-ready stack.
     (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies);
 }

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

@@ -6,9 +6,11 @@ const devkit_1 = require("@nx/devkit");
 const posix_1 = require("node:path/posix");
 const utils_1 = require("nx/src/tasks-runner/utils");
 const plugin_1 = require("../../plugins/plugin");
+const assert_supported_eslint_version_1 = require("../../utils/assert-supported-eslint-version");
 const config_file_1 = require("../../utils/config-file");
 const target_options_map_1 = require("./lib/target-options-map");
 async function convertToInferred(tree, options) {
+    (0, assert_supported_eslint_version_1.assertSupportedEslintVersion)(tree);
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
     const migratedProjects = await (0, internal_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/eslint/plugin', plugin_1.createNodesV2, { targetName: 'lint' }, [
         {

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

@@ -34,9 +34,10 @@ function migrateConfigToMonorepoStyle(projects, tree, unitTestRunner, eslintConf
     else {
         if ((0, flat_config_1.useFlatConfig)(tree)) {
             // we need this for the compat
+            const { eslintVersion } = (0, versions_1.versions)(tree);
             (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-                '@eslint/js': versions_1.eslintVersion,
-            }, undefined, keepExistingVersions);
+                '@eslint/js': eslintVersion,
+            }, undefined, keepExistingVersions ?? true);
             tree.write(tree.exists(`eslint.config.${eslintConfigFormat}`)
                 ? `eslint.base.config.${eslintConfigFormat}`
                 : `eslint.config.${eslintConfigFormat}`, (0, global_eslint_config_1.getGlobalFlatEslintConfiguration)(eslintConfigFormat));
@@ -77,7 +78,7 @@ function migrateConfigToMonorepoStyle(projects, tree, unitTestRunner, eslintConf
     });
     return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
         '@nx/eslint-plugin': versions_1.nxVersion,
-    });
+    }, undefined, keepExistingVersions ?? true);
 }
 function findLintTarget(project) {
     return Object.values(project.targets ?? {}).find((target) => target.executor === '@nx/eslint:lint' ||

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

@@ -4,6 +4,7 @@ exports.initEsLint = initEsLint;
 exports.lintInitGenerator = lintInitGenerator;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
+const assert_supported_eslint_version_1 = require("../../utils/assert-supported-eslint-version");
 const versions_1 = require("../../utils/versions");
 const eslint_file_1 = require("../utils/eslint-file");
 const plugin_1 = require("../../plugins/plugin");
@@ -62,6 +63,7 @@ function updateVsCodeRecommendedExtensions(host) {
     });
 }
 async function initEsLint(tree, options) {
+    (0, assert_supported_eslint_version_1.assertSupportedEslintVersion)(tree);
     const nxJson = (0, devkit_1.readNxJson)(tree);
     const addPluginDefault = process.env.NX_ADD_PLUGINS !== 'false' &&
         nxJson.useInferencePlugins !== false;
@@ -108,11 +110,12 @@ async function initEsLint(tree, options) {
     }
     const tasks = [];
     if (!options.skipPackageJson) {
+        const { eslintVersion } = (0, versions_1.versions)(tree);
         tasks.push((0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@nx/eslint'], []));
         tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
             '@nx/eslint': versions_1.nxVersion,
-            eslint: versions_1.eslintVersion,
-        }, undefined, options.keepExistingVersions));
+            eslint: eslintVersion,
+        }, undefined, options.keepExistingVersions ?? true));
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }

package/dist/src/generators/init/schema.json

@@ -15,7 +15,7 @@
       "type": "boolean",
       "x-priority": "internal",
       "description": "Keep existing dependencies versions",
-      "default": false
+      "default": true
     },
     "updatePackageScripts": {
       "type": "boolean",

package/dist/src/generators/lint-project/setup-root-eslint.js

@@ -29,24 +29,28 @@ function setUpLegacyRootEslintRc(tree, options) {
     else {
         tree.write('.eslintignore', 'node_modules\n');
     }
-    return !options.skipPackageJson
-        ? (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            '@nx/eslint-plugin': versions_1.nxVersion,
-            '@typescript-eslint/parser': versions_1.typescriptESLintVersion,
-            '@typescript-eslint/eslint-plugin': versions_1.typescriptESLintVersion,
-            'eslint-config-prettier': versions_1.eslintConfigPrettierVersion,
-        })
-        : () => { };
+    if (options.skipPackageJson) {
+        return () => { };
+    }
+    const { typescriptESLintVersion } = (0, versions_1.versions)(tree);
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+        '@nx/eslint-plugin': versions_1.nxVersion,
+        '@typescript-eslint/parser': typescriptESLintVersion,
+        '@typescript-eslint/eslint-plugin': typescriptESLintVersion,
+        'eslint-config-prettier': versions_1.eslintConfigPrettierVersion,
+    }, undefined, true);
 }
 function setUpRootFlatConfig(tree, options) {
     tree.write(`eslint.config.${options.eslintConfigFormat}`, (0, global_eslint_config_1.getGlobalFlatEslintConfiguration)(options.eslintConfigFormat, options.rootProject));
-    return !options.skipPackageJson
-        ? (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-            '@eslint/js': versions_1.eslint9__eslintVersion,
-            '@nx/eslint-plugin': versions_1.nxVersion,
-            eslint: versions_1.eslint9__eslintVersion,
-            'eslint-config-prettier': versions_1.eslintConfigPrettierVersion,
-            'typescript-eslint': versions_1.eslint9__typescriptESLintVersion,
-        })
-        : () => { };
+    if (options.skipPackageJson) {
+        return () => { };
+    }
+    const { eslintVersion, typescriptESLintVersion } = (0, versions_1.versions)(tree);
+    return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
+        '@eslint/js': eslintVersion,
+        '@nx/eslint-plugin': versions_1.nxVersion,
+        eslint: eslintVersion,
+        'eslint-config-prettier': versions_1.eslintConfigPrettierVersion,
+        'typescript-eslint': typescriptESLintVersion,
+    }, undefined, true);
 }

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

@@ -14,10 +14,8 @@ exports.addPluginsToLintConfig = addPluginsToLintConfig;
 exports.addIgnoresToLintConfig = addIgnoresToLintConfig;
 exports.getPluginImport = getPluginImport;
 const devkit_1 = require("@nx/devkit");
-const semver_1 = require("semver");
 const config_file_1 = require("../../utils/config-file");
 const flat_config_1 = require("../../utils/flat-config");
-const version_utils_1 = require("../../utils/version-utils");
 const versions_1 = require("../../utils/versions");
 const ast_utils_1 = require("./flat-config/ast-utils");
 const path_utils_1 = require("./flat-config/path-utils");
@@ -312,9 +310,9 @@ function addExtendsToLintConfig(tree, root, plugin, insertAtTheEnd = false) {
                     ? 'cjs'
                     : 'mjs';
         let shouldImportEslintCompat = false;
-        // assume eslint version is 9 if not found, as it's what we'd be generating by default
-        const eslintVersion = (0, version_utils_1.getInstalledEslintVersion)(tree) ?? versions_1.eslint9__eslintVersion;
-        if ((0, semver_1.gte)(eslintVersion, '9.0.0')) {
+        // assume eslint major is 9 if not found, as it's what we'd be generating by default
+        const eslintMajor = (0, versions_1.getInstalledEslintMajorVersion)(tree) ?? 9;
+        if (eslintMajor >= 9) {
             // eslint v9 requires the incompatible plugins to be wrapped with a helper from @eslint/compat
             const plugins = (Array.isArray(plugin) ? plugin : [plugin]).map((p) => typeof p === 'string' ? { name: p, needCompatFixup: false } : p);
             let compatiblePluginsBatch = [];

package/dist/src/generators/workspace-rule/files/__name__.spec.ts__tmpl__

@@ -1,4 +1,4 @@
-<% if (flatConfig) { %>import { RuleTester } from '@typescript-eslint/rule-tester';
+<% if (useFlatRuleTester) { %>import { RuleTester } from '@typescript-eslint/rule-tester';
 import type { RuleTesterConfig } from '@typescript-eslint/rule-tester';
 import { rule, RULE_NAME } from './<%= name %>';
 

package/dist/src/generators/workspace-rule/workspace-rule.js

@@ -5,14 +5,26 @@ const tslib_1 = require("tslib");
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const path_1 = require("path");
+const semver_1 = require("semver");
 const ts = tslib_1.__importStar(require("typescript"));
 const workspace_lint_rules_1 = require("../../utils/workspace-lint-rules");
 const workspace_rules_project_1 = require("../workspace-rules-project/workspace-rules-project");
+const assert_supported_eslint_version_1 = require("../../utils/assert-supported-eslint-version");
 const flat_config_1 = require("../../utils/flat-config");
 const versions_1 = require("../../utils/versions");
 async function lintWorkspaceRuleGenerator(tree, options) {
+    (0, assert_supported_eslint_version_1.assertSupportedEslintVersion)(tree);
     const tasks = [];
     const flatConfig = (0, flat_config_1.useFlatConfig)(tree);
+    // ESLint v9 dropped the eslintrc-style `RuleTester` API. typescript-eslint's
+    // recommended replacement for any v9 workspace (flat or eslintrc) is the
+    // separate `@typescript-eslint/rule-tester` package, which has a flat-style
+    // API that works with ESLint v8.57+ and v9 alike. We resolve the effective
+    // major from `versions(tree)` to cover both declared workspaces and fresh
+    // installs that will be bumped to v9.
+    const { eslintVersion, typescriptESLintVersion } = (0, versions_1.versions)(tree);
+    const effectiveEslintMajor = (0, semver_1.major)((0, semver_1.coerce)(eslintVersion));
+    const useFlatRuleTester = flatConfig || effectiveEslintMajor >= 9;
     const nxJson = (0, devkit_1.readNxJson)(tree);
     // Ensure that the workspace rules project has been created
     tasks.push(await (0, workspace_rules_project_1.lintWorkspaceRulesProjectGenerator)(tree, {
@@ -20,15 +32,15 @@ async function lintWorkspaceRuleGenerator(tree, options) {
         addPlugin: process.env.NX_ADD_PLUGINS !== 'false' &&
             nxJson.useInferencePlugins !== false,
     }));
-    if (flatConfig) {
-        tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@typescript-eslint/rule-tester': versions_1.eslint9__typescriptESLintVersion }));
+    if (useFlatRuleTester) {
+        tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { '@typescript-eslint/rule-tester': typescriptESLintVersion }, undefined, true));
     }
     const ruleDir = (0, devkit_1.joinPathFragments)(workspace_lint_rules_1.workspaceLintPluginDir, options.directory ?? '');
     // Generate the required files for the new rule
     (0, devkit_1.generateFiles)(tree, (0, path_1.join)(__dirname, 'files'), ruleDir, {
         tmpl: '',
         name: options.name,
-        flatConfig,
+        useFlatRuleTester,
     });
     const nameCamelCase = (0, internal_1.camelize)(options.name);
     /**

package/dist/src/generators/workspace-rules-project/workspace-rules-project.js

@@ -6,12 +6,13 @@ const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
 const internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
+const assert_supported_eslint_version_1 = require("../../utils/assert-supported-eslint-version");
 const versions_1 = require("../../utils/versions");
-const version_utils_1 = require("../../utils/version-utils");
 const workspace_lint_rules_1 = require("../../utils/workspace-lint-rules");
 exports.WORKSPACE_RULES_PROJECT_NAME = 'eslint-rules';
 exports.WORKSPACE_PLUGIN_DIR = 'tools/eslint-rules';
 async function lintWorkspaceRulesProjectGenerator(tree, options = {}) {
+    (0, assert_supported_eslint_version_1.assertSupportedEslintVersion)(tree);
     const { configurationGenerator } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
     const tasks = [];
     // Noop if the workspace rules project already exists
@@ -56,6 +57,13 @@ async function lintWorkspaceRulesProjectGenerator(tree, options = {}) {
     (0, devkit_1.updateJson)(tree, (0, path_1.join)(workspace_lint_rules_1.workspaceLintPluginDir, 'tsconfig.spec.json'), (json) => {
         delete json.compilerOptions?.module;
         delete json.compilerOptions?.moduleResolution;
+        // Inherits `module: node16` from the project's base `tsconfig.json`,
+        // which requires `isolatedModules: true` to reliably honor packages'
+        // `exports` maps (e.g. `@typescript-eslint/rule-tester`).
+        json.compilerOptions = {
+            ...json.compilerOptions,
+            isolatedModules: true,
+        };
         if (json.include) {
             json.include = json.include.map((v) => {
                 if (v.startsWith('src/**')) {
@@ -76,10 +84,10 @@ async function lintWorkspaceRulesProjectGenerator(tree, options = {}) {
     });
     // Add swc dependencies
     tasks.push((0, internal_1.addSwcRegisterDependencies)(tree));
-    const typescriptEslintVersion = (0, version_utils_1.getTypeScriptEslintVersionToInstall)(tree);
+    const { typescriptESLintVersion } = (0, versions_1.versions)(tree);
     tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
-        '@typescript-eslint/utils': typescriptEslintVersion,
-    }));
+        '@typescript-eslint/utils': typescriptESLintVersion,
+    }, undefined, true));
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
     }

package/dist/src/migrations/update-20-2-0/update-typescript-eslint-v8-13-0.js

@@ -2,12 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
 const semver_1 = require("semver");
-const version_utils_1 = require("../../utils/version-utils");
 async function default_1(tree) {
     const devDependencies = {};
+    // `@typescript-eslint/parser >=8.0.0` is enforced at the `requires` gate
+    // in `migrations.json`. The per-package `gte('8.0.0') && lt('8.13.0')`
+    // check below catches the lockstep-broken case where one of the four
+    // typescript-eslint packages is at a different major than the parser.
     const checkPackageAndMigrate = (pkgName) => {
-        const pkgVersion = (0, version_utils_1.getInstalledPackageVersion)(pkgName, tree);
+        const pkgVersion = (0, internal_1.getDeclaredPackageVersion)(tree, pkgName);
         if (!!pkgVersion && (0, semver_1.gte)(pkgVersion, '8.0.0') && (0, semver_1.lt)(pkgVersion, '8.13.0')) {
             devDependencies[pkgName] = '^8.13.0';
         }

package/dist/src/utils/assert-supported-eslint-version.d.ts

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

package/dist/src/utils/assert-supported-eslint-version.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.assertSupportedEslintVersion = assertSupportedEslintVersion;
+const internal_1 = require("@nx/devkit/internal");
+const deprecation_1 = require("./deprecation");
+const versions_1 = require("./versions");
+function assertSupportedEslintVersion(tree) {
+    (0, internal_1.assertSupportedPackageVersion)(tree, 'eslint', versions_1.minSupportedEslintVersion);
+    if ((0, versions_1.getInstalledEslintMajorVersion)(tree) === 8) {
+        (0, deprecation_1.warnEslintV8Deprecation)();
+    }
+}

package/dist/src/utils/deprecation.d.ts

@@ -1,3 +1,5 @@
 export declare const ESLINT_EXECUTOR_DEPRECATION_MESSAGE = "The `@nx/eslint:lint` executor is deprecated and will be removed in Nx v24. Run `nx g @nx/eslint:convert-to-inferred` to migrate to the `@nx/eslint/plugin` inferred targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.";
 export declare function warnEslintExecutorDeprecation(): void;
 export declare function warnEslintExecutorGenerating(): void;
+export declare const ESLINT_V8_DEPRECATION_MESSAGE = "Support for ESLint v8 is deprecated and will be removed in Nx v24. Please upgrade to ESLint v9.";
+export declare function warnEslintV8Deprecation(): void;

package/dist/src/utils/deprecation.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ESLINT_EXECUTOR_DEPRECATION_MESSAGE = void 0;
+exports.ESLINT_V8_DEPRECATION_MESSAGE = exports.ESLINT_EXECUTOR_DEPRECATION_MESSAGE = void 0;
 exports.warnEslintExecutorDeprecation = warnEslintExecutorDeprecation;
 exports.warnEslintExecutorGenerating = warnEslintExecutorGenerating;
+exports.warnEslintV8Deprecation = warnEslintV8Deprecation;
 const devkit_1 = require("@nx/devkit");
 // TODO(v24): Remove the @nx/eslint:lint executor. The inferred plugin
 // (@nx/eslint/plugin) and the convert-to-inferred generator stay supported.
@@ -13,3 +14,12 @@ function warnEslintExecutorDeprecation() {
 function warnEslintExecutorGenerating() {
     devkit_1.logger.warn('Generating a target that uses the deprecated `@nx/eslint:lint` executor. The executor will be removed in Nx v24. Run `nx g @nx/eslint:convert-to-inferred` next to migrate this target to the `@nx/eslint/plugin` inferred plugin and prevent future generators from emitting executor targets. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.');
 }
+// TODO(v24): Remove ESLint v8 support. Concrete removals:
+//   - Raise `minSupportedEslintVersion` to '9.0.0' in versions.ts.
+//   - Delete `versionMap[8]` and the `CompatVersions` type alias.
+//   - Delete this constant + `warnEslintV8Deprecation` and their call sites.
+//   - Drop the v8 branch in the workspace-rule generator/template.
+exports.ESLINT_V8_DEPRECATION_MESSAGE = 'Support for ESLint v8 is deprecated and will be removed in Nx v24. Please upgrade to ESLint v9.';
+function warnEslintV8Deprecation() {
+    devkit_1.logger.warn(exports.ESLINT_V8_DEPRECATION_MESSAGE);
+}

package/dist/src/utils/versions.d.ts

@@ -1,9 +1,17 @@
+import { type Tree } from '@nx/devkit';
 export declare const nxVersion: any;
-export declare const eslintVersion = "~8.57.0";
-export declare const eslintrcVersion = "^2.1.1";
+export declare const minSupportedEslintVersion = "8.0.0";
 export declare const eslintConfigPrettierVersion = "^10.0.0";
-export declare const typescriptESLintVersion = "^7.16.0";
+export declare const eslintrcVersion = "^2.1.1";
 export declare const jsoncEslintParserVersion = "^2.1.0";
-export declare const eslint9__typescriptESLintVersion = "^8.40.0";
-export declare const eslint9__eslintVersion = "^9.8.0";
 export declare const eslintCompat = "^1.1.1";
+export declare const eslintVersion = "^9.8.0";
+export declare const typescriptESLintVersion = "^8.40.0";
+type EslintVersions = {
+    eslintVersion: string;
+    typescriptESLintVersion: string;
+};
+export declare function versions(tree: Tree): EslintVersions;
+export declare function getInstalledEslintVersion(tree?: Tree): string | null;
+export declare function getInstalledEslintMajorVersion(tree?: Tree): number | null;
+export {};

package/dist/src/utils/versions.js

@@ -1,14 +1,49 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.eslintCompat = exports.eslint9__eslintVersion = exports.eslint9__typescriptESLintVersion = exports.jsoncEslintParserVersion = exports.typescriptESLintVersion = exports.eslintConfigPrettierVersion = exports.eslintrcVersion = exports.eslintVersion = exports.nxVersion = void 0;
+exports.typescriptESLintVersion = exports.eslintVersion = exports.eslintCompat = exports.jsoncEslintParserVersion = exports.eslintrcVersion = exports.eslintConfigPrettierVersion = exports.minSupportedEslintVersion = exports.nxVersion = void 0;
+exports.versions = versions;
+exports.getInstalledEslintVersion = getInstalledEslintVersion;
+exports.getInstalledEslintMajorVersion = getInstalledEslintMajorVersion;
+const internal_1 = require("@nx/devkit/internal");
 const path_1 = require("path");
+const semver_1 = require("semver");
 exports.nxVersion = require((0, path_1.join)('@nx/eslint', 'package.json')).version;
-exports.eslintVersion = '~8.57.0';
-exports.eslintrcVersion = '^2.1.1';
+exports.minSupportedEslintVersion = '8.0.0';
 exports.eslintConfigPrettierVersion = '^10.0.0';
-exports.typescriptESLintVersion = '^7.16.0';
+exports.eslintrcVersion = '^2.1.1';
 exports.jsoncEslintParserVersion = '^2.1.0';
-// Updated linting stack for ESLint v9, typescript-eslint v8
-exports.eslint9__typescriptESLintVersion = '^8.40.0';
-exports.eslint9__eslintVersion = '^9.8.0';
 exports.eslintCompat = '^1.1.1';
+exports.eslintVersion = '^9.8.0';
+exports.typescriptESLintVersion = '^8.40.0';
+const latestVersions = {
+    eslintVersion: exports.eslintVersion,
+    typescriptESLintVersion: exports.typescriptESLintVersion,
+};
+const versionMap = {
+    8: {
+        eslintVersion: '~8.57.0',
+        typescriptESLintVersion: '^8.40.0',
+    },
+};
+function versions(tree) {
+    const installedEslintVersion = getInstalledEslintVersion(tree);
+    if (installedEslintVersion) {
+        const eslintMajorVersion = (0, semver_1.major)(installedEslintVersion);
+        return versionMap[eslintMajorVersion] ?? latestVersions;
+    }
+    // No ESLint declared yet — fresh installs always go to the latest supported
+    // ESLint stack (v9 + typescript-eslint v8). The eslintrc config shape is
+    // still respected at the config-file level when `useFlatConfig(tree)` is
+    // false; only the installed package versions move forward.
+    return latestVersions;
+}
+function getInstalledEslintVersion(tree) {
+    if (!tree) {
+        return (0, internal_1.getInstalledPackageVersion)('eslint');
+    }
+    return (0, internal_1.getDeclaredPackageVersion)(tree, 'eslint');
+}
+function getInstalledEslintMajorVersion(tree) {
+    const installedEslintVersion = getInstalledEslintVersion(tree);
+    return installedEslintVersion ? (0, semver_1.major)(installedEslintVersion) : null;
+}

package/migrations.json

@@ -3,12 +3,20 @@
     "update-typescript-eslint-v8.13.0": {
       "version": "20.2.0-beta.5",
       "description": "Update TypeScript ESLint packages to v8.13.0 if they are already on v8",
-      "implementation": "./dist/src/migrations/update-20-2-0/update-typescript-eslint-v8-13-0"
+      "implementation": "./dist/src/migrations/update-20-2-0/update-typescript-eslint-v8-13-0",
+      "requires": {
+        "@typescript-eslint/parser": ">=8.0.0"
+      },
+      "documentation": "./dist/src/migrations/update-20-2-0/update-typescript-eslint-v8-13-0.md"
     },
     "add-file-extensions-to-overrides": {
       "version": "20.3.0-beta.1",
       "description": "Update ESLint flat config to include .cjs, .mjs, .cts, and .mts files in overrides (if needed)",
-      "implementation": "./dist/src/migrations/update-20-3-0/add-file-extensions-to-overrides"
+      "implementation": "./dist/src/migrations/update-20-3-0/add-file-extensions-to-overrides",
+      "requires": {
+        "eslint": ">=8.57.0"
+      },
+      "documentation": "./dist/src/migrations/update-20-3-0/add-file-extensions-to-overrides.md"
     },
     "update-executor-lint-inputs": {
       "version": "22.7.0-beta.12",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "23.0.0-beta.20",
+  "version": "23.0.0-beta.22",
   "private": false,
   "type": "commonjs",
   "files": [
@@ -73,17 +73,17 @@
   "peerDependencies": {
     "@zkochan/js-yaml": "0.0.7",
     "eslint": "^8.0.0 || ^9.0.0 || ^10.0.0",
-    "@nx/jest": "23.0.0-beta.20"
+    "@nx/jest": "23.0.0-beta.22"
   },
   "dependencies": {
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "typescript": "~5.9.2",
-    "@nx/devkit": "23.0.0-beta.20",
-    "@nx/js": "23.0.0-beta.20"
+    "@nx/js": "23.0.0-beta.22",
+    "@nx/devkit": "23.0.0-beta.22"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.20"
+    "nx": "23.0.0-beta.22"
   },
   "peerDependenciesMeta": {
     "@nx/jest": {

package/dist/src/utils/version-utils.d.ts

@@ -1,4 +0,0 @@
-import { type Tree } from '@nx/devkit';
-export declare function getInstalledPackageVersion(pkgName: string, tree?: Tree): string | null;
-export declare function getInstalledEslintVersion(tree?: Tree): string | null;
-export declare function getTypeScriptEslintVersionToInstall(tree: Tree): string | null;

package/dist/src/utils/version-utils.js

@@ -1,49 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getInstalledPackageVersion = getInstalledPackageVersion;
-exports.getInstalledEslintVersion = getInstalledEslintVersion;
-exports.getTypeScriptEslintVersionToInstall = getTypeScriptEslintVersionToInstall;
-const devkit_1 = require("@nx/devkit");
-const internal_1 = require("@nx/devkit/internal");
-const devkit_internals_1 = require("nx/src/devkit-internals");
-const semver_1 = require("semver");
-const versions_1 = require("./versions");
-function getInstalledPackageVersion(pkgName, tree) {
-    try {
-        const packageJson = (0, devkit_internals_1.readModulePackageJson)(pkgName).packageJson;
-        return packageJson.version;
-    }
-    catch { }
-    // the package is not installed on disk, it could be in the package.json
-    // but waiting to be installed
-    let pkgVersionInRootPackageJson;
-    if (tree) {
-        pkgVersionInRootPackageJson = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, pkgName);
-    }
-    else {
-        // Use filesystem-based signature for pnpm catalog compatibility
-        pkgVersionInRootPackageJson = (0, devkit_1.getDependencyVersionFromPackageJson)(pkgName);
-    }
-    if (!pkgVersionInRootPackageJson) {
-        // the package is not installed
-        return null;
-    }
-    try {
-        // try to parse and return the version
-        return tree
-            ? (0, internal_1.checkAndCleanWithSemver)(tree, pkgName, pkgVersionInRootPackageJson)
-            : (0, internal_1.checkAndCleanWithSemver)(pkgName, pkgVersionInRootPackageJson);
-    }
-    catch { }
-    // we could not resolve the version
-    return null;
-}
-function getInstalledEslintVersion(tree) {
-    return getInstalledPackageVersion('eslint', tree);
-}
-function getTypeScriptEslintVersionToInstall(tree) {
-    const eslintVersion = getInstalledEslintVersion(tree);
-    return eslintVersion && (0, semver_1.lt)(eslintVersion, '9.0.0')
-        ? versions_1.typescriptESLintVersion
-        : versions_1.eslint9__typescriptESLintVersion;
-}