From 9b7668f527fce8981f4684ed0459b62e740b4b82 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Tue, 7 Jan 2020 16:53:55 +0100 Subject: Fix npm run dev script --- scripts/dev/client.sh | 15 ++++++++++++--- scripts/dev/index.sh | 2 +- 2 files changed, 13 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/dev/client.sh b/scripts/dev/client.sh index d6669ed78..cdcf29ef2 100755 --- a/scripts/dev/client.sh +++ b/scripts/dev/client.sh @@ -2,6 +2,15 @@ set -eu -NODE_ENV=test npm run concurrently -- -k \ - "cd client && npm run ng -- serve --proxy-config proxy.config.json --hmr --configuration hmr --host 0.0.0.0 --disable-host-check --port 3000" \ - "npm run build:server && NODE_ENV=test npm start" +clientCommand="cd client && npm run ng -- serve --proxy-config proxy.config.json --hmr --configuration hmr --host 0.0.0.0 --disable-host-check --port 3000" +serverCommand="npm run build:server && NODE_ENV=test npm start" + +if [ ! -z ${1+x} ] && [ "$1" == "--skip-server" ]; then + NODE_ENV=test eval $clientCommand +else + NODE_ENV=test npm run concurrently -- -k \ + "$clientCommand" \ + "$serverCommand" +fi + + diff --git a/scripts/dev/index.sh b/scripts/dev/index.sh index d63dfbd24..d221d2fc8 100755 --- a/scripts/dev/index.sh +++ b/scripts/dev/index.sh @@ -3,5 +3,5 @@ set -eu NODE_ENV=test npm run concurrently -- -k \ - "npm run dev:client" \ + "npm run dev:client -- --skip-server" \ "npm run dev:server" -- cgit v1.2.3