X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;f=scripts%2Fdev%2Fserver.sh;h=9dae43a632b79d72f02fc25570ee741409cd657c;hb=f7298d0dcc247fe3be94ec1e00351942a079a44b;hp=5aac470eba73b1e84d948e54b13c990d1e395bbf;hpb=d573926e9b94fb19c8f51c53f71fc853182e1761;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/dev/server.sh b/scripts/dev/server.sh
index 5aac470eb..9dae43a63 100755
--- a/scripts/dev/server.sh
+++ b/scripts/dev/server.sh
@@ -5,7 +5,7 @@ set -eu
 if [ ! -f "./client/dist/en-US/index.html" ]; then
   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
+    npm run build:client
   fi
 fi
 
@@ -14,15 +14,12 @@ mkdir -p "./client/dist"
 rm -rf "./client/dist/locale"
 cp -r "./client/src/locale" "./client/dist/locale"
 
-rm -rf "./dist"
+mkdir -p "./dist/server/lib"
 
-mkdir "./dist"
-cp "./tsconfig.json" "./dist"
+npm run tsc -- -b -v --incremental
+npm run resolve-tspaths:server
 
-npm run tsc -- --incremental --sourceMap
 cp -r ./server/static ./server/assets ./dist/server
 cp -r "./server/lib/emails" "./dist/server/lib"
 
-NODE_ENV=test node node_modules/.bin/concurrently -k \
-  "node_modules/.bin/nodemon --delay 1 --watch ./dist dist/server" \
-  "node_modules/.bin/tsc --incremental --sourceMap --preserveWatchOutput -w"
+./node_modules/.bin/tsc-watch --build --preserveWatchOutput --verbose --onSuccess 'sh -c "npm run resolve-tspaths:server && NODE_ENV=test node dist/server"'