Merge pull request #18 from plotly/fix-umd

Fix UMD in plotly.js dist files

Author: etpinard

src/assets/geo_assets.js

@@ -9,4 +9,7 @@
 
 var saneTopojson = require('sane-topojson');
 
+// export the version found in the package.json
+exports.version = require('../../package.json').version;
+
 exports.topojson = saneTopojson;

src/index.js

@@ -16,6 +16,9 @@
 
 var Plotly = require('./plotly');
 
+// export the version found in the package.json
+exports.version = require('../package.json').version;
+
 // plot api
 exports.plot = Plotly.plot;
 exports.newPlot = Plotly.newPlot;

tasks/bundle.js

@@ -4,7 +4,6 @@ var browserify = require('browserify');
 var UglifyJS = require('uglify-js');
 
 var compressAttributes = require('./util/compress_attributes');
-var appendVersion = require('./util/append_version');
 var constants = require('./util/constants');
 
 /*
@@ -48,19 +47,11 @@ browserify(constants.pathToPlotlySrc, {
     if(!DEV) {
         fs.writeFile(
             constants.pathToPlotlyDistMin,
-            UglifyJS.minify(buf.toString(), constants.uglifyOptions).code,
-            function() {
-                appendVersion(
-                    constants.pathToPlotlyDistMin, {object: 'Plotly'}
-                );
-            }
+            UglifyJS.minify(buf.toString(), constants.uglifyOptions).code
         );
     }
 })
-.pipe(fs.createWriteStream(constants.pathToPlotlyDist))
-.on('finish', function() {
-    appendVersion(constants.pathToPlotlyDist, {object: 'Plotly', DEV: DEV});
-});
+.pipe(fs.createWriteStream(constants.pathToPlotlyDist));
 
 
 // Browserify the geo assets
@@ -70,10 +61,7 @@ browserify(constants.pathToPlotlyGeoAssetsSrc, {
 .bundle(function(err) {
     if(err) throw err;
 })
-.pipe(fs.createWriteStream(constants.pathToPlotlyGeoAssetsDist))
-.on('finish', function() {
-    appendVersion(constants.pathToPlotlyGeoAssetsDist, {object: 'PlotlyGeoAssets'});
-});
+.pipe(fs.createWriteStream(constants.pathToPlotlyGeoAssetsDist));
 
 
 // Browserify the plotly.js with meta
@@ -84,7 +72,4 @@ browserify(constants.pathToPlotlySrc, {
 .bundle(function(err) {
     if(err) throw err;
 })
-.pipe(fs.createWriteStream(constants.pathToPlotlyDistWithMeta))
-.on('finish', function() {
-    appendVersion(constants.pathToPlotlyDistWithMeta, {object: 'Plotly', DEV: DEV});
-});
+.pipe(fs.createWriteStream(constants.pathToPlotlyDistWithMeta));

tasks/cibundle.js

@@ -3,7 +3,6 @@ var fs = require('fs');
 var browserify = require('browserify');
 
 var compressAttributes = require('./util/compress_attributes');
-var appendVersion = require('./util/append_version');
 var constants = require('./util/constants');
 
 /*
@@ -24,10 +23,7 @@ browserify(constants.pathToPlotlySrc, {
 .bundle(function(err) {
     if(err) throw err;
 })
-.pipe(fs.createWriteStream(constants.pathToPlotlyBuild))
-.on('finish', function() {
-    appendVersion(constants.pathToPlotlyBuild, {object: 'Plotly'});
-});
+.pipe(fs.createWriteStream(constants.pathToPlotlyBuild));
 
 
 // Browserify the geo assets
@@ -37,7 +33,4 @@ browserify(constants.pathToPlotlyGeoAssetsSrc, {
 .bundle(function(err) {
     if(err) throw err;
 })
-.pipe(fs.createWriteStream(constants.pathToPlotlyGeoAssetsDist))
-.on('finish', function() {
-    appendVersion(constants.pathToPlotlyGeoAssetsDist, {object: 'PlotlyGeoAssets'});
-});
+.pipe(fs.createWriteStream(constants.pathToPlotlyGeoAssetsDist));

tasks/util/append_version.js

@@ -4,7 +4,6 @@ var browserify = require('browserify');
 var watchify = require('watchify');
 
 var compressAttributes = require('./compress_attributes');
-var appendVersion = require('./append_version');
 var formatBundleMsg = require('./format_bundle_msg');
 var constants = require('./constants');
 
@@ -53,9 +52,6 @@ module.exports = function makeWatchifiedBundle(onFirstBundleCallback) {
         .pipe(
             fs.createWriteStream(constants.pathToPlotlyBuild)
         )
-        .on('finish', function() {
-            appendVersion(constants.pathToPlotlyBuild, {object: 'Plotly', DEV: true});
-        });
     }
 
     return bundle;