Merge pull request #2447 from etpinard/browser-pack-flat

Bundle with browser-pack-flat plugin
plotly · Mar 7, 2018 · dfe13b5 · dfe13b5
2 parents d55a1be + 7b05183
commit dfe13b5
Show file tree

Hide file tree

Showing 4 changed files with 209 additions and 36 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -114,6 +114,7 @@
   },
   "devDependencies": {
     "brfs": "^1.4.4",
+    "browser-pack-flat": "^3.0.8",
     "browserify": "^15.2.0",
     "browserify-transform-tools": "^1.7.0",
     "check-node-version": "^3.2.0",
@@ -148,6 +149,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",

diff --git a/tasks/bundle.js b/tasks/bundle.js
@@ -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,63 @@ 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,
+        packFlat: 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,
+        packFlat: true
+    }, 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,
+            packFlat: 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;
 });