@nx/eslint 23.0.0-beta.1 → 23.0.0-beta.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "23.0.0-beta.1",
+  "version": "23.0.0-beta.11",
   "private": false,
   "description": "The ESLint plugin for Nx contains executors, generators and utilities used for linting JavaScript/TypeScript projects within an Nx workspace.",
   "repository": {
@@ -32,19 +32,19 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "peerDependencies": {
-    "@nx/jest": "23.0.0-beta.1",
+    "@nx/jest": "23.0.0-beta.11",
     "@zkochan/js-yaml": "0.0.7",
     "eslint": "^8.0.0 || ^9.0.0 || ^10.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.1",
-    "@nx/js": "23.0.0-beta.1",
+    "@nx/devkit": "23.0.0-beta.11",
+    "@nx/js": "23.0.0-beta.11",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "typescript": "~5.9.2"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.1"
+    "nx": "23.0.0-beta.11"
   },
   "peerDependenciesMeta": {
     "@nx/jest": {

package/src/executors/lint/lint.impl.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lint.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/executors/lint/lint.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAM7E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAGvC,wBAA8B,GAAG,CAC/B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CAwN/B"}
+{"version":3,"file":"lint.impl.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/executors/lint/lint.impl.ts"],"names":[],"mappings":"AAAA,OAAO,EAA6B,KAAK,eAAe,EAAE,MAAM,YAAY,CAAC;AAM7E,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAIvC,wBAA8B,GAAG,CAC/B,OAAO,EAAE,MAAM,EACf,OAAO,EAAE,eAAe,GACvB,OAAO,CAAC;IAAE,OAAO,EAAE,OAAO,CAAA;CAAE,CAAC,CA0N/B"}

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

@@ -7,7 +7,9 @@ const utils_1 = require("nx/src/tasks-runner/utils");
 const path_1 = require("path");
 const config_file_1 = require("../../utils/config-file");
 const eslint_utils_1 = require("./utility/eslint-utils");
+const deprecation_1 = require("../../utils/deprecation");
 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
     delete options.hasTypeAwareRules;
     const systemRoot = context.root;

package/src/executors/lint/schema.json

@@ -6,6 +6,7 @@
   "description": "ESLint Lint Target.",
   "cli": "nx",
   "type": "object",
+  "x-deprecated": "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 plugin. See https://nx.dev/docs/guides/tasks--caching/convert-to-inferred for details.",
   "properties": {
     "eslintConfig": {
       "type": "string",

package/src/generators/convert-to-flat-config/converters/json-converter.d.ts

@@ -1,5 +1,6 @@
 import { Tree } from '@nx/devkit';
 import { ESLint } from 'eslint';
+export declare function renameLegacyEslintrcFile(path: string, format: 'mjs' | 'cjs'): string;
 /**
  * Converts an ESLint JSON config to a flat config.
  * Deletes the original file along with .eslintignore if it exists.

package/src/generators/convert-to-flat-config/converters/json-converter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json-converter.d.ts","sourceRoot":"","sources":["../../../../../../../packages/eslint/src/generators/convert-to-flat-config/converters/json-converter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAS,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAehC;;;GAGG;AACH,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,CAAC,UAAU,EACzB,WAAW,EAAE,MAAM,EAAE,EACrB,MAAM,EAAE,KAAK,GAAG,KAAK,GACpB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,CA8OjE"}
+{"version":3,"file":"json-converter.d.ts","sourceRoot":"","sources":["../../../../../../../packages/eslint/src/generators/convert-to-flat-config/converters/json-converter.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAS,MAAM,YAAY,CAAC;AACzC,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAmBhC,wBAAgB,wBAAwB,CACtC,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,KAAK,GAAG,KAAK,GACpB,MAAM,CAOR;AA0DD;;;GAGG;AACH,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,IAAI,EACV,IAAI,EAAE,MAAM,EACZ,MAAM,EAAE,MAAM,CAAC,UAAU,EACzB,WAAW,EAAE,MAAM,EAAE,EACrB,MAAM,EAAE,KAAK,GAAG,KAAK,GACpB;IAAE,OAAO,EAAE,MAAM,CAAC;IAAC,WAAW,EAAE,OAAO,CAAC;IAAC,WAAW,EAAE,OAAO,CAAA;CAAE,CA6PjE"}

package/src/generators/convert-to-flat-config/converters/json-converter.js

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.renameLegacyEslintrcFile = renameLegacyEslintrcFile;
 exports.convertEslintJsonToFlatConfig = convertEslintJsonToFlatConfig;
 const tslib_1 = require("tslib");
 const devkit_1 = require("@nx/devkit");
@@ -7,6 +8,57 @@ const ts = tslib_1.__importStar(require("typescript"));
 const ast_utils_1 = require("../../utils/flat-config/ast-utils");
 const eslint_file_1 = require("../../utils/eslint-file");
 const path_utils_1 = require("../../utils/flat-config/path-utils");
+// Rewrites legacy `.eslintrc[.base][.json]` / `.eslintignore` filenames to their flat-config
+// counterparts. Used for `extends` local paths, rule option values that embed these filenames,
+// and nx.json / project.json input globs that referenced the deleted files. Accepts
+// extensionless `.eslintrc` since ESLint treats that as JSON by convention.
+function renameLegacyEslintrcFile(path, format) {
+    return path
+        .replace(/(^|.*?)\.eslintrc(\.base)?(\.json)?$/, `$1eslint$2.config.${format}`)
+        .replace(/(^|.*?)\.eslintignore$/, `$1eslint.config.${format}`);
+}
+// In flat config, `@nx/workspace/<rule>` is parsed as plugin `@nx/workspace`, rule `<rule>`.
+// The `@nx` plugin already exposes workspace rules under both `workspace/<rule>` and `workspace-<rule>` keys.
+// Rewriting to `@nx/workspace-<rule>` makes ESLint resolve them via the already-registered `@nx` plugin.
+function renameLegacyWorkspaceRules(rules) {
+    const renamed = {};
+    for (const [key, value] of Object.entries(rules)) {
+        const newKey = key.startsWith('@nx/workspace/')
+            ? '@nx/workspace-' + key.slice('@nx/workspace/'.length)
+            : key;
+        renamed[newKey] = value;
+    }
+    return renamed;
+}
+// Rewrites references to the legacy `.eslintrc[.base].json` / `.eslintignore` that may appear
+// inside rule option values (e.g. `@nx/dependency-checks`'s `ignoredFiles`) to point at the
+// generated flat-config files instead. Without this, rule options keep pointing at files that
+// no longer exist after the conversion.
+function rewriteStaleEslintrcRefs(value, format) {
+    if (typeof value === 'string') {
+        return renameLegacyEslintrcFile(value, format);
+    }
+    if (Array.isArray(value)) {
+        const mapped = value.map((v) => rewriteStaleEslintrcRefs(v, format));
+        // Rewriting may collapse distinct strings (e.g. `.eslintrc.json` and
+        // `.eslintrc.base.json`) into identical entries; dedupe string arrays.
+        if (mapped.every((v) => typeof v === 'string')) {
+            return Array.from(new Set(mapped));
+        }
+        return mapped;
+    }
+    if (value && typeof value === 'object') {
+        const out = {};
+        for (const [k, v] of Object.entries(value)) {
+            out[k] = rewriteStaleEslintrcRefs(v, format);
+        }
+        return out;
+    }
+    return value;
+}
+function preprocessRules(rules, format) {
+    return rewriteStaleEslintrcRefs(renameLegacyWorkspaceRules(rules), format);
+}
 /**
  * Converts an ESLint JSON config to a flat config.
  * Deletes the original file along with .eslintignore if it exists.
@@ -18,10 +70,17 @@ function convertEslintJsonToFlatConfig(tree, root, config, ignorePaths, format)
     let isESLintJSNeeded = false;
     let combinedConfig = [];
     let languageOptions = [];
-    // exclude dist and eslint config from being linted, which matches the default for new workspaces
-    exportElements.push((0, ast_utils_1.generateAst)({
-        ignores: ['**/dist', '**/out-tsc'],
-    }));
+    if (config.rules) {
+        config.rules = preprocessRules(config.rules, format);
+    }
+    if (config.overrides) {
+        config.overrides = config.overrides.map((override) => override.rules
+            ? {
+                ...override,
+                rules: preprocessRules(override.rules, format),
+            }
+            : override);
+    }
     if (config.extends) {
         const extendsResult = addExtends(importsMap, exportElements, config, format);
         isFlatCompatNeeded = extendsResult.isFlatCompatNeeded;
@@ -101,28 +160,30 @@ function convertEslintJsonToFlatConfig(tree, root, config, ignorePaths, format)
                     if (Object.keys(remainingRest).length > 0 || hasNonEmptyRules) {
                         if (remainingOverride.env ||
                             remainingOverride.extends ||
-                            remainingOverride.plugins ||
-                            remainingOverride.parser) {
+                            remainingOverride.plugins) {
                             isFlatCompatNeeded = true;
                         }
-                        exportElements.push((0, ast_utils_1.generateFlatOverride)(remainingOverride, format));
+                        exportElements.push((0, ast_utils_1.generateFlatOverride)(remainingOverride, format, importsMap));
                     }
                     return;
                 }
             }
