From caa40912ac686c3b1b7ae4f5e04ee09e38afb373 Mon Sep 17 00:00:00 2001
From: Whymarrh Whitby <whymarrh.whitby@gmail.com>
Date: Tue, 9 Jul 2019 14:09:31 -0230
Subject: Replace deprecated shell-parallel with concurrently (#6807)

* Replace shell-parallel with concurrently

* Update ganache-cli
---
 package.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'package.json')

diff --git a/package.json b/package.json
index 59abcfe2c..f924c862a 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "build:test": "gulp build:test",
     "test": "npm run test:unit && npm run lint",
     "dapp": "static-server test/e2e/contract-test --port 8080",
-    "dapp-chain": "shell-parallel -s 'npm run ganache:start -- -b 2' -x 'sleep 5 && static-server test/e2e/contract-test --port 8080'",
+    "dapp-chain": "GANACHE_ARGS='-b 2' concurrently -k -n ganache,dapp -p '[{time}][{name}]' 'npm run ganache:start' 'sleep 5 && static-server test/e2e/contract-test --port 8080'",
     "watch:test:unit": "nodemon --exec \"npm run test:unit\" ./test ./app ./ui",
     "test:unit": "cross-env METAMASK_ENV=test mocha --exit --require test/setup.js --recursive \"test/unit/**/*.js\" \"ui/app/**/*.test.js\"",
     "test:single": "cross-env METAMASK_ENV=test mocha --require test/helper.js",
@@ -30,7 +30,7 @@
     "test:flat:build:states": "node development/genStates.js",
     "test:flat:build:locales": "mkdirp dist/chrome && cp -R app/_locales dist/chrome/_locales",
     "test:flat:build:ui": "npm run test:flat:build:states && browserify --transform babelify --transform brfs ./development/mock-dev.js -o ./development/bundle.js",
-    "ganache:start": "ganache-cli --noVMErrorsOnRPCResponse -i 5777 -m 'phrase upgrade clock rough situate wedding elder clever doctor stamp excess tent'",
+    "ganache:start": "./development/run-ganache",
     "sentry:publish": "node ./development/sentry-publish.js",
     "lint": "eslint .",
     "lint:fix": "eslint . --fix",
@@ -185,6 +185,7 @@
     "browserify": "^16.2.3",
     "chai": "^4.1.0",
     "chromedriver": "^2.41.0",
+    "concurrently": "^4.1.1",
     "coveralls": "^3.0.0",
     "cross-env": "^5.1.4",
     "css-loader": "^2.1.1",
@@ -202,7 +203,7 @@
     "file-loader": "^1.1.11",
     "fs-extra": "^6.0.1",
     "fs-promise": "^2.0.3",
-    "ganache-cli": "^6.1.0",
+    "ganache-cli": "^6.4.4",
     "ganache-core": "^2.5.5",
     "geckodriver": "^1.16.2",
     "gh-pages": "^1.2.0",
@@ -254,7 +255,6 @@
     "rimraf": "^2.6.2",
     "sass-loader": "^7.0.1",
     "selenium-webdriver": "^3.5.0",
-    "shell-parallel": "1.0.3",
     "sinon": "^5.0.0",
     "source-map": "^0.7.2",
     "static-server": "^2.2.1",
-- 
cgit