Merge pull request #2187 from plotly/bundle-up

Upgrade bundling

Author: etpinard

package.json

@@ -86,6 +86,7 @@
     "has-hover": "^1.0.1",
     "mapbox-gl": "^0.22.0",
     "matrix-camera-controller": "^2.1.3",
+    "minify-stream": "^1.1.0",
     "mouse-change": "^1.4.0",
     "mouse-event-offset": "^3.0.2",
     "mouse-wheel": "^1.0.2",
@@ -109,6 +110,7 @@
     "brfs": "^1.4.3",
     "browserify": "^14.1.0",
     "browserify-transform-tools": "^1.7.0",
+    "cross-spawn": "^5.1.0",
     "deep-equal": "^1.0.1",
     "ecstatic": "^2.1.0",
     "eslint": "^3.17.1",
@@ -140,7 +142,6 @@
     "read-last-lines": "^1.1.0",
     "requirejs": "^2.3.1",
     "through2": "^2.0.3",
-    "uglify-js": "^2.8.12",
     "watchify": "^3.9.0",
     "xml2js": "^0.4.16"
   }

tasks/bundle.js

@@ -33,6 +33,7 @@ _bundle(constants.pathToPlotlyIndex, constants.pathToPlotlyDist, {
     pathToMinBundle: constants.pathToPlotlyDistMin
 });
 
+
 // Browserify the geo assets
 _bundle(constants.pathToPlotlyGeoAssetsSrc, constants.pathToPlotlyGeoAssetsDist, {
     standalone: 'PlotlyGeoAssets'

tasks/stats.js

@@ -1,6 +1,6 @@
 var path = require('path');
 var fs = require('fs');
-var spawn = require('child_process').spawn;
+var spawn = require('cross-spawn');
 
 var falafel = require('falafel');
 var gzipSize = require('gzip-size');

tasks/util/browserify_wrapper.js

@@ -2,11 +2,10 @@ var fs = require('fs');
 var path = require('path');
 
 var browserify = require('browserify');
-var UglifyJS = require('uglify-js');
+var minify = require('minify-stream');
 
 var constants = require('./constants');
 var compressAttributes = require('./compress_attributes');
-var patchMinified = require('./patch_minified');
 var strictD3 = require('./strict_d3');
 
 /** Convenience browserify wrapper
@@ -46,30 +45,28 @@ module.exports = function _bundle(pathToIndex, pathToBundle, opts) {
     }
 
     var b = browserify(pathToIndex, browserifyOpts);
-    var bundleWriteStream = fs.createWriteStream(pathToBundle);
 
-    bundleWriteStream.on('finish', function() {
-        logger(pathToBundle);
-        if(opts.then) {
-            opts.then();
-        }
-    });
-
-    b.bundle(function(err, buf) {
+    var bundleStream = b.bundle(function(err) {
         if(err) throw err;
+    });
 
-        if(outputMinified) {
-            var minifiedCode = UglifyJS.minify(buf.toString(), constants.uglifyOptions).code;
-            minifiedCode = patchMinified(minifiedCode);
-
-            fs.writeFile(pathToMinBundle, minifiedCode, function(err) {
-                if(err) throw err;
-
+    if(outputMinified) {
+        bundleStream
+            .pipe(minify(constants.uglifyOptions))
+            .pipe(fs.createWriteStream(pathToMinBundle))
+            .on('finish', function() {
                 logger(pathToMinBundle);
             });
-        }
-    })
-    .pipe(bundleWriteStream);
+    }
+
+    bundleStream
+        .pipe(fs.createWriteStream(pathToBundle))
+        .on('finish', function() {
+            logger(pathToBundle);
+            if(opts.then) {
+                opts.then();
+            }
+        });
 };
 
 function logger(pathToOutput) {

tasks/util/constants.js

@@ -84,16 +84,15 @@ module.exports = {
     testContainerHome: '/var/www/streambed/image_server/plotly.js',
 
     uglifyOptions: {
-        fromString: true,
         mangle: true,
         compress: {
-            warnings: false,
-            screw_ie8: true
+            warnings: false
         },
         output: {
             beautify: false,
             ascii_only: true
-        }
+        },
+        sourceMap: false
     },
 
     licenseDist: [