From 4acb51f6fa7338a3d21e9f6e09107f8f18353978 Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Date: Tue, 25 Jul 2017 09:13:49 +0200
Subject: [PATCH 1/3] assets: bump mapbox-gl related versions

---
 superset/assets/package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/superset/assets/package.json b/superset/assets/package.json
index ff4c161ad6e11..ca7ca42c76f3f 100644
--- a/superset/assets/package.json
+++ b/superset/assets/package.json
@@ -57,7 +57,7 @@
     "jquery": "^3.2.1",
     "jsdom": "9.12.0",
     "lodash.throttle": "^4.1.1",
-    "mapbox-gl": "^0.26.0",
+    "mapbox-gl": "^0.32.1",
     "moment": "^2.14.1",
     "mustache": "^2.2.1",
     "nvd3": "1.8.5",
@@ -72,7 +72,7 @@
     "react-dom": "^15.5.1",
     "react-gravatar": "^2.6.1",
     "react-grid-layout": "^0.14.4",
-    "react-map-gl": "^1.7.0",
+    "react-map-gl": "^2.0.3",
     "react-redux": "^5.0.2",
     "react-resizable": "^1.3.3",
     "react-select": "1.0.0-rc.3",

From e70a1456b259f8b9943f3526b2bc5c028d14f9aa Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Date: Tue, 25 Jul 2017 09:20:04 +0200
Subject: [PATCH 2/3] assets: please the linter

---
 superset/assets/javascripts/modules/superset.js | 2 +-
 superset/assets/visualizations/treemap.js       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/superset/assets/javascripts/modules/superset.js b/superset/assets/javascripts/modules/superset.js
index 55af823117c4e..eccdda4a312f7 100644
--- a/superset/assets/javascripts/modules/superset.js
+++ b/superset/assets/javascripts/modules/superset.js
@@ -8,7 +8,7 @@ import { QUERY_TIMEOUT_THRESHOLD } from '../constants';
 
 const utils = require('./utils');
 
-/* eslint wrap-iife: 0*/
+/* eslint wrap-iife: 0 */
 const px = function () {
   let slice;
   function getParam(name) {
diff --git a/superset/assets/visualizations/treemap.js b/superset/assets/visualizations/treemap.js
index f728985dba5cd..3243dba472281 100644
--- a/superset/assets/visualizations/treemap.js
+++ b/superset/assets/visualizations/treemap.js
@@ -1,4 +1,4 @@
-/* eslint-disable no-shadow, no-param-reassign, no-underscore-dangle, no-use-before-define*/
+/* eslint-disable no-shadow, no-param-reassign, no-underscore-dangle, no-use-before-define */
 import d3 from 'd3';
 import { category21 } from '../javascripts/modules/colors';
 

From 0bb6a382c24d7899e9abe18c1b03b4db551f8721 Mon Sep 17 00:00:00 2001
From: Riccardo Magliocchetti <riccardo.magliocchetti@gmail.com>
Date: Tue, 25 Jul 2017 22:30:01 +0200
Subject: [PATCH 3/3] assets: use babel to load mapbox-gl js

---
 superset/assets/webpack.config.js | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/superset/assets/webpack.config.js b/superset/assets/webpack.config.js
index be8c8c983b9cb..bfcfd8756e669 100644
--- a/superset/assets/webpack.config.js
+++ b/superset/assets/webpack.config.js
@@ -39,12 +39,20 @@ const config = {
 
   },
   module: {
-    noParse: /mapbox-gl\/dist/,
     loaders: [
       {
         test: /datatables\.net.*/,
         loader: 'imports-loader?define=>false',
       },
+      {
+        test: /mapbox-gl\/.*\.js$/,
+        loader: 'babel-loader',
+        query: {
+          presets: [
+            'es2015',
+          ],
+        },
+      },
       {
         test: /\.jsx?$/,
         exclude: APP_DIR + '/node_modules',