make watchified bundle step output plotly.js in build/:

- so that temporary dev build are ignored by git. - `npm run build` is reserved for dist/ builds, while `npm run watch` and `npm run start-test_dashboard` use the build/ plotly.js
plotly · etpinard · Nov 16, 2015 · Nov 11, 2015 · Nov 15, 2015 · Nov 15, 2015
commit 6d6ba5441670776758ecd38fb89f4d0b4688a1b6
diff --git a/.gitignore b/.gitignore
@@ -3,7 +3,4 @@ node_modules
 build/*
 !build/README.md
 
-dist/*
-!dist/README.md
-
 npm-debug.log
diff --git a/devtools/test_dashboard/index.html b/devtools/test_dashboard/index.html
@@ -11,7 +11,8 @@
 
     <script type="text/javascript" src="../../dist/extras/mathjax/MathJax.js?config=TeX-AMS-MML_SVG"></script>
 
-    <script type="text/javascript" src="../../dist/plotly.js" charset="utf-8"></script>
+    <!-- use dev plotly.js build -->
+    <script type="text/javascript" src="../../build/plotly.js" charset="utf-8"></script>
 
     <!-- use local topojson files -->
     <script>Plotly.setPlotConfig({ topojsonURL: '../../dist/topojson/' });</script>

diff --git a/tasks/bundle.js b/tasks/bundle.js
@@ -13,6 +13,9 @@ var constants = require('./util/constants');
  * Run `npm run build -- dev` or `npm run build -- --dev`
  * to include source map in the plotly.js bundle
  *
+ * N.B. This script is meant for dist builds; the output bundles are placed
+ *      in plotly.js/dist/.
+ *      Use `npm run watch` for dev builds.
  */
 
 var arg = process.argv[2];

diff --git a/tasks/util/constants.js b/tasks/util/constants.js
@@ -11,6 +11,7 @@ module.exports = {
     pathToMocks: path.join(pathToRoot, 'test/image/mocks'),
 
     pathToPlotlySrc: path.join(pathToSrc, 'index.js'),
+    pathToPlotlyBuild: path.join(pathToBuild, 'plotly.js'),
     pathToPlotlyDist: path.join(pathToDist, 'plotly.js'),
     pathToPlotlyDistMin: path.join(pathToDist, 'plotly.min.js'),
     pathToPlotlyDistWithMeta: path.join(pathToDist, 'plotly-with-meta.js'),

diff --git a/tasks/util/make_watchified_bundle.js b/tasks/util/make_watchified_bundle.js
@@ -11,6 +11,10 @@ var constants = require('./constants');
 /**
  * Make a plotly.js browserify bundle function watched by watchify.
  *
+ * N.B. This module is meant for dev builds; the output bundle is placed
+ *      in plotly.js/build/
+ *      Use `npm run build` for dist builds.
+ *
  * @param {function} onFirstBundleCallback executed when first bundle is completed
  *
  */
@@ -47,10 +51,10 @@ module.exports = function makeWatchifiedBundle(onFirstBundleCallback) {
             }
         })
         .pipe(
-            fs.createWriteStream(constants.pathToPlotlyDist)
+            fs.createWriteStream(constants.pathToPlotlyBuild)
         )
         .on('finish', function() {
-            appendVersion(constants.pathToPlotlyDist, {object: 'Plotly', DEV: true});
+            appendVersion(constants.pathToPlotlyBuild, {object: 'Plotly', DEV: true});
         });
     }