@nx/eslint 22.7.0 → 22.7.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "22.7.0",
+  "version": "22.7.1",
   "private": false,
   "description": "The ESLint plugin for Nx contains executors, generators and utilities used for linting JavaScript/TypeScript projects within an Nx workspace.",
   "repository": {
@@ -32,19 +32,19 @@
   "generators": "./generators.json",
   "executors": "./executors.json",
   "peerDependencies": {
-    "@nx/jest": "22.7.0",
+    "@nx/jest": "22.7.1",
     "@zkochan/js-yaml": "0.0.7",
     "eslint": "^8.0.0 || ^9.0.0 || ^10.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "22.7.0",
-    "@nx/js": "22.7.0",
+    "@nx/devkit": "22.7.1",
+    "@nx/js": "22.7.1",
     "semver": "^7.6.3",
     "tslib": "^2.3.0",
     "typescript": "~5.9.2"
   },
   "devDependencies": {
-    "nx": "22.7.0"
+    "nx": "22.7.1"
   },
   "peerDependenciesMeta": {
     "@nx/jest": {

package/src/generators/lint-project/lint-project.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lint-project.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/lint-project/lint-project.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EASjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AA0BnE,UAAU,kBAAkB;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;IACjC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,UAAU,EAAE,OAAO,CAAC;IACpB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,kBAAkB,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IAEnC;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,8BAA8B,CAAC,EAAE,OAAO,CAAC;CAC1C;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,kBAAkB,8BAE3E;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,kBAAkB,8BA8I5B"}
+{"version":3,"file":"lint-project.d.ts","sourceRoot":"","sources":["../../../../../../packages/eslint/src/generators/lint-project/lint-project.ts"],"names":[],"mappings":"AAAA,OAAO,EAIL,iBAAiB,EAQjB,IAAI,EAIL,MAAM,YAAY,CAAC;AAEpB,OAAO,EAAE,MAAM,IAAI,UAAU,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AA0BnE,UAAU,kBAAkB;IAC1B,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,UAAU,GAAG,UAAU,CAAC;IACjC,kBAAkB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC9B,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,UAAU,EAAE,OAAO,CAAC;IACpB,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAClC,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,oBAAoB,CAAC,EAAE,OAAO,CAAC;IAC/B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,kBAAkB,CAAC,EAAE,KAAK,GAAG,KAAK,CAAC;IAEnC;;OAEG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,8BAA8B,CAAC,EAAE,OAAO,CAAC;CAC1C;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,kBAAkB,8BAE3E;AAED,wBAAsB,4BAA4B,CAChD,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,kBAAkB,8BA4I5B"}

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

@@ -78,13 +78,11 @@ async function lintProjectGeneratorInternal(tree, options) {
     // companion e2e app so we should check if migration to
     // monorepo style is needed
     if (!options.rootProject) {
-        const projects = {};
-        (0, project_configuration_1.getProjects)(tree).forEach((v, k) => (projects[k] = v));
-        const graph = await (0, devkit_1.createProjectGraphAsync)();
-        if (isMigrationToMonorepoNeeded(tree, graph)) {
+        const projectsFromTree = (0, project_configuration_1.getProjects)(tree);
+        if (await isMigrationToMonorepoNeeded(tree, projectsFromTree)) {
             // we only migrate project configurations that have been created
             const filteredProjects = [];
-            Object.entries(projects).forEach(([name, project]) => {
+            projectsFromTree.forEach((project, name) => {
                 if (name !== options.project) {
                     filteredProjects.push(project);
                 }
@@ -244,20 +242,42 @@ function isBuildableLibraryProject(tree, projectConfig) {
 }
 /**
  * Detect based on the state of lint target configuration of the root project
- * if we should migrate eslint configs to monorepo style
+ * if we should migrate eslint configs to monorepo style.
+ *
+ * Checks the tree first so explicit root lint targets written earlier in the
+ * same generator run are visible; the project graph is only consulted to
+ * surface targets inferred by `@nx/eslint/plugin`, which don't appear on the
+ * tree.
  */
-function isMigrationToMonorepoNeeded(tree, graph) {
+async function isMigrationToMonorepoNeeded(tree, projectsFromTree) {
     // the base config is already created, migration has been done
     if ([config_file_1.baseEsLintConfigFile, ...config_file_1.BASE_ESLINT_CONFIG_FILENAMES].some((f) => tree.exists(f))) {
         return false;
     }
-    const nodes = Object.values(graph.nodes);
-    // get root project
-    const rootProject = nodes.find((p) => p.data.root === '.');
-    if (!rootProject || !rootProject.data.targets) {
+    for (const project of projectsFromTree.values()) {
+        if (project.root === '.') {
+            if (rootHasEslintLintTarget(project.targets)) {
+                return true;
+            }
+            break;
+        }
+    }
+    if (!(0, plugin_1.hasEslintPlugin)(tree)) {
+        return false;
+    }
+    const graph = await (0, devkit_1.createProjectGraphAsync)();
+    for (const node of Object.values(graph.nodes)) {
+        if (node.data.root === '.') {
+            return rootHasEslintLintTarget(node.data.targets);
+        }
+    }
+    return false;
+}
+function rootHasEslintLintTarget(targets) {
+    if (!targets) {
         return false;
     }
-    for (const targetConfig of Object.values(rootProject.data.targets ?? {})) {
+    for (const targetConfig of Object.values(targets)) {
         if (['@nx/eslint:lint', '@nx/linter:eslint'].includes(targetConfig.executor) ||
             (targetConfig.executor === 'nx:run-commands' &&
                 targetConfig.options?.command &&