X-Git-Url: https://git.immae.eu/?a=blobdiff_plain;ds=sidebyside;f=scripts%2Fdev%2Fserver.sh;h=c52c5124c4db187dca063c312dd37e1ddeb6fb1e;hb=4cf800a350972a078c074da6b31da2b98ab4b007;hp=a7fa88fbd880d9637bad92f4f1a400f9a0f47bef;hpb=c026a2e67357bd4bd4fcc4c10f8c5cd4749435c9;p=github%2FChocobozzz%2FPeerTube.git

diff --git a/scripts/dev/server.sh b/scripts/dev/server.sh
index a7fa88fbd..c52c5124c 100755
--- a/scripts/dev/server.sh
+++ b/scripts/dev/server.sh
@@ -1,10 +1,12 @@
-#!/bin/sh
+#!/bin/bash
 
 set -eu
 
 if [ ! -f "./client/dist/en-US/index.html" ]; then
-  echo "client/dist/en-US/index.html does not exist, compile client files..."
-  npm run build:client -- --light
+  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
+  fi
 fi
 
 # Copy locales
@@ -12,14 +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 npm run concurrently -- -k \
-  "npm run nodemon -- --delay 1 --watch ./dist dist/server" \
-  "npm run tsc -- --incremental --sourceMap --preserveWatchOutput -w"
+./node_modules/.bin/tsc-watch --build --preserveWatchOutput --verbose --onSuccess 'sh -c "npm run resolve-tspaths:server && NODE_ENV=dev node dist/server"'