BREAKING: Use eslint for file ignoring; remove deblog

Ignore patterns should follow the .gitignore format rather than the `glob` pattern.

So, you can use dir/ instead of dir/** now.

There may be subtle differences in behavior.

Fixes: #226

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,70 @@ 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 (!opts.cwd) opts.cwd = self.cwd
-  opts.eslintConfig.cwd = opts.cwd
+  if (!Array.isArray(opts.gitIgnoreFile)) {
+    opts.gitIgnoreFile = [opts.gitIgnoreFile]
+  }
 
-  // If no usePackageJson option is given, default to `true`
-  var usePackageJson = opts.usePackageJson != null
-    ? opts.usePackageJson
-    : true
+  opts.eslintConfig.cwd = opts.cwd
+  opts.eslintConfig.fix = opts.fix
 
-  var packageOpts = usePackageJson
+  var packageOpts = opts.usePackageJson
     ? pkgConf.sync(self.cmd, { cwd: opts.cwd })
     : {}
 
-  if (!opts.ignore) opts.ignore = []
-  addIgnore(packageOpts.ignore)
+  var rootPath = opts.usePackageJson
+    ? path.dirname(pkgConf.filepath(packageOpts))
+    : null
+
   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 +188,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 +199,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,7 +38,6 @@
     "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",