@nx/eslint 0.0.0-pr-29860-d639246 → 0.0.0-pr-3-e51e28c

package/migrations.json

@@ -104,18 +104,6 @@
         },
         "@typescript-eslint/utils": {
           "version": "^7.16.0"
-        },
-        "@typescript-eslint/rule-tester": {
-          "version": "^7.16.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@typescript-eslint/scope-manager": {
-          "version": "^7.16.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "^7.16.0",
-          "alwaysAddToPackageJson": false
         }
       }
     },
@@ -128,26 +116,14 @@
         "typescript-eslint": {
           "version": "^8.19.0"
         },
-        "@typescript-eslint/eslint-plugin": {
+        "@typescript-eslint/parser": {
           "version": "^8.19.0"
         },
-        "@typescript-eslint/parser": {
+        "@typescript-eslint/eslint-plugin": {
           "version": "^8.19.0"
         },
         "@typescript-eslint/utils": {
           "version": "^8.19.0"
-        },
-        "@typescript-eslint/rule-tester": {
-          "version": "^8.19.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@typescript-eslint/scope-manager": {
-          "version": "^8.19.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "^8.19.0",
-          "alwaysAddToPackageJson": false
         }
       }
     },
@@ -160,26 +136,14 @@
         "typescript-eslint": {
           "version": "^8.19.0"
         },
-        "@typescript-eslint/eslint-plugin": {
+        "@typescript-eslint/parser": {
           "version": "^8.19.0"
         },
-        "@typescript-eslint/parser": {
+        "@typescript-eslint/eslint-plugin": {
           "version": "^8.19.0"
         },
         "@typescript-eslint/utils": {
           "version": "^8.19.0"
-        },
-        "@typescript-eslint/rule-tester": {
-          "version": "^8.19.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@typescript-eslint/scope-manager": {
-          "version": "^8.19.0",
-          "alwaysAddToPackageJson": false
-        },
-        "@typescript-eslint/typescript-estree": {
-          "version": "^8.19.0",
-          "alwaysAddToPackageJson": false
         }
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "0.0.0-pr-29860-d639246",
+  "version": "0.0.0-pr-3-e51e28c",
   "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": "0.0.0-pr-29860-d639246",
-    "@nx/js": "0.0.0-pr-29860-d639246",
+    "@nx/devkit": "0.0.0-pr-3-e51e28c",
+    "@nx/js": "0.0.0-pr-3-e51e28c",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.7.2"

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

@@ -12,7 +12,6 @@ const flat_config_1 = require("../../utils/flat-config");
 const ast_utils_1 = require("../utils/flat-config/ast-utils");
 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");
 function lintProjectGenerator(tree, options) {
@@ -97,12 +96,7 @@ async function lintProjectGeneratorInternal(tree, options) {
     // additionally, the companion e2e app would have `rootProject: true`
     // so we need to check for the root path as well
     if (!options.rootProject || projectConfig.root !== '.') {
-        const addDependencyChecks = options.addPackageJsonDependencyChecks ||
-            isBuildableLibraryProject(tree, projectConfig);
-        createEsLintConfiguration(tree, options, projectConfig, options.setParserOptionsProject, options.rootProject, addDependencyChecks);
-        if (addDependencyChecks) {
-            tasks.push((0, devkit_1.addDependenciesToPackageJson)(tree, {}, { 'jsonc-eslint-parser': versions_1.jsoncEslintParserVersion }, undefined, true));
-        }
+        createEsLintConfiguration(tree, options, projectConfig, options.setParserOptionsProject, options.rootProject);
     }
     // Buildable libs need source analysis enabled for linting `package.json`.
     if (isBuildableLibraryProject(tree, projectConfig) &&
@@ -120,7 +114,7 @@ async function lintProjectGeneratorInternal(tree, options) {
     }
     return (0, devkit_1.runTasksInSerial)(...tasks);
 }
-function createEsLintConfiguration(tree, options, projectConfig, setParserOptionsProject, rootProject, addDependencyChecks) {
+function createEsLintConfiguration(tree, options, projectConfig, setParserOptionsProject, rootProject) {
     // we are only extending root for non-standalone projects or their complementary e2e apps
     const extendedRootConfig = rootProject ? undefined : (0, eslint_file_1.findEslintFile)(tree);
     const pathToRootConfig = extendedRootConfig
@@ -138,6 +132,8 @@ function createEsLintConfiguration(tree, options, projectConfig, setParserOption
             options.eslintConfigFormat = (0, eslint_file_1.determineEslintConfigFormat)(tree.read(extendedRootConfig, 'utf-8'));
         }
     }
+    const addDependencyChecks = options.addPackageJsonDependencyChecks ||
+        isBuildableLibraryProject(tree, projectConfig);
     const overrides = (0, flat_config_1.useFlatConfig)(tree)
         ? // For flat configs, we don't need to generate different overrides for each file. Users should add their own overrides as needed.
             []

package/src/utils/versions.d.ts

@@ -3,7 +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 jsoncEslintParserVersion = "^2.1.0";
 export declare const eslint9__typescriptESLintVersion = "^8.19.0";
 export declare const eslint9__eslintVersion = "^9.8.0";
 export declare const eslintCompat = "^1.1.1";

package/src/utils/versions.js

@@ -1,12 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.eslintCompat = exports.eslint9__eslintVersion = exports.eslint9__typescriptESLintVersion = exports.jsoncEslintParserVersion = exports.typescriptESLintVersion = exports.eslintConfigPrettierVersion = exports.eslintrcVersion = exports.eslintVersion = exports.nxVersion = void 0;
+exports.eslintCompat = exports.eslint9__eslintVersion = exports.eslint9__typescriptESLintVersion = exports.typescriptESLintVersion = exports.eslintConfigPrettierVersion = exports.eslintrcVersion = exports.eslintVersion = exports.nxVersion = void 0;
 exports.nxVersion = require('../../package.json').version;
 exports.eslintVersion = '~8.57.0';
 exports.eslintrcVersion = '^2.1.1';
 exports.eslintConfigPrettierVersion = '^9.0.0';
 exports.typescriptESLintVersion = '^7.16.0';
-exports.jsoncEslintParserVersion = '^2.1.0';
 // Updated linting stack for ESLint v9, typescript-eslint v8
 exports.eslint9__typescriptESLintVersion = '^8.19.0';
 exports.eslint9__eslintVersion = '^9.8.0';