-            if (override.env ||
-                override.extends ||
-                override.plugins ||
-                override.parser) {
+            if (override.env || override.extends || override.plugins) {
                 isFlatCompatNeeded = true;
             }
-            exportElements.push((0, ast_utils_1.generateFlatOverride)(override, format));
+            exportElements.push((0, ast_utils_1.generateFlatOverride)(override, format, importsMap));
         });
     }
     if (config.ignorePatterns) {
         const patterns = (Array.isArray(config.ignorePatterns)
             ? config.ignorePatterns
-            : [config.ignorePatterns]).filter((pattern) => !['**/*', '!**/*', 'node_modules'].includes(pattern)); // these are useless in a flat config
+            : [config.ignorePatterns]).filter((pattern) => 
+        // Drop patterns that are meaningless in flat config. `'**/*'` and
+        // `'!**/*'` were eslintrc cascading toggles; `node_modules` is already
+        // ignored by default. Real negations like `['dist/**', '!dist/keep.js']`
+        // are preserved — flat config still supports un-ignoring within a
+        // broader ignores block.
+        !['**/*', '!**/*', 'node_modules'].includes(pattern));
         if (patterns.length > 0) {
             exportElements.push((0, ast_utils_1.generateAst)({
                 ignores: patterns.map((path) => (0, path_utils_1.mapFilePath)(path)),
@@ -165,11 +226,10 @@ function addExtends(importsMap, configBlocks, config, format) {
     extendsConfig
         .filter((imp) => imp.match(/^\.?(\.\/)/))
         .forEach((imp, index) => {
-        if (imp.match(/\.eslintrc(.base)?\.json$/)) {
+        if (imp.match(/\.eslintrc(\.base)?(\.json)?$/)) {
             const localName = index ? `baseConfig${index}` : 'baseConfig';
             configBlocks.push((0, ast_utils_1.generateSpreadElement)(localName));
-            const newImport = imp.replace(/^(.*)\.eslintrc(.base)?\.json$/, `$1eslint$2.config.${format}`);
-            importsMap.set(newImport, localName);
+            importsMap.set(renameLegacyEslintrcFile(imp, format), localName);
         }
         else {
             eslintrcConfigs.push(imp);

package/src/generators/convert-to-flat-config/generator.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/convert-to-flat-config/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EASjB,IAAI,EAGL,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAC;AAc9D,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,kCAAkC,GAC1C,OAAO,CAAC,IAAI,GAAG,iBAAiB,CAAC,CA6CnC;AAED,eAAe,4BAA4B,CAAC"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/convert-to-flat-config/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EASjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,kCAAkC,EAAE,MAAM,UAAU,CAAC;AAiB9D,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,kCAAkC,GAC1C,OAAO,CAAC,IAAI,GAAG,iBAAiB,CAAC,CA8CnC;AAED,eAAe,4BAA4B,CAAC"}

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

@@ -28,8 +28,9 @@ async function convertToFlatConfigGenerator(tree, options) {
     for (const ignoreFile of eslintIgnoreFiles) {
         tree.delete(ignoreFile);
     }
-    // replace references in nx.json
+    // replace references in nx.json and project.json files
     updateNxJsonConfig(tree, options.eslintConfigFormat);
+    updateProjectConfigsInputs(tree, options.eslintConfigFormat);
     // install missing packages
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
@@ -86,35 +87,108 @@ function convertProjectToFlatConfig(tree, project, projectConfig, nxJson, eslint
         eslintIgnoreFiles.add(ignorePath);
     }
 }
-// update names of eslint files in nx.json
-// and remove eslintignore
+// Rewrites input entries that reference legacy `.eslintrc[.base].json` / `.eslintignore`
+// files to their flat-config counterparts, then dedupes so the rewrite doesn't produce
+// duplicates of entries that already pointed at the flat config. Leaves non-string /
+// non-fileset inputs (runtime/env/dependentTasksOutputFiles/etc.) untouched.
+function rewriteLegacyInputs(inputs, format) {
+    const seenStrings = new Set();
+    const result = [];
+    for (const entry of inputs) {
+        if (typeof entry === 'string') {
+            const rewritten = (0, json_converter_1.renameLegacyEslintrcFile)(entry, format);
+            if (seenStrings.has(rewritten))
+                continue;
+            seenStrings.add(rewritten);
+            result.push(rewritten);
+        }
+        else if ('fileset' in entry) {
+            const rewritten = (0, json_converter_1.renameLegacyEslintrcFile)(entry.fileset, format);
+            // Preserve the original reference when nothing changed so downstream identity
+            // checks (e.g. `inputsEqual`) don't see a spurious mutation.
+            result.push(rewritten === entry.fileset ? entry : { ...entry, fileset: rewritten });
+        }
+        else {
+            result.push(entry);
+        }
+    }
+    return result;
+}
+// Adds `value` to `inputs` (after rewriting) when the rewritten set doesn't already contain it.
+function ensureInputPresent(inputs, value, format) {
+    const rewritten = rewriteLegacyInputs(inputs, format);
+    if (!rewritten.some((entry) => entry === value)) {
+        rewritten.push(value);
+    }
+    return rewritten;
+}
+// Updates nx.json: rewrites stale eslintrc/eslintignore references across all targetDefaults
+// inputs and namedInputs, and ensures lint targets include the new flat config file as an input
+// (and `production` excludes it).
 function updateNxJsonConfig(tree, format) {
-    if (tree.exists('nx.json')) {
-        (0, devkit_1.updateJson)(tree, 'nx.json', (json) => {
-            if (json.targetDefaults?.lint?.inputs) {
-                const inputSet = new Set(json.targetDefaults.lint.inputs);
-                inputSet.add(`{workspaceRoot}/eslint.config.${format}`);
-                json.targetDefaults.lint.inputs = Array.from(inputSet);
+    if (!tree.exists('nx.json')) {
+        return;
+    }
+    (0, devkit_1.updateJson)(tree, 'nx.json', (json) => {
+        if (json.targetDefaults) {
+            for (const [name, target] of Object.entries(json.targetDefaults)) {
+                if (!target.inputs)
+                    continue;
+                const isLintTarget = name === 'lint' || name === ESLINT_LINT_EXECUTOR;
+                target.inputs = isLintTarget
+                    ? ensureInputPresent(target.inputs, `{workspaceRoot}/eslint.config.${format}`, format)
+                    : rewriteLegacyInputs(target.inputs, format);
             }
-            if (json.targetDefaults?.['@nx/eslint:lint']?.inputs) {
-                const inputSet = new Set(json.targetDefaults['@nx/eslint:lint'].inputs);
-                inputSet.add(`{workspaceRoot}/eslint.config.${format}`);
-                json.targetDefaults['@nx/eslint:lint'].inputs = Array.from(inputSet);
+        }
+        if (json.namedInputs) {
+            for (const [name, inputs] of Object.entries(json.namedInputs)) {
+                json.namedInputs[name] =
+                    name === 'production'
+                        ? ensureInputPresent(inputs, `!{projectRoot}/eslint.config.${format}`, format)
+                        : rewriteLegacyInputs(inputs, format);
             }
-            if (json.namedInputs?.production) {
-                const inputSet = new Set(json.namedInputs.production);
-                inputSet.add(`!{projectRoot}/eslint.config.${format}`);
-                json.namedInputs.production = Array.from(inputSet);
+        }
+        return json;
+    });
+}
+// Walks every project's `targets.*.inputs` and `namedInputs.*`, rewriting stale references.
+function updateProjectConfigsInputs(tree, format) {
+    for (const [project, projectConfig] of (0, devkit_1.getProjects)(tree)) {
+        let changed = false;
+        if (projectConfig.targets) {
+            for (const target of Object.values(projectConfig.targets)) {
+                if (!target.inputs)
+                    continue;
+                const rewritten = rewriteLegacyInputs(target.inputs, format);
+                if (!inputsEqual(target.inputs, rewritten)) {
+                    target.inputs = rewritten;
+                    changed = true;
+                }
             }
-            return json;
-        });
+        }
+        if (projectConfig.namedInputs) {
+            for (const [name, inputs] of Object.entries(projectConfig.namedInputs)) {
+                const rewritten = rewriteLegacyInputs(inputs, format);
+                if (!inputsEqual(inputs, rewritten)) {
+                    projectConfig.namedInputs[name] = rewritten;
+                    changed = true;
+                }
+            }
+        }
+        if (changed) {
+            (0, devkit_1.updateProjectConfiguration)(tree, project, projectConfig);
+        }
     }
 }
+function inputsEqual(a, b) {
+    return a.length === b.length && a.every((entry, i) => entry === b[i]);
+}
 function convertConfigToFlatConfig(tree, root, source, target, format, ignorePath) {
     const ignorePaths = ignorePath
         ? [ignorePath, `${root}/.eslintignore`]
         : [`${root}/.eslintignore`];
-    if (source.endsWith('.json')) {
+    // `.eslintrc` (no extension) is JSON by convention.
+    if (source.endsWith('.json') || (0, path_1.basename)(source) === '.eslintrc') {
         const config = (0, devkit_1.readJson)(tree, `${root}/${source}`);
         const conversionResult = (0, json_converter_1.convertEslintJsonToFlatConfig)(tree, root, config, ignorePaths, format);
         return processConvertedConfig(tree, root, source, target, conversionResult);

package/src/generators/convert-to-flat-config/schema.json

@@ -10,6 +10,13 @@
       "description": "Skip formatting files.",
       "default": false,
       "x-priority": "internal"
+    },
+    "eslintConfigFormat": {
+      "type": "string",
+      "description": "The format of the generated ESLint flat config files.",
+      "enum": ["mjs", "cjs"],
+      "default": "mjs",
+      "x-priority": "internal"
     }
   },
   "additionalProperties": false,

package/src/generators/convert-to-inferred/convert-to-inferred.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"convert-to-inferred.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/convert-to-inferred/convert-to-inferred.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAYpB,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,iBA4BlE;AAyJD,eAAe,iBAAiB,CAAC"}
+{"version":3,"file":"convert-to-inferred.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/convert-to-inferred/convert-to-inferred.ts"],"names":[],"mappings":"AAKA,OAAO,EAKL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AAOpB,UAAU,MAAM;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,iBA4BlE;AAyJD,eAAe,iBAAiB,CAAC"}

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

@@ -1,9 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.convertToInferred = convertToInferred;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const executor_to_plugin_migrator_1 = require("@nx/devkit/src/generators/plugin-migrations/executor-to-plugin-migrator");
-const plugin_migration_utils_1 = require("@nx/devkit/src/generators/plugin-migrations/plugin-migration-utils");
 const posix_1 = require("node:path/posix");
 const utils_1 = require("nx/src/tasks-runner/utils");
 const plugin_1 = require("../../plugins/plugin");
@@ -11,7 +10,7 @@ const config_file_1 = require("../../utils/config-file");
 const target_options_map_1 = require("./lib/target-options-map");
 async function convertToInferred(tree, options) {
     const projectGraph = await (0, devkit_1.createProjectGraphAsync)();
-    const migratedProjects = await (0, executor_to_plugin_migrator_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.createNodesV2, { targetName: 'lint' }, [
         {
             executors: ['@nx/eslint:lint', '@nrwl/linter:eslint'],
             postTargetTransformer,
@@ -20,7 +19,7 @@ async function convertToInferred(tree, options) {
         },
     ], options.project);
     if (migratedProjects.size === 0) {
-        throw new executor_to_plugin_migrator_1.NoTargetsToMigrateError();
+        throw new internal_1.NoTargetsToMigrateError();
     }
     if (!options.skipFormat) {
         await (0, devkit_1.formatFiles)(tree);
@@ -75,7 +74,7 @@ function postTargetTransformer(target, tree, projectDetails, inferredTargetConfi
         }
     }
     if (target.outputs) {
-        (0, plugin_migration_utils_1.processTargetOutputs)(target, [], inferredTargetConfiguration, {
+        (0, internal_1.processTargetOutputs)(target, [], inferredTargetConfiguration, {
             projectName: projectDetails.projectName,
             projectRoot: projectDetails.root,
         });

package/src/generators/init/init.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/init/init.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAIjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAWpB,MAAM,WAAW,iBAAiB;IAChC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB,kBAAkB,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;CACpC;AA+CD,wBAAsB,UAAU,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,iBAAiB,CAAC,CAwF5B;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,iBAAiB,8BAG3B"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/init/init.ts"],"names":[],"mappings":"AACA,OAAO,EAGL,iBAAiB,EAIjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAUpB,MAAM,WAAW,iBAAiB;IAChC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;IAEpB,kBAAkB,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;CACpC;AA+CD,wBAAsB,UAAU,CAC9B,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,iBAAiB,CAAC,CAwF5B;AAED,wBAAsB,iBAAiB,CACrC,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,iBAAiB,8BAG3B"}

package/src/generators/init/init.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.initEsLint = initEsLint;
 exports.lintInitGenerator = lintInitGenerator;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const add_plugin_1 = require("@nx/devkit/src/utils/add-plugin");
 const versions_1 = require("../../utils/versions");
 const eslint_file_1 = require("../utils/eslint-file");
 const plugin_1 = require("../../plugins/plugin");
@@ -75,7 +75,7 @@ async function initEsLint(tree, options) {
         '_eslint-lint',
     ];
     if (rootEslintFile && options.addPlugin && !hasPlugin) {
-        await (0, add_plugin_1.addPlugin)(tree, graph, '@nx/eslint/plugin', plugin_1.createNodesV2, {
+        await (0, internal_1.addPlugin)(tree, graph, '@nx/eslint/plugin', plugin_1.createNodesV2, {
             targetName: lintTargetNames,
         }, options.updatePackageScripts);
         return () => { };
@@ -86,7 +86,7 @@ async function initEsLint(tree, options) {
     updateProductionFileset(tree, options.eslintConfigFormat);
     updateVsCodeRecommendedExtensions(tree);
     if (options.addPlugin) {
-        await (0, add_plugin_1.addPlugin)(tree, graph, '@nx/eslint/plugin', plugin_1.createNodesV2, {
+        await (0, internal_1.addPlugin)(tree, graph, '@nx/eslint/plugin', plugin_1.createNodesV2, {
             targetName: lintTargetNames,
         }, options.updatePackageScripts);
     }

package/src/generators/lint-project/lint-project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lint-project.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/lint-project/lint-project.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAQjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AA0BnE,UAAU,kBAAkB;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;IACjC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,UAAU,EAAE,OAAO,CAAC;IACpB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,kBAAkB,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IAEnC;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,8BAA8B,CAAC,EAAE,OAAO,CAAC;CAC1C;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,kBAAkB,8BAE3E;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,kBAAkB,8BA4I5B"}
+{"version":3,"file":"lint-project.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/lint-project/lint-project.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAQjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AA2BnE,UAAU,kBAAkB;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;IACjC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,UAAU,EAAE,OAAO,CAAC;IACpB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,kBAAkB,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IAEnC;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,8BAA8B,CAAC,EAAE,OAAO,CAAC;CAC1C;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,kBAAkB,8BAE3E;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,kBAAkB,8BA6I5B"}

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

@@ -6,6 +6,7 @@ const devkit_1 = require("@nx/devkit");
 const eslint_file_1 = require("../utils/eslint-file");
 const path_1 = require("path");
 const init_1 = require("../init/init");
+const deprecation_1 = require("../../utils/deprecation");
 const init_migration_1 = require("../init/init-migration");
 const project_configuration_1 = require("nx/src/generators/utils/project-configuration");
 const flat_config_1 = require("../../utils/flat-config");
@@ -63,6 +64,7 @@ async function lintProjectGeneratorInternal(tree, options) {
         }
     }
     else {
+        (0, deprecation_1.warnEslintExecutorGenerating)();
         projectConfig.targets ??= {};
         projectConfig.targets['lint'] = {
             executor: '@nx/eslint:lint',

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

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

package/src/generators/utils/flat-config/ast-utils.d.ts

@@ -73,7 +73,7 @@ export declare function overrideNeedsCompat(override: Partial<Linter.ConfigOverr
  */
 export declare function generateFlatOverride(_override: Partial<Linter.ConfigOverride<Linter.RulesRecord>> & {
     ignores?: Linter.FlatConfig['ignores'];
-}, format: 'mjs' | 'cjs'): ts.ObjectLiteralExpression | ts.SpreadElement;
+}, format: 'mjs' | 'cjs', importsMap?: Map<string, string>): ts.ObjectLiteralExpression | ts.SpreadElement;
 export declare function generateFlatPredefinedConfig(predefinedConfigName: string, moduleName?: string, spread?: boolean): ts.ObjectLiteralExpression | ts.SpreadElement | ts.ElementAccessExpression;
 export declare function mapFilePaths<T extends Partial<Linter.ConfigOverride<Linter.RulesRecord>>>(_override: T): T;
 /**

package/src/generators/utils/flat-config/ast-utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ast-utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/eslint/src/generators/utils/flat-config/ast-utils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ast-utils.d.ts","sourceRoot":"","sources":["../../../../../../../packages/eslint/src/generators/utils/flat-config/ast-utils.ts"],"names":[],"mappings":"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"}

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

@@ -1101,7 +1101,7 @@ function overrideNeedsCompat(override) {
  * Generates an AST object or spread element representing a modern flat config entry,
  * based on a given legacy eslintrc JSON override object
  */
-function generateFlatOverride(_override, format) {
+function generateFlatOverride(_override, format, importsMap) {
     const override = mapFilePaths(_override);
     // We do not need the compat tooling for this override
     if (!overrideNeedsCompat(override)) {
@@ -1159,7 +1159,7 @@ function generateFlatOverride(_override, format) {
                 else {
                     // Change parser to import statement.
                     return format === 'mjs'
-                        ? generateESMParserImport(override)
+                        ? generateESMParserImport(override, importsMap)
                         : generateCJSParserImport(override);
                 }
             },
@@ -1215,12 +1215,19 @@ function generateFlatOverride(_override, format) {
         ], undefined, ts.factory.createToken(ts.SyntaxKind.EqualsGreaterThanToken), ts.factory.createParenthesizedExpression(ts.factory.createObjectLiteralExpression(objectLiteralElements, true))),
     ]));
 }
-function generateESMParserImport(override) {
-    return ts.factory.createPropertyAssignment('parser', ts.factory.createAwaitExpression(ts.factory.createCallExpression(ts.factory.createIdentifier('import'), undefined, [
-        ts.factory.createStringLiteral(override['languageOptions']?.['parserOptions']?.parser ??
-            override['languageOptions']?.parser ??
-            override.parser),
-    ])));
+function generateESMParserImport(override, importsMap) {
+    const parser = override['languageOptions']?.['parserOptions']?.parser ??
+        override['languageOptions']?.parser ??
+        override.parser;
+    // Dynamic `await import()` doesn't expose top-level CJS exports (e.g. `parseForESLint`)
+    // because those are nested under `.default`. Use a hoisted static import instead so the
+    // resolved binding matches the parser's module.exports shape.
+    if (importsMap) {
+        const parserName = importsMap.get(parser) ?? (0, devkit_1.names)(parser).propertyName;
+        importsMap.set(parser, parserName);
+        return ts.factory.createPropertyAssignment('parser', ts.factory.createIdentifier(parserName));
+    }
+    return ts.factory.createPropertyAssignment('parser', ts.factory.createAwaitExpression(ts.factory.createCallExpression(ts.factory.createIdentifier('import'), undefined, [ts.factory.createStringLiteral(parser)])));
 }
 function generateCJSParserImport(override) {
     return ts.factory.createPropertyAssignment('parser', ts.factory.createCallExpression(ts.factory.createIdentifier('require'), undefined, [
@@ -1237,17 +1244,13 @@ function mapFilePaths(_override) {
     const override = {
         ..._override,
     };
+    // Dedupe after mapping — both source-side duplicates and glob-mapping collisions collapse.
+    const normalize = (value) => Array.from(new Set((Array.isArray(value) ? value : [value]).map(path_utils_1.mapFilePath)));
     if (override.files) {
-        override.files = Array.isArray(override.files)
-            ? override.files
-            : [override.files];
-        override.files = override.files.map((file) => (0, path_utils_1.mapFilePath)(file));
+        override.files = normalize(override.files);
     }
     if (override.excludedFiles) {
-        override.excludedFiles = Array.isArray(override.excludedFiles)
-            ? override.excludedFiles
-            : [override.excludedFiles];
-        override.excludedFiles = override.excludedFiles.map((file) => (0, path_utils_1.mapFilePath)(file));
+        override.excludedFiles = normalize(override.excludedFiles);
     }
     return override;
 }

package/src/generators/workspace-rule/workspace-rule.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-rule.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/workspace-rule/workspace-rule.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,iBAAiB,EAKjB,IAAI,EACL,MAAM,YAAY,CAAC;AASpB,MAAM,WAAW,iCAAiC;IAChD,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,iCAAiC,8BAiH3C"}
+{"version":3,"file":"workspace-rule.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/workspace-rule/workspace-rule.ts"],"names":[],"mappings":"AACA,OAAO,EAML,iBAAiB,EAKjB,IAAI,EACL,MAAM,YAAY,CAAC;AAQpB,MAAM,WAAW,iCAAiC;IAChD,IAAI,EAAE,MAAM,CAAC;IACb,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,wBAAsB,0BAA0B,CAC9C,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,iCAAiC,8BAiH3C"}

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

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.lintWorkspaceRuleGenerator = lintWorkspaceRuleGenerator;
 const tslib_1 = require("tslib");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const string_utils_1 = require("@nx/devkit/src/utils/string-utils");
 const path_1 = require("path");
 const ts = tslib_1.__importStar(require("typescript"));
 const workspace_lint_rules_1 = require("../../utils/workspace-lint-rules");
@@ -30,7 +30,7 @@ async function lintWorkspaceRuleGenerator(tree, options) {
         name: options.name,
         flatConfig,
     });
-    const nameCamelCase = (0, string_utils_1.camelize)(options.name);
+    const nameCamelCase = (0, internal_1.camelize)(options.name);
     /**
      * Import the new rule into the workspace plugin index.ts and
      * register it ready for use in lint configs.

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

@@ -1 +1 @@
-{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/eslint/src/plugins/plugin.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,aAAa,EAMd,MAAM,YAAY,CAAC;AAwBpB,MAAM,WAAW,mBAAmB;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAuHD,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,mBAAmB,CAoF1D,CAAC;AAEF,eAAO,MAAM,aAAa,oCAAc,CAAC"}
+{"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../../packages/eslint/src/plugins/plugin.ts"],"names":[],"mappings":"AAIA,OAAO,EAIL,aAAa,EAId,MAAM,YAAY,CAAC;AAuBpB,MAAM,WAAW,mBAAmB;IAClC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AA2GD,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,mBAAmB,CAoF1D,CAAC;AAEF,eAAO,MAAM,aAAa,oCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodesV2 = exports.createNodes = void 0;
+const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
-const calculate_hash_for_create_nodes_1 = require("@nx/devkit/src/utils/calculate-hash-for-create-nodes");
 const js_1 = require("@nx/js");
-const internal_1 = require("@nx/js/src/internal");
+const internal_2 = require("@nx/js/src/internal");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const posix_1 = require("node:path/posix");
@@ -32,14 +32,6 @@ const ESLINT_CONFIG_GLOB_V2 = (0, globs_1.combineGlobPatterns)([
     ...config_file_1.ESLINT_CONFIG_FILENAMES.map((f) => `**/${f}`),
     ...PROJECT_CONFIG_FILENAMES.map((f) => `**/${f}`),
 ]);
-function readTargetsCache(cachePath) {
-    return process.env.NX_CACHE_PROJECT_GRAPH !== 'false' && (0, node_fs_1.existsSync)(cachePath)
-        ? (0, devkit_1.readJsonFile)(cachePath)
-        : {};
-}
-function writeTargetsToCache(cachePath, results) {
-    (0, devkit_1.writeJsonFile)(cachePath, results);
-}
 const internalCreateNodesV2 = async (ESLint, configFilePath, options, context, projectRootsByEslintRoots, lintableFilesPerProjectRoot, tsconfigChainsByProjectRoot, projectsCache, hashByRoot, pmc) => {
     const configDir = (0, posix_1.dirname)(configFilePath);
     const eslintVersion = ESLint.version;
@@ -56,9 +48,10 @@ const internalCreateNodesV2 = async (ESLint, configFilePath, options, context, p
     const projects = {};
     await Promise.all(projectRootsByEslintRoots.get(configDir).map(async (projectRoot) => {
         const hash = hashByRoot.get(projectRoot);
-        if (projectsCache[hash]) {
+        const cached = projectsCache.get(hash);
+        if (cached) {
             // We can reuse the projects in the cache.
-            Object.assign(projects, projectsCache[hash]);
+            Object.assign(projects, cached);
             return;
         }
         let hasNonIgnoredLintableFiles = false;
@@ -76,18 +69,18 @@ const internalCreateNodesV2 = async (ESLint, configFilePath, options, context, p
         }
         if (!hasNonIgnoredLintableFiles) {
             // No lintable files in the project, store in the cache and skip further processing
-            projectsCache[hash] = {};
+            projectsCache.set(hash, {});
             return;
         }
         const project = getProjectUsingESLintConfig(configFilePath, projectRoot, eslintVersion, options, context, pmc, tsconfigChainsByProjectRoot.get(projectRoot) ?? []);
         if (project) {
             projects[projectRoot] = project;
             // Store project into the cache
-            projectsCache[hash] = { [projectRoot]: project };
+            projectsCache.set(hash, { [projectRoot]: project });
         }
         else {
             // No project found, store in the cache
-            projectsCache[hash] = {};
+            projectsCache.set(hash, {});
         }
     }));
     return {
@@ -101,12 +94,12 @@ exports.createNodes = [
         const pmc = (0, devkit_1.getPackageManagerCommand)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
         const optionsHash = (0, file_hasher_1.hashObject)(options);
         const cachePath = (0, posix_1.join)(cache_directory_1.workspaceDataDirectory, `eslint-${optionsHash}.hash`);
-        const targetsCache = readTargetsCache(cachePath);
+        const targetsCache = new internal_1.PluginCache(cachePath);
         const { eslintConfigFiles, projectRoots, projectRootsByEslintRoots } = splitConfigFiles(configFiles);
         const lintableFilesPerProjectRoot = await collectLintableFilesByProjectRoot(projectRoots, options, context);
         const tsconfigChainsByProjectRoot = collectTsconfigChainsByProjectRoot(projectRoots, context.workspaceRoot);
         const lockFilePattern = (0, js_1.getLockFileName)((0, devkit_1.detectPackageManager)(context.workspaceRoot));
-        const hashes = await (0, calculate_hash_for_create_nodes_1.calculateHashesForCreateNodes)(projectRoots, options, context, projectRoots.map((root) => {
+        const hashes = await (0, internal_1.calculateHashesForCreateNodes)(projectRoots, options, context, projectRoots.map((root) => {
             const parentConfigs = eslintConfigFiles.filter((eslintConfig) => isSubDir(root, (0, posix_1.dirname)(eslintConfig)));
             return [
                 ...parentConfigs,
@@ -132,7 +125,7 @@ exports.createNodes = [
             return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => internalCreateNodesV2(ESLint, configFile, options, context, projectRootsByEslintRoots, lintableFilesPerProjectRoot, tsconfigChainsByProjectRoot, targetsCache, hashByRoot, pmc), eslintConfigFiles, options, context);
         }
         finally {
-            writeTargetsToCache(cachePath, targetsCache);
+            targetsCache.writeToDisk();
         }
     },
 ];
@@ -197,7 +190,7 @@ function collectTsconfigChainsByProjectRoot(projectRoots, workspaceRoot) {
             continue;
         const outside = [];
         const projectPrefix = `${projectRoot}/`;
-        (0, internal_1.walkTsconfigExtendsChain)((0, posix_1.join)(workspaceRoot, tsconfigPath), (absolutePath) => {
+        (0, internal_2.walkTsconfigExtendsChain)((0, posix_1.join)(workspaceRoot, tsconfigPath), (absolutePath) => {
             const wsRelative = (0, node_path_1.relative)(workspaceRoot, absolutePath)
                 .split(node_path_1.sep)
                 .join('/');

package/src/utils/deprecation.d.ts

@@ -0,0 +1,4 @@
+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;
+//# sourceMappingURL=deprecation.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"deprecation.d.ts","sourceRoot":"","sources":["../../../../../packages/eslint/src/utils/deprecation.ts"],"names":[],"mappings":"AAIA,eAAO,MAAM,mCAAmC,iQACgN,CAAC;AAEjQ,wBAAgB,6BAA6B,IAAI,IAAI,CAEpD;AAED,wBAAgB,4BAA4B,IAAI,IAAI,CAInD"}

package/src/utils/deprecation.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ESLINT_EXECUTOR_DEPRECATION_MESSAGE = void 0;
+exports.warnEslintExecutorDeprecation = warnEslintExecutorDeprecation;
+exports.warnEslintExecutorGenerating = warnEslintExecutorGenerating;
+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.
+exports.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.';
+function warnEslintExecutorDeprecation() {
+    devkit_1.logger.warn(exports.ESLINT_EXECUTOR_DEPRECATION_MESSAGE);
+}
+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.');
+}

package/src/utils/version-utils.js

@@ -4,9 +4,9 @@ exports.getInstalledPackageVersion = getInstalledPackageVersion;
 exports.getInstalledEslintVersion = getInstalledEslintVersion;
 exports.getTypeScriptEslintVersionToInstall = getTypeScriptEslintVersionToInstall;
 const devkit_1 = require("@nx/devkit");
-const semver_1 = require("@nx/devkit/src/utils/semver");
+const internal_1 = require("@nx/devkit/internal");
 const devkit_internals_1 = require("nx/src/devkit-internals");
-const semver_2 = require("semver");
+const semver_1 = require("semver");
 const versions_1 = require("./versions");
 function getInstalledPackageVersion(pkgName, tree) {
     try {
@@ -31,8 +31,8 @@ function getInstalledPackageVersion(pkgName, tree) {
     try {
         // try to parse and return the version
         return tree
-            ? (0, semver_1.checkAndCleanWithSemver)(tree, pkgName, pkgVersionInRootPackageJson)
-            : (0, semver_1.checkAndCleanWithSemver)(pkgName, pkgVersionInRootPackageJson);
+            ? (0, internal_1.checkAndCleanWithSemver)(tree, pkgName, pkgVersionInRootPackageJson)
+            : (0, internal_1.checkAndCleanWithSemver)(pkgName, pkgVersionInRootPackageJson);
     }
     catch { }
     // we could not resolve the version
@@ -43,7 +43,7 @@ function getInstalledEslintVersion(tree) {
 }
 function getTypeScriptEslintVersionToInstall(tree) {
     const eslintVersion = getInstalledEslintVersion(tree);
-    return eslintVersion && (0, semver_2.lt)(eslintVersion, '9.0.0')
+    return eslintVersion && (0, semver_1.lt)(eslintVersion, '9.0.0')
         ? versions_1.typescriptESLintVersion
         : versions_1.eslint9__typescriptESLintVersion;
 }