fix(linter): handle non-JSON eslintrc files when updating overrides

nrwl · Sep 6, 2023 · 6cbd1fc · 6cbd1fc
1 parent 2bc7031
commit 6cbd1fc
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 2 deletions.
diff --git a/e2e/node/src/node.test.ts b/e2e/node/src/node.test.ts
@@ -142,7 +142,7 @@ describe('Node Applications', () => {
       }
     ).toString();
     expect(additionalResult).toContain('Hello Additional World!');
-  }, 60000);
+  }, 300_000);
 
   it('should be able to generate an empty application with variable in .env file', async () => {
     const originalEnvPort = process.env.PORT;

diff --git a/packages/linter/src/generators/utils/eslint-file.spec.ts b/packages/linter/src/generators/utils/eslint-file.spec.ts
@@ -2,6 +2,7 @@ import {
   baseEsLintConfigFile,
   eslintConfigFileWhitelist,
   findEslintFile,
+  lintConfigHasOverride,
 } from './eslint-file';
 
 import { Tree } from '@nx/devkit';
@@ -36,4 +37,40 @@ describe('@nx/linter:eslint-file', () => {
       }
     );
   });
+
+  describe('lintConfigHasOverride', () => {
+    it('should return true when override exists in eslintrc format', () => {
+      tree.write(
+        '.eslintrc.json',
+        '{"overrides": [{ "files": ["*.ts"], "rules": {} }]}'
+      );
+      expect(
+        lintConfigHasOverride(
+          tree,
+          '.',
+          (o) => {
+            return o.files?.includes('*.ts');
+          },
+          false
+        )
+      ).toBe(true);
+    });
+
+    it('should return false when eslintrc is not in JSON format', () => {
+      tree.write(
+        '.eslintrc.js',
+        'module.exports = {overrides: [{ files: ["*.ts"], rules: {} }]};'
+      );
+      expect(
+        lintConfigHasOverride(
+          tree,
+          '.',
+          (o) => {
+            return o.files?.includes('*.ts');
+          },
+          false
+        )
+      ).toBe(false);
+    });
+  });
 });
diff --git a/packages/linter/src/generators/utils/eslint-file.ts b/packages/linter/src/generators/utils/eslint-file.ts
@@ -247,7 +247,10 @@ export function lintConfigHasOverride(
       root,
       isBase ? baseEsLintConfigFile : '.eslintrc.json'
     );
-    return readJson(tree, fileName).overrides?.some(lookup) || false;
+
+    return tree.exists(fileName)
+      ? readJson(tree, fileName).overrides?.some(lookup) || false
+      : false;
   }
 }