Fix hasPkg checks

alecmev · Mar 14, 2021 · 52fe441 · 52fe441
1 parent 35c5f21
commit 52fe441
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 14 deletions.
diff --git a/detect/configs.js b/detect/configs.js
@@ -1,14  1,11 @@
-const { settings = {} } = require('../lib/config')
-const { hasAnyDep } = require('../lib/utils')
-
-const hasBabel = hasAnyDep('babel') || hasAnyDep('@babel/core') || settings.babel
 const { hasBabel, hasTypeScript, hasReact } = require('../lib/hasPackage')
 
 const configs = []
 
-if (hasAnyDep('typescript')) configs.push('@typescript-eslint/eslint-plugin')
 if (hasTypeScript) configs.push('@typescript-eslint/eslint-plugin')
 
-configs.push(hasAnyDep('react') ? 'airbnb' : 'airbnb-base')
-if (hasAnyDep('typescript')) configs.push('airbnb-typescript')
 configs.push(hasReact ? 'airbnb' : 'airbnb-base')
 if (hasTypeScript) configs.push('airbnb-typescript')
 if (hasBabel) configs.push('airbnb-babel')
 
 configs.push('adjunct')

diff --git a/detect/parsers.js b/detect/parsers.js
@@ -1,12  1,9 @@
-const isModuleAvailable = require('../lib/is-module-available')
-
-const hasBabel = isModuleAvailable('babel') || isModuleAvailable('@babel/core')
-const hasTypescript = isModuleAvailable('typescript')
 const { hasBabel, hasTypeScript } = require('../lib/hasPackage')
 
 const parsers = []
 
 if (hasBabel) parsers.push('babel-eslint')
 
-if (hasTypescript) parsers.push('@typescript-eslint/parser')
 if (hasTypeScript) parsers.push('@typescript-eslint/parser')
 
 module.exports = parsers
diff --git a/detect/plugins.js b/detect/plugins.js
@@ -1,7  1,5 @@
 const { env = {}, settings = {} } = require('../lib/config')
-
 const { hasAnyDep } = require('../lib/utils')
-
 const { hasBabel } = require('../lib/hasPackage')
 
 const plugins = []

diff --git a/lib/hasPackage.js b/lib/hasPackage.js
@@ -9,7  9,10 @@ const hasBabel =
 
 const hasTypeScript = settings.typescript || hasAnyDep('typescript')
 
 const hasReact = hasAnyDep('react')
 
 module.exports = {
   hasBabel,
   hasTypeScript,
   hasReact,
 }