From 5cb3cc2ed8c8c2f0295da7ecdf8ec33a526acee1 Mon Sep 17 00:00:00 2001
From: Alanna Scott <alanna.scott@airbnb.com>
Date: Wed, 12 Oct 2016 10:41:26 -0700
Subject: [PATCH] polyfill es2015 in older browsers and for phantomjs (#1323)

* use babel polyfill

* alphabetize entry files, only add babel-polyfill once for each entry
---
 caravel/assets/package.json      |  5 +++--
 caravel/assets/webpack.config.js | 12 ++++++------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/caravel/assets/package.json b/caravel/assets/package.json
index 5ea806a219..5b11aa4702 100644
--- a/caravel/assets/package.json
+++ b/caravel/assets/package.json
@@ -37,8 +37,6 @@
   "homepage": "https://github.com/airbnb/caravel#readme",
   "dependencies": {
     "autobind-decorator": "^1.3.3",
-    "babel-cli": "^6.14.0",
-    "babel-preset-es2015": "^6.14.0",
     "bootstrap": "^3.3.6",
     "bootstrap-datepicker": "^1.6.0",
     "brace": "^0.7.0",
@@ -90,6 +88,9 @@
   },
   "devDependencies": {
     "babel": "^6.3.26",
+    "babel-cli": "^6.14.0",
+    "babel-polyfill": "^6.14.0",
+    "babel-preset-es2015": "^6.14.0",
     "babel-core": "^6.10.4",
     "babel-loader": "^6.2.4",
     "babel-preset-airbnb": "^2.1.1",
diff --git a/caravel/assets/webpack.config.js b/caravel/assets/webpack.config.js
index 1667e016f1..e03265cc57 100644
--- a/caravel/assets/webpack.config.js
+++ b/caravel/assets/webpack.config.js
@@ -13,13 +13,13 @@ const VERSION_STRING = JSON.parse(fs.readFileSync('package.json')).version;
 const config = {
   entry: {
     'css-theme': APP_DIR + '/javascripts/css-theme.js',
-    dashboard: APP_DIR + '/javascripts/dashboard/Dashboard.jsx',
-    explore: APP_DIR + '/javascripts/explore/explore.jsx',
-    explorev2: APP_DIR + '/javascripts/explorev2/index.jsx',
-    welcome: APP_DIR + '/javascripts/welcome.js',
-    standalone: APP_DIR + '/javascripts/standalone.js',
     common: APP_DIR + '/javascripts/common.js',
-    sqllab: APP_DIR + '/javascripts/SqlLab/index.jsx',
+    dashboard: ['babel-polyfill', APP_DIR + '/javascripts/dashboard/Dashboard.jsx'],
+    explore: ['babel-polyfill', APP_DIR + '/javascripts/explore/explore.jsx'],
+    explorev2: ['babel-polyfill', APP_DIR + '/javascripts/explorev2/index.jsx'],
+    sqllab: ['babel-polyfill', APP_DIR + '/javascripts/SqlLab/index.jsx'],
+    standalone: ['babel-polyfill', APP_DIR + '/javascripts/standalone.js'],
+    welcome: ['babel-polyfill', APP_DIR + '/javascripts/welcome.js'],
   },
   output: {
     path: BUILD_DIR,