Merge branch 'master' of github.com:babel/babel

2015-04-08 07:47:52 -07:00
parent de5520a94f a5fed376d8
commit 982c142bf6
2 changed files with 3 additions and 1 deletions
--- a/src/babel/tools/resolve-rc.js
+++ b/src/babel/tools/resolve-rc.js
@@ -1,3 +1,4 @@
+import stripJsonComments from "strip-json-comments";
 import merge from "lodash/object/merge";
 import path from "path";
 import fs from "fs";
@@ -24,7 +25,7 @@ export default function (loc, opts = {}) {
      var json;

      try {
-        json = jsons[content] ||= JSON.parse(content);
+        json = jsons[content] ||= JSON.parse(stripJsonComments(content));
      } catch (err) {
        err.message = `${file}: ${err.message}`;
        throw err;