diff options
| author | Chocobozzz <me@florianbigard.com> | 2020-01-07 16:53:55 +0100 |
|---|---|---|
| committer | Chocobozzz <me@florianbigard.com> | 2020-01-07 16:53:55 +0100 |
| commit | 9b7668f527fce8981f4684ed0459b62e740b4b82 (patch) | |
| tree | e0d59948df1959ff31df3db312a8badc8e9e4bd3 /scripts | |
| parent | e92269053e3fd0e9b9c155ded86a1668444f3d70 (diff) | |
| download | PeerTube-9b7668f527fce8981f4684ed0459b62e740b4b82.tar.gz PeerTube-9b7668f527fce8981f4684ed0459b62e740b4b82.tar.zst PeerTube-9b7668f527fce8981f4684ed0459b62e740b4b82.zip | |
Fix npm run dev script
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/dev/client.sh | 15 | ||||
| -rwxr-xr-x | scripts/dev/index.sh | 2 |
2 files changed, 13 insertions, 4 deletions
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 @@ | |||
| 2 | 2 | ||
| 3 | set -eu | 3 | set -eu |
| 4 | 4 | ||
| 5 | NODE_ENV=test npm run concurrently -- -k \ | 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" |
| 6 | "cd client && npm run 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" |
| 7 | "npm run build:server && NODE_ENV=test npm start" | 7 | |
| 8 | if [ ! -z ${1+x} ] && [ "$1" == "--skip-server" ]; then | ||
| 9 | NODE_ENV=test eval $clientCommand | ||
| 10 | else | ||
| 11 | NODE_ENV=test npm run concurrently -- -k \ | ||
| 12 | "$clientCommand" \ | ||
| 13 | "$serverCommand" | ||
| 14 | fi | ||
| 15 | |||
| 16 | |||
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 @@ | |||
| 3 | set -eu | 3 | set -eu |
| 4 | 4 | ||
| 5 | NODE_ENV=test npm run concurrently -- -k \ | 5 | NODE_ENV=test npm run concurrently -- -k \ |
| 6 | "npm run dev:client" \ | 6 | "npm run dev:client -- --skip-server" \ |
| 7 | "npm run dev:server" | 7 | "npm run dev:server" |