Fix bug introduced during commander upgrade that caused -c/--config n…

…ot to be honored for non-JSON files (fixes #173).
igorshubovych · Mar 2, 2021 · f2e4c4d · f2e4c4d
1 parent d0051f7
commit f2e4c4d
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 3 deletions.
diff --git a/markdownlint.js b/markdownlint.js
@@ -34,8 +34,7 @@ const configFileParsers = [jsoncParse, jsYamlSafeLoad];
 const fsOptions = {encoding: 'utf8'};
 const processCwd = process.cwd();
 
-function readConfiguration(args) {
-  const userConfigFile = args.config;
+function readConfiguration(userConfigFile) {
   const jsConfigFile = /\.js$/i.test(userConfigFile);
   const rcArgv = minimist(process.argv.slice(2));
   if (jsConfigFile) {
@@ -268,7 +267,7 @@ const diff = differenceWith(files, ignores, function (a, b) {
 
 function lintAndPrint(stdin, files) {
   files = files || [];
-  const config = readConfiguration(program);
+  const config = readConfiguration(options.config);
   const lintOptions = {
     config,
     customRules,

diff --git a/test/md043-config.js b/test/md043-config.js
@@ -4,6 +4,7 @@
 // -OR-
 // via require('some-npm-module-that-exports-config')
 module.exports = {
+  MD012: false,
   MD043: {
     headers: [
       '# First',

diff --git a/test/md043-config.json b/test/md043-config.json
@@ -1,4 +1,5 @@
 {
+  "MD012": false,
   "MD043": {
     "headers": [
       "# First",

diff --git a/test/md043-config.md b/test/md043-config.md
@@ -7,3 +7,6 @@ Text
 Text
 
 ### Third
+
+Extra newline at end of file is sentinel to ensure config file is used
+
diff --git a/test/md043-config.yaml b/test/md043-config.yaml
@@ -1,3 +1,4 @@
+MD012: false
 MD043:
   headers:
     - "# First"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,3 +7,6 @@ Text
		Text

		### Third

		Extra newline at end of file is sentinel to ensure config file is used