Merge pull request #228 from standard/remove-deglob

Author: feross

index.js

@@ -3,18 +3,18 @@ module.exports.cli = require('./bin/cmd')
 
 module.exports.linter = Linter
 
-var deglob = require('deglob')
 var os = require('os')
 var path = require('path')
 var pkgConf = require('pkg-conf')
+var fs = require('fs')
 
 var CACHE_HOME = require('xdg-basedir').cache || os.tmpdir()
 
-var DEFAULT_PATTERNS = [
-  '**/*.js',
-  '**/*.jsx',
-  '**/*.mjs',
-  '**/*.cjs'
+var DEFAULT_EXTENSIONS = [
+  '.js',
+  '.jsx',
+  '.mjs',
+  '.cjs'
 ]
 
 var DEFAULT_IGNORE = [
@@ -48,8 +48,9 @@ function Linter (opts) {
     envs: [],
     fix: false,
     globals: [],
-    ignore: false,
     plugins: [],
+    ignorePattern: [],
+    extensions: DEFAULT_EXTENSIONS,
     useEslintrc: false
   }, opts.eslintConfig)
 
@@ -109,58 +110,72 @@ Linter.prototype.lintFiles = function (files, opts, cb) {
   opts = self.parseOpts(opts)
 
   if (typeof files === 'string') files = [files]
-  if (files.length === 0) files = DEFAULT_PATTERNS
+  if (files.length === 0) files = ['.']
 
-  var deglobOpts = {
-    ignore: opts.ignore,
-    cwd: opts.cwd,
-    useGitIgnore: true,
-    usePackageJson: false
+  var result
+  try {
+    result = new self.eslint.CLIEngine(opts.eslintConfig).executeOnFiles(files)
+  } catch (err) {
+    return cb(err)
   }
 
-  deglob(files, deglobOpts, function (err, allFiles) {
-    if (err) return cb(err)
-
-    var result
-    try {
-      result = new self.eslint.CLIEngine(opts.eslintConfig).executeOnFiles(allFiles)
-    } catch (err) {
-      return cb(err)
-    }
-
-    if (opts.fix) {
-      self.eslint.CLIEngine.outputFixes(result)
-    }
+  if (opts.fix) {
+    self.eslint.CLIEngine.outputFixes(result)
+  }
 
-    return cb(null, result)
-  })
+  return cb(null, result)
 }
 
 Linter.prototype.parseOpts = function (opts) {
   var self = this
 
-  if (!opts) opts = {}
-  opts = Object.assign({}, opts)
-  opts.eslintConfig = Object.assign({}, self.eslintConfig)
-  opts.eslintConfig.fix = !!opts.fix
+  opts = {
+    eslintConfig: { ...self.eslintConfig },
+    usePackageJson: true,
+    useGitIgnore: true,
+    gitIgnoreFile: ['.gitignore', '.git/info/exclude'],
+    cwd: self.cwd,
+    fix: false,
+    ignore: [],
+    ...opts
+  }
+
+  if (!Array.isArray(opts.gitIgnoreFile)) {
+    opts.gitIgnoreFile = [opts.gitIgnoreFile]
+  }
 
-  if (!opts.cwd) opts.cwd = self.cwd
   opts.eslintConfig.cwd = opts.cwd
+  opts.eslintConfig.fix = opts.fix
+
+  var packageOpts = {}
+  var rootPath = null
 
-  // If no usePackageJson option is given, default to `true`
-  var usePackageJson = opts.usePackageJson != null
-    ? opts.usePackageJson
-    : true
+  if (opts.usePackageJson || opts.useGitIgnore) {
+    packageOpts = pkgConf.sync(self.cmd, { cwd: opts.cwd })
+    rootPath = path.dirname(pkgConf.filepath(packageOpts))
+  }
 
-  var packageOpts = usePackageJson
-    ? pkgConf.sync(self.cmd, { cwd: opts.cwd })
-    : {}
+  if (!opts.usePackageJson) packageOpts = {}
 
-  if (!opts.ignore) opts.ignore = []
-  addIgnore(packageOpts.ignore)
   if (!packageOpts.noDefaultIgnore) {
     addIgnore(DEFAULT_IGNORE)
   }
+  addIgnore(packageOpts.ignore)
+
+  if (opts.useGitIgnore) {
+    opts.gitIgnoreFile
+      .map(gitIgnoreFile => {
+        try {
+          return fs.readFileSync(path.join(rootPath, gitIgnoreFile), 'utf8')
+        } catch (err) {
+          return null
+        }
+      })
+      .filter(Boolean)
+      .forEach(gitignore => {
+        addIgnore(gitignore.split(/\r?\n/))
+      })
+  }
 
   addGlobals(packageOpts.globals || packageOpts.global)
   addGlobals(opts.globals || opts.global)
@@ -175,7 +190,7 @@ Linter.prototype.parseOpts = function (opts) {
 
   if (self.customParseOpts) {
     var rootDir
-    if (usePackageJson) {
+    if (opts.usePackageJson) {
       var filePath = pkgConf.filepath(packageOpts)
       rootDir = filePath ? path.dirname(filePath) : opts.cwd
     } else {
@@ -186,7 +201,7 @@ Linter.prototype.parseOpts = function (opts) {
 
   function addIgnore (ignore) {
     if (!ignore) return
-    opts.ignore = opts.ignore.concat(ignore)
+    opts.eslintConfig.ignorePattern = opts.eslintConfig.ignorePattern.concat(ignore)
   }
 
   function addGlobals (globals) {

package.json

@@ -38,26 +38,24 @@
     "test": "standard && tape test/clone.js test/api.js"
   },
   "dependencies": {
-    "deglob": "^4.0.1",
     "get-stdin": "^8.0.0",
     "minimist": "^1.2.5",
     "pkg-conf": "^3.1.0",
     "xdg-basedir": "^4.0.0"
   },
   "devDependencies": {
     "babel-eslint": "^10.1.0",
-    "cross-spawn": "^7.0.2",
-    "eslint": "^6.8.0",
-    "eslint-config-standard": "^14.1.1",
-    "eslint-config-standard-jsx": "^8.1.0",
-    "eslint-plugin-import": "^2.20.2",
+    "cross-spawn": "^7.0.3",
+    "eslint": "^7.12.1",
+    "eslint-config-standard": "^15.0.1",
+    "eslint-config-standard-jsx": "^9.0.0",
+    "eslint-plugin-import": "^2.22.1",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-promise": "^4.2.1",
-    "eslint-plugin-react": "^7.19.0",
-    "eslint-plugin-standard": "^4.0.1",
-    "mkdirp": "^0.5.5",
-    "standard": "^14.3.3",
-    "tape": "^5.0.0"
+    "eslint-plugin-react": "^7.21.5",
+    "eslint-plugin-standard": "^4.0.2",
+    "standard": "^15.0.1",
+    "tape": "^5.0.1"
   },
   "engines": {
     "node": ">=8.10"

test/clone.js

@@ -2,7 +2,6 @@
 
 var crossSpawn = require('cross-spawn')
 var fs = require('fs')
-var mkdirp = require('mkdirp')
 var path = require('path')
 var test = require('tape')
 
@@ -18,7 +17,7 @@ const pkg = {
 test('test `standard` repo', function (t) {
   t.plan(1)
 
-  mkdirp.sync(TMP)
+  fs.mkdirSync(TMP, { recursive: true })
 
   var name = pkg.name
   var url = pkg.repo + '.git'