fix & update bundle options

Author: archmoj

tasks/bundle.js

@@ -31,10 +31,9 @@ if(!doesFileExist(constants.pathToCSSBuild)) {
 // memory consumption.
 var tasks = [];
 
-// Browserify plotly.js
+// Bundle plotly.js
 tasks.push(function(done) {
     _bundle(pathToPlotlyIndex, pathToPlotlyDist, {
-        standalone: 'Plotly',
         pathToMinBundle: pathToPlotlyDistMin
     }, function() {
         prependFile.sync(pathToPlotlyDist, header, common.throwOnError);
@@ -44,10 +43,9 @@ tasks.push(function(done) {
     });
 });
 
-// Browserify plotly.js-strict
+// Bundle plotly.js-strict
 tasks.push(function(done) {
     _bundle(pathToPlotlyStrict, pathToPlotlyStrictDist, {
-        standalone: 'Plotly',
         pathToMinBundle: pathToPlotlyStrictDistMin
     }, function() {
         prependFile.sync(pathToPlotlyStrictDist, header.replace('plotly.js', 'plotly.js (strict)'), common.throwOnError);
@@ -57,7 +55,7 @@ tasks.push(function(done) {
     });
 });
 
-// Browserify the geo assets
+// Bundle the geo assets
 tasks.push(function(done) {
     _bundle(pathToPlotlyGeoAssetsSrc, pathToPlotlyGeoAssetsDist, {
         standalone: 'PlotlyGeoAssets'
@@ -68,10 +66,9 @@ tasks.push(function(done) {
     });
 });
 
-// Browserify plotly.js with meta
+// Bundle plotly.js with meta
 tasks.push(function(done) {
     _bundle(pathToPlotlyIndex, pathToPlotlyDistWithMeta, {
-        standalone: 'Plotly',
         noCompress: true
     }, function() {
         prependFile.sync(pathToPlotlyDistWithMeta, header, common.throwOnError);

tasks/cibundle.js

@@ -13,8 +13,7 @@ var _bundle = require('./util/browserify_wrapper');
 
 // Bundle plotly.js and plotly.min.js
 _bundle(constants.pathToPlotlyIndex, constants.pathToPlotlyBuild, {
-    standalone: 'Plotly',
-    debug: true,
+    noCompress: true,
     pathToMinBundle: constants.pathToPlotlyBuildMin
 }, function() {
     // Bundle the geo assets

tasks/extra_bundles.js

@@ -26,7 +26,7 @@ if(process.argv.length > 2) {
 
 var tasks = [];
 
-// Browserify the plotly.js partial bundles
+// Bundle the plotly.js partial bundles
 for(var i = 0; i < list.length; i++) {
     var opts = list[i];
 

tasks/partial_bundle.js

@@ -9,7 +9,7 @@ var allTransforms = constants.allTransforms;
 var allTraces = constants.allTraces;
 var mainIndex = constants.mainIndex;
 
-// Browserify the plotly.js partial bundles
+// Bundle the plotly.js partial bundles
 module.exports = function partialBundle(tasks, opts) {
     var name = opts.name;
     var index = opts.index;
@@ -54,7 +54,6 @@ module.exports = function partialBundle(tasks, opts) {
 
     tasks.push(function(done) {
         var bundleOpts = {
-            standalone: 'Plotly',
             deleteIndex: deleteIndex,
             pathToMinBundle: distMin
         };

tasks/util/browserify_wrapper.js

@@ -4,14 +4,15 @@ var webpack = require('webpack');
 
 var config = require('../../webpack.config.js');
 
+var nRules = config.module.rules.length;
+
 /** Convenience bundle wrapper
  *
  * @param {string} pathToIndex path to index file to bundle
  * @param {string} pathToBunlde path to destination bundle
  * @param {object} opts
  *  Browserify options:
  *  - standalone {string}
- *  - debug {boolean} [optional]
  *  Additional option:
  *  - pathToMinBundle {string} path to destination minified bundle
  *  - noCompress {boolean} skip attribute meta compression?
@@ -27,14 +28,12 @@ module.exports = function _bundle(pathToIndex, pathToBundle, opts, cb) {
 
     var pathToMinBundle = opts.pathToMinBundle;
 
-    if(!opts.noCompress) {
-        config.module.rules.push({
-            test: /\.(js|glsl)$/,
-            use: [
-                'ify-loader'
-            ]
-        });
-    }
+    config.module.rules[nRules] = opts.noCompress ? {} : {
+        test: /\.js$/,
+        use: [
+            'transform-loader?' + path.resolve(__dirname, '../../tasks/compress_attributes.js')
+        ]
+    };
 
     config.entry = pathToIndex;
 
@@ -45,8 +44,10 @@ module.exports = function _bundle(pathToIndex, pathToBundle, opts, cb) {
     config.output.path = parsedPath.dir;
     config.output.filename = parsedPath.base;
 
+    config.output.library.name = opts.standalone || 'Plotly';
+
     config.optimization = {
-        minimize: pathToMinBundle && pending === 1
+        minimize: !!(pathToMinBundle && pending === 1)
     };
 
     var compiler = webpack(config);