From b5bd7b1c92e148c2161f05841601f97eb774270d Mon Sep 17 00:00:00 2001
From: Sebastian McKenzie <sebmck@gmail.com>
Date: Fri, 31 Jul 2015 23:36:50 +0100
Subject: [PATCH] always parse package.json with default json parser, use json5
 otherwise

---
 .../babel/src/transformation/file/options/option-manager.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/babel/src/transformation/file/options/option-manager.js b/packages/babel/src/transformation/file/options/option-manager.js
index 00aefb15af..5933c56d29 100644
--- a/packages/babel/src/transformation/file/options/option-manager.js
+++ b/packages/babel/src/transformation/file/options/option-manager.js
@@ -51,14 +51,14 @@ export default class OptionManager {
    * [Please add a description.]
    */
 
-  addConfig(loc, key?) {
+  addConfig(loc, key?, json=json5) {
     if (this.resolvedConfigs.indexOf(loc) >= 0) return;
 
     var content = fs.readFileSync(loc, "utf8");
     var opts;
 
     try {
-      opts = jsonCache[content] = jsonCache[content] || json5.parse(content);
+      opts = jsonCache[content] = jsonCache[content] || json.parse(content);
       if (key) opts = opts[key];
     } catch (err) {
       err.message = `${loc}: Error while parsing JSON - ${err.message}`;
@@ -125,7 +125,7 @@ export default class OptionManager {
       if (exists(configLoc)) this.addConfig(configLoc);
 
       var pkgLoc = path.join(loc, PACKAGE_FILENAME);
-      if (exists(pkgLoc)) this.addConfig(pkgLoc, "babel");
+      if (exists(pkgLoc)) this.addConfig(pkgLoc, "babel", JSON);
 
       var ignoreLoc = path.join(loc, BABELIGNORE_FILENAME);
       if (exists(ignoreLoc)) this.addIgnoreConfig(ignoreLoc);