@nx/eslint 19.7.0-canary.20240906-a3c2db8 → 19.7.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "19.7.0-canary.20240906-a3c2db8",
+  "version": "19.7.0",
   "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,12 +35,12 @@
     "eslint": "^8.0.0 || ^9.0.0"
   },
   "dependencies": {
-    "@nx/devkit": "19.7.0-canary.20240906-a3c2db8",
-    "@nx/js": "19.7.0-canary.20240906-a3c2db8",
+    "@nx/devkit": "19.7.0",
+    "@nx/js": "19.7.0",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.4.2",
-    "@nx/linter": "19.7.0-canary.20240906-a3c2db8"
+    "@nx/linter": "19.7.0"
   },
   "peerDependenciesMeta": {
     "@zkochan/js-yaml": {

package/src/plugins/plugin.js

@@ -94,8 +94,7 @@ const internalCreateNodes = async (configFilePath, options, context, projectsCac
         projects,
     };
 };
-let collectingLintableFilesPromise;
-const internalCreateNodesV2 = async (configFilePath, options, context, eslintConfigFiles, allProjectRoots, projectRootsByEslintRoots, lintableFilesPerProjectRoot, projectsCache) => {
+const internalCreateNodesV2 = async (configFilePath, options, context, eslintConfigFiles, projectRootsByEslintRoots, lintableFilesPerProjectRoot, projectsCache) => {
     const configDir = (0, posix_1.dirname)(configFilePath);
     const ESLint = await (0, resolve_eslint_class_1.resolveESLintClass)((0, config_file_1.isFlatConfig)(configFilePath));
     const eslintVersion = ESLint.version;
@@ -112,11 +111,6 @@ const internalCreateNodesV2 = async (configFilePath, options, context, eslintCon
             Object.assign(projects, projectsCache[hash]);
             return;
         }
-        if (!lintableFilesPerProjectRoot.size) {
-            collectingLintableFilesPromise ??= collectLintableFilesByProjectRoot(lintableFilesPerProjectRoot, allProjectRoots, options, context);
-            await collectingLintableFilesPromise;
-            collectingLintableFilesPromise = null;
-        }
         const eslint = new ESLint({
             cwd: (0, posix_1.join)(context.workspaceRoot, projectRoot),
         });
@@ -155,9 +149,9 @@ exports.createNodesV2 = [
         const cachePath = (0, posix_1.join)(cache_directory_1.workspaceDataDirectory, `eslint-${optionsHash}.hash`);
         const targetsCache = readTargetsCache(cachePath);
         const { eslintConfigFiles, projectRoots, projectRootsByEslintRoots } = splitConfigFiles(configFiles);
-        const lintableFilesPerProjectRoot = new Map();
+        const lintableFilesPerProjectRoot = await collectLintableFilesByProjectRoot(projectRoots, options, context);
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => internalCreateNodesV2(configFile, options, context, eslintConfigFiles, projectRoots, projectRootsByEslintRoots, lintableFilesPerProjectRoot, targetsCache), eslintConfigFiles, options, context);
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => internalCreateNodesV2(configFile, options, context, eslintConfigFiles, projectRootsByEslintRoots, lintableFilesPerProjectRoot, targetsCache), eslintConfigFiles, options, context);
         }
         finally {
             writeTargetsToCache(cachePath, targetsCache);
@@ -203,7 +197,8 @@ function groupProjectRootsByEslintRoots(eslintConfigFiles, projectRoots) {
     }
     return projectRootsByEslintRoots;
 }
-async function collectLintableFilesByProjectRoot(lintableFilesPerProjectRoot, projectRoots, options, context) {
+async function collectLintableFilesByProjectRoot(projectRoots, options, context) {
+    const lintableFilesPerProjectRoot = new Map();
     const lintableFiles = await (0, workspace_context_1.globWithWorkspaceContext)(context.workspaceRoot, [
         `**/*.{${options.extensions.join(',')}}`,
     ]);
@@ -216,6 +211,7 @@ async function collectLintableFilesByProjectRoot(lintableFilesPerProjectRoot, pr
             lintableFilesPerProjectRoot.get(projectRoot).push(file);
         }
     }
+    return lintableFilesPerProjectRoot;
 }
 function getRootForDirectory(directory, roots) {
     let currentPath = (0, posix_1.normalize)(directory);