From 4a143b08b6c4eb92acf52982f2922bf698e85c0e Mon Sep 17 00:00:00 2001
From: danielweck <daniel.weck@gmail.com>
Date: Tue, 27 Sep 2016 19:03:54 +0100
Subject: [PATCH] parallelshell deprecated, migration to concurrently and
 npm-run-all https://github.com/readium/readium-js-viewer/issues/572

---
 package.cson   | 14 +++++++++-----
 package.json   |  5 +++--
 readium-cfi-js |  2 +-
 3 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/package.cson b/package.cson
index b3118add4..0f8671039 100644
--- a/package.cson
+++ b/package.cson
@@ -90,7 +90,11 @@ files: [
 #####################################################################
 dependencies:
 
-    "parallelshell": 'latest'
+    #"parallelshell": 'latest'
+    "concurrently": 'latest'
+
+    "npm-run-all": 'latest'
+
 
     "opener": 'latest'
 
@@ -327,11 +331,11 @@ scripts:
 
         echo > open_webbrowser.js
         &&
-        parallelshell
-            \"npm run dowatch\"
-            \"npm run httpServe\"
+        run-p
+            \"dowatch\"
+            \"httpServe\"
     '
-# \"npm run live-reload\"
+# \"live-reload\"
 
 #=====================
 #### BLOCKING! (CTRL-C) [http]
diff --git a/package.json b/package.json
index 9b7e9391a..c6ce9b76b 100644
--- a/package.json
+++ b/package.json
@@ -44,7 +44,8 @@
     "README.md"
   ],
   "dependencies": {
-    "parallelshell": "latest",
+    "concurrently": "latest",
+    "npm-run-all": "latest",
     "opener": "latest",
     "http-server": "danielweck/http-server"
   },
@@ -78,7 +79,7 @@
     "build:scripts:single": "node ./readium-cfi-js/node_modules/requirejs/bin/r.js -o ./readium-cfi-js/readium-build-tools/RequireJS_config.js --rjs_bundle=single",
     "prebuild:styles": "node ./readium-cfi-js/node_modules/mkdirp/bin/cmd.js build-output/css/",
     "build:styles": "node ./readium-cfi-js/node_modules/cpy-cli/cli.js static/sdk.css build-output/css/",
-    "http:watch": "echo > open_webbrowser.js && parallelshell \"npm run dowatch\" \"npm run httpServe\"",
+    "http:watch": "echo > open_webbrowser.js && run-p \"dowatch\" \"httpServe\"",
     "http": "npm run genPluginsConfig && npm run httpServe",
     "dowatch": "node ./readium-cfi-js/node_modules/watch/cli.js \"npm run build && node readium-cfi-js/readium-build-tools/webbrowser.js && node ./readium-cfi-js/node_modules/rimraf/bin.js open_webbrowser.js\" dev/ js/ plugins/ readium-cfi-js/js/",
     "httpServe": "node readium-cfi-js/readium-build-tools/http-server.js -LOGFILE http.log -OPEN /dev/ -a 127.0.0.1 -p 9090 --cors ."
diff --git a/readium-cfi-js b/readium-cfi-js
index bd0b26674..6deaa0341 160000
--- a/readium-cfi-js
+++ b/readium-cfi-js
@@ -1 +1 @@
-Subproject commit bd0b26674c1252d0c45977fb51e998b210527bf3
+Subproject commit 6deaa0341a311e3e8a8cb083e6c54d6b3ae18df1