From 9a6df0bf18dd17f8994ca0bf84d25f7081a910e7 Mon Sep 17 00:00:00 2001
From: Patrik Oldsberg <poldsberg@gmail.com>
Date: Fri, 29 May 2020 10:20:22 +0200
Subject: [PATCH] packages/cli: call eslint directly

---
 packages/cli/config/eslint.backend.js |  2 +-
 packages/cli/config/eslint.js         |  2 +-
 packages/cli/src/commands/lint.ts     | 11 +++++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/packages/cli/config/eslint.backend.js b/packages/cli/config/eslint.backend.js
index 619d3c72e0..4f45e232b2 100644
--- a/packages/cli/config/eslint.backend.js
+++ b/packages/cli/config/eslint.backend.js
@@ -32,7 +32,7 @@ module.exports = {
     ecmaVersion: 2018,
     sourceType: 'module',
   },
-  ignorePatterns: ['**/dist/**', '**/build/**'],
+  ignorePatterns: ['.eslintrc.js', '**/dist/**'],
   rules: {
     'no-console': 0, // Permitted in console programs
     'new-cap': ['error', { capIsNew: false }], // Because Express constructs things e.g. like 'const r = express.Router()'
diff --git a/packages/cli/config/eslint.js b/packages/cli/config/eslint.js
index 0c6bfbe8e7..922867ea5a 100644
--- a/packages/cli/config/eslint.js
+++ b/packages/cli/config/eslint.js
@@ -39,7 +39,7 @@ module.exports = {
       version: 'detect',
     },
   },
-  ignorePatterns: ['**/dist/**', '**/build/**'],
+  ignorePatterns: ['.eslintrc.js', '**/dist/**'],
   rules: {
     'import/no-duplicates': 'warn',
     'import/no-extraneous-dependencies': [
diff --git a/packages/cli/src/commands/lint.ts b/packages/cli/src/commands/lint.ts
index 07819bacfb..7eeedcbe29 100644
--- a/packages/cli/src/commands/lint.ts
+++ b/packages/cli/src/commands/lint.ts
@@ -16,12 +16,19 @@
 
 import { Command } from 'commander';
 import { run } from '../lib/run';
+import { paths } from '../lib/paths';
 
 export default async (cmd: Command) => {
-  const args = ['lint', '--max-warnings=0', '--format=codeframe'];
+  const args = [
+    '--ext',
+    'js,jsx,ts,tsx',
+    '--max-warnings=0',
+    '--format=codeframe',
+    paths.targetDir,
+  ];
   if (cmd.fix) {
     args.push('--fix');
   }
 
-  await run('web-scripts', args);
+  await run('eslint', args);
 };