undo 'typeofs' compress for min bundles that include mapbox-gl

... and run full compress otherwise.

Author: etpinard

tasks/util/browserify_wrapper.js

@@ -4,7 +4,6 @@ var path = require('path');
 var browserify = require('browserify');
 var minify = require('minify-stream');
 
-var constants = require('./constants');
 var compressAttributes = require('./compress_attributes');
 var strictD3 = require('./strict_d3');
 
@@ -45,7 +44,7 @@ module.exports = function _bundle(pathToIndex, pathToBundle, opts, cb) {
     }
 
     var b = browserify(pathToIndex, browserifyOpts);
-    var pending = opts.pathToMinBundle ? 2 : 1;
+    var pending = pathToMinBundle ? 2 : 1;
 
     function done() {
         if(cb && --pending === 0) cb(null);
@@ -58,9 +57,27 @@ module.exports = function _bundle(pathToIndex, pathToBundle, opts, cb) {
         }
     });
 
-    if(opts.pathToMinBundle) {
+    if(pathToMinBundle) {
+        var uglifyOptions = {
+            ecma: 5,
+            mangle: true,
+            compress: true,
+            output: {
+                beautify: false,
+                ascii_only: true
+            },
+            sourceMap: false
+        };
+
+        // need this to make mapbox-gl work in minified bundles
+        // see https://github.com/plotly/plotly.js/issues/2787
+        var fname = path.basename(pathToMinBundle);
+        if(fname === 'plotly.min.js' || fname === 'plotly-mapbox.min.js') {
+            uglifyOptions.compress = {typeofs: false};
+        }
+
         bundleStream
-            .pipe(minify(constants.uglifyOptions))
+            .pipe(minify(uglifyOptions))
             .pipe(fs.createWriteStream(pathToMinBundle))
             .on('finish', function() {
                 logger(pathToMinBundle);

tasks/util/constants.js

@@ -84,19 +84,6 @@ module.exports = {
     testContainerUrl: 'http://localhost:9010/',
     testContainerHome: '/var/www/streambed/image_server/plotly.js',
 
-    uglifyOptions: {
-        mangle: true,
-        // the compress flag break mapbox-gl,
-        // TODO find a way to only skip compression on mapbox-gl files
-        compress: false,
-        output: {
-            beautify: false,
-            ascii_only: true
-        },
-
-        sourceMap: false
-    },
-
     licenseDist: [
         '/**',
         '* plotly.js v' + pkg.version,

tasks/util/wrap_locale.js

@@ -4,8 +4,6 @@ var path = require('path');
 var minify = require('minify-stream');
 var intoStream = require('into-stream');
 
-var constants = require('./constants');
-
 var prefix = 'Plotly.register(';
 var suffix = ');';
 
@@ -25,8 +23,19 @@ module.exports = function wrap_locale(pathToInput, pathToOutput) {
 
         var rawOut = prefix + data.substr(moduleStart, moduleEnd - moduleStart) + suffix;
 
+        var uglifyOptions = {
+            ecma: 5,
+            mangle: true,
+            compress: true,
+            output: {
+                beautify: false,
+                ascii_only: true
+            },
+            sourceMap: false
+        };
+
         intoStream(rawOut)
-            .pipe(minify(constants.uglifyOptions))
+            .pipe(minify(uglifyOptions))
             .pipe(fs.createWriteStream(pathToOutput))
             .on('finish', function() {
                 logger(pathToOutput);