From 0eebcb59628fdb18d0bcfe6e245b4e87140da07a Mon Sep 17 00:00:00 2001
From: Richard Hoffman <coverslide@gmail.com>
Date: Fri, 27 Jan 2017 10:07:49 -0800
Subject: [PATCH] Use babel presets and plugins directly

---
 package.json                            |  6 +++++-
 src/core_plugins/timelion/public/app.js |  2 +-
 src/optimize/babel/options.build.js     | 28 ++++++++++++++-----------
 src/optimize/babel/options.js           | 21 ++++++++++---------
 4 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/package.json b/package.json
index 2c9b11f040743..b3f7433eceb7f 100644
--- a/package.json
+++ b/package.json
@@ -75,7 +75,6 @@
     "@elastic/datemath": "2.3.0",
     "@elastic/kibana-ui-framework": "0.0.13",
     "@elastic/webpack-directory-name-as-main": "2.0.2",
-    "@elastic/babel-preset-kibana": "git+https://github.com/coverslide/babel-preset-kibana#00e3e6d",
     "@spalger/filesaver": "1.1.2",
     "@spalger/leaflet-draw": "0.2.3",
     "@spalger/leaflet-heat": "0.1.3",
@@ -96,7 +95,12 @@
     "babel-cli": "6.18.0",
     "babel-core": "6.21.0",
     "babel-loader": "6.2.10",
+    "babel-plugin-add-module-exports": "0.2.1",
     "babel-polyfill": "6.20.0",
+    "babel-preset-es2015": "6.22.0",
+    "babel-preset-es2015-node": "6.1.1",
+    "babel-preset-react": "6.22.0",
+    "babel-preset-stage-1": "6.22.0",
     "babel-register": "6.18.0",
     "babel-runtime": "6.20.0",
     "bluebird": "2.9.34",
diff --git a/src/core_plugins/timelion/public/app.js b/src/core_plugins/timelion/public/app.js
index 21d56ea3c89cc..0466aa6a9ed11 100644
--- a/src/core_plugins/timelion/public/app.js
+++ b/src/core_plugins/timelion/public/app.js
@@ -27,7 +27,7 @@ require('./vis');
 require('ui/saved_objects/saved_object_registry').register(require('plugins/timelion/services/saved_sheet_register'));
 
 // TODO: Expose an api for dismissing notifications
-const unsafeNotifications = require('ui/notify')._notifs;
+const unsafeNotifications = require('ui/notify').default._notifs;
 
 require('ui/routes').enable();
 
diff --git a/src/optimize/babel/options.build.js b/src/optimize/babel/options.build.js
index 0a83ee724443d..d6e7e241b7dd1 100644
--- a/src/optimize/babel/options.build.js
+++ b/src/optimize/babel/options.build.js
@@ -4,15 +4,19 @@ var helpers = require('./helpers');
 
 helpers.setupBabelCache(process.env);
 
-exports.webpack = require('@elastic/babel-preset-kibana/webpack');
-exports.react = require('@elastic/babel-preset-kibana/webpack');
-exports.node = Object.assign(
-  {},
-  require('@elastic/babel-preset-kibana/node'),
-  {
-    ignore: [
-      helpers.fromRoot('src'),
-      /[\\\/](node_modules|bower_components)[\\\/]/
-    ]
-  }
-);
+exports.webpack = {
+  presets: ["react", "es2015", "stage-1"],
+  plugins: ["add-module-exports"]
+};
+exports.react = {
+  presets: ["react", "es2015", "stage-1"],
+  plugins: ["add-module-exports"]
+};
+exports.node = {
+  presets: ["es2015-node", "stage-1"],
+  plugins: ["add-module-exports"],
+  ignore: [
+    helpers.fromRoot('src'),
+    /[\\\/](node_modules|bower_components)[\\\/]/
+  ]
+};
diff --git a/src/optimize/babel/options.js b/src/optimize/babel/options.js
index b0ac9f868a467..1fcb0d557f156 100644
--- a/src/optimize/babel/options.js
+++ b/src/optimize/babel/options.js
@@ -4,13 +4,14 @@ var helpers = require('./helpers');
 
 helpers.setupBabelCache(process.env);
 
-exports.webpack = require('@elastic/babel-preset-kibana/webpack');
-exports.node = Object.assign(
-  {},
-  require('@elastic/babel-preset-kibana/node'),
-  {
-    ignore: [
-      /[\\\/](node_modules|bower_components|mock_data|scenarios)[\\\/]/
-    ]
-  }
-);
+exports.webpack = {
+  presets: ["react", "es2015", "stage-1"],
+  plugins: ["add-module-exports"]
+};
+exports.node = {
+  presets: ["es2015-node", "stage-1"],
+  plugins: ["add-module-exports"],
+  ignore: [
+    /[\\\/](node_modules|bower_components|mock_data|scenarios)[\\\/]/
+  ]
+};