@nx/eslint 23.0.0 → 23.1.0-beta.0

package/dist/src/utils/deprecation.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ESLINT_V8_DEPRECATION_MESSAGE = exports.ESLINT_EXECUTOR_DEPRECATION_MESSAGE = void 0;
+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.
@@ -14,12 +13,3 @@ 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/flat-config.d.ts

@@ -1,5 +1,6 @@
 import { Tree } from '@nx/devkit';
 export declare const eslintFlatConfigFilenames: string[];
 export declare const baseEslintConfigFilenames: string[];
+export declare const eslintrcFilenames: string[];
 export declare function getRootESLintFlatConfigFilename(tree: Tree): string;
 export declare function useFlatConfig(tree?: Tree): boolean;

package/dist/src/utils/flat-config.js

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.baseEslintConfigFilenames = exports.eslintFlatConfigFilenames = void 0;
+exports.eslintrcFilenames = exports.baseEslintConfigFilenames = exports.eslintFlatConfigFilenames = void 0;
 exports.getRootESLintFlatConfigFilename = getRootESLintFlatConfigFilename;
 exports.useFlatConfig = useFlatConfig;
-const semver_1 = require("semver");
 exports.eslintFlatConfigFilenames = [
     'eslint.config.cjs',
     'eslint.config.js',
@@ -22,6 +21,14 @@ exports.baseEslintConfigFilenames = [
     'eslint.base.config.ts',
     'eslint.base.config.mts',
 ];
+exports.eslintrcFilenames = [
+    '.eslintrc',
+    '.eslintrc.js',
+    '.eslintrc.cjs',
+    '.eslintrc.yaml',
+    '.eslintrc.yml',
+    '.eslintrc.json',
+];
 function getRootESLintFlatConfigFilename(tree) {
     for (const file of exports.eslintFlatConfigFilenames) {
         if (tree.exists(file)) {
@@ -31,30 +38,25 @@ function getRootESLintFlatConfigFilename(tree) {
     throw new Error('Could not find root flat config file');
 }
 function useFlatConfig(tree) {
-    // Prioritize taking ESLint's own environment variable into account when determining if we should use flat config
-    // If it is not defined, then default to true.
+    // ESLint's own environment variable wins when set.
     if (process.env.ESLINT_USE_FLAT_CONFIG === 'true') {
         return true;
     }
     else if (process.env.ESLINT_USE_FLAT_CONFIG === 'false') {
         return false;
     }
-    // If we find an existing flat config file in the root of the provided tree, we should use flat config
     if (tree) {
-        const hasRootFlatConfig = exports.eslintFlatConfigFilenames.some((filename) => tree.exists(filename));
-        if (hasRootFlatConfig) {
+        // An existing flat config at the root means the workspace is on flat config.
+        if (exports.eslintFlatConfigFilenames.some((filename) => tree.exists(filename))) {
             return true;
         }
+        // An existing eslintrc config means the workspace is still on eslintrc, which
+        // we keep supporting; don't force it onto flat config.
+        if (exports.eslintrcFilenames.some((filename) => tree.exists(filename))) {
+            return false;
+        }
     }
-    // Otherwise fallback to checking the installed eslint version
-    try {
-        const { ESLint } = require('eslint');
-        // Default to any v8 version to compare against in this case as it implies a much older version of ESLint was found (and gte() requires a valid version)
-        const eslintVersion = ESLint.version || '8.0.0';
-        return (0, semver_1.gte)(eslintVersion, '9.0.0');
-    }
-    catch {
-        // Default to assuming flat config in case ESLint is not yet installed
-        return true;
-    }
+    // Nothing to go on: default to flat config, the default for every supported
+    // ESLint version (v9+).
+    return true;
 }

package/dist/src/utils/resolve-eslint-class.js

@@ -3,26 +3,20 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveESLintClass = resolveESLintClass;
 const flat_config_1 = require("../utils/flat-config");
 async function resolveESLintClass(opts) {
+    const shouldESLintUseFlatConfig = typeof opts?.useFlatConfigOverrideVal === 'boolean'
+        ? opts.useFlatConfigOverrideVal
+        : (0, flat_config_1.useFlatConfig)();
+    // `loadESLint` (added in eslint 8.57.0) resolves the correct ESLint class
+    // for flat vs eslintrc config; it exists in every supported version (v9+).
+    let eslintModule;
+    // Only a failed import means eslint is missing; let loadESLint errors surface.
     try {
-        const shouldESLintUseFlatConfig = typeof opts?.useFlatConfigOverrideVal === 'boolean'
-            ? opts.useFlatConfigOverrideVal
-            : (0, flat_config_1.useFlatConfig)();
-        // In eslint 8.57.0 (the final v8 version), a dedicated API was added for resolving the correct ESLint class.
-        const eslintModule = (await import('eslint'));
-        if (typeof eslintModule.loadESLint === 'function') {
-            return (await eslintModule.loadESLint({
-                useFlatConfig: shouldESLintUseFlatConfig,
-            }));
-        }
-        // Explicitly use the FlatESLint and LegacyESLint classes here because the ESLint class points at a different one based on ESLint v8 vs ESLint v9
-        // But the decision on which one to use is not just based on the major version of ESLint.
-        const { LegacyESLint, FlatESLint } = await import('eslint/use-at-your-own-risk');
-        // LegacyESLint's type no longer structurally matches the flat ESLint class
-        // in v9 type defs (new static members like defaultConfig, fromOptionsModule),
-        // but at runtime either class is an appropriate return value here.
-        return (shouldESLintUseFlatConfig ? FlatESLint : LegacyESLint);
+        eslintModule = (await import('eslint'));
     }
     catch {
         throw new Error('Unable to find `eslint`. Ensure a valid `eslint` version is installed.');
     }
+    return (await eslintModule.loadESLint({
+        useFlatConfig: shouldESLintUseFlatConfig,
+    }));
 }

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

@@ -1,17 +1,16 @@
 import { type Tree } from '@nx/devkit';
 export declare const nxVersion: any;
-export declare const minSupportedEslintVersion = "8.0.0";
+export declare const minSupportedEslintVersion = "9.0.0";
 export declare const eslintConfigPrettierVersion = "^10.0.0";
-export declare const eslintrcVersion = "^2.1.1";
+export declare const eslintrcVersion = "^3.0.0";
 export declare const jsoncEslintParserVersion = "^2.1.0";
 export declare const eslintCompat = "^1.1.1";
 export declare const eslintVersion = "^9.8.0";
-export declare const typescriptESLintVersion = "^8.40.0";
+export declare const typescriptESLintVersion = "^8.58.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

@@ -3,27 +3,23 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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.minSupportedEslintVersion = '8.0.0';
+exports.minSupportedEslintVersion = '9.0.0';
 exports.eslintConfigPrettierVersion = '^10.0.0';
-exports.eslintrcVersion = '^2.1.1';
+exports.eslintrcVersion = '^3.0.0';
 exports.jsoncEslintParserVersion = '^2.1.0';
 exports.eslintCompat = '^1.1.1';
 exports.eslintVersion = '^9.8.0';
-exports.typescriptESLintVersion = '^8.40.0';
+exports.typescriptESLintVersion = '^8.58.0';
 const latestVersions = {
     eslintVersion: exports.eslintVersion,
     typescriptESLintVersion: exports.typescriptESLintVersion,
 };
 const versionMap = {
-    8: {
-        eslintVersion: '~8.57.0',
-        typescriptESLintVersion: '^8.40.0',
-    },
+    9: { eslintVersion: '^9.8.0', typescriptESLintVersion: '^8.58.0' },
 };
 function versions(tree) {
     const installedEslintVersion = getInstalledEslintVersion(tree);
@@ -31,10 +27,7 @@ function versions(tree) {
         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.
+    // No ESLint declared yet, so fresh installs go to the latest supported stack.
     return latestVersions;
 }
 function getInstalledEslintVersion(tree) {
@@ -43,7 +36,3 @@ function getInstalledEslintVersion(tree) {
     }
     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

@@ -15,6 +15,15 @@
       "description": "Rename imports of `createNodesV2` from `@nx/eslint/plugin` to the canonical `createNodes` export.",
       "implementation": "./dist/src/migrations/update-23-0-0/migrate-create-nodes-v2-to-create-nodes",
       "documentation": "./dist/src/migrations/update-23-0-0/migrate-create-nodes-v2-to-create-nodes.md"
+    },
+    "update-23-1-0-convert-to-flat-config": {
+      "version": "23.1.0-beta.0",
+      "requires": {
+        "eslint": ">=9.0.0"
+      },
+      "description": "Convert remaining ESLint configs to flat config for ESLint v9 and keep the workspace lint-passing, disabling rules whose preset defaults changed.",
+      "implementation": "./dist/src/migrations/update-23-1-0/convert-to-flat-config",
+      "prompt": "./dist/src/migrations/update-23-1-0/convert-to-flat-config.md"
     }
   },
   "packageJsonUpdates": {
@@ -145,6 +154,118 @@
           "alwaysAddToPackageJson": false
         }
       }
+    },
+    "23.1.0": {
+      "version": "23.1.0-beta.0",
+      "requires": {
+        "eslint": ">=8.0.0 <9.0.0"
+      },
+      "packages": {
+        "eslint": {
+          "version": "^9.8.0",
+          "alwaysAddToPackageJson": false
+        },
+        "typescript-eslint": {
+          "version": "^8.40.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@typescript-eslint/eslint-plugin": {
+          "version": "^8.40.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@typescript-eslint/parser": {
+          "version": "^8.40.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@typescript-eslint/utils": {
+          "version": "^8.40.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@typescript-eslint/type-utils": {
+          "version": "^8.40.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@typescript-eslint/rule-tester": {
+          "version": "^8.40.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@typescript-eslint/scope-manager": {
+          "version": "^8.40.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@typescript-eslint/typescript-estree": {
+          "version": "^8.40.0",
+          "alwaysAddToPackageJson": false
+        },
+        "eslint-config-prettier": {
+          "version": "^10.0.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
+    "23.1.0-typescript-eslint": {
+      "version": "23.1.0-beta.0",
+      "requires": {
+        "typescript-eslint": ">8.0.0 <8.58.0"
+      },
+      "packages": {
+        "typescript-eslint": {
+          "version": "^8.58.0"
+        },
+        "@typescript-eslint/eslint-plugin": {
+          "version": "^8.58.0"
+        },
+        "@typescript-eslint/parser": {
+          "version": "^8.58.0"
+        },
+        "@typescript-eslint/utils": {
+          "version": "^8.58.0"
+        },
+        "@typescript-eslint/rule-tester": {
+          "version": "^8.58.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@typescript-eslint/scope-manager": {
+          "version": "^8.58.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@typescript-eslint/typescript-estree": {
+          "version": "^8.58.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
+    },
+    "23.1.0-@typescript-eslint": {
+      "version": "23.1.0-beta.0",
+      "requires": {
+        "@typescript-eslint/eslint-plugin": ">8.0.0 <8.58.0"
+      },
+      "packages": {
+        "typescript-eslint": {
+          "version": "^8.58.0"
+        },
+        "@typescript-eslint/eslint-plugin": {
+          "version": "^8.58.0"
+        },
+        "@typescript-eslint/parser": {
+          "version": "^8.58.0"
+        },
+        "@typescript-eslint/utils": {
+          "version": "^8.58.0"
+        },
+        "@typescript-eslint/rule-tester": {
+          "version": "^8.58.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@typescript-eslint/scope-manager": {
+          "version": "^8.58.0",
+          "alwaysAddToPackageJson": false
+        },
+        "@typescript-eslint/typescript-estree": {
+          "version": "^8.58.0",
+          "alwaysAddToPackageJson": false
+        }
+      }
     }
   }
 }

package/package.json

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