From 9738ca35611a20f9b1cd2b66500a96335d30c850 Mon Sep 17 00:00:00 2001
From: Jehan <jehan.tremback@gmail.com>
Date: Sat, 30 May 2015 17:55:45 -0700
Subject: [PATCH 1/4] Update transformer.js

---
 packager/transformer.js | 39 +++++++++++++++++++++++++++++++++++----
 1 file changed, 35 insertions(+), 4 deletions(-)

diff --git a/packager/transformer.js b/packager/transformer.js
index a2efcea3bb2b54..d4dcae3795c70c 100644
--- a/packager/transformer.js
+++ b/packager/transformer.js
@@ -11,9 +11,31 @@
 'use strict';
 
 var babel = require('babel');
+var fs = require('fs');
 
-function transform(srcTxt, filename, options) {
-  var result = babel.transform(srcTxt, {
+function getBabelrc () {
+  try {
+    // Try to get .babelrc file
+    return JSON.parse(
+      fs.readFileSync(process.cwd() + '/.babelrc').toString()
+    );
+  } catch (e) {
+    try {
+      // Fall back to package.json
+      return JSON.parse(
+        fs.readFileSync(process.cwd() + '/package.json').toString()
+      ).babel;
+    } catch (e) {
+      // If neither exist
+      return null
+    }
+  }
+}
+
+var babelrc = getBabelrc()
+
+function transform(srcTxt, filename, extra) {
+  var options = {
     retainLines: true,
     compact: true,
     comments: false,
@@ -35,8 +57,17 @@ function transform(srcTxt, filename, options) {
     ],
     sourceFileName: filename,
     sourceMaps: false,
-    extra: options || {},
-  });
+    extra: extra || {},
+  };
+
+  // If custom babel options exist, merge them in
+  if (babelrc) {
+    Object.keys(babelrc).forEach(function (key) {
+      options[key] = babelrc[key];
+    });
+  }
+
+  var result = babel.transform(srcTxt, options);
 
   return {
     code: result.code,

From bf853cd830de8d02f940079e5022ea29abed4def Mon Sep 17 00:00:00 2001
From: Jehan <jehan.tremback@gmail.com>
Date: Sat, 30 May 2015 18:01:14 -0700
Subject: [PATCH 2/4] typos

---
 packager/transformer.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packager/transformer.js b/packager/transformer.js
index d4dcae3795c70c..919bbdce9eb1b0 100644
--- a/packager/transformer.js
+++ b/packager/transformer.js
@@ -27,7 +27,7 @@ function getBabelrc () {
       ).babel;
     } catch (e) {
       // If neither exist
-      return null
+      return null;
     }
   }
 }

From 7aad4acdfb562f5eeab6588f446e8fa8d09a36e3 Mon Sep 17 00:00:00 2001
From: Jehan <jehan.tremback@gmail.com>
Date: Sun, 31 May 2015 16:34:23 -0700
Subject: [PATCH 3/4] stop looking for package.json

---
 packager/transformer.js | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/packager/transformer.js b/packager/transformer.js
index 919bbdce9eb1b0..cb3079446d4074 100644
--- a/packager/transformer.js
+++ b/packager/transformer.js
@@ -20,15 +20,8 @@ function getBabelrc () {
       fs.readFileSync(process.cwd() + '/.babelrc').toString()
     );
   } catch (e) {
-    try {
-      // Fall back to package.json
-      return JSON.parse(
-        fs.readFileSync(process.cwd() + '/package.json').toString()
-      ).babel;
-    } catch (e) {
-      // If neither exist
-      return null;
-    }
+    // If neither exist
+    return null;
   }
 }
 

From a3686a28c8f6106582a1e2a5c6bb5be4d500f785 Mon Sep 17 00:00:00 2001
From: Jehan <jehan.tremback@gmail.com>
Date: Sun, 31 May 2015 16:34:45 -0700
Subject: [PATCH 4/4] cleanup comments

---
 packager/transformer.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packager/transformer.js b/packager/transformer.js
index cb3079446d4074..3a9971c2fb04f7 100644
--- a/packager/transformer.js
+++ b/packager/transformer.js
@@ -20,7 +20,6 @@ function getBabelrc () {
       fs.readFileSync(process.cwd() + '/.babelrc').toString()
     );
   } catch (e) {
-    // If neither exist
     return null;
   }
 }