Skip to content

Commit

Permalink
Make generated filenames consistent & explicit (mapbox#3029)
Browse files Browse the repository at this point in the history 
* Make generated filenames consistent & explicit

* Use long-form command line flags
  • Loading branch information
@lucaswoj @mourner
lucaswoj authored and mourner committed Aug 18, 2016
1 parent 13a9015 commit 3ff8138
Show file tree
Hide file tree
Showing 15 changed files with 20 additions and 20 deletions.
4 changes: 2 additions & 2 deletions .gitignore
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
2 changes: 1 addition & 1 deletion bench/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
0 debug/access-token-src.js → debug/access-token.js
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion debug/chinese.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
2 changes: 1 addition & 1 deletion debug/circles.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
2 changes: 1 addition & 1 deletion debug/cluster.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion debug/events.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
2 changes: 1 addition & 1 deletion debug/image.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion debug/index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
2 changes: 1 addition & 1 deletion debug/markers.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
2 changes: 1 addition & 1 deletion debug/multiple.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion debug/queryFeatures.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
2 changes: 1 addition & 1 deletion debug/video.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 = {
Expand Down
2 changes: 1 addition & 1 deletion debug/wms.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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({
Expand Down
12 changes: 6 additions & 6 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down

0 comments on commit 3ff8138

Please sign in to comment.