diff --git a/index.js b/index.js index f288754..7ceb1a4 100644 --- a/index.js +++ b/index.js @@ -3,10 +3,9 @@ module.exports.cli = require('./bin/cmd') module.exports.linter = Linter var deglob = require('deglob') -var findRoot = require('find-root') var homeOrTmp = require('home-or-tmp') var path = require('path') -var pkgConfig = require('pkg-config') +var pkgConf = require('pkg-conf') var DEFAULT_PATTERNS = [ '**/*.js', @@ -135,19 +134,12 @@ Linter.prototype.parseOpts = function (opts) { setEnvs(opts.envs || opts.env) setParser(opts.parser) - var root - try { root = findRoot(opts.cwd) } catch (e) {} - if (root) { - var packageOpts = pkgConfig(self.cmd, { root: false, cwd: opts.cwd }) - - if (packageOpts) { - setIgnore(packageOpts.ignore) - setGlobals(packageOpts.globals || packageOpts.global) - setPlugins(packageOpts.plugins || packageOpts.plugin) - setEnvs(packageOpts.envs || packageOpts.env) - if (!opts.parser) setParser(packageOpts.parser) - } - } + var packageOpts = pkgConf.sync(self.cmd, { cwd: opts.cwd }) + setIgnore(packageOpts.ignore) + setGlobals(packageOpts.globals || packageOpts.global) + setPlugins(packageOpts.plugins || packageOpts.plugin) + setEnvs(packageOpts.envs || packageOpts.env) + if (!opts.parser) setParser(packageOpts.parser) function setIgnore (ignore) { if (!ignore) return diff --git a/package.json b/package.json index 752e8e4..a1c2c15 100644 --- a/package.json +++ b/package.json @@ -8,11 +8,10 @@ }, "dependencies": { "deglob": "^2.1.0", - "find-root": "^1.0.0", "get-stdin": "^5.0.1", "home-or-tmp": "^2.0.0", "minimist": "^1.1.0", - "pkg-config": "^1.0.1" + "pkg-conf": "^2.0.0" }, "devDependencies": { "babel-eslint": "^7.1.1",