diff options
Diffstat (limited to 'scripts/dev')
-rwxr-xr-x | scripts/dev/client.sh | 6 | ||||
-rwxr-xr-x | scripts/dev/server.sh | 6 |
2 files changed, 6 insertions, 6 deletions
diff --git a/scripts/dev/client.sh b/scripts/dev/client.sh index cdcf29ef2..bcb8b88f6 100755 --- a/scripts/dev/client.sh +++ b/scripts/dev/client.sh | |||
@@ -2,13 +2,13 @@ | |||
2 | 2 | ||
3 | set -eu | 3 | set -eu |
4 | 4 | ||
5 | 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" | 5 | 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" |
6 | serverCommand="npm run build:server && NODE_ENV=test npm start" | 6 | serverCommand="npm run build:server && NODE_ENV=test node dist/server" |
7 | 7 | ||
8 | if [ ! -z ${1+x} ] && [ "$1" == "--skip-server" ]; then | 8 | if [ ! -z ${1+x} ] && [ "$1" == "--skip-server" ]; then |
9 | NODE_ENV=test eval $clientCommand | 9 | NODE_ENV=test eval $clientCommand |
10 | else | 10 | else |
11 | NODE_ENV=test npm run concurrently -- -k \ | 11 | NODE_ENV=test node node_modules/.bin/concurrently -k \ |
12 | "$clientCommand" \ | 12 | "$clientCommand" \ |
13 | "$serverCommand" | 13 | "$serverCommand" |
14 | fi | 14 | fi |
diff --git a/scripts/dev/server.sh b/scripts/dev/server.sh index a7fa88fbd..b09a966dd 100755 --- a/scripts/dev/server.sh +++ b/scripts/dev/server.sh | |||
@@ -20,6 +20,6 @@ cp "./tsconfig.json" "./dist" | |||
20 | npm run tsc -- --incremental --sourceMap | 20 | npm run tsc -- --incremental --sourceMap |
21 | cp -r ./server/static ./server/assets ./dist/server | 21 | cp -r ./server/static ./server/assets ./dist/server |
22 | 22 | ||
23 | NODE_ENV=test npm run concurrently -- -k \ | 23 | NODE_ENV=test node node_modules/.bin/concurrently -k \ |
24 | "npm run nodemon -- --delay 1 --watch ./dist dist/server" \ | 24 | "node_modules/.bin/nodemon --delay 1 --watch ./dist dist/server" \ |
25 | "npm run tsc -- --incremental --sourceMap --preserveWatchOutput -w" | 25 | "node_modules/.bin/tsc --incremental --sourceMap --preserveWatchOutput -w" |