From e88c28f88ba11c72e8a46d1eb93f855c7df43b92 Mon Sep 17 00:00:00 2001
From: Andres Suarez <zertosh@gmail.com>
Date: Tue, 7 Apr 2015 16:33:44 -0400
Subject: [PATCH] Strip out comments before parsing babelrc

---
 package.json                  | 1 +
 src/babel/tools/resolve-rc.js | 3 ++-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 680212e211..9e3459c481 100644
--- a/package.json
+++ b/package.json
@@ -53,6 +53,7 @@
     "slash": "^1.0.0",
     "source-map": "^0.4.0",
     "source-map-support": "^0.2.9",
+    "strip-json-comments": "^1.0.2",
     "to-fast-properties": "^1.0.0",
     "trim-right": "^1.0.0"
   },
diff --git a/src/babel/tools/resolve-rc.js b/src/babel/tools/resolve-rc.js
index 2c1255f06e..3a561d44dd 100644
--- 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;