From 3ff8138db7b881ac59a6c89157c3ebe71128e111 Mon Sep 17 00:00:00 2001
From: Lucas Wojciechowski <lucas@lucaswoj.com>
Date: Thu, 18 Aug 2016 12:32:25 -0700
Subject: [PATCH] Make generated filenames consistent & explicit (#3029)

* Make generated filenames consistent & explicit

* Use long-form command line flags
---
 .gitignore                                     |  4 ++--
 bench/index.html                               |  2 +-
 debug/{access-token-src.js => access-token.js} |  0
 debug/chinese.html                             |  2 +-
 debug/circles.html                             |  2 +-
 debug/cluster.html                             |  2 +-
 debug/events.html                              |  2 +-
 debug/image.html                               |  2 +-
 debug/index.html                               |  2 +-
 debug/markers.html                             |  2 +-
 debug/multiple.html                            |  2 +-
 debug/queryFeatures.html                       |  2 +-
 debug/video.html                               |  2 +-
 debug/wms.html                                 |  2 +-
 package.json                                   | 12 ++++++------
 15 files changed, 20 insertions(+), 20 deletions(-)
 rename debug/{access-token-src.js => access-token.js} (100%)

diff --git a/.gitignore b/.gitignore
index 136eac7024e..1e320e7d787 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,5 +9,5 @@ npm-debug.log
 coverage
 .DS_Store
 .nyc_output
-/debug/access-token.js
-/bench/bench.js
+/debug/access-token-generated.js
+/bench/index-generated.js
diff --git a/bench/index.html b/bench/index.html
index 458b26efe43..7b8b4db81e1 100644
--- a/bench/index.html
+++ b/bench/index.html
@@ -14,7 +14,7 @@
     <div id="benchmarks"></div>
     <script src="https://npmcdn.com/react@15.3.0/dist/react.js"></script>
     <script src="https://npmcdn.com/react-dom@15.3.0/dist/react-dom.js"></script>
-    <script src="bench.js"></script>
+    <script src="index-generated.js"></script>
 </body>
 
 </html>
diff --git a/debug/access-token-src.js b/debug/access-token.js
similarity index 100%
rename from debug/access-token-src.js
rename to debug/access-token.js
diff --git a/debug/chinese.html b/debug/chinese.html
index 2e1bfc96be5..3137e781dee 100644
--- a/debug/chinese.html
+++ b/debug/chinese.html
@@ -26,7 +26,7 @@
 <div id='map'></div>
 
 <script src='/dist/mapbox-gl-dev.js'></script>
-<script src='access-token.js'></script>
+<script src='/debug/access-token-generated.js'></script>
 
 <script>
 var map = window.map = new mapboxgl.Map({
diff --git a/debug/circles.html b/debug/circles.html
index a4ae6474f9d..16dcb1d2af8 100644
--- a/debug/circles.html
+++ b/debug/circles.html
@@ -50,7 +50,7 @@
 </div>
 
 <script src='/dist/mapbox-gl-dev.js'></script>
-<script src='access-token.js'></script>
+<script src='/debug/access-token-generated.js'></script>
 
 <script>
 var map = window.map = new mapboxgl.Map({
diff --git a/debug/cluster.html b/debug/cluster.html
index 391203191f1..54588ac3fa9 100644
--- a/debug/cluster.html
+++ b/debug/cluster.html
@@ -50,7 +50,7 @@
 </div>
 
 <script src='/dist/mapbox-gl-dev.js'></script>
-<script src='access-token.js'></script>
+<script src='/debug/access-token-generated.js'></script>
 
 <script>
 var style = {
diff --git a/debug/events.html b/debug/events.html
index 453fb851a53..aaba0875a17 100644
--- a/debug/events.html
+++ b/debug/events.html
@@ -95,7 +95,7 @@
 <div id='console' class='hide'></div>
 
 <script src='/dist/mapbox-gl-dev.js'></script>
-<script src='access-token.js'></script>
+<script src='/debug/access-token-generated.js'></script>
 
 <script>
 var map = window.map = new mapboxgl.Map({
diff --git a/debug/image.html b/debug/image.html
index bf94b2d9ef1..bc6e43c468f 100644
--- a/debug/image.html
+++ b/debug/image.html
@@ -15,7 +15,7 @@
 <div id='map'></div>
 
 <script src='/dist/mapbox-gl-dev.js'></script>
-<script src='access-token.js'></script>
+<script src='/debug/access-token-generated.js'></script>
 
 <script>
 var imageStyle = {
diff --git a/debug/index.html b/debug/index.html
index c808ca4fa26..2208fead097 100644
--- a/debug/index.html
+++ b/debug/index.html
@@ -50,7 +50,7 @@
 </div>
 
 <script src='/dist/mapbox-gl-dev.js'></script>
-<script src='access-token.js'></script>
+<script src='/debug/access-token-generated.js'></script>
 
 <script>
 var map = window.map = new mapboxgl.Map({
diff --git a/debug/markers.html b/debug/markers.html
index 082fdcca44b..52bbe38ab39 100644
--- a/debug/markers.html
+++ b/debug/markers.html
@@ -26,7 +26,7 @@
 <div id='map'></div>
 
 <script src='/dist/mapbox-gl-dev.js'></script>
-<script src='access-token.js'></script>
+<script src='/debug/access-token-generated.js'></script>
 
 <script>
 var map = window.map = new mapboxgl.Map({
diff --git a/debug/multiple.html b/debug/multiple.html
index 24e1b129964..4f892ca01b3 100644
--- a/debug/multiple.html
+++ b/debug/multiple.html
@@ -16,7 +16,7 @@
 <div class='map' id='map2'></div>
 
 <script src='/dist/mapbox-gl-dev.js'></script>
-<script src='access-token.js'></script>
+<script src='/debug/access-token-generated.js'></script>
 
 <script>
 var style = {
diff --git a/debug/queryFeatures.html b/debug/queryFeatures.html
index 34e51b92055..731445d9296 100644
--- a/debug/queryFeatures.html
+++ b/debug/queryFeatures.html
@@ -15,7 +15,7 @@
 <body>
 <div id='map'></div>
 <script src='/dist/mapbox-gl-dev.js'></script>
-<script src='access-token.js'></script>
+<script src='/debug/access-token-generated.js'></script>
 
 <script>
 var map = new mapboxgl.Map({
diff --git a/debug/video.html b/debug/video.html
index 9b29d133321..b6394eb862f 100644
--- a/debug/video.html
+++ b/debug/video.html
@@ -15,7 +15,7 @@
 <div id='map'></div>
 
 <script src='/dist/mapbox-gl-dev.js'></script>
-<script src='access-token.js'></script>
+<script src='/debug/access-token-generated.js'></script>
 
 <script>
 var videoStyle = {
diff --git a/debug/wms.html b/debug/wms.html
index 751d56d8e42..c89e34c2d83 100644
--- a/debug/wms.html
+++ b/debug/wms.html
@@ -33,7 +33,7 @@
 </div>
 
 <script src='/dist/mapbox-gl-dev.js'></script>
-<script src='access-token.js'></script>
+<script src='/debug/access-token-generated.js'></script>
 
 <script>
 var map = window.map = new mapboxgl.Map({
diff --git a/package.json b/package.json
index 3318d32139f..e5369cb255b 100644
--- a/package.json
+++ b/package.json
@@ -87,19 +87,19 @@
   },
   "scripts": {
     "build-dev": "browserify js/mapbox-gl.js --debug --standalone mapboxgl > dist/mapbox-gl-dev.js && tap --no-coverage test/build/dev.test.js",
-    "watch-dev": "watchify js/mapbox-gl.js --debug --standalone mapboxgl -o dist/mapbox-gl-dev.js -v",
-    "build-min": "browserify js/mapbox-gl.js --debug -t unassertify --plugin [minifyify --map mapbox-gl.js.map --output dist/mapbox-gl.js.map] --standalone mapboxgl > dist/mapbox-gl.js && tap --no-coverage test/build/min.test.js",
-    "build-token": "browserify debug/access-token-src.js --debug -t envify > debug/access-token.js",
-    "watch-bench": "node bench/download-data.js && watchify bench/index.js --plugin [minifyify --no-map] -t [babelify --presets react] -t unassertify -t envify -o bench/bench.js -v",
+    "watch-dev": "watchify js/mapbox-gl.js --debug --standalone mapboxgl --outfile dist/mapbox-gl-dev.js --verbose",
+    "build-min": "browserify js/mapbox-gl.js --debug --transform unassertify --plugin [minifyify --map mapbox-gl.js.map --output dist/mapbox-gl.js.map] --standalone mapboxgl > dist/mapbox-gl.js && tap --no-coverage test/build/min.test.js",
+    "build-token": "browserify debug/access-token.js --debug --transform envify > debug/access-token-generated.js",
+    "watch-bench": "node bench/download-data.js && watchify bench/index.js --plugin [minifyify --no-map] --transform [babelify --presets react] --transform unassertify --transform envify --outfile bench/index-generated.js --verbose",
     "start-server": "st --no-cache --localhost --port 9966 --index index.html .",
 
     "start": "run-p build-token watch-dev watch-bench start-server",
     "start-debug": "run-p build-token watch-dev start-server",
     "start-bench": "run-p build-token watch-bench start-server",
 
-    "build-docs": "documentation build --github --format html -c documentation.yml --theme ./docs/_theme --output docs/api/",
+    "build-docs": "documentation build --github --format html --config documentation.yml --theme ./docs/_theme --output docs/api/",
     "build": "npm run build-docs # invoked by publisher when publishing docs on the mb-pages branch",
-    "start-docs": "npm run build-min && npm run build-docs && jekyll serve -w",
+    "start-docs": "npm run build-min && npm run build-docs && jekyll serve --watch",
 
     "lint": "eslint  --ignore-path .gitignore js test bench docs/_posts/examples/*.html",
     "open-changed-examples": "git diff --name-only mb-pages HEAD -- docs/_posts/examples/*.html | awk '{print \"http://127.0.0.1:4000/mapbox-gl-js/example/\" substr($0,33,length($0)-37)}' | xargs open",