From f48fa127a26fc2cd534abfa7fb27fa7e2bdaa20d Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Fri, 28 Oct 2016 10:39:34 -0400
Subject: [PATCH] Improve npm build commands, add shx for windows

---
 package.json | 23 +++++++++++++----------
 1 file changed, 13 insertions(+), 10 deletions(-)

diff --git a/package.json b/package.json
index e5469b4c4..02fa9f4fd 100644
--- a/package.json
+++ b/package.json
@@ -10,25 +10,26 @@
   ],
   "license": "ISC",
   "scripts": {
-    "all": "npm run clean && npm run build-assets && npm run build && npm run build-min",
+    "all": "npm-run-all -s clean build dist",
     "build": "node build.js && node development_server.js",
-    "build-assets": "npm run build-css && npm run build-svg",
-    "build-css": "cat css/reset.css css/map.css css/app.css > dist/iD.css",
-    "build-min": "uglifyjs dist/iD.js -c -m -o dist/iD.min.js",
-    "build-svg": "npm run build-svg-maki && npm run build-svg-id",
-    "build-svg-maki": "svg-sprite --symbol --symbol-dest . --symbol-sprite dist/img/maki-sprite.svg node_modules/maki/src/*.svg",
-    "build-svg-id": "node svg/spriteify.js --svg svg/iD-sprite.src.svg --json svg/iD-sprite.json > dist/img/iD-sprite.svg",
-    "clean": "rm -f dist/*.js dist/*.map dist/*.css dist/img/*.svg",
+    "clean": "shx rm -f dist/*.js dist/*.map dist/*.css dist/img/*.svg",
+    "dist": "npm-run-all -p dist:**",
+    "dist:css": "shx cat css/reset.css css/map.css css/app.css > dist/iD.css",
+    "dist:min": "uglifyjs dist/iD.js -c -m -o dist/iD.min.js",
+    "dist:svg:maki": "svg-sprite --symbol --symbol-dest . --symbol-sprite dist/img/maki-sprite.svg node_modules/maki/src/*.svg",
+    "dist:svg:id": "node svg/spriteify.js --svg svg/iD-sprite.src.svg --json svg/iD-sprite.json > dist/img/iD-sprite.svg",
     "imagery": "node data/update_imagery",
     "lint": "eslint *.js js/id test/spec modules",
     "prepublish": "npm run all",
     "start": "node development_server.js develop",
-    "test": "npm run lint && npm run build && phantomjs node_modules/mocha-phantomjs-core/mocha-phantomjs-core.js test/index.html spec",
+    "test": "npm-run-all -s lint build test:**",
+    "test:phantom": "phantomjs node_modules/mocha-phantomjs-core/mocha-phantomjs-core.js test/index.html spec",
     "translations": "node data/update_locales"
   },
   "dependencies": {
     "diacritics": "1.2.3",
     "lodash": "4.16.4",
+    "mapillary-js": "2.0.0",
     "marked": "0.3.6",
     "osm-auth": "1.0.1",
     "rbush": "2.0.1",
@@ -41,7 +42,7 @@
     "chai": "~3.5.0",
     "d3": "4.2.8",
     "ecstatic": "~2.1.0",
-    "editor-layer-index": "git://github.com/osmlab/editor-layer-index.git#gh-pages",
+    "editor-layer-index": "osmlab/editor-layer-index.git#gh-pages",
     "gaze": "~1.1.1",
     "eslint": "~3.8.0",
     "glob": "~7.1.0",
@@ -53,12 +54,14 @@
     "mocha": "~3.1.0",
     "mocha-phantomjs-core": "~2.0.1",
     "name-suggestion-index": "0.1.1",
+    "npm-run-all": "~3.1.1",
     "phantomjs-prebuilt": "~2.1.11",
     "request": "~2.76.0",
     "rollup": "0.36.2",
     "rollup-plugin-commonjs": "5.0.5",
     "rollup-plugin-json": "2.0.2",
     "rollup-plugin-node-resolve": "2.0.0",
+    "shx": "~0.1.4",
     "sinon": "~1.17.5",
     "sinon-chai": "~2.8.0",
     "smash": "0.0",