From bd269ed52d40d815eacf84bfaf05a53f929cb365 Mon Sep 17 00:00:00 2001
From: spalger <email@spalger.com>
Date: Wed, 5 Aug 2015 07:40:26 -0700
Subject: [PATCH 1/3] set server babel options to match browser ones

---
 src/cli/index.js              |  2 +-
 src/optimize/BaseOptimizer.js | 13 +++----------
 src/optimize/babelOptions.js  |  5 +++++
 3 files changed, 9 insertions(+), 11 deletions(-)
 create mode 100644 src/optimize/babelOptions.js

diff --git a/src/cli/index.js b/src/cli/index.js
index 8e859819d7263..39f2bb94f16a5 100644
--- a/src/cli/index.js
+++ b/src/cli/index.js
@@ -1,2 +1,2 @@
-require('babel/register');
+require('babel/register')(require('../optimize/babelOptions'));
 require('./cli');
diff --git a/src/optimize/BaseOptimizer.js b/src/optimize/BaseOptimizer.js
index 722e2be1dc490..0a0ec461a6be7 100644
--- a/src/optimize/BaseOptimizer.js
+++ b/src/optimize/BaseOptimizer.js
@@ -11,6 +11,7 @@ let utils = require('requirefrom')('src/utils');
 let fromRoot = utils('fromRoot');
 let OptmzBundles = require('./OptmzBundles');
 let OptmzUiModules = require('./OptmzUiModules');
+let babelOptions = require('./babelOptions');
 
 let kbnTag = `Kibana ${ utils('packageJson').version }`;
 
@@ -75,22 +76,14 @@ class BaseOptimizer extends EventEmitter {
             test: /\.js$/,
             exclude: /(node_modules|bower_components)/,
             loader: 'babel',
-            query: {
-              optional: ['runtime'],
-              stage: 1,
-              nonStandard: false
-            }
+            query: babelOptions
           },
           {
             // explicitly require .jsx extension to support jsx
             test: /\.jsx$/,
             exclude: /(node_modules|bower_components)/,
             loader: 'babel',
-            query: {
-              optional: ['runtime'],
-              stage: 1,
-              nonStandard: true
-            }
+            query: babelOptions
           }
         ].concat(this.modules.loaders),
         noParse: this.modules.noParse,
diff --git a/src/optimize/babelOptions.js b/src/optimize/babelOptions.js
new file mode 100644
index 0000000000000..a52e262e9fa26
--- /dev/null
+++ b/src/optimize/babelOptions.js
@@ -0,0 +1,5 @@
+module.exports = {
+  optional: ['runtime'],
+  stage: 1,
+  nonStandard: true
+};

From 230daafa32b008cb97b972ba5a5b9737a41cc508 Mon Sep 17 00:00:00 2001
From: spalger <email@spalger.com>
Date: Wed, 5 Aug 2015 10:28:13 -0700
Subject: [PATCH 2/3] only set notStandard:true for jsx loader

---
 src/optimize/BaseOptimizer.js | 4 +++-
 src/optimize/babelOptions.js  | 3 +--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/optimize/BaseOptimizer.js b/src/optimize/BaseOptimizer.js
index 0a0ec461a6be7..f93ad6fc901e8 100644
--- a/src/optimize/BaseOptimizer.js
+++ b/src/optimize/BaseOptimizer.js
@@ -83,7 +83,9 @@ class BaseOptimizer extends EventEmitter {
             test: /\.jsx$/,
             exclude: /(node_modules|bower_components)/,
             loader: 'babel',
-            query: babelOptions
+            query: _.defaults({
+              nonStandard: true
+            }, babelOptions)
           }
         ].concat(this.modules.loaders),
         noParse: this.modules.noParse,
diff --git a/src/optimize/babelOptions.js b/src/optimize/babelOptions.js
index a52e262e9fa26..34608d59c8269 100644
--- a/src/optimize/babelOptions.js
+++ b/src/optimize/babelOptions.js
@@ -1,5 +1,4 @@
 module.exports = {
   optional: ['runtime'],
-  stage: 1,
-  nonStandard: true
+  stage: 1
 };

From c2b297b97e83a67334a090b213cc0a15b8a6ca48 Mon Sep 17 00:00:00 2001
From: spalger <email@spalger.com>
Date: Wed, 5 Aug 2015 10:31:16 -0700
Subject: [PATCH 3/3] override the default nonStandard value

---
 src/optimize/babelOptions.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/optimize/babelOptions.js b/src/optimize/babelOptions.js
index 34608d59c8269..48698b7cbb8fe 100644
--- a/src/optimize/babelOptions.js
+++ b/src/optimize/babelOptions.js
@@ -1,4 +1,5 @@
 module.exports = {
   optional: ['runtime'],
-  stage: 1
+  stage: 1,
+  nonStandard: false
 };