@nx/eslint 21.1.1 → 21.1.3

package/README.md

@@ -1,7 +1,7 @@
 <p style="text-align: center;">
   <picture>
     <source media="(prefers-color-scheme: dark)" srcset="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-dark.svg">
-    <img alt="Nx - Smart Monorepos · Fast CI" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
+    <img alt="Nx - Smart Repos · Fast Builds" src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-light.svg" width="100%">
   </picture>
 </p>
 
@@ -20,9 +20,9 @@
 
 <hr>
 
-# Nx: Smart Monorepos · Fast CI
+# Nx: Smart Repos · Fast Builds
 
-Nx is a build system, optimized for monorepos, with plugins for popular frameworks and tools and advanced CI capabilities including caching and distribution.
+An AI-first build platform that connects everything from your editor to CI. Helping you deliver fast, without breaking things.
 
 ## Getting Started
 
@@ -62,5 +62,5 @@ npx nx@latest init
 - [Blog Posts About Nx](https://nx.dev/blog)
 
 <p style="text-align: center;"><a href="https://nx.dev/#learning-materials" target="_blank" rel="noreferrer"><img src="https://raw.githubusercontent.com/nrwl/nx/master/images/nx-courses-and-videos.svg" 
-width="100%" alt="Nx - Smart Monorepos · Fast CI"></a></p>
+width="100%" alt="Nx - Smart Repos · Fast Builds"></a></p>
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "21.1.1",
+  "version": "21.1.3",
   "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": "21.1.1",
-    "@nx/js": "21.1.1",
+    "@nx/devkit": "21.1.3",
+    "@nx/js": "21.1.3",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.7.2"

package/src/generators/convert-to-flat-config/converters/json-converter.js

@@ -91,7 +91,7 @@ function convertEslintJsonToFlatConfig(tree, root, config, ignorePaths, format)
         if (tree.exists(ignorePath)) {
             const patterns = tree
                 .read(ignorePath, 'utf-8')
-                .split('\n')
+                .split(/\r\n|\r|\n/)
                 .filter((line) => line.length > 0 && line !== 'node_modules')
                 .map((path) => (0, path_utils_1.mapFilePath)(path));
             if (patterns.length > 0) {

package/src/plugins/plugin.js

@@ -107,11 +107,8 @@ const internalCreateNodes = async (configFilePath, options, context, projectsCac
         projects,
     };
 };
-const internalCreateNodesV2 = async (configFilePath, options, context, projectRootsByEslintRoots, lintableFilesPerProjectRoot, projectsCache, hashByRoot) => {
+const internalCreateNodesV2 = async (ESLint, configFilePath, options, context, projectRootsByEslintRoots, lintableFilesPerProjectRoot, projectsCache, hashByRoot) => {
     const configDir = (0, posix_1.dirname)(configFilePath);
-    const ESLint = await (0, resolve_eslint_class_1.resolveESLintClass)({
-        useFlatConfigOverrideVal: (0, config_file_1.isFlatConfig)(configFilePath),
-    });
     const eslintVersion = ESLint.version;
     const projects = {};
     await Promise.all(projectRootsByEslintRoots.get(configDir).map(async (projectRoot) => {
@@ -121,16 +118,21 @@ const internalCreateNodesV2 = async (configFilePath, options, context, projectRo
             Object.assign(projects, projectsCache[hash]);
             return;
         }
-        const eslint = new ESLint({
-            cwd: (0, posix_1.join)(context.workspaceRoot, projectRoot),
-        });
         let hasNonIgnoredLintableFiles = false;
-        for (const file of lintableFilesPerProjectRoot.get(projectRoot) ?? []) {
-            if (!(await eslint.isPathIgnored((0, posix_1.join)(context.workspaceRoot, file)))) {
-                hasNonIgnoredLintableFiles = true;
-                break;
+        if (configDir !== projectRoot || projectRoot === '.') {
+            const eslint = new ESLint({
+                cwd: (0, posix_1.join)(context.workspaceRoot, projectRoot),
+            });
+            for (const file of lintableFilesPerProjectRoot.get(projectRoot) ?? []) {
+                if (!(await eslint.isPathIgnored((0, posix_1.join)(context.workspaceRoot, file)))) {
+                    hasNonIgnoredLintableFiles = true;
+                    break;
+                }
             }
         }
+        else {
+            hasNonIgnoredLintableFiles = true;
+        }
         if (!hasNonIgnoredLintableFiles) {
             // No lintable files in the project, store in the cache and skip further processing
             projectsCache[hash] = {};
@@ -166,7 +168,13 @@ exports.createNodesV2 = [
         }));
         const hashByRoot = new Map(projectRoots.map((r, i) => [r, hashes[i]]));
         try {
-            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => internalCreateNodesV2(configFile, options, context, projectRootsByEslintRoots, lintableFilesPerProjectRoot, targetsCache, hashByRoot), eslintConfigFiles, options, context);
+            if (eslintConfigFiles.length === 0) {
+                return [];
+            }
+            const ESLint = await (0, resolve_eslint_class_1.resolveESLintClass)({
+                useFlatConfigOverrideVal: (0, config_file_1.isFlatConfig)(eslintConfigFiles[0]),
+            });
+            return await (0, devkit_1.createNodesFromFiles)((configFile, options, context) => internalCreateNodesV2(ESLint, configFile, options, context, projectRootsByEslintRoots, lintableFilesPerProjectRoot, targetsCache, hashByRoot), eslintConfigFiles, options, context);
         }
         finally {
             writeTargetsToCache(cachePath, targetsCache);