7 files changed, 14 insertions, 6 deletions

diff --git a/scripts/build.sh b/scripts/build.sh
deleted file mode 100755
index 5be6afcdf..000000000
--- a/scripts/build.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env sh
-
-NODE_ENV=test concurrently \
-  "npm run build:client:prod" \
-  "npm run build:server:prod"
diff --git a/scripts/build/client/prod.sh b/scripts/build/client.sh
index 65b67edcf..65b67edcf 100755
--- a/scripts/build/client/prod.sh
+++ b/scripts/build/client.sh
diff --git a/scripts/build/server/prod.sh b/scripts/build/server.sh
index 811da2154..811da2154 100755
--- a/scripts/build/server/prod.sh
+++ b/scripts/build/server.sh
diff --git a/scripts/dev.sh b/scripts/dev/client.sh
index 1cfa638ad..6d4e7000e 100755
--- a/scripts/dev.sh
+++ b/scripts/dev/client.sh
@@ -2,4 +2,4 @@
 
 NODE_ENV=test concurrently -k \
   "npm run watch:client" \
-  "tsc && npm start"
+  "npm run build:server && NODE_ENV=test npm start"
diff --git a/scripts/dev/server.sh b/scripts/dev/server.sh
new file mode 100755
index 000000000..bff26cb4b
--- /dev/null
+++ b/scripts/dev/server.sh
@@ -0,0 +1,8 @@
+#!/usr/bin/env sh
+
+if [ ! -d "./client/dist" ]; then
+  echo "client/dist does not exist, compile client files..."
+  npm run build:client
+fi
+
+npm run watch:server
diff --git a/scripts/watch/client/webpack.sh b/scripts/watch/client.sh
index 3e4522547..3e4522547 100755
--- a/scripts/watch/client/webpack.sh
+++ b/scripts/watch/client.sh
diff --git a/scripts/watch/server.sh b/scripts/watch/server.sh
new file mode 100755
index 000000000..55570138e
--- /dev/null
+++ b/scripts/watch/server.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+NODE_ENV=test concurrently \
+  "npm run tsc -- --sourceMap && npm run nodemon -- --delay 2 --watch ./dist dist/server" \
+  "npm run tsc -- --sourceMap -w"