@nx/eslint 23.0.0-beta.12 → 23.0.0-beta.14

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "23.0.0-beta.12",
+  "version": "23.0.0-beta.14",
   "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.12",
+    "@nx/jest": "23.0.0-beta.14",
     "@zkochan/js-yaml": "0.0.7",
     "eslint": "^8.0.0 || ^9.0.0 || ^10.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.12",
-    "@nx/js": "23.0.0-beta.12",
+    "@nx/devkit": "23.0.0-beta.14",
+    "@nx/js": "23.0.0-beta.14",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "typescript": "~5.9.2"
   },
   "devDependencies": {
-    "nx": "23.0.0-beta.12"
+    "nx": "23.0.0-beta.14"
   },
   "peerDependenciesMeta": {
     "@nx/jest": {

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;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"}
+{"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/convert-to-flat-config/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,iBAAiB,EAUjB,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

@@ -49,6 +49,18 @@ function isEslintTarget(target) {
     return (target.executor === ESLINT_LINT_EXECUTOR ||
         target.command?.includes('eslint'));
 }
+function hasMatchingEslintTargetDefault(projectConfig, targetDefaults) {
+    if (!projectConfig.targets || !targetDefaults) {
+        return false;
+    }
+    if (Array.isArray(targetDefaults)) {
+        return targetDefaults.some((entry) => entry.target !== undefined &&
+            projectConfig.targets[entry.target] !== undefined &&
+            (entry.target === ESLINT_LINT_EXECUTOR || isEslintTarget(entry)));
+    }
+    return Object.entries(targetDefaults).some(([targetName, targetConfig]) => projectConfig.targets[targetName] !== undefined &&
+        (targetName === ESLINT_LINT_EXECUTOR || isEslintTarget(targetConfig)));
+}
 function convertProjectToFlatConfig(tree, project, projectConfig, nxJson, eslintIgnoreFiles, format) {
     const eslintFile = (0, eslint_file_1.findEslintFile)(tree, projectConfig.root);
     if (!eslintFile || eslintFile.endsWith('.js')) {
@@ -71,10 +83,7 @@ function convertProjectToFlatConfig(tree, project, projectConfig, nxJson, eslint
     if (eslintTargets.length > 0) {
         (0, devkit_1.updateProjectConfiguration)(tree, project, projectConfig);
     }
-    const hasEslintTargetDefaults = projectConfig.targets &&
-        Object.keys(nxJson.targetDefaults || {}).some((t) => (t === ESLINT_LINT_EXECUTOR ||
-            isEslintTarget(nxJson.targetDefaults[t])) &&
-            projectConfig.targets[t]);
+    const hasEslintTargetDefaults = hasMatchingEslintTargetDefault(projectConfig, nxJson.targetDefaults);
     if (eslintTargets.length === 0 &&
         !hasEslintTargetDefaults &&
         !(0, plugin_1.hasEslintPlugin)(tree)) {
@@ -124,20 +133,32 @@ function ensureInputPresent(inputs, value, format) {
 }
 // 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).
+// (and `production` excludes it). Handles both the legacy record shape and the new array shape
+// of `targetDefaults`.
 function updateNxJsonConfig(tree, format) {
     if (!tree.exists('nx.json')) {
         return;
     }
     (0, devkit_1.updateJson)(tree, 'nx.json', (json) => {
+        const rewriteTargetInputs = (target, isLintTarget) => {
+            if (!target.inputs)
+                return;
+            target.inputs = isLintTarget
+                ? ensureInputPresent(target.inputs, `{workspaceRoot}/eslint.config.${format}`, format)
+                : rewriteLegacyInputs(target.inputs, format);
+        };
         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 (Array.isArray(json.targetDefaults)) {
+                for (const entry of json.targetDefaults) {
+                    const isLintTarget = entry.target === 'lint' || entry.target === ESLINT_LINT_EXECUTOR;
+                    rewriteTargetInputs(entry, isLintTarget);
+                }
+            }
+            else {
+                for (const [name, target] of Object.entries(json.targetDefaults)) {
+                    const isLintTarget = name === 'lint' || name === ESLINT_LINT_EXECUTOR;
+                    rewriteTargetInputs(target, isLintTarget);
+                }
             }
         }
         if (json.namedInputs) {

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":"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"}
+{"version":3,"file":"init.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/init/init.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,iBAAiB,EAKjB,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;AA0DD,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

@@ -21,19 +21,32 @@ function updateProductionFileset(tree, format = 'mjs') {
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
 function addTargetDefaults(tree, format) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    nxJson.targetDefaults ??= {};
-    nxJson.targetDefaults['@nx/eslint:lint'] ??= {};
-    nxJson.targetDefaults['@nx/eslint:lint'].cache ??= true;
-    nxJson.targetDefaults['@nx/eslint:lint'].inputs ??= [
-        'default',
-        '^default',
-        `{workspaceRoot}/.eslintrc.json`,
-        `{workspaceRoot}/.eslintignore`,
-        `{workspaceRoot}/eslint.config.${format}`,
-        '{workspaceRoot}/tools/eslint-rules/**/*',
-    ];
-    (0, devkit_1.updateNxJson)(tree, nxJson);
+    const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
+    // `@nx/eslint:lint` is an executor identifier — match defaults keyed on
+    // the executor, not on a target named that string.
+    const existing = (0, internal_1.findTargetDefault)(nxJson.targetDefaults, {
+        executor: '@nx/eslint:lint',
+    });
+    const patch = {};
+    if (existing?.cache === undefined)
+        patch.cache = true;
+    if (existing?.inputs === undefined) {
+        patch.inputs = [
+            'default',
+            '^default',
+            `{workspaceRoot}/.eslintrc.json`,
+            `{workspaceRoot}/.eslintignore`,
+            `{workspaceRoot}/eslint.config.${format}`,
+            '{workspaceRoot}/tools/eslint-rules/**/*',
+        ];
+    }
+    if (Object.keys(patch).length > 0) {
+        (0, internal_1.upsertTargetDefault)(tree, nxJson, {
+            executor: '@nx/eslint:lint',
+            ...patch,
+        });
+        (0, devkit_1.updateNxJson)(tree, nxJson);
+    }
 }
 function updateVsCodeRecommendedExtensions(host) {
     if (!host.exists('.vscode/extensions.json')) {

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

@@ -15,7 +15,7 @@ const config_file_1 = require("../../utils/config-file");
 const plugin_1 = require("../utils/plugin");
 const versions_1 = require("../../utils/versions");
 const setup_root_eslint_1 = require("./setup-root-eslint");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 function lintProjectGenerator(tree, options) {
     return lintProjectGeneratorInternal(tree, { addPlugin: false, ...options });
 }
@@ -237,7 +237,7 @@ function isJsAnalyzeSourceFilesEnabled(tree) {
         nxJson.extends !== 'nx/presets/npm.json');
 }
 function isBuildableLibraryProject(tree, projectConfig) {
-    return ((0, ts_solution_setup_1.getProjectType)(tree, projectConfig.root, projectConfig.projectType) ===
+    return ((0, internal_1.getProjectType)(tree, projectConfig.root, projectConfig.projectType) ===
         'library' &&
         projectConfig.targets?.build &&
         !!projectConfig.targets.build);

package/src/generators/workspace-rules-project/workspace-rules-project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"workspace-rules-project.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/workspace-rules-project/workspace-rules-project.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,iBAAiB,EAKjB,IAAI,EAGL,MAAM,YAAY,CAAC;AASpB,eAAO,MAAM,4BAA4B,iBAAiB,CAAC;AAE3D,eAAO,MAAM,oBAAoB,uBAAuB,CAAC;AAEzD,MAAM,WAAW,yCAAyC;IACxD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,wBAAsB,kCAAkC,CACtD,IAAI,EAAE,IAAI,EACV,OAAO,GAAE,yCAA8C,8BAsGxD"}
+{"version":3,"file":"workspace-rules-project.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/workspace-rules-project/workspace-rules-project.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,iBAAiB,EAOjB,IAAI,EAGL,MAAM,YAAY,CAAC;AAWpB,eAAO,MAAM,4BAA4B,iBAAiB,CAAC;AAE3D,eAAO,MAAM,oBAAoB,uBAAuB,CAAC;AAEzD,MAAM,WAAW,yCAAyC;IACxD,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,wBAAsB,kCAAkC,CACtD,IAAI,EAAE,IAAI,EACV,OAAO,GAAE,yCAA8C,8BAqGxD"}

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

@@ -4,8 +4,7 @@ exports.WORKSPACE_PLUGIN_DIR = exports.WORKSPACE_RULES_PROJECT_NAME = void 0;
 exports.lintWorkspaceRulesProjectGenerator = lintWorkspaceRulesProjectGenerator;
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const add_swc_dependencies_1 = require("@nx/js/src/utils/swc/add-swc-dependencies");
-const ts_solution_setup_1 = require("@nx/js/src/utils/typescript/ts-solution-setup");
+const internal_1 = require("@nx/js/internal");
 const path_1 = require("path");
 const versions_1 = require("../../utils/versions");
 const version_utils_1 = require("../../utils/version-utils");
@@ -38,8 +37,9 @@ async function lintWorkspaceRulesProjectGenerator(tree, options = {}) {
      * TODO: Explore writing a ProjectGraph plugin to make this more surgical.
      */
     const nxJson = (0, devkit_1.readNxJson)(tree);
-    if (nxJson.targetDefaults?.lint?.inputs) {
-        nxJson.targetDefaults.lint.inputs.push(`{workspaceRoot}/${exports.WORKSPACE_PLUGIN_DIR}/**/*`);
+    const lintEntry = findLintTargetDefault(nxJson.targetDefaults);
+    if (lintEntry?.inputs) {
+        lintEntry.inputs.push(`{workspaceRoot}/${exports.WORKSPACE_PLUGIN_DIR}/**/*`);
         (0, devkit_1.updateNxJson)(tree, nxJson);
     }
     // Add jest to the project and return installation task
@@ -49,7 +49,7 @@ async function lintWorkspaceRulesProjectGenerator(tree, options = {}) {
         supportTsx: false,
         skipSerializers: true,
         setupFile: 'none',
-        compiler: (0, ts_solution_setup_1.isUsingTsSolutionSetup)(tree) ? 'swc' : 'tsc',
+        compiler: (0, internal_1.isUsingTsSolutionSetup)(tree) ? 'swc' : 'tsc',
         skipFormat: true,
         testEnvironment: 'node',
     }));
@@ -75,7 +75,7 @@ async function lintWorkspaceRulesProjectGenerator(tree, options = {}) {
         return json;
     });
     // Add swc dependencies
-    tasks.push((0, add_swc_dependencies_1.addSwcRegisterDependencies)(tree));
+    tasks.push((0, internal_1.addSwcRegisterDependencies)(tree));
     const typescriptEslintVersion = (0, version_utils_1.getTypeScriptEslintVersionToInstall)(tree);
     tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, {
         '@typescript-eslint/utils': typescriptEslintVersion,
@@ -85,3 +85,13 @@ async function lintWorkspaceRulesProjectGenerator(tree, options = {}) {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
+function findLintTargetDefault(td) {
+    if (!td)
+        return undefined;
+    if (Array.isArray(td)) {
+        return td.find((e) => e.target === 'lint' &&
+            e.projects === undefined &&
+            e.plugin === undefined);
+    }
+    return td['lint'];
+}

package/src/migrations/update-21-6-0/update-executor-lint-inputs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"update-executor-lint-inputs.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/migrations/update-21-6-0/update-executor-lint-inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAyC,MAAM,YAAY,CAAC;AAE9E,yBAA+B,IAAI,EAAE,IAAI,iBA0BxC"}
+{"version":3,"file":"update-executor-lint-inputs.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/migrations/update-21-6-0/update-executor-lint-inputs.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAyC,MAAM,YAAY,CAAC;AAM9E,yBAA+B,IAAI,EAAE,IAAI,iBAmCxC"}

package/src/migrations/update-21-6-0/update-executor-lint-inputs.js

@@ -2,13 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.default = default_1;
 const devkit_1 = require("@nx/devkit");
+const internal_1 = require("@nx/devkit/internal");
 async function default_1(tree) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
+    const nxJson = (0, devkit_1.readNxJson)(tree) ?? {};
     const executor = '@nx/eslint:lint';
-    if (!nxJson.targetDefaults?.[executor]?.inputs) {
+    const existing = (0, internal_1.normalizeTargetDefaults)(nxJson.targetDefaults).find((e) => e.executor === executor &&
+        e.target === undefined &&
+        e.projects === undefined &&
+        e.plugin === undefined);
+    if (!existing?.inputs) {
         return;
     }
-    const inputs = nxJson.targetDefaults[executor].inputs;
+    const inputs = [...existing.inputs];
     if (!inputs.includes('^default')) {
         // Add after 'default' if present, otherwise at the beginning
         const defaultIndex = inputs.indexOf('default');
@@ -22,6 +27,7 @@ async function default_1(tree) {
     if (!inputs.includes('{workspaceRoot}/tools/eslint-rules/**/*')) {
         inputs.push('{workspaceRoot}/tools/eslint-rules/**/*');
     }
+    (0, internal_1.upsertTargetDefault)(tree, nxJson, { executor, inputs });
     (0, devkit_1.updateNxJson)(tree, nxJson);
     await (0, devkit_1.formatFiles)(tree);
 }

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":"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"}
+{"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;AAuHD,eAAO,MAAM,WAAW,EAAE,aAAa,CAAC,mBAAmB,CAoF1D,CAAC;AAEF,eAAO,MAAM,aAAa,oCAAc,CAAC"}

package/src/plugins/plugin.js

@@ -4,7 +4,7 @@ exports.createNodesV2 = exports.createNodes = void 0;
 const internal_1 = require("@nx/devkit/internal");
 const devkit_1 = require("@nx/devkit");
 const js_1 = require("@nx/js");
-const internal_2 = require("@nx/js/src/internal");
+const internal_2 = require("@nx/js/internal");
 const node_fs_1 = require("node:fs");
 const node_path_1 = require("node:path");
 const posix_1 = require("node:path/posix");
@@ -45,14 +45,17 @@ const internalCreateNodesV2 = async (ESLint, configFilePath, options, context, p
         });
         return sharedEslint;
     };
-    const projects = {};
-    await Promise.all(projectRootsByEslintRoots.get(configDir).map(async (projectRoot) => {
+    // Collect each project root's contribution in parallel, but write
+    // them into `projects` afterwards in input order so insertion order
+    // (and therefore downstream merge order) is deterministic. Mutating
+    // `projects` from inside `Promise.all` would order keys by which
+    // async branch resolves first.
+    const orderedProjectRoots = projectRootsByEslintRoots.get(configDir) ?? [];
+    const contributions = await Promise.all(orderedProjectRoots.map(async (projectRoot) => {
         const hash = hashByRoot.get(projectRoot);
         const cached = projectsCache.get(hash);
         if (cached) {
-            // We can reuse the projects in the cache.
-            Object.assign(projects, cached);
-            return;
+            return cached;
         }
         let hasNonIgnoredLintableFiles = false;
         if (configDir !== projectRoot || projectRoot === '.') {
@@ -70,19 +73,25 @@ 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.set(hash, {});
-            return;
+            return null;
         }
         const project = getProjectUsingESLintConfig(configFilePath, projectRoot, eslintVersion, options, context, pmc, tsconfigChainsByProjectRoot.get(projectRoot) ?? []);
         if (project) {
-            projects[projectRoot] = project;
+            const entry = { [projectRoot]: project };
             // Store project into the cache
-            projectsCache.set(hash, { [projectRoot]: project });
-        }
-        else {
-            // No project found, store in the cache
-            projectsCache.set(hash, {});
+            projectsCache.set(hash, entry);
+            return entry;
         }
+        // No project found, store in the cache
+        projectsCache.set(hash, {});
+        return null;
     }));
+    const projects = {};
+    for (const contribution of contributions) {
+        if (contribution) {
+            Object.assign(projects, contribution);
+        }
+    }
     return {
         projects,
     };