support json comments (#171)

Jasper De Moor · devongovett · commit 7bfe232ba1db · 2017-12-10T18:48:48.000-08:00
diff --git a/package.json b/package.json
@@ -34,6 +34,7 @@
     "posthtml": "^0.9.2",
     "resolve": "^1.4.0",
     "serve-static": "^1.12.4",
+    "strip-json-comments": "^2.0.1",
     "uglify-js": "^3.0.28",
     "v8-compile-cache": "^1.1.0",
     "worker-farm": "^1.4.1",
diff --git a/src/utils/config.js b/src/utils/config.js
@@ -1,6 +1,7 @@
 const fs = require('./fs');
 const path = require('path');
 const parseJson = require('parse-json');
+const stripJsonComments = require('strip-json-comments');
 
 const existsCache = new Map();
 
@@ -35,7 +36,8 @@ async function load(filepath, filenames, root = path.parse(filepath).root) {
       return require(configFile);
     }
 
-    return parseJson(await fs.readFile(configFile));
+    let configStream = await fs.readFile(configFile);
+    return parseJson(stripJsonComments(configStream.toString()));
   }
 
   return null;
diff --git a/yarn.lock b/yarn.lock
@@ -4728,7 +4728,7 @@ strip-indent@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
 
-strip-json-comments@~2.0.1:
+strip-json-comments@^2.0.1, strip-json-comments@~2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-2.0.1.tgz#3c531942e908c2697c0ec344858c286c7ca0a60a"
 

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`const fs = require('./fs');`
`2`	`2`	`const path = require('path');`
`3`	`3`	`const parseJson = require('parse-json');`
	`4`	`+const stripJsonComments = require('strip-json-comments');`
`4`	`5`
`5`	`6`	`const existsCache = new Map();`
`6`	`7`
`@@ -35,7 +36,8 @@ async function load(filepath, filenames, root = path.parse(filepath).root) {`
`35`	`36`	`return require(configFile);`
`36`	`37`	`}`
`37`	`38`
`38`		`- return parseJson(await fs.readFile(configFile));`
	`39`	`+ let configStream = await fs.readFile(configFile);`
	`40`	`+ return parseJson(stripJsonComments(configStream.toString()));`
`39`	`41`	`}`
`40`	`42`
`41`	`43`	`return null;`