@nx/eslint 22.0.0-canary.20251015-f37c13b → 22.0.0-canary.20251018-6549d2a

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "22.0.0-canary.20251015-f37c13b",
+  "version": "22.0.0-canary.20251018-6549d2a",
   "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,14 +35,14 @@
     "eslint": "^8.0.0 || ^9.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "22.0.0-canary.20251015-f37c13b",
-    "@nx/js": "22.0.0-canary.20251015-f37c13b",
+    "@nx/devkit": "22.0.0-canary.20251018-6549d2a",
+    "@nx/js": "22.0.0-canary.20251018-6549d2a",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.9.2"
   },
   "devDependencies": {
-    "nx": "22.0.0-canary.20251015-f37c13b"
+    "nx": "22.0.0-canary.20251018-6549d2a"
   },
   "peerDependenciesMeta": {
     "@zkochan/js-yaml": {

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

@@ -131,7 +131,17 @@ function processConvertedConfig(tree, root, source, target, { content, addESLint
         eslint: versions_1.eslint9__eslintVersion,
         'eslint-config-prettier': versions_1.eslintConfigPrettierVersion,
         'typescript-eslint': versions_1.eslint9__typescriptESLintVersion,
+        '@typescript-eslint/eslint-plugin': versions_1.eslint9__typescriptESLintVersion,
+        '@typescript-eslint/parser': versions_1.eslint9__typescriptESLintVersion,
     };
+    if ((0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@typescript-eslint/utils')) {
+        devDependencies['@typescript-eslint/utils'] =
+            versions_1.eslint9__typescriptESLintVersion;
+    }
+    if ((0, devkit_1.getDependencyVersionFromPackageJson)(tree, '@typescript-eslint/type-utils')) {
+        devDependencies['@typescript-eslint/type-utils'] =
+            versions_1.eslint9__typescriptESLintVersion;
+    }
     // add missing packages
     if (addESLintRC) {
         devDependencies['@eslint/eslintrc'] = versions_1.eslintrcVersion;
@@ -140,5 +150,4 @@ function processConvertedConfig(tree, root, source, target, { content, addESLint
         devDependencies['@eslint/js'] = versions_1.eslintVersion;
     }
     (0, devkit_1.addDependenciesToPackageJson)(tree, {}, devDependencies);
-    (0, devkit_1.removeDependenciesFromPackageJson)(tree, ['@typescript-eslint/eslint-plugin', '@typescript-eslint/parser'], ['@typescript-eslint/eslint-plugin', '@typescript-eslint/parser']);
 }

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

@@ -1,4 +1,5 @@
 import { type Tree } from '@nx/devkit';
 export declare function getInstalledPackageVersion(pkgName: string, tree?: Tree): string | null;
 export declare function getInstalledEslintVersion(tree?: Tree): string | null;
+export declare function getTypeScriptEslintVersionToInstall(tree: Tree): string | null;
 //# sourceMappingURL=version-utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/eslint/src/utils/version-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,KAAK,IAAI,EAAE,MAAM,YAAY,CAAC;AAI/D,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,IAAI,GACV,MAAM,GAAG,IAAI,CA2Bf;AAED,wBAAgB,yBAAyB,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAEpE"}
+{"version":3,"file":"version-utils.d.ts","sourceRoot":"","sources":["../../../../../packages/eslint/src/utils/version-utils.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,KAAK,IAAI,EACV,MAAM,YAAY,CAAC;AASpB,wBAAgB,0BAA0B,CACxC,OAAO,EAAE,MAAM,EACf,IAAI,CAAC,EAAE,IAAI,GACV,MAAM,GAAG,IAAI,CAmCf;AAED,wBAAgB,yBAAyB,CAAC,IAAI,CAAC,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAEpE;AAED,wBAAgB,mCAAmC,CAAC,IAAI,EAAE,IAAI,GAAG,MAAM,GAAG,IAAI,CAM7E"}

package/src/utils/version-utils.js

@@ -2,9 +2,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 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 devkit_internals_1 = require("nx/src/devkit-internals");
+const semver_2 = require("semver");
+const versions_1 = require("./versions");
 function getInstalledPackageVersion(pkgName, tree) {
     try {
         const packageJson = (0, devkit_internals_1.readModulePackageJson)(pkgName).packageJson;
@@ -13,18 +16,25 @@ function getInstalledPackageVersion(pkgName, tree) {
     catch { }
     // 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 pkgVersionInRootPackageJson = rootPackageJson.devDependencies?.[pkgName] ??
-        rootPackageJson.dependencies?.[pkgName];
+    let pkgVersionInRootPackageJson;
+    if (tree) {
+        pkgVersionInRootPackageJson = (0, devkit_1.getDependencyVersionFromPackageJson)(tree, pkgName);
+    }
+    else {
+        const rootPackageJson = (0, devkit_1.readJsonFile)('package.json');
+        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)(pkgName, pkgVersionInRootPackageJson);
+        return tree
+            ? (0, semver_1.checkAndCleanWithSemver)(tree, pkgName, pkgVersionInRootPackageJson)
+            : (0, semver_1.checkAndCleanWithSemver)(pkgName, pkgVersionInRootPackageJson);
     }
     catch { }
     // we could not resolve the version
@@ -33,3 +43,9 @@ function getInstalledPackageVersion(pkgName, tree) {
 function getInstalledEslintVersion(tree) {
     return getInstalledPackageVersion('eslint', tree);
 }
+function getTypeScriptEslintVersionToInstall(tree) {
+    const eslintVersion = getInstalledEslintVersion(tree);
+    return eslintVersion && (0, semver_2.lt)(eslintVersion, '9.0.0')
+        ? versions_1.typescriptESLintVersion
+        : versions_1.eslint9__typescriptESLintVersion;
+}