@nx/eslint 21.0.0-beta.7 → 21.0.0-beta.9

package/migrations.json

@@ -1,25 +1,5 @@
 {
   "generators": {
-    "update-17-0-0-rename-to-eslint": {
-      "version": "17.0.0-beta.7",
-      "description": "update-17-0-0-rename-to-eslint",
-      "implementation": "./src/migrations/update-17-0-0-rename-to-eslint/update-17-0-0-rename-to-eslint"
-    },
-    "update-typescript-eslint": {
-      "version": "17.1.0-beta.1",
-      "description": "Updates for @typescript-utils/utils v6.9.1+",
-      "implementation": "./src/migrations/update-17-1-0/update-typescript-eslint"
-    },
-    "simplify-eslint-patterns": {
-      "version": "17.2.0-beta.0",
-      "description": "Simplify eslintFilePatterns",
-      "implementation": "./src/migrations/update-17-2-0/simplify-eslint-patterns"
-    },
-    "move-options-to-target-defaults": {
-      "version": "17.2.9",
-      "description": "Move executor options to target defaults",
-      "implementation": "./src/migrations/update-17-2-9/move-options-to-target-defaults"
-    },
     "update-typescript-eslint-v8.13.0": {
       "version": "20.2.0-beta.5",
       "description": "Update TypeScript ESLint packages to v8.13.0 if they are already on v8",
@@ -32,67 +12,6 @@
     }
   },
   "packageJsonUpdates": {
-    "17.0.0": {
-      "version": "17.0.0-rc.2",
-      "packages": {
-        "eslint-config-prettier": {
-          "version": "^9.0.0"
-        }
-      }
-    },
-    "17.1.0": {
-      "version": "17.1.0-beta.1",
-      "packages": {
-        "@typescript-eslint/parser": {
-          "version": "^6.9.1"
-        },
-        "@typescript-eslint/eslint-plugin": {
-          "version": "^6.9.1"
-        },
-        "@typescript-eslint/utils": {
-          "version": "^6.9.1"
-        }
-      }
-    },
-    "17.2.0": {
-      "version": "17.2.0-beta.2",
-      "packages": {
-        "eslint": {
-          "version": "~8.48.0"
-        }
-      }
-    },
-    "17.3.0": {
-      "version": "17.3.0-beta.0",
-      "packages": {
-        "@typescript-eslint/parser": {
-          "version": "^6.13.2"
-        },
-        "@typescript-eslint/eslint-plugin": {
-          "version": "^6.13.2"
-        },
-        "@typescript-eslint/utils": {
-          "version": "^6.13.2"
-        }
-      }
-    },
-    "18.2.0": {
-      "version": "18.2.0-beta.0",
-      "packages": {
-        "@typescript-eslint/parser": {
-          "version": "^7.3.0"
-        },
-        "@typescript-eslint/eslint-plugin": {
-          "version": "^7.3.0"
-        },
-        "@typescript-eslint/utils": {
-          "version": "^7.3.0"
-        },
-        "eslint": {
-          "version": "~8.57.0"
-        }
-      }
-    },
     "19.5.0": {
       "version": "19.5.0-beta.1",
       "packages": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "21.0.0-beta.7",
+  "version": "21.0.0-beta.9",
   "private": false,
   "description": "The ESLint plugin for Nx contains executors, generators and utilities used for linting JavaScript/TypeScript projects within an Nx workspace.",
   "repository": {
@@ -35,8 +35,8 @@
     "eslint": "^8.0.0 || ^9.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "21.0.0-beta.7",
-    "@nx/js": "21.0.0-beta.7",
+    "@nx/devkit": "21.0.0-beta.9",
+    "@nx/js": "21.0.0-beta.9",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.7.2"

package/src/migrations/update-17-0-0-rename-to-eslint/update-17-0-0-rename-to-eslint.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function replacePackage(tree: Tree): Promise<void>;

package/src/migrations/update-17-0-0-rename-to-eslint/update-17-0-0-rename-to-eslint.js

@@ -1,47 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = replacePackage;
-const devkit_1 = require("@nx/devkit");
-const replace_package_1 = require("@nx/devkit/src/utils/replace-package");
-async function replacePackage(tree) {
-    await (0, replace_package_1.replaceNrwlPackageWithNxPackage)(tree, '@nx/linter', '@nx/eslint');
-    // executor name change from :eslint to :lint
-    updateNxJsonExecutor(tree);
-    updateProjectExecutor(tree);
-    await (0, devkit_1.formatFiles)(tree);
-}
-function updateNxJsonExecutor(tree) {
-    if (!tree.exists('nx.json')) {
-        return;
-    }
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    let needsUpdate = false;
-    for (const [targetName, targetConfig] of Object.entries(nxJson.targetDefaults ?? {})) {
-        // this will be in a broken state after the package is globally renamed
-        if (targetConfig.executor !== '@nx/eslint:eslint') {
-            continue;
-        }
-        needsUpdate = true;
-        nxJson.targetDefaults[targetName].executor = '@nx/eslint:lint';
-    }
-    if (needsUpdate) {
-        (0, devkit_1.updateNxJson)(tree, nxJson);
-    }
-}
-function updateProjectExecutor(tree) {
-    const projects = (0, devkit_1.getProjects)(tree);
-    for (const [projectName, projectConfiguration] of projects) {
-        let needsUpdate = false;
-        for (const [targetName, targetConfig] of Object.entries(projectConfiguration.targets ?? {})) {
-            // this will be in a broken state after the package is globally renamed
-            if (targetConfig.executor !== '@nx/eslint:eslint') {
-                continue;
-            }
-            needsUpdate = true;
-            projectConfiguration.targets[targetName].executor = '@nx/eslint:lint';
-        }
-        if (needsUpdate) {
-            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
-        }
-    }
-}

package/src/migrations/update-17-1-0/update-typescript-eslint.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-17-1-0/update-typescript-eslint.js

@@ -1,74 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = update;
-const devkit_1 = require("@nx/devkit");
-const versions_1 = require("../../utils/versions");
-const path_1 = require("path");
-const typescript_1 = require("typescript");
-function updateJestConfig(tree) {
-    const jestConfigPath = 'tools/eslint-rules/jest.config.ts';
-    if (tree.exists(jestConfigPath)) {
-        const { removePropertyFromJestConfig } = (0, devkit_1.ensurePackage)('@nx/jest', versions_1.nxVersion);
-        removePropertyFromJestConfig(tree, jestConfigPath, [
-            'moduleNameMapper',
-            '@eslint/eslintrc',
-        ]);
-    }
-}
-function updateTsConfigs(tree) {
-    const tsConfigPath = 'tools/eslint-rules/tsconfig.json';
-    if (tree.exists(tsConfigPath)) {
-        (0, devkit_1.updateJson)(tree, tsConfigPath, (tsConfig) => {
-            tsConfig.compilerOptions ??= {};
-            tsConfig.compilerOptions.moduleResolution = 'node16';
-            tsConfig.compilerOptions.module = 'node16';
-            return tsConfig;
-        });
-    }
-    const tsConfigSpec = 'tools/eslint-rules/tsconfig.spec.json';
-    if (tree.exists(tsConfigSpec)) {
-        (0, devkit_1.updateJson)(tree, tsConfigSpec, (tsConfigSpec) => {
-            delete tsConfigSpec.compilerOptions?.module;
-            delete tsConfigSpec.compilerOptions?.moduleResolution;
-            return tsConfigSpec;
-        });
-    }
-}
-function updateRecommended(tree) {
-    (0, devkit_1.visitNotIgnoredFiles)(tree, 'tools/eslint-rules', (path) => {
-        if ((0, path_1.extname)(path) !== '.ts') {
-            return;
-        }
-        const contents = tree.read(path, 'utf-8');
-        const sourceFile = (0, typescript_1.createSourceFile)(path, contents, typescript_1.ScriptTarget.ESNext, true);
-        const changes = [];
-        const visit = (node) => {
-            if ((0, typescript_1.isPropertyAssignment)(node) &&
-                (0, typescript_1.isIdentifier)(node.name) &&
-                node.name.text === 'recommended' &&
-                (0, typescript_1.isStringLiteral)(node.initializer)) {
-                changes.push({
-                    type: devkit_1.ChangeType.Delete,
-                    start: node.initializer.getStart(sourceFile),
-                    length: node.initializer.getWidth(sourceFile),
-                });
-                changes.push({
-                    type: devkit_1.ChangeType.Insert,
-                    index: node.initializer.getStart(sourceFile),
-                    text: "'recommended'",
-                });
-            }
-            else {
-                (0, typescript_1.forEachChild)(node, visit);
-            }
-        };
-        (0, typescript_1.forEachChild)(sourceFile, visit);
-        tree.write(path, (0, devkit_1.applyChangesToString)(contents, changes));
-    });
-}
-async function update(tree) {
-    updateJestConfig(tree);
-    updateTsConfigs(tree);
-    updateRecommended(tree);
-    await (0, devkit_1.formatFiles)(tree);
-}

package/src/migrations/update-17-2-0/simplify-eslint-patterns.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-17-2-0/simplify-eslint-patterns.js

@@ -1,46 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = update;
-const devkit_1 = require("@nx/devkit");
-async function update(tree) {
-    const projects = (0, devkit_1.getProjects)(tree);
-    for (const [projectName, projectConfiguration] of projects) {
-        let needsUpdate = false;
-        for (const [targetName, targetConfig] of Object.entries(projectConfiguration.targets ?? {})) {
-            if (targetConfig.executor !== '@nx/eslint:lint') {
-                continue;
-            }
-            needsUpdate = true;
-            if (projectConfiguration.targets[targetName].options?.lintFilePatterns) {
-                const rootPattern = getLintRoot(projectConfiguration);
-                const nonRootPatterns = projectConfiguration.targets[targetName].options.lintFilePatterns.filter((p) => !p.startsWith(rootPattern) && !p.startsWith('{projectRoot}'));
-                if (nonRootPatterns.length === 0 &&
-                    rootPattern === projectConfiguration.root) {
-                    // delete the lintFilePatterns option if it's the only option and matches the root of the project
-                    delete projectConfiguration.targets[targetName].options
-                        .lintFilePatterns;
-                    if (Object.keys(projectConfiguration.targets[targetName].options)
-                        .length === 0) {
-                        delete projectConfiguration.targets[targetName].options;
-                    }
-                }
-                else {
-                    projectConfiguration.targets[targetName].options.lintFilePatterns = [
-                        rootPattern,
-                        ...nonRootPatterns,
-                    ];
-                }
-            }
-        }
-        if (needsUpdate) {
-            (0, devkit_1.updateProjectConfiguration)(tree, projectName, projectConfiguration);
-        }
-    }
-    await (0, devkit_1.formatFiles)(tree);
-}
-function getLintRoot({ root, sourceRoot }) {
-    if (root === '' || root === '.') {
-        return sourceRoot || './src';
-    }
-    return root;
-}

package/src/migrations/update-17-2-9/move-options-to-target-defaults.d.ts

@@ -1,2 +0,0 @@
-import { Tree } from '@nx/devkit';
-export default function update(tree: Tree): Promise<void>;

package/src/migrations/update-17-2-9/move-options-to-target-defaults.js

@@ -1,107 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = update;
-const devkit_1 = require("@nx/devkit");
-const executor_options_utils_1 = require("@nx/devkit/src/generators/executor-options-utils");
-const eslint_file_1 = require("../../generators/utils/eslint-file");
-const project_configuration_utils_1 = require("nx/src/project-graph/utils/project-configuration-utils");
-async function update(tree) {
-    const nxJson = (0, devkit_1.readNxJson)(tree);
-    // Don't override anything if there are already target defaults for eslint
-    if (nxJson.targetDefaults?.['@nx/eslint:lint']) {
-        return;
-    }
-    nxJson.targetDefaults ??= {};
-    const graph = await (0, devkit_1.createProjectGraphAsync)();
-    const lintTargets = new Set();
-    (0, executor_options_utils_1.forEachExecutorOptionsInGraph)(graph, '@nx/eslint:lint', (value, proj, targetName) => {
-        lintTargets.add(targetName);
-    });
-    // Workspace does not use eslint?
-    if (lintTargets.size === 0) {
-        return;
-    }
-    const lintDefaults = (nxJson.targetDefaults['@nx/eslint:lint'] = {});
-    // All eslint targets have the same name
-    if (lintTargets.size === 1) {
-        const targetName = Array.from(lintTargets)[0];
-        if (nxJson.targetDefaults[targetName]) {
-            Object.assign(lintDefaults, nxJson.targetDefaults[targetName]);
-        }
-    }
-    lintDefaults.cache ??= true;
-    if (!lintDefaults.inputs) {
-        const eslintConfig = (0, eslint_file_1.findEslintFile)(tree);
-        lintDefaults.inputs = [
-            'default',
-            ...(eslintConfig ? [`{workspaceRoot}/${eslintConfig}`] : []),
-            '{workspaceRoot}/tools/eslint-rules/**/*',
-        ];
-    }
-    // Cleanup old target defaults
-    const projects = graph.nodes;
-    const projectMap = (0, devkit_1.getProjects)(tree);
-    for (const [targetDefaultKey, targetDefault] of Object.entries(nxJson.targetDefaults)) {
-        if (!isTargetDefaultUsed(targetDefault, nxJson.targetDefaults, projects, projectMap)) {
-            delete nxJson.targetDefaults[targetDefaultKey];
-        }
-    }
-    let addOutputs = false;
-    (0, executor_options_utils_1.forEachExecutorOptions)(tree, '@nx/eslint:lint', (options, proj, targetName, configuration) => {
-        const projConfig = projectMap.get(proj);
-        // modify lint file patterns
-        if (options.lintFilePatterns) {
-            const projectRootRegex = new RegExp(`^${projConfig.root}/`);
-            projConfig.targets[targetName].options.lintFilePatterns =
-                options.lintFilePatterns
-                    .filter((filePattern) => filePattern !== '{projectRoot}' &&
-                    filePattern !== projConfig.root)
-                    .map((filePattern) => filePattern.replace(projectRootRegex, '{projectRoot}/'));
-            // remove lintFilePatterns if empty
-            if (projConfig.targets[targetName].options.lintFilePatterns.length === 0) {
-                delete projConfig.targets[targetName].options.lintFilePatterns;
-            }
-        }
-        // remove inputs if they are not bringing any new inputs
-        if (projConfig.targets[targetName].inputs &&
-            projConfig.targets[targetName].inputs.every((i) => lintDefaults.inputs.includes(i))) {
-            delete projConfig.targets[targetName].inputs;
-        }
-        // remove obsolete eslint config definition, unless it's a custom one
-        const projectEslintConfig = (0, eslint_file_1.findEslintFile)(tree, projConfig.root);
-        if (options.eslintConfig === `${projConfig.root}/${projectEslintConfig}` ||
-            options.eslintConfig === `{projectRoot}/${projectEslintConfig}`) {
-            delete projConfig.targets[targetName].options.eslintConfig;
-        }
-        // remove options if empty
-        if (Object.keys(projConfig.targets[targetName]?.options ?? {}).length === 0) {
-            delete projConfig.targets[targetName].options;
-        }
-        // track output
-        if (options.outputFile) {
-            addOutputs = true;
-        }
-        if (projConfig.targets[targetName].outputs?.length === 1 &&
-            projConfig.targets[targetName].outputs[0] === '{options.outputFile}') {
-            delete projConfig.targets[targetName].outputs;
-        }
-        (0, devkit_1.updateProjectConfiguration)(tree, proj, projConfig);
-    });
-    if (addOutputs) {
-        lintDefaults.outputs = ['{options.outputFile}'];
-    }
-    (0, devkit_1.updateNxJson)(tree, nxJson);
-    await (0, devkit_1.formatFiles)(tree);
-}
-function isTargetDefaultUsed(targetDefault, targetDefaults, projects, projectMap) {
-    for (const p of Object.values(projects)) {
-        for (const targetName in p.data?.targets ?? {}) {
-            if ((0, project_configuration_utils_1.readTargetDefaultsForTarget)(targetName, targetDefaults, 
-            // It might seem like we should use the graph here too but we don't want to pass an executor which was processed in the graph
-            projectMap.get(p.name)?.targets?.[targetName]?.executor) === targetDefault) {
-                return true;
-            }
-        }
-    }
-    return false;
-}