aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--package.json4
-rwxr-xr-xscripts/ci.sh2
-rwxr-xr-xscripts/dev/client.sh6
-rwxr-xr-xscripts/dev/server.sh6
4 files changed, 9 insertions, 9 deletions
diff --git a/package.json b/package.json
index 7f704b5a8..0122a54e4 100644
--- a/package.json
+++ b/package.json
@@ -42,9 +42,9 @@
42 "reset-password": "node ./dist/scripts/reset-password.js", 42 "reset-password": "node ./dist/scripts/reset-password.js",
43 "play": "scripty", 43 "play": "scripty",
44 "dev": "scripty", 44 "dev": "scripty",
45 "dev:server": "scripty", 45 "dev:server": "sh ./scripts/dev/server.sh",
46 "dev:embed": "scripty", 46 "dev:embed": "scripty",
47 "dev:client": "scripty", 47 "dev:client": "sh ./scripts/dev/client.sh",
48 "dev:cli": "scripty", 48 "dev:cli": "scripty",
49 "start": "node dist/server", 49 "start": "node dist/server",
50 "start:server": "node dist/server --no-client", 50 "start:server": "node dist/server --no-client",
diff --git a/scripts/ci.sh b/scripts/ci.sh
index 6281e1aa4..d111b7447 100755
--- a/scripts/ci.sh
+++ b/scripts/ci.sh
@@ -9,7 +9,7 @@ fi
9 9
10killall -q peertube || true 10killall -q peertube || true
11 11
12perl -0777 -i -pe 's#proxy:(\n\s+)enabled: false\n\s+url: ""#proxy:$1enabled: true$1url: "https://cpy.re:7899"#' config/test.yaml 12perl -0777 -i -pe 's#proxy:(\n\s+)enabled: false\n\s+url: ""#proxy:$1enabled: true$1url: "http://188.165.225.149:7899"#' config/test.yaml
13 13
14if [ "$1" = "misc" ]; then 14if [ "$1" = "misc" ]; then
15 npm run build -- --light-fr 15 npm run build -- --light-fr
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
3set -eu 3set -eu
4 4
5clientCommand="cd client && npm run ng -- serve --proxy-config proxy.config.json --hmr --configuration hmr --host 0.0.0.0 --disable-host-check --port 3000" 5clientCommand="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"
6serverCommand="npm run build:server && NODE_ENV=test npm start" 6serverCommand="npm run build:server && NODE_ENV=test node dist/server"
7 7
8if [ ! -z ${1+x} ] && [ "$1" == "--skip-server" ]; then 8if [ ! -z ${1+x} ] && [ "$1" == "--skip-server" ]; then
9 NODE_ENV=test eval $clientCommand 9 NODE_ENV=test eval $clientCommand
10else 10else
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"
14fi 14fi
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"
20npm run tsc -- --incremental --sourceMap 20npm run tsc -- --incremental --sourceMap
21cp -r ./server/static ./server/assets ./dist/server 21cp -r ./server/static ./server/assets ./dist/server
22 22
23NODE_ENV=test npm run concurrently -- -k \ 23NODE_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"