use pkg-conf module for less code and improved JSON errors

fixes #16
xojs · Sep 3, 2015 · d2a20bc · d2a20bc
1 parent 4fc25f4
commit d2a20bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/index.js b/index.js
@@ -2,9 +2,9 @@
 var path = require('path');
 var eslint = require('eslint');
 var globby = require('globby');
-var lookUp = require('look-up');
 var objectAssign = require('object-assign');
 var arrify = require('arrify');
+var pkgConf = require('pkg-conf');
 
 var DEFAULT_PATTERNS = [
 	'**/*.js',
@@ -33,13 +33,7 @@ function handleOpts(opts) {
 		cwd: process.cwd()
 	}, opts);
 
-	var pkgOpts = {};
-
-	try {
-		pkgOpts = require(lookUp('package.json', {cwd: opts.cwd})).xo;
-	} catch (err) {}
-
-	opts = objectAssign({}, pkgOpts, opts);
+	opts = objectAssign({}, pkgConf.sync('xo', opts.cwd), opts);
 
 	// alias to help humans
 	opts.envs = opts.envs || opts.env;

diff --git a/package.json b/package.json
@@ -57,9 +57,9 @@
     "eslint-plugin-babel": "^2.1.1",
     "get-stdin": "^5.0.0",
     "globby": "^3.0.0",
-    "look-up": "^0.7.1",
     "meow": "^3.3.0",
     "object-assign": "^4.0.1",
+    "pkg-conf": "^1.0.1",
     "update-notifier": "^0.5.0",
     "xo-init": "^0.2.0"
   },