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

diff --git a/scripts/dev/server.sh b/scripts/dev/server.sh
index 468af0a56..9dae43a63 100755
--- a/scripts/dev/server.sh
+++ b/scripts/dev/server.sh
@@ -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 "./dist"
-cp "./tsconfig.json" "./dist"
+mkdir -p "./dist/server/lib"
 
 npm run tsc -- -b -v --incremental
+npm run resolve-tspaths:server
+
 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 --enable-source-maps --delay 1 --watch ./dist dist/server" \
-  "node_modules/.bin/tsc -b -w --preserveWatchOutput"
+./node_modules/.bin/tsc-watch --build --preserveWatchOutput --verbose --onSuccess 'sh -c "npm run resolve-tspaths:server && NODE_ENV=test node dist/server"'