use run-series in bundle script to limit memory consumption

... that can lead to `npm run build` blowing up (especially with
    browser-pack-flat - see next commit).

- adapt opts.then to callback signatrue instead
- make opts more granular and clearer

Author: etpinard

package-lock.json

@@ -148,6 +148,7 @@
     "prettysize": "1.1.0",
     "read-last-lines": "^1.1.0",
     "requirejs": "^2.3.1",
+    "run-series": "^1.1.4",
     "through2": "^2.0.3",
     "true-case-path": "^1.0.2",
     "watchify": "^3.10.0",

package.json

@@ -1,5 +1,6 @@
 var path = require('path');
 var glob = require('glob');
+var runSeries = require('run-series');
 
 var constants = require('./util/constants');
 var common = require('./util/common');
@@ -30,41 +31,60 @@ if(!doesFileExist(constants.pathToCSSBuild) || !doesFileExist(constants.pathToFo
     ].join('\n'));
 }
 
-// Browserify plotly.js
-_bundle(constants.pathToPlotlyIndex, constants.pathToPlotlyDist, {
-    standalone: 'Plotly',
-    debug: DEV,
-    pathToMinBundle: constants.pathToPlotlyDistMin
+// "Browserify" the locales
+var localeGlob = path.join(constants.pathToLib, 'locales', '*.js');
+glob(localeGlob, function(err, files) {
+    files.forEach(function(file) {
+        var outName = 'plotly-locale-' + path.basename(file);
+        var outPath = path.join(constants.pathToDist, outName);
+        wrapLocale(file, outPath);
+    });
 });
 
+// list of tasks to pass to run-series to not blow up
+// memory consumption.
+var tasks = [];
+
+// Browserify plotly.js
+tasks.push(function(cb) {
+    _bundle(constants.pathToPlotlyIndex, constants.pathToPlotlyDist, {
+        standalone: 'Plotly',
+        debug: DEV,
+        compressAttrs: true,
+        pathToMinBundle: constants.pathToPlotlyDistMin
+    }, cb);
+});
 
 // Browserify the geo assets
-_bundle(constants.pathToPlotlyGeoAssetsSrc, constants.pathToPlotlyGeoAssetsDist, {
-    standalone: 'PlotlyGeoAssets'
+tasks.push(function(cb) {
+    _bundle(constants.pathToPlotlyGeoAssetsSrc, constants.pathToPlotlyGeoAssetsDist, {
+        standalone: 'PlotlyGeoAssets'
+    }, cb);
 });
 
 // Browserify the plotly.js with meta
-_bundle(constants.pathToPlotlyIndex, constants.pathToPlotlyDistWithMeta, {
-    standalone: 'Plotly',
-    debug: DEV,
-    then: makeSchema(constants.pathToPlotlyDistWithMeta, constants.pathToSchema)
+tasks.push(function(cb) {
+    _bundle(constants.pathToPlotlyIndex, constants.pathToPlotlyDistWithMeta, {
+        standalone: 'Plotly',
+        debug: DEV,
+    }, function() {
+        makeSchema(constants.pathToPlotlyDistWithMeta, constants.pathToSchema)();
+        cb();
+    });
 });
 
 // Browserify the plotly.js partial bundles
 constants.partialBundlePaths.forEach(function(pathObj) {
-    _bundle(pathObj.index, pathObj.dist, {
-        standalone: 'Plotly',
-        debug: DEV,
-        pathToMinBundle: pathObj.distMin
+    tasks.push(function(cb) {
+        _bundle(pathObj.index, pathObj.dist, {
+            standalone: 'Plotly',
+            debug: DEV,
+            compressAttrs: true,
+            pathToMinBundle: pathObj.distMin
+        }, cb);
     });
 });
 
-// "Browserify" the locales
-var localeGlob = path.join(constants.pathToLib, 'locales', '*.js');
-glob(localeGlob, function(err, files) {
-    files.forEach(function(file) {
-        var outName = 'plotly-locale-' + path.basename(file);
-        var outPath = path.join(constants.pathToDist, outName);
-        wrapLocale(file, outPath);
-    });
+runSeries(tasks, function(err) {
+    if(err) throw err;
 });

tasks/bundle.js

@@ -21,56 +21,67 @@ var strictD3 = require('./strict_d3');
  *
  *  Additional option:
  *  - pathToMinBundle {string} path to destination minified bundle
+ *  - compressAttrs {boolean} do we compress attribute meta?
+ * @param {function} cb callback
  *
  * Outputs one bundle (un-minified) file if opts.pathToMinBundle is omitted
  * or opts.debug is true. Otherwise outputs two file: one un-minified bundle and
  * one minified bundle.
  *
  * Logs basename of bundle when completed.
  */
-module.exports = function _bundle(pathToIndex, pathToBundle, opts) {
+module.exports = function _bundle(pathToIndex, pathToBundle, opts, cb) {
     opts = opts || {};
 
-    // do we output a minified file?
     var pathToMinBundle = opts.pathToMinBundle;
-    var outputMinified = !!pathToMinBundle;
 
     var browserifyOpts = {};
     browserifyOpts.standalone = opts.standalone;
     browserifyOpts.debug = opts.debug;
-    browserifyOpts.transform = outputMinified ? [compressAttributes] : [];
 
+    browserifyOpts.transform = [];
+    if(opts.compressAttrs) {
+        browserifyOpts.transform.push(compressAttributes);
+    }
     if(opts.debug) {
         browserifyOpts.transform.push(strictD3);
     }
 
     var b = browserify(pathToIndex, browserifyOpts);
 
+
+    var pending = opts.pathToMinBundle ? 2 : 1;
+
+    function done() {
+        if(cb && --pending === 0) cb(null);
+    }
+
     var bundleStream = b.bundle(function(err) {
-        if(err) throw err;
+        if(err) {
+            if(cb) cb(err);
+            else throw err;
+        }
     });
 
-    if(outputMinified) {
+    if(opts.pathToMinBundle) {
         bundleStream
             .pipe(minify(constants.uglifyOptions))
             .pipe(fs.createWriteStream(pathToMinBundle))
             .on('finish', function() {
                 logger(pathToMinBundle);
+                done();
             });
     }
 
     bundleStream
         .pipe(fs.createWriteStream(pathToBundle))
         .on('finish', function() {
             logger(pathToBundle);
-            if(opts.then) {
-                opts.then();
-            }
+            done();
         });
 };
 
 function logger(pathToOutput) {
     var log = 'ok ' + path.basename(pathToOutput);
-
     console.log(log);
 }