@nx/eslint 23.0.0-rc.3 → 23.0.0-rc.4

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

@@ -51,18 +51,6 @@ 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')) {
@@ -85,7 +73,10 @@ function convertProjectToFlatConfig(tree, project, projectConfig, nxJson, eslint
     if (eslintTargets.length > 0) {
         (0, devkit_1.updateProjectConfiguration)(tree, project, projectConfig);
     }
-    const hasEslintTargetDefaults = hasMatchingEslintTargetDefault(projectConfig, nxJson.targetDefaults);
+    const hasEslintTargetDefaults = projectConfig.targets &&
+        Object.keys(nxJson.targetDefaults || {}).some((t) => (t === ESLINT_LINT_EXECUTOR ||
+            isEslintTarget(nxJson.targetDefaults[t])) &&
+            projectConfig.targets[t]);
     if (eslintTargets.length === 0 &&
         !hasEslintTargetDefaults &&
         !(0, plugin_1.hasEslintPlugin)(tree)) {
@@ -135,32 +126,20 @@ 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). Handles both the legacy record shape and the new array shape
-// of `targetDefaults`.
+// (and `production` excludes it).
 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) {
-            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);
-                }
+            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.namedInputs) {

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

@@ -22,32 +22,19 @@ function updateProductionFileset(tree, format = 'mjs') {
     (0, devkit_1.updateNxJson)(tree, nxJson);
 }
 function addTargetDefaults(tree, format) {
-    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);
-    }
+    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);
 }
 function updateVsCodeRecommendedExtensions(host) {
     if (!host.exists('.vscode/extensions.json')) {

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

@@ -38,9 +38,8 @@ async function lintWorkspaceRulesProjectGenerator(tree, options = {}) {
      * TODO: Explore writing a ProjectGraph plugin to make this more surgical.
      */
     const nxJson = (0, devkit_1.readNxJson)(tree);
-    const lintEntry = findLintTargetDefault(nxJson.targetDefaults);
-    if (lintEntry?.inputs) {
-        lintEntry.inputs.push(`{workspaceRoot}/${exports.WORKSPACE_PLUGIN_DIR}/**/*`);
+    if (nxJson.targetDefaults?.lint?.inputs) {
+        nxJson.targetDefaults.lint.inputs.push(`{workspaceRoot}/${exports.WORKSPACE_PLUGIN_DIR}/**/*`);
         (0, devkit_1.updateNxJson)(tree, nxJson);
     }
     // Add jest to the project and return installation task
@@ -93,13 +92,3 @@ 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/dist/src/migrations/update-21-6-0/update-executor-lint-inputs.js

@@ -2,18 +2,13 @@
 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';
-    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) {
+    if (!nxJson.targetDefaults?.[executor]?.inputs) {
         return;
     }
-    const inputs = [...existing.inputs];
+    const inputs = nxJson.targetDefaults[executor].inputs;
     if (!inputs.includes('^default')) {
         // Add after 'default' if present, otherwise at the beginning
         const defaultIndex = inputs.indexOf('default');
@@ -27,7 +22,6 @@ 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "23.0.0-rc.3",
+  "version": "23.0.0-rc.4",
   "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-rc.3"
+    "@nx/jest": "23.0.0-rc.4"
   },
   "dependencies": {
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "typescript": "~5.9.2",
-    "@nx/devkit": "23.0.0-rc.3",
-    "@nx/js": "23.0.0-rc.3"
+    "@nx/devkit": "23.0.0-rc.4",
+    "@nx/js": "23.0.0-rc.4"
   },
   "devDependencies": {
-    "nx": "23.0.0-rc.3"
+    "nx": "23.0.0-rc.4"
   },
   "peerDependenciesMeta": {
     "@nx/jest": {