Merge remote-tracking branch 'origin/master' into dev-griddash

Author: njwhite

package.json

@@ -32,7 +32,7 @@
     "use-draftlogs": "node tasks/use_draftlogs.js",
     "empty-draftlogs": "node tasks/empty_draftlogs.js",
     "empty-dist": "node tasks/empty_dist.js",
-    "build": "npm run empty-dist && npm run preprocess && npm run find-strings && npm run bundle && npm run extra-bundles basic && npm run extra-bundles cartesian && npm run extra-bundles geo && npm run extra-bundles gl2d && npm run extra-bundles gl3d && npm run extra-bundles mapbox && npm run extra-bundles finance && npm run locales && npm run schema dist && npm run stats",
+    "build": "npm run empty-dist && npm run preprocess && npm run find-strings && npm run bundle && npm run extra-bundles && npm run locales && npm run schema dist && npm run stats",
     "regl-codegen": "node devtools/regl_codegen/server.js",
     "cibuild": "npm run empty-dist && npm run preprocess && node tasks/cibundle.js",
     "watch": "node tasks/watch.js",

tasks/bundle.js

@@ -37,8 +37,8 @@ tasks.push(function(done) {
         standalone: 'Plotly',
         pathToMinBundle: pathToPlotlyDistMin
     }, function() {
-        prependFile(pathToPlotlyDist, header, common.throwOnError);
-        prependFile(pathToPlotlyDistMin, header, common.throwOnError);
+        prependFile.sync(pathToPlotlyDist, header, common.throwOnError);
+        prependFile.sync(pathToPlotlyDistMin, header, common.throwOnError);
 
         done();
     });
@@ -50,8 +50,8 @@ tasks.push(function(done) {
         standalone: 'Plotly',
         pathToMinBundle: pathToPlotlyStrictDistMin
     }, function() {
-        prependFile(pathToPlotlyStrictDist, header, common.throwOnError);
-        prependFile(pathToPlotlyStrictDistMin, header, common.throwOnError);
+        prependFile.sync(pathToPlotlyStrictDist, header.replace('plotly.js', 'plotly.js (strict)'), common.throwOnError);
+        prependFile.sync(pathToPlotlyStrictDistMin, header.replace('plotly.js', 'plotly.js (strict - minified)'), common.throwOnError);
 
         done();
     });
@@ -62,7 +62,7 @@ tasks.push(function(done) {
     _bundle(pathToPlotlyGeoAssetsSrc, pathToPlotlyGeoAssetsDist, {
         standalone: 'PlotlyGeoAssets'
     }, function() {
-        prependFile(pathToPlotlyGeoAssetsDist, header, common.throwOnError);
+        prependFile.sync(pathToPlotlyGeoAssetsDist, header, common.throwOnError);
 
         done();
     });
@@ -74,7 +74,7 @@ tasks.push(function(done) {
         standalone: 'Plotly',
         noCompress: true
     }, function() {
-        prependFile(pathToPlotlyDistWithMeta, header, common.throwOnError);
+        prependFile.sync(pathToPlotlyDistWithMeta, header, common.throwOnError);
 
         done();
     });

tasks/extra_bundles.js

@@ -30,6 +30,9 @@ var tasks = [];
 for(var i = 0; i < list.length; i++) {
     var opts = list[i];
 
+    // strict bundle is no longer a partial bundle and generated with bundles
+    if(opts.name === 'strict') continue;
+
     partialBundle(tasks, {
         name: opts.name,
         index: opts.index,

tasks/partial_bundle.js

@@ -63,8 +63,8 @@ module.exports = function partialBundle(tasks, opts) {
             var headerDist = header.replace('plotly.js', 'plotly.js (' + name + ')');
             var headerDistMin = header.replace('plotly.js', 'plotly.js (' + name + ' - minified)');
 
-            if(dist) prependFile(dist, headerDist, common.throwOnError);
-            if(distMin) prependFile(distMin, headerDistMin, common.throwOnError);
+            if(dist) prependFile.sync(dist, headerDist, common.throwOnError);
+            if(distMin) prependFile.sync(distMin, headerDistMin, common.throwOnError);
 
             done();
         });