Merge branch 'feature/esm-and-nx' into develop

4 files changed, 28 insertions, 7 deletions

diff --git a/scripts/build/peertube-cli.sh b/scripts/build/peertube-cli.sh
new file mode 100644
index 000000000..51886a0db
--- /dev/null
+++ b/scripts/build/peertube-cli.sh
@@ -0,0 +1,12 @@
+#!/bin/bash
+
+set -eu
+
+cd ./apps/peertube-cli
+rm -rf ./dist
+
+../../node_modules/.bin/tsc -b --verbose
+rm -rf ./dist
+mkdir ./dist
+
+node ./scripts/build.js
diff --git a/scripts/build/peertube-runner.sh b/scripts/build/peertube-runner.sh
index 7f6ad5ede..321d10b4b 100755
--- a/scripts/build/peertube-runner.sh
+++ b/scripts/build/peertube-runner.sh
@@ -2,12 +2,11 @@
 
 set -eu
 
-
-cd ./packages/peertube-runner
+cd ./apps/peertube-runner
 rm -rf ./dist
 
 ../../node_modules/.bin/tsc -b --verbose
 rm -rf ./dist
 mkdir ./dist
 
-./node_modules/.bin/esbuild ./peertube-runner.ts --bundle --platform=node --target=node16 --external:"./lib-cov/fluent-ffmpeg" --external:pg-hstore --outfile=dist/peertube-runner.js
+node ./scripts/build.js
diff --git a/scripts/build/server.sh b/scripts/build/server.sh
index a2dfc3dd9..bbab633a2 100755
--- a/scripts/build/server.sh
+++ b/scripts/build/server.sh
@@ -2,10 +2,11 @@
 
 set -eu
 
-rm -rf ./dist
+rm -rf ./dist ./packages/*/dist
 
-npm run tsc -- -b --verbose
+npm run tsc --  -b --verbose 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"
+cp "./server/scripts/upgrade.sh" "./dist/scripts"
diff --git a/scripts/build/tests.sh b/scripts/build/tests.sh
new file mode 100755
index 000000000..f94dde2a4
--- /dev/null
+++ b/scripts/build/tests.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+
+set -eu
+
+rm -rf ./packages/tests/dist
+
+npm run tsc --  -b --verbose ./packages/tests/tsconfig.json
+npm run resolve-tspaths:server-lib
+npm run resolve-tspaths:tests