3 files changed, 24 insertions, 2 deletions

diff --git a/scripts/dev/client.sh b/scripts/dev/client.sh
index c630de2c4..d6669ed78 100755
--- a/scripts/dev/client.sh
+++ b/scripts/dev/client.sh
@@ -3,5 +3,5 @@
 set -eu
 
 NODE_ENV=test npm run concurrently -- -k \
-  "npm run watch:client" \
+  "cd client && npm run ng -- serve --proxy-config proxy.config.json --hmr --configuration hmr --host 0.0.0.0 --disable-host-check --port 3000" \
   "npm run build:server && NODE_ENV=test npm start"
diff --git a/scripts/dev/embed.sh b/scripts/dev/embed.sh
new file mode 100644
index 000000000..9b0ef27cf
--- /dev/null
+++ b/scripts/dev/embed.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+set -eu
+
+NODE_ENV=test npm run concurrently -- -k \
+  "cd client && npm run webpack -- --config webpack/webpack.video-embed.js --mode development --watch" \
+  "npm run build:server && NODE_ENV=test npm start"
diff --git a/scripts/dev/server.sh b/scripts/dev/server.sh
index beee5b8d4..a7fa88fbd 100755
--- a/scripts/dev/server.sh
+++ b/scripts/dev/server.sh
@@ -7,4 +7,19 @@ if [ ! -f "./client/dist/en-US/index.html" ]; then
   npm run build:client -- --light
 fi
 
-npm run watch:server
+# Copy locales
+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"
+
+npm run tsc -- --incremental --sourceMap
+cp -r ./server/static ./server/assets ./dist/server
+
+NODE_ENV=test npm run concurrently -- -k \
+  "npm run nodemon -- --delay 1 --watch ./dist dist/server" \
+  "npm run tsc -- --incremental --sourceMap --preserveWatchOutput -w"