fix(misc): add files to flat config overrides

nrwl · Sep 10, 2024 · 09b2d8d · 09b2d8d
1 parent f7ba497
commit 09b2d8d
Show file tree

Hide file tree

Showing 9 changed files with 39 additions and 7 deletions.
diff --git a/packages/angular/src/generators/add-linting/add-linting.ts b/packages/angular/src/generators/add-linting/add-linting.ts
@@ -65,6 +65,7 @@ export async function addLintingGenerator(
         'flat/angular-template'
       );
       addOverrideToLintConfig(tree, options.projectRoot, {
+        files: ['*.ts'],
         rules: {
           '@angular-eslint/directive-selector': [
             'error',
@@ -84,6 +85,10 @@ export async function addLintingGenerator(
           ],
         },
       });
+      addOverrideToLintConfig(tree, options.projectRoot, {
+        files: ['*.html'],
+        rules: {},
+      });
 
       if (isBuildableLibraryProject(tree, options.projectName)) {
         addOverrideToLintConfig(tree, '', {

diff --git a/packages/angular/src/generators/library/library.spec.ts b/packages/angular/src/generators/library/library.spec.ts
@@ -1215,6 +1215,7 @@ describe('lib', () => {
           ...nx.configs["flat/angular"],
           ...nx.configs["flat/angular-template"],
           {
+              files: ["**/*.ts"],
               rules: {
                   "@angular-eslint/directive-selector": [
                       "error",
@@ -1233,6 +1234,11 @@ describe('lib', () => {
                       }
                   ]
               }
+          },
+          {
+              files: ["**/*.html"],
+              // Override or add rules here
+              rules: {}
           }
           ];
           "

diff --git a/packages/cypress/src/utils/add-linter.ts b/packages/cypress/src/utils/add-linter.ts
@@ -102,7 +102,10 @@ export async function addLinterToCyProject(
         false,
         false
       );
-      addOverrideToLintConfig(tree, projectConfig.root, { rules: {} });
+      addOverrideToLintConfig(tree, projectConfig.root, {
+        files: ['*.ts', '*.js'],
+        rules: {},
+      });
     } else {
       if (options.rootProject) {
         addPluginsToLintConfig(tree, projectConfig.root, '@nx');

diff --git a/packages/detox/src/generators/application/lib/add-linting.ts b/packages/detox/src/generators/application/lib/add-linting.ts
@@ -41,7 +41,10 @@ export async function addLinting(host: Tree, options: NormalizedSchema) {
         'flat/react'
       );
       // Add an empty rules object to users know how to add/override rules
-      addOverrideToLintConfig(host, options.e2eProjectRoot, { rules: {} });
+      addOverrideToLintConfig(host, options.e2eProjectRoot, {
+        files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
+        rules: {},
+      });
     } else {
       const addExtendsTask = addExtendsToLintConfig(
         host,

diff --git a/packages/expo/src/utils/add-linting.ts b/packages/expo/src/utils/add-linting.ts
@@ -50,7 +50,10 @@ export async function addLinting(host: Tree, options: NormalizedSchema) {
         'flat/react'
       );
       // Add an empty rules object to users know how to add/override rules
-      addOverrideToLintConfig(host, options.projectRoot, { rules: {} });
+      addOverrideToLintConfig(host, options.projectRoot, {
+        files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
+        rules: {},
+      });
     } else {
       const addExtendsTask = addExtendsToLintConfig(host, options.projectRoot, {
         name: 'plugin:@nx/react',

diff --git a/packages/playwright/src/utils/add-linter.ts b/packages/playwright/src/utils/add-linter.ts
@@ -88,7 +88,10 @@ export async function addLinterToPlaywrightProject(
         false,
         false
       );
-      addOverrideToLintConfig(tree, projectConfig.root, { rules: {} });
+      addOverrideToLintConfig(tree, projectConfig.root, {
+        files: ['*.ts', '*.js'],
+        rules: {},
+      });
     } else {
       const addExtendsTask = addExtendsToLintConfig(
         tree,

diff --git a/packages/react-native/src/utils/add-linting.ts b/packages/react-native/src/utils/add-linting.ts
@@ -50,7 +50,10 @@ export async function addLinting(host: Tree, options: NormalizedSchema) {
         'flat/react'
       );
       // Add an empty rules object to users know how to add/override rules
-      addOverrideToLintConfig(host, options.projectRoot, { rules: {} });
+      addOverrideToLintConfig(host, options.projectRoot, {
+        files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
+        rules: {},
+      });
     } else {
       const addExtendsTask = addExtendsToLintConfig(host, options.projectRoot, {
         name: 'plugin:@nx/react',

diff --git a/packages/react/src/generators/application/application.ts b/packages/react/src/generators/application/application.ts
@@ -72,7 +72,10 @@ async function addLinting(host: Tree, options: NormalizedSchema) {
           'flat/react'
         );
         // Add an empty rules object to users know how to add/override rules
-        addOverrideToLintConfig(host, options.appProjectRoot, { rules: {} });
+        addOverrideToLintConfig(host, options.appProjectRoot, {
+          files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
+          rules: {},
+        });
       } else {
         const addExtendsTask = addExtendsToLintConfig(
           host,

diff --git a/packages/react/src/generators/library/lib/add-linting.ts b/packages/react/src/generators/library/lib/add-linting.ts
@@ -42,7 +42,10 @@ export async function addLinting(host: Tree, options: NormalizedSchema) {
           'flat/react'
         );
         // Add an empty rules object to users know how to add/override rules
-        addOverrideToLintConfig(host, options.projectRoot, { rules: {} });
+        addOverrideToLintConfig(host, options.projectRoot, {
+          files: ['*.ts', '*.tsx', '*.js', '*.jsx'],
+          rules: {},
+        });
       } else {
         const addExtendsTask = addExtendsToLintConfig(
           host,