Merge branch 'release/4.1.0' into develop

[github/Chocobozzz/PeerTube.git] / scripts / dev / server.sh

diff --git a/scripts/dev/server.sh b/scripts/dev/server.sh
index b4675c57f54c3d8b3a4f609e9382f40d9291d079..9dae43a632b79d72f02fc25570ee741409cd657c 100755 (executable)
--- a/scripts/dev/server.sh
+++ b/scripts/dev/server.sh
@@ -1,10 +1,25 @@
-#!/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 [ ! -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
+  fi
 fi
 
-npm run watch:server
+# Copy locales
+mkdir -p "./client/dist"
+rm -rf "./client/dist/locale"
+cp -r "./client/src/locale" "./client/dist/locale"
+
+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_modules/.bin/tsc-watch --build --preserveWatchOutput --verbose --onSuccess 'sh -c "npm run resolve-tspaths:server && NODE_ENV=test node dist/server"'