feat(core): Allow to configure with json, yaml and package.json

Fix conventional-changelog#73

Author: pvdlg

@commitlint/cli/cli.test.js

@@ -31,7 +31,7 @@ const exec = (command, args = [], opts = {}) => {
 			console.log(result.stderr);
 		}
 		return result;
-	}
+	};
 };
 
 const cli = exec.bind(null, CLI);
@@ -40,8 +40,12 @@ const mkdir = exec.bind(null, bin('mkdirp'));
 const npm = exec.bind(null, 'npm');
 const rm = exec.bind(null, bin('rimraf'));
 
-test('should throw when called without [input]', t => {
-	t.throws(cli()(), /Expected a raw commit/);
+test('should throw when called without [input]', async t => {
+	const dir = tmp.dirSync().name;
+
+	await init(dir);
+	await t.throws(cli([], {cwd: dir})(), /Expected a raw commit/);
+	await rm([dir])();
 });
 
 test('should reprint input from stdin', async t => {
@@ -73,11 +77,19 @@ test('should fail for input from stdin with rule from rc', async t => {
 });
 
 test('should fail for input from stdin with rule from js', async t => {
+	const dir = tmp.dirSync().name;
+
+	await init(dir);
+	await sander.copydir(EXTENDS_ROOT).to(dir);
+
 	const actual = await t.throws(
-		cli(['--extends', './extended'], {cwd: EXTENDS_ROOT})('foo: bar')
+		cli(['--extends', './extended'], {cwd: dir})('foo: bar')
 	);
+
 	t.true(includes(actual.stdout, 'type must not be one of [foo]'));
 	t.is(actual.code, 1);
+
+	await rm([dir])();
 });
 
 test('should produce no error output with --quiet flag', async t => {
@@ -129,7 +141,9 @@ test('should pick up parser preset', async t => {
 	const actual = await t.throws(cli([], {cwd})('type(scope)-ticket subject'));
 	t.true(includes(actual.stdout, 'message may not be empty [subject-empty]'));
 
-	await cli(['--parser-preset', './parser-preset'], {cwd})('type(scope)-ticket subject');
+	await cli(['--parser-preset', './parser-preset'], {cwd})(
+		'type(scope)-ticket subject'
+	);
 });
 
 async function init(cwd) {
@@ -142,5 +156,9 @@ async function init(cwd) {
 }
 
 function pkg(cwd) {
-	return sander.writeFile(cwd, 'package.json', JSON.stringify({scripts: {commitmsg: `${CLI} -e`}}));
+	return sander.writeFile(
+		cwd,
+		'package.json',
+		JSON.stringify({scripts: {commitmsg: `${CLI} -e`}})
+	);
 }

@commitlint/core/fixtures/recursive-extends-js/.commitlintrc.js

@@ -0,0 +1,6 @@
+module.exports = {
+	extends: ['./first-extended'],
+	rules: {
+		zero: 0
+	}
+};

@commitlint/core/fixtures/recursive-extends-js/first-extended/index.js

@@ -0,0 +1,6 @@
+module.exports = {
+	extends: ['./second-extended'],
+	rules: {
+		one: 1
+	}
+};

@commitlint/core/fixtures/recursive-extends-js/first-extended/second-extended/index.js

@@ -0,0 +1,5 @@
+module.exports = {
+	rules: {
+		two: 2
+	}
+};

@commitlint/core/fixtures/recursive-extends-json/.commitlintrc.json

@@ -0,0 +1,6 @@
+{
+	"extends": ["./first-extended"],
+	"rules": {
+		"zero": 0
+	}
+}

@commitlint/core/fixtures/recursive-extends-json/first-extended/index.js

@@ -0,0 +1,6 @@
+module.exports = {
+	extends: ['./second-extended'],
+	rules: {
+		one: 1
+	}
+};

@commitlint/core/fixtures/recursive-extends-json/first-extended/second-extended/index.js

@@ -0,0 +1,5 @@
+module.exports = {
+	rules: {
+		two: 2
+	}
+};

@commitlint/core/fixtures/recursive-extends-package/first-extended/index.js

@@ -0,0 +1,6 @@
+module.exports = {
+	extends: ['./second-extended'],
+	rules: {
+		one: 1
+	}
+};

@commitlint/core/fixtures/recursive-extends-package/first-extended/second-extended/index.js

@@ -0,0 +1,5 @@
+module.exports = {
+	rules: {
+		two: 2
+	}
+};

@commitlint/core/fixtures/recursive-extends-package/package.json

@@ -0,0 +1,8 @@
+{
+  "commitlint": {
+  	"extends": ["./first-extended"],
+  	"rules": {
+  		"zero": 0
+  	}
+  }
+}

@commitlint/core/fixtures/recursive-extends-yaml/.commitlintrc.yml

@@ -0,0 +1,4 @@
+extends:
+- "./first-extended"
+rules:
+  zero: 0

@commitlint/core/fixtures/recursive-extends-yaml/first-extended/index.js

@@ -0,0 +1,6 @@
+module.exports = {
+	extends: ['./second-extended'],
+	rules: {
+		one: 1
+	}
+};

@commitlint/core/fixtures/recursive-extends-yaml/first-extended/second-extended/index.js

@@ -0,0 +1,5 @@
+module.exports = {
+	rules: {
+		two: 2
+	}
+};

@commitlint/core/package.json

@@ -78,6 +78,7 @@
     "nyc": "10.3.2",
     "path-exists": "3.0.0",
     "resolve-from": "3.0.0",
+    "sander": "^0.6.0",
     "rimraf": "2.6.1",
     "xo": "0.18.2"
   },
@@ -86,10 +87,10 @@
     "chalk": "^2.0.1",
     "conventional-changelog-angular": "^1.3.3",
     "conventional-commits-parser": "^1.3.0",
+    "cosmiconfig": "^3.0.1",
     "find-up": "^2.1.0",
     "franc": "^2.0.0",
     "git-raw-commits": "^1.1.2",
-    "import-from": "^2.1.0",
     "lodash": "^4.17.4",
     "mz": "^2.6.0",
     "path-exists": "^3.0.0",

@commitlint/core/src/load.js

@@ -1,8 +1,9 @@
 import path from 'path';
-import importFrom from 'import-from';
 import {entries, merge, mergeWith, pick} from 'lodash';
 import rc from 'rc';
+import cosmiconfig from 'cosmiconfig';
 import resolveFrom from 'resolve-from';
+import up from 'find-up';
 
 import resolveExtends from './library/resolve-extends';
 import executeRule from './library/execute-rule';
@@ -12,19 +13,23 @@ const valid = input => pick(input, 'extends', 'rules', 'parserPreset');
 
 export default async (seed = {}) => {
 	// Obtain config from .rc files
-	const raw = file();
-
+	const raw = await file();
 	// Merge passed config with file based options
 	const config = valid(merge(raw, seed));
 	const opts = merge({extends: [], rules: {}}, pick(config, 'extends'));
 
 	// Resolve parserPreset key
 	if (typeof config.parserPreset === 'string') {
-		const resolvedParserPreset = resolveFrom(process.cwd(), config.parserPreset);
+		const resolvedParserPreset = resolveFrom(
+			process.cwd(),
+			config.parserPreset
+		);
 
 		config.parserPreset = {
 			name: config.parserPreset,
-			path: `./${path.posix.relative(process.cwd(), resolvedParserPreset)}`.split(path.sep).join('/'),
+			path: `./${path.posix.relative(process.cwd(), resolvedParserPreset)}`
+				.split(path.sep)
+				.join('/'),
 			opts: require(resolvedParserPreset)
 		};
 	}
@@ -39,7 +44,10 @@ export default async (seed = {}) => {
 	const preset = valid(mergeWith(extended, config, w));
 
 	// Await parser-preset if applicable
-	if (typeof preset.parserPreset === 'object' && typeof preset.parserPreset.opts === 'object') {
+	if (
+		typeof preset.parserPreset === 'object' &&
+		typeof preset.parserPreset.opts === 'object'
+	) {
 		preset.parserPreset.opts = await preset.parserPreset.opts;
 	}
 
@@ -73,14 +81,16 @@ export default async (seed = {}) => {
 	}, preset);
 };
 
-function file() {
+async function file() {
 	const legacy = rc('conventional-changelog-lint');
 	const legacyFound = typeof legacy.config === 'string';
+	const explorer = cosmiconfig('commitlint', {
+		rcExtensions: true,
+		stopDir: await toplevel()
+	});
+	const config = await explorer.load('.');
 
-	const found = resolveable('./commitlint.config');
-	const raw = found ? importFrom(process.cwd(), './commitlint.config') : {};
-
-	if (legacyFound && !found) {
+	if (legacyFound && !config) {
 		console.warn(
 			`Using legacy ${path.relative(
 				process.cwd(),
@@ -89,7 +99,7 @@ function file() {
 		);
 	}
 
-	if (legacyFound && found) {
+	if (legacyFound && config) {
 		console.warn(
 			`Ignored legacy ${path.relative(
 				process.cwd(),
@@ -98,18 +108,21 @@ function file() {
 		);
 	}
 
-	if (found) {
-		return raw;
+	if (config) {
+		return config.config;
 	}
 
 	return legacy;
 }
 
-function resolveable(id) {
-	try {
-		resolveFrom(process.cwd(), id);
-		return true;
-	} catch (err) {
-		return false;
+// Find the next git root
+// (start: string) => Promise<string | null>
+async function toplevel(cwd = process.cwd()) {
+	const found = await up('.git', {cwd});
+
+	if (typeof found !== 'string') {
+		return found;
 	}
+
+	return path.join(found, '..');
 }