@nx/eslint 23.0.0-beta.21 → 23.0.0-beta.23

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

@@ -6,6 +6,7 @@ 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 deprecation_1 = require("../../utils/deprecation");
 const versions_1 = require("../../utils/versions");
@@ -47,6 +48,10 @@ async function run(options, context) {
         : undefined;
     const { eslint, ESLint } = await (0, eslint_utils_1.resolveAndInstantiateESLint)(eslintConfigPath, normalizedOptions, hasFlatConfig);
     (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 {
             const fileConfig = await eslint.calculateConfigForFile(printConfig);

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

@@ -12,7 +12,7 @@ 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' }, [
+    const migratedProjects = await (0, internal_1.migrateProjectExecutorsToPlugin)(tree, projectGraph, '@nx/eslint/plugin', plugin_1.createNodes, { targetName: 'lint' }, [
         {
             executors: ['@nx/eslint:lint', '@nrwl/linter:eslint'],
             postTargetTransformer,

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

@@ -90,7 +90,7 @@ async function initEsLint(tree, options) {
         '_eslint-lint',
     ];
     if (rootEslintFile && options.addPlugin && !hasPlugin) {
-        await (0, internal_1.addPlugin)(tree, graph, '@nx/eslint/plugin', plugin_1.createNodesV2, {
+        await (0, internal_1.addPlugin)(tree, graph, '@nx/eslint/plugin', plugin_1.createNodes, {
             targetName: lintTargetNames,
         }, options.updatePackageScripts);
         return () => { };
@@ -101,7 +101,7 @@ async function initEsLint(tree, options) {
     updateProductionFileset(tree, options.eslintConfigFormat);
     updateVsCodeRecommendedExtensions(tree);
     if (options.addPlugin) {
-        await (0, internal_1.addPlugin)(tree, graph, '@nx/eslint/plugin', plugin_1.createNodesV2, {
+        await (0, internal_1.addPlugin)(tree, graph, '@nx/eslint/plugin', plugin_1.createNodes, {
             targetName: lintTargetNames,
         }, options.updatePackageScripts);
     }

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,6 +5,7 @@ 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");
@@ -15,6 +16,15 @@ 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, {
@@ -22,8 +32,7 @@ async function lintWorkspaceRuleGenerator(tree, options) {
         addPlugin: process.env.NX_ADD_PLUGINS !== 'false' &&
             nxJson.useInferencePlugins !== false,
     }));
-    if (flatConfig) {
-        const { typescriptESLintVersion } = (0, versions_1.versions)(tree);
+    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 ?? '');
@@ -31,7 +40,7 @@ async function lintWorkspaceRuleGenerator(tree, options) {
     (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

@@ -57,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/**')) {

package/dist/src/plugins/plugin.d.ts

@@ -1,7 +1,7 @@
-import { CreateNodesV2 } from '@nx/devkit';
+import { CreateNodes } from '@nx/devkit';
 export interface EslintPluginOptions {
     targetName?: string;
     extensions?: string[];
 }
-export declare const createNodes: CreateNodesV2<EslintPluginOptions>;
-export declare const createNodesV2: CreateNodesV2<EslintPluginOptions>;
+export declare const createNodes: CreateNodes<EslintPluginOptions>;
+export declare const createNodesV2: CreateNodes<EslintPluginOptions>;

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

@@ -2,7 +2,11 @@
 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.js

@@ -7,7 +7,6 @@ exports.getInstalledEslintMajorVersion = getInstalledEslintMajorVersion;
 const internal_1 = require("@nx/devkit/internal");
 const path_1 = require("path");
 const semver_1 = require("semver");
-const flat_config_1 = require("./flat-config");
 exports.nxVersion = require((0, path_1.join)('@nx/eslint', 'package.json')).version;
 exports.minSupportedEslintVersion = '8.0.0';
 exports.eslintConfigPrettierVersion = '^10.0.0';
@@ -32,11 +31,11 @@ function versions(tree) {
         const eslintMajorVersion = (0, semver_1.major)(installedEslintVersion);
         return versionMap[eslintMajorVersion] ?? latestVersions;
     }
-    // No ESLint declared yet — fresh installs honor the user's flat-config
-    // preference. Without flat config, install ESLint v8 (eslintrc lane); with
-    // flat config, install ESLint v9. Both lanes ship typescript-eslint v8 to
-    // match the `@nx/eslint-plugin` `@typescript-eslint/parser` peer.
-    return (0, flat_config_1.useFlatConfig)(tree) ? latestVersions : versionMap[8];
+    // 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) {

package/migrations.json

@@ -6,7 +6,8 @@
       "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",
@@ -14,7 +15,8 @@
       "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.21",
+  "version": "23.0.0-beta.23",
   "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.21"
+    "@nx/jest": "23.0.0-beta.23"
   },
   "dependencies": {
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "typescript": "~5.9.2",
-    "@nx/js": "23.0.0-beta.21",
-    "@nx/devkit": "23.0.0-beta.21"
+    "@nx/js": "23.0.0-beta.23",
+    "@nx/devkit": "23.0.0-beta.23"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.21"
+    "nx": "23.0.0-beta.23"
   },
   "peerDependenciesMeta": {
     "@nx/jest": {