Skip package.json files with "xo": false (#151)

options-manager.js

@@ -74,8 +74,8 @@ function normalizeOpts(opts) {
 
 function mergeWithPkgConf(opts) {
 	opts = Object.assign({cwd: process.cwd()}, opts);
-
-	return Object.assign({}, pkgConf.sync('xo', opts.cwd), opts);
+	const conf = pkgConf.sync('xo', {cwd: opts.cwd, skipOnFalse: true});
+	return Object.assign({}, conf, opts);
 }
 
 // define the shape of deep properties for deepAssign

package.json

@@ -78,7 +78,7 @@
     "meow": "^3.4.2",
     "multimatch": "^2.1.0",
     "path-exists": "^3.0.0",
-    "pkg-conf": "^1.0.1",
+    "pkg-conf": "^2.0.0",
     "resolve-cwd": "^1.0.0",
     "resolve-from": "^2.0.0",
     "update-notifier": "^1.0.0",

readme.md

@@ -253,6 +253,13 @@ XO makes it easy to override configs for specific files. The `overrides` propert
 ```
 
 
+## Tips
+
+### Using a parent's config
+
+If you have a directory structure with nested `package.json` files and you want one of the child manifests to be skipped, you can do so by setting `"xo": false`. For example, when you have separate app and dev `package.json` files with `electron-builder`.
+
+
 ## FAQ
 
 #### What does XO mean?

test/fixtures/nested/child-empty/package.json

@@ -0,0 +1,3 @@
+{
+  "xo": {}
+}

test/fixtures/nested/child-ignore/package.json

@@ -0,0 +1,3 @@
+{
+  "xo": false
+}

test/fixtures/nested/child/package.json

@@ -0,0 +1,5 @@
+{
+  "xo": {
+    "esnext": false
+  }
+}

test/fixtures/nested/file.js

@@ -0,0 +1,2 @@
+var obj = { a: 1 };
+console.log(obj.a);

test/fixtures/nested/package.json

@@ -0,0 +1,5 @@
+{
+  "xo": {
+    "esnext": true
+  }
+}

test/options-manager.js

@@ -1,5 +1,8 @@
+import path from 'path';
 import test from 'ava';
 import proxyquire from 'proxyquire';
+import parentConfig from './fixtures/nested/package.json';
+import childConfig from './fixtures/nested/child/package.json';
 
 const manager = proxyquire('../options-manager', {
 	'resolve-from': (cwd, path) => `cwd/${path}`
@@ -138,3 +141,30 @@ test('groupConfigs', t => {
 		return obj;
 	}));
 });
+
+test('mergeWithPkgConf: use child if closest', t => {
+	const cwd = path.resolve('fixtures', 'nested', 'child');
+	const result = manager.mergeWithPkgConf({cwd});
+	const expected = Object.assign({}, childConfig.xo, {cwd});
+	t.deepEqual(result, expected);
+});
+
+test('mergeWithPkgConf: use parent if closest', t => {
+	const cwd = path.resolve('fixtures', 'nested');
+	const result = manager.mergeWithPkgConf({cwd});
+	const expected = Object.assign({}, parentConfig.xo, {cwd});
+	t.deepEqual(result, expected);
+});
+
+test('mergeWithPkgConf: use parent if child is ignored', t => {
+	const cwd = path.resolve('fixtures', 'nested', 'child-ignore');
+	const result = manager.mergeWithPkgConf({cwd});
+	const expected = Object.assign({}, parentConfig.xo, {cwd});
+	t.deepEqual(result, expected);
+});
+
+test('mergeWithPkgConf: use child if child is empty', t => {
+	const cwd = path.resolve('fixtures', 'nested', 'child-empty');
+	const result = manager.mergeWithPkgConf({cwd});
+	t.deepEqual(result, {cwd});
+});