fix(eslint-config): remove isSrcAppDirAvailable which seems useless

1stG · Nov 1, 2019 · 7906321 · 7906321
1 parent 932f230
commit 7906321
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 17 deletions.
diff --git a/packages/eslint-config/_util.js b/packages/eslint-config/_util.js
@@ -1,8 +1,7 @@
-/* eslint-disable node/no-extraneous-require */
 const fs = require('fs')
 const { resolve } = require('path')
 
-const { tryFile, tryPkg } = require('@pkgr/utils')
+const { isPkgAvailable, tryFile } = require('@pkgr/utils')
 const isGlob = require('is-glob')
 const globSync = require('tiny-glob/sync')
 
@@ -53,11 +52,7 @@ try {
   exports.isSrcDirAvailable = fs.statSync(resolve('src')).isDirectory()
 } catch (e) {}
 
-try {
-  exports.isSrcAppDirAvailable = fs.statSync(resolve('src/app')).isDirectory()
-} catch (e) {}
-
-exports.isWebpackAvailable = tryPkg('webpack')
+exports.isWebpackAvailable = isPkgAvailable('webpack')
 
 // https://webpack.js.org/api/module-variables/#__resourcequery-webpack-specific
 exports.webpackSpecVars = [
@@ -76,7 +71,7 @@ exports.camelCaseRule = [
   {
     properties: 'never',
     ignoreDestructuring: true,
-    allow: exports.isWebpackAvailable && exports.webpackSpecVars,
+    allow: exports.isWebpackAvailable ? exports.webpackSpecVars : undefined,
   },
 ]
 
@@ -98,6 +93,7 @@ exports.magicNumbers = [
   100,
   365,
   500,
+  768,
   1000,
   1024,
   3600,

diff --git a/packages/eslint-config/index.js b/packages/eslint-config/index.js
@@ -38,7 +38,7 @@ module.exports = {
       ],
     },
   },
-  globals: isWebpackAvailable && getGlobals(webpackSpecVars),
+  globals: isWebpackAvailable ? getGlobals(webpackSpecVars) : undefined,
   rules: {
     camelcase: camelCaseRule,
     'import/order': [

diff --git a/packages/eslint-config/overrides.js b/packages/eslint-config/overrides.js
@@ -10,12 +10,7 @@ const {
   tryPkg,
 } = require('@pkgr/utils')
 
-const {
-  camelCaseRule,
-  isSrcDirAvailable,
-  isSrcAppDirAvailable,
-  magicNumbers,
-} = require('./_util')
+const { camelCaseRule, isSrcDirAvailable, magicNumbers } = require('./_util')
 
 const configFile =
   tryFile(resolve('babel.config.js')) ||
@@ -75,8 +70,7 @@ const resolveSettings = {
     resolvePaths: [
       tryFile('node_modules/@d-ts', true),
       tryFile('node_modules/@types', true),
-      isSrcDirAvailable && !isAngularAvailable && 'src',
-      isAngularAvailable && isSrcAppDirAvailable && 'src/app',
+      isSrcDirAvailable && 'src',
     ].filter(Boolean),
     tryExtensions: [
       '.ts',