@nx/eslint 21.2.0-beta.1 → 21.2.0-beta.3

package/README.md

@@ -22,7 +22,7 @@
 
 # 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
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/eslint",
-  "version": "21.2.0-beta.1",
+  "version": "21.2.0-beta.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.2.0-beta.1",
-    "@nx/js": "21.2.0-beta.1",
+    "@nx/devkit": "21.2.0-beta.3",
+    "@nx/js": "21.2.0-beta.3",
     "semver": "^7.5.3",
     "tslib": "^2.3.0",
     "typescript": "~5.8.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/generators/convert-to-inferred/convert-to-inferred.js

@@ -28,14 +28,29 @@ async function convertToInferred(tree, options) {
 }
 function postTargetTransformer(target, tree, projectDetails, inferredTargetConfiguration) {
     if (target.inputs) {
-        const inputs = target.inputs.filter((input) => typeof input === 'string' &&
-            ![
-                'default',
-                '{workspaceRoot}/.eslintrc.json',
-                '{workspaceRoot}/.eslintignore',
-                '{workspaceRoot}/eslint.config.cjs',
-                '{workspaceRoot}/eslint.config.mjs',
-            ].includes(input));
+        const normalizeInput = (input) => {
+            return input
+                .replace('{workspaceRoot}', '')
+                .replace('{projectRoot}', projectDetails.root)
+                .replace('{projectName}', projectDetails.projectName)
+                .replace(/^\//, '');
+        };
+        const inputs = target.inputs.filter((input) => {
+            if (typeof input === 'string') {
+                // if the input is a string, check if it is inferred by the plugin
+                // if it is, filter it out
+                return !inferredTargetConfiguration.inputs.some((inferredInput) => typeof inferredInput === 'string' &&
+                    normalizeInput(inferredInput) === normalizeInput(input));
+            }
+            else if ('externalDependencies' in input) {
+                // if the input is an object with an externalDependencies property,
+                // check if all the external dependencies are inferred by the plugin
+                // if they are, filter it out
+                return !input.externalDependencies.every((externalDependency) => inferredTargetConfiguration.inputs.some((inferredInput) => typeof inferredInput === 'object' &&
+                    'externalDependencies' in inferredInput &&
+                    inferredInput.externalDependencies.includes(externalDependency)));
+            }
+        });
         if (inputs.length === 0) {
             delete target.inputs;
         }

package/src/generators/init/global-eslint-config.js

@@ -99,7 +99,7 @@ const getGlobalFlatEslintConfiguration = (format, rootProject) => {
                         allow: [
                             // This allows a root project to be present without causing lint errors
                             // since all projects will depend on this base file.
-                            '^.*/eslint(\\.base)?\\.config\\.[cm]?js$',
+                            '^.*/eslint(\\.base)?\\.config\\.[cm]?[jt]s$',
                         ],
                         depConstraints: [
                             { sourceTag: '*', onlyDependOnLibsWithTags: ['*'] },

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

@@ -185,8 +185,10 @@ function createEsLintConfiguration(tree, options, projectConfig, setParserOption
                 '@nx/dependency-checks': [
                     'error',
                     {
-                        // With flat configs, we don't want to include imports in the eslint js/cjs/mjs files to be checked
-                        ignoredFiles: ['{projectRoot}/eslint.config.{js,cjs,mjs}'],
+                        // With flat configs, we don't want to include imports in the eslint js/cjs/mjs/ts/cts/mts files to be checked
+                        ignoredFiles: [
+                            '{projectRoot}/eslint.config.{js,cjs,mjs,ts,cts,mts}',
+                        ],
                     },
                 ],
             },

package/src/plugins/plugin.js

@@ -71,7 +71,12 @@ const internalCreateNodes = async (configFilePath, options, context, projectsCac
         // exclude nested eslint roots and nested project roots
         [...nestedEslintRootPatterns, ...nestedProjectRootPatterns]);
         const parentConfigs = context.configFiles.filter((eslintConfig) => isSubDir(childProjectRoot, (0, posix_1.dirname)(eslintConfig)));
-        const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(childProjectRoot, options, context, [...parentConfigs, (0, posix_1.join)(childProjectRoot, '.eslintignore')]);
+        const hash = await (0, calculate_hash_for_create_nodes_1.calculateHashForCreateNodes)(childProjectRoot, {
+            ...options,
+            // change this to bust the cache when making changes that would yield
+            // different results for the same hash
+            bust: 1,
+        }, context, [...parentConfigs, (0, posix_1.join)(childProjectRoot, '.eslintignore')]);
         if (projectsCache[hash]) {
             // We can reuse the projects in the cache.
             Object.assign(projects, projectsCache[hash]);
@@ -162,7 +167,12 @@ exports.createNodesV2 = [
         const targetsCache = readTargetsCache(cachePath);
         const { eslintConfigFiles, projectRoots, projectRootsByEslintRoots } = splitConfigFiles(configFiles);
         const lintableFilesPerProjectRoot = await collectLintableFilesByProjectRoot(projectRoots, options, context);
-        const hashes = await (0, calculate_hash_for_create_nodes_1.calculateHashesForCreateNodes)(projectRoots, options, context, projectRoots.map((root) => {
+        const hashes = await (0, calculate_hash_for_create_nodes_1.calculateHashesForCreateNodes)(projectRoots, {
+            ...options,
+            // change this to bust the cache when making changes that would yield
+            // different results for the same hash
+            bust: 1,
+        }, context, projectRoots.map((root) => {
             const parentConfigs = eslintConfigFiles.filter((eslintConfig) => isSubDir(root, (0, posix_1.dirname)(eslintConfig)));
             return [...parentConfigs, (0, posix_1.join)(root, '.eslintignore')];
         }));
@@ -287,9 +297,9 @@ function buildEslintTargets(eslintConfigs, eslintVersion, projectRoot, workspace
             'default',
             // Certain lint rules can be impacted by changes to dependencies
             '^default',
-            ...eslintConfigs.map((config) => `{workspaceRoot}/${config}`.replace(`{workspaceRoot}/${projectRoot}`, isRootProject ? '{projectRoot}/' : '{projectRoot}')),
+            ...eslintConfigs.map((config) => `{workspaceRoot}/${config}`),
             ...((0, node_fs_1.existsSync)((0, posix_1.join)(workspaceRoot, projectRoot, '.eslintignore'))
-                ? ['{projectRoot}/.eslintignore']
+                ? [(0, posix_1.join)('{workspaceRoot}', projectRoot, '.eslintignore')]
                 : []),
             '{workspaceRoot}/tools/eslint-rules/**/*',
             { externalDependencies: ['eslint'] },

package/src/utils/flat-config.js

@@ -8,12 +8,19 @@ exports.eslintFlatConfigFilenames = [
     'eslint.config.cjs',
     'eslint.config.js',
     'eslint.config.mjs',
+    'eslint.config.cts',
+    'eslint.config.ts',
+    'eslint.config.mts',
 ];
 exports.baseEslintConfigFilenames = [
     'eslint.base.js',
+    'eslint.base.ts',
     'eslint.base.config.cjs',
     'eslint.base.config.js',
     'eslint.base.config.mjs',
+    'eslint.base.config.cts',
+    'eslint.base.config.ts',
+    'eslint.base.config.mts',
 ];
 function getRootESLintFlatConfigFilename(tree) {
     for (const file of exports.eslintFlatConfigFilenames) {