@nx/eslint 20.2.0-canary.20241130-ec5a5e6 → 20.2.0-canary.20241203-6b87005

package/migrations.json

@@ -19,6 +19,11 @@
       "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",
+      "implementation": "./src/migrations/update-20-2-0/update-typescript-eslint-v8-13-0"
     }
   },
   "packageJsonUpdates": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "20.2.0-canary.20241130-ec5a5e6",
+  "version": "20.2.0-canary.20241203-6b87005",
   "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,11 +35,11 @@
     "eslint": "^8.0.0 || ^9.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "20.2.0-canary.20241130-ec5a5e6",
-    "@nx/js": "20.2.0-canary.20241130-ec5a5e6",
+    "@nx/devkit": "20.2.0-canary.20241203-6b87005",
+    "@nx/js": "20.2.0-canary.20241203-6b87005",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
-    "typescript": "~5.4.2"
+    "typescript": "~5.6.2"
   },
   "peerDependenciesMeta": {
     "@zkochan/js-yaml": {

package/src/migrations/update-20-2-0/update-typescript-eslint-v8-13-0.d.ts

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

package/src/migrations/update-20-2-0/update-typescript-eslint-v8-13-0.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.default = default_1;
+const devkit_1 = require("@nx/devkit");
+const semver_1 = require("semver");
+const version_utils_1 = require("../../utils/version-utils");
+async function default_1(tree) {
+    const devDependencies = {};
+    const checkPackageAndMigrate = (pkgName) => {
+        const pkgVersion = (0, version_utils_1.getInstalledPackageVersion)(pkgName, tree);
+        if (!!pkgVersion && (0, semver_1.gte)(pkgVersion, '8.0.0') && (0, semver_1.lt)(pkgVersion, '8.13.0')) {
+            devDependencies[pkgName] = '^8.13.0';
+        }
+    };
+    checkPackageAndMigrate('typescript-eslint');
+    checkPackageAndMigrate('@typescript-eslint/eslint-plugin');
+    checkPackageAndMigrate('@typescript-eslint/parser');
+    checkPackageAndMigrate('@typescript-eslint/utils');
+    if (Object.keys(devDependencies).length > 0) {
+        return (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies);
+    }
+    return () => { };
+}

package/src/utils/version-utils.d.ts

@@ -1,2 +1,3 @@
 import { type Tree } from '@nx/devkit';
+export declare function getInstalledPackageVersion(pkgName: string, tree?: Tree): string | null;
 export declare function getInstalledEslintVersion(tree?: Tree): string | null;

package/src/utils/version-utils.js

@@ -1,31 +1,35 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.getInstalledPackageVersion = getInstalledPackageVersion;
 exports.getInstalledEslintVersion = getInstalledEslintVersion;
 const devkit_1 = require("@nx/devkit");
 const semver_1 = require("@nx/devkit/src/utils/semver");
 const devkit_internals_1 = require("nx/src/devkit-internals");
-function getInstalledEslintVersion(tree) {
+function getInstalledPackageVersion(pkgName, tree) {
     try {
-        const eslintPackageJson = (0, devkit_internals_1.readModulePackageJson)('eslint').packageJson;
-        return eslintPackageJson.version;
+        const packageJson = (0, devkit_internals_1.readModulePackageJson)(pkgName).packageJson;
+        return packageJson.version;
     }
     catch { }
-    // eslint is not installed on disk, it could be in the package.json
+    // the package is not installed on disk, it could be in the package.json
     // but waiting to be installed
     const rootPackageJson = tree
         ? (0, devkit_1.readJson)(tree, 'package.json')
         : (0, devkit_1.readJsonFile)('package.json');
-    const eslintVersionInRootPackageJson = rootPackageJson.devDependencies?.['eslint'] ??
-        rootPackageJson.dependencies?.['eslint'];
-    if (!eslintVersionInRootPackageJson) {
-        // eslint is not installed
+    const pkgVersionInRootPackageJson = rootPackageJson.devDependencies?.[pkgName] ??
+        rootPackageJson.dependencies?.[pkgName];
+    if (!pkgVersionInRootPackageJson) {
+        // the package is not installed
         return null;
     }
     try {
         // try to parse and return the version
-        return (0, semver_1.checkAndCleanWithSemver)('eslint', eslintVersionInRootPackageJson);
+        return (0, semver_1.checkAndCleanWithSemver)(pkgName, pkgVersionInRootPackageJson);
     }
     catch { }
     // we could not resolve the version
     return null;
 }
+function getInstalledEslintVersion(tree) {
+    return getInstalledPackageVersion('eslint', tree);
+}

package/src/utils/versions.d.ts

@@ -3,6 +3,6 @@ export declare const eslintVersion = "~8.57.0";
 export declare const eslintrcVersion = "^2.1.1";
 export declare const eslintConfigPrettierVersion = "^9.0.0";
 export declare const typescriptESLintVersion = "^7.16.0";
-export declare const eslint9__typescriptESLintVersion = "^8.0.0";
+export declare const eslint9__typescriptESLintVersion = "^8.13.0";
 export declare const eslint9__eslintVersion = "^9.8.0";
 export declare const eslintCompat = "^1.1.1";

package/src/utils/versions.js

@@ -7,6 +7,6 @@ exports.eslintrcVersion = '^2.1.1';
 exports.eslintConfigPrettierVersion = '^9.0.0';
 exports.typescriptESLintVersion = '^7.16.0';
 // Updated linting stack for ESLint v9, typescript-eslint v8
-exports.eslint9__typescriptESLintVersion = '^8.0.0';
+exports.eslint9__typescriptESLintVersion = '^8.13.0';
 exports.eslint9__eslintVersion = '^9.8.0';
 exports.eslintCompat = '^1.1.1';