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/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",
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';
 
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',