fix(misc): ensure that eslint.config.js file is ignored for dep-check…

…s rule
nrwl · Sep 11, 2024 · 86e4a5d · 86e4a5d
1 parent 00130f5
commit 86e4a5d
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 18 deletions.
diff --git a/packages/eslint/src/generators/lint-project/lint-project.spec.ts b/packages/eslint/src/generators/lint-project/lint-project.spec.ts
@@ -170,7 +170,7 @@ describe('@nx/eslint:lint-project', () => {
               "@nx/dependency-checks": [
                 "error",
                 {
-                  "ignoredFiles": ["**/*/*eslint*"]
+                  "ignoredFiles": ["{projectRoot}/eslint.config.{js,cjs,mjs}"]
                 }
               ]
             }

diff --git a/packages/eslint/src/generators/lint-project/lint-project.ts b/packages/eslint/src/generators/lint-project/lint-project.ts
@@ -252,7 +252,7 @@ function createEsLintConfiguration(
           'error',
           {
             // With flat configs, we don't want to include imports in the eslint js/cjs/mjs files to be checked
-            ignoredFiles: ['**/*/*eslint*'],
+            ignoredFiles: ['{projectRoot}/eslint.config.{js,cjs,mjs}'],
           },
         ],
       },

diff --git a/packages/js/src/generators/library/library.spec.ts b/packages/js/src/generators/library/library.spec.ts
@@ -541,7 +541,7 @@ describe('lib', () => {
                     "error",
                     {
                       "ignoredFiles": [
-                        "**/*/*eslint*",
+                        "{projectRoot}/eslint.config.{js,cjs,mjs}",
                       ],
                     },
                   ],
@@ -605,7 +605,7 @@ describe('lib', () => {
                     "error",
                     {
                       "ignoredFiles": [
-                        "**/*/*eslint*",
+                        "{projectRoot}/eslint.config.{js,cjs,mjs}",
                       ],
                     },
                   ],
@@ -737,7 +737,7 @@ describe('lib', () => {
                     "error",
                     {
                       "ignoredFiles": [
-                        "**/*/*eslint*",
+                        "{projectRoot}/eslint.config.{js,cjs,mjs}",
                       ],
                     },
                   ],
@@ -1503,7 +1503,10 @@ describe('lib', () => {
           '@nx/dependency-checks': [
             'error',
             {
-              ignoredFiles: ['{projectRoot}/esbuild.config.{js,ts,mjs,mts}'],
+              ignoredFiles: [
+                '{projectRoot}/eslint.config.{js,cjs,mjs}',
+                '{projectRoot}/esbuild.config.{js,ts,mjs,mts}',
+              ],
             },
           ],
         },
@@ -1528,7 +1531,10 @@ describe('lib', () => {
           '@nx/dependency-checks': [
             'error',
             {
-              ignoredFiles: ['{projectRoot}/rollup.config.{js,ts,mjs,mts}'],
+              ignoredFiles: [
+                '{projectRoot}/eslint.config.{js,cjs,mjs}',
+                '{projectRoot}/rollup.config.{js,ts,mjs,mts}',
+              ],
             },
           ],
         },

diff --git a/packages/js/src/generators/library/library.ts b/packages/js/src/generators/library/library.ts
@@ -388,19 +388,22 @@ export async function addLint(
           ruleOptions = {};
         }
         if (options.bundler === 'vite' || options.unitTestRunner === 'vitest') {
-          ruleOptions.ignoredFiles = [
-            '{projectRoot}/vite.config.{js,ts,mjs,mts}',
-          ];
+          ruleOptions.ignoredFiles ??= [];
+          ruleOptions.ignoredFiles.push(
+            '{projectRoot}/vite.config.{js,ts,mjs,mts}'
+          );
           o.rules['@nx/dependency-checks'] = [ruleSeverity, ruleOptions];
         } else if (options.bundler === 'rollup') {
-          ruleOptions.ignoredFiles = [
-            '{projectRoot}/rollup.config.{js,ts,mjs,mts}',
-          ];
+          ruleOptions.ignoredFiles ??= [];
+          ruleOptions.ignoredFiles.push(
+            '{projectRoot}/rollup.config.{js,ts,mjs,mts}'
+          );
           o.rules['@nx/dependency-checks'] = [ruleSeverity, ruleOptions];
         } else if (options.bundler === 'esbuild') {
-          ruleOptions.ignoredFiles = [
-            '{projectRoot}/esbuild.config.{js,ts,mjs,mts}',
-          ];
+          ruleOptions.ignoredFiles ??= [];
+          ruleOptions.ignoredFiles.push(
+            '{projectRoot}/esbuild.config.{js,ts,mjs,mts}'
+          );
           o.rules['@nx/dependency-checks'] = [ruleSeverity, ruleOptions];
         }
         return o;

diff --git a/packages/plugin/src/generators/lint-checks/generator.spec.ts b/packages/plugin/src/generators/lint-checks/generator.spec.ts
@@ -160,7 +160,7 @@ describe('lint-checks generator', () => {
               "error",
               {
                 "ignoredFiles": [
-                  "**/*/*eslint*",
+                  "{projectRoot}/eslint.config.{js,cjs,mjs}",
                 ],
               },
             ],

diff --git a/packages/vite/src/generators/configuration/configuration.spec.ts b/packages/vite/src/generators/configuration/configuration.spec.ts
@@ -290,7 +290,10 @@ describe('@nx/vite:configuration', () => {
           '@nx/dependency-checks': [
             'error',
             {
-              ignoredFiles: ['{projectRoot}/vite.config.{js,ts,mjs,mts}'],
+              ignoredFiles: [
+                '{projectRoot}/eslint.config.{js,cjs,mjs}',
+                '{projectRoot}/vite.config.{js,ts,mjs,mts}',
+              ],
             },
           ],
         },