turn off 'typeof' compress options for all minify steps

- for consistency and maintainability, this does lead to a few extra bytes though.
plotly · Jul 9, 2018 · 2a3afe7 · 2a3afe7
1 parent 7171bc4
commit 2a3afe7
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 31 deletions.
diff --git a/tasks/util/browserify_wrapper.js b/tasks/util/browserify_wrapper.js
@@ -4,6 +4,7 @@ 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');
 
@@ -58,26 +59,8 @@ module.exports = function _bundle(pathToIndex, pathToBundle, opts, cb) {
     });
 
     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(uglifyOptions))
+            .pipe(minify(constants.uglifyOptions))
             .pipe(fs.createWriteStream(pathToMinBundle))
             .on('finish', function() {
                 logger(pathToMinBundle);

diff --git a/tasks/util/constants.js b/tasks/util/constants.js
@@ -84,6 +84,26 @@ module.exports = {
     testContainerUrl: 'http://localhost:9010/',
     testContainerHome: '/var/www/streambed/image_server/plotly.js',
 
+    uglifyOptions: {
+        ecma: 5,
+        mangle: true,
+        compress: {
+            // see full list of compress option
+            // https://github.com/fabiosantoscode/terser#compress-options
+            //
+            // need to turn off 'typeofs' to make mapbox-gl work in
+            // minified bundles, for more info see:
+            // https://github.com/plotly/plotly.js/issues/2787
+            typeofs: false
+        },
+        output: {
+            beautify: false,
+            ascii_only: true
+        },
+
+        sourceMap: false
+    },
+
     licenseDist: [
         '/**',
         '* plotly.js v' + pkg.version,

diff --git a/tasks/util/wrap_locale.js b/tasks/util/wrap_locale.js
@@ -4,6 +4,8 @@ var path = require('path');
 var minify = require('minify-stream');
 var intoStream = require('into-stream');
 
+var constants = require('./constants');
+
 var prefix = 'Plotly.register(';
 var suffix = ');';
 
@@ -23,19 +25,8 @@ 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(uglifyOptions))
+            .pipe(minify(constants.uglifyOptions))
             .pipe(fs.createWriteStream(pathToOutput))
             .on('finish', function() {
                 logger(pathToOutput);