4 files changed, 18 insertions, 23 deletions

diff --git a/scripts/dev/cli.sh b/scripts/dev/cli.sh
deleted file mode 100755
index 39ecaad94..000000000
--- a/scripts/dev/cli.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -eu
-
-rm -rf ./dist/server/tools/
-
-(
-    cd ./server/tools
-    yarn install --pure-lockfile
-)
-
-mkdir -p "./dist/server/tools"
-cp -r "./server/tools/node_modules" "./dist/server/tools"
-
-cd ./server/tools
-../../node_modules/.bin/tsc-watch --build --verbose --onSuccess 'sh -c "cd ../../ && npm run resolve-tspaths:server"'
diff --git a/scripts/dev/peertube-cli.sh b/scripts/dev/peertube-cli.sh
new file mode 100755
index 000000000..172bf038e
--- /dev/null
+++ b/scripts/dev/peertube-cli.sh
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+set -eu
+
+rm -rf ./apps/peertube-cli/dist
+
+cd ./apps/peertube-cli
+
+../../node_modules/.bin/concurrently -k \
+  "../../node_modules/.bin/tsc -w --noEmit" \
+  "node ./scripts/watch.js"
diff --git a/scripts/dev/peertube-runner.sh b/scripts/dev/peertube-runner.sh
index e39259372..7bd756123 100755
--- a/scripts/dev/peertube-runner.sh
+++ b/scripts/dev/peertube-runner.sh
@@ -2,10 +2,10 @@
 
 set -eu
 
-rm -rf ./packages/peertube-runner/dist
+rm -rf ./apps/peertube-runner/dist
 
-cd ./packages/peertube-runner
+cd ./apps/peertube-runner
 
 ../../node_modules/.bin/concurrently -k \
   "../../node_modules/.bin/tsc -w --noEmit" \
-  "./node_modules/.bin/esbuild ./peertube-runner.ts --bundle --sourcemap --platform=node --external:"./lib-cov/fluent-ffmpeg" --external:pg-hstore --watch --outfile=dist/peertube-runner.js"
+  "node ./scripts/watch.js"
diff --git a/scripts/dev/server.sh b/scripts/dev/server.sh
index c52c5124c..4112cb2f8 100755
--- a/scripts/dev/server.sh
+++ b/scripts/dev/server.sh
@@ -16,10 +16,10 @@ cp -r "./client/src/locale" "./client/dist/locale"
 
 mkdir -p "./dist/server/lib"
 
-npm run tsc -- -b -v --incremental
+npm run tsc -- -b -v --incremental server/tsconfig.json
 npm run resolve-tspaths:server
 
-cp -r ./server/static ./server/assets ./dist/server
-cp -r "./server/lib/emails" "./dist/server/lib"
+cp -r ./server/server/static ./server/server/assets ./dist/server
+cp -r "./server/server/lib/emails" "./dist/server/lib"
 
-./node_modules/.bin/tsc-watch --build --preserveWatchOutput --verbose --onSuccess 'sh -c "npm run resolve-tspaths:server && NODE_ENV=dev node dist/server"'
+./node_modules/.bin/tsc-watch --build --preserveWatchOutput --verbose --onSuccess 'sh -c "npm run resolve-tspaths:server && NODE_ENV=dev node dist/server"' server/tsconfig.json