@nx/eslint 19.0.0-canary.20240425-cec57c4 → 19.0.0-canary.20240426-ac9ad35

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "19.0.0-canary.20240425-cec57c4",
+  "version": "19.0.0-canary.20240426-ac9ad35",
   "private": false,
   "description": "The ESLint plugin for Nx contains executors, generators and utilities used for linting JavaScript/TypeScript projects within an Nx workspace.",
   "repository": {
@@ -33,12 +33,12 @@
     "js-yaml": "4.1.0"
   },
   "dependencies": {
-    "@nx/devkit": "19.0.0-canary.20240425-cec57c4",
-    "@nx/js": "19.0.0-canary.20240425-cec57c4",
+    "@nx/devkit": "19.0.0-canary.20240426-ac9ad35",
+    "@nx/js": "19.0.0-canary.20240426-ac9ad35",
     "eslint": "^8.0.0",
     "tslib": "^2.3.0",
     "typescript": "~5.4.2",
-    "@nx/linter": "19.0.0-canary.20240425-cec57c4"
+    "@nx/linter": "19.0.0-canary.20240426-ac9ad35"
   },
   "peerDependenciesMeta": {
     "js-yaml": {

package/src/plugins/plugin.js

@@ -30,21 +30,24 @@ exports.createNodes = [
                 nestedEslintRootPatterns.push(`${eslintRootDir}/**/*`);
             }
         }
-        const childProjectRoots = new Set();
-        const ESLint = resolveESLintClass((0, config_file_1.isFlatConfig)(configFilePath));
         const projectFiles = (0, workspace_context_1.globWithWorkspaceContext)(context.workspaceRoot, [
             'project.json',
             'package.json',
             '**/project.json',
             '**/package.json',
         ].map((f) => (0, node_path_1.join)(configDir, f)), nestedEslintRootPatterns.length ? nestedEslintRootPatterns : undefined);
-        for (const projectFile of projectFiles) {
-            const childProjectRoot = (0, node_path_1.dirname)(projectFile);
-            if (childProjectRoots.has(childProjectRoot)) {
-                continue;
-            }
+        // dedupe and sort project roots by depth for more efficient traversal
+        const dedupedProjectRoots = Array.from(new Set(projectFiles.map((f) => (0, node_path_1.dirname)(f)))).sort((a, b) => (a !== b && isSubDir(a, b) ? -1 : 1));
+        const excludePatterns = dedupedProjectRoots.map((root) => `${root}/**/*`);
+        const ESLint = resolveESLintClass((0, config_file_1.isFlatConfig)(configFilePath));
+        const childProjectRoots = new Set();
+        await Promise.all(dedupedProjectRoots.map(async (childProjectRoot, index) => {
+            // anything after is either a nested project or a sibling project, can be excluded
+            const nestedProjectRootPatterns = excludePatterns.slice(index + 1);
             // Ignore project roots where the project does not contain any lintable files
-            const lintableFiles = (0, workspace_context_1.globWithWorkspaceContext)(context.workspaceRoot, [(0, node_path_1.join)(childProjectRoot, `**/*.{${options.extensions.join(',')}}`)], nestedEslintRootPatterns.length ? nestedEslintRootPatterns : undefined);
+            const lintableFiles = (0, workspace_context_1.globWithWorkspaceContext)(context.workspaceRoot, [(0, node_path_1.join)(childProjectRoot, `**/*.{${options.extensions.join(',')}}`)], 
+            // exclude nested eslint roots and nested project roots
+            [...nestedEslintRootPatterns, ...nestedProjectRootPatterns]);
             const eslint = new ESLint({
                 cwd: (0, node_path_1.join)(context.workspaceRoot, childProjectRoot),
             });
@@ -54,7 +57,7 @@ exports.createNodes = [
                     break;
                 }
             }
-        }
+        }));
         const uniqueChildProjectRoots = Array.from(childProjectRoots);
         return {
             projects: getProjectsUsingESLintConfig(configFilePath, uniqueChildProjectRoots, options, context),