From 99ae9d3a9eeaf3db5c66bde006aded133757cb17 Mon Sep 17 00:00:00 2001 From: Chocobozzz Date: Wed, 19 Feb 2020 09:14:28 +0100 Subject: Fix npm run dev --- scripts/dev/client.sh | 2 +- scripts/dev/index.sh | 2 +- scripts/dev/server.sh | 6 ++++-- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'scripts/dev') diff --git a/scripts/dev/client.sh b/scripts/dev/client.sh index a056b7d7f..e9cade800 100755 --- a/scripts/dev/client.sh +++ b/scripts/dev/client.sh @@ -5,7 +5,7 @@ set -eu clientCommand="cd client && node node_modules/.bin/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 node dist/server" -if [ ! -z ${1+x} ] && [ "$1" == "--skip-server" ]; then +if [ ! -z ${1+x} ] && [ "$1" = "--skip-server" ]; then NODE_ENV=test eval $clientCommand else NODE_ENV=test node node_modules/.bin/concurrently -k \ diff --git a/scripts/dev/index.sh b/scripts/dev/index.sh index 218d02b8c..56addb7fe 100755 --- a/scripts/dev/index.sh +++ b/scripts/dev/index.sh @@ -4,4 +4,4 @@ set -eu NODE_ENV=test npm run concurrently -- -k \ "sh scripts/dev/client.sh --skip-server" \ - "sh scripts/dev/server.sh" + "sh scripts/dev/server.sh --skip-client" diff --git a/scripts/dev/server.sh b/scripts/dev/server.sh index 187a1843e..680ca3d79 100755 --- a/scripts/dev/server.sh +++ b/scripts/dev/server.sh @@ -3,8 +3,10 @@ set -eu if [ ! -f "./client/dist/en-US/index.html" ]; then - echo "client/dist/en-US/index.html does not exist, compile client files..." - npm run build:client -- --light + if [ -z ${1+x} ] || [ "$1" != "--skip-client" ]; then + echo "client/dist/en-US/index.html does not exist, compile client files..." + npm run build:client -- --light + fi fi # Copy locales -- cgit v1.2.3