From 66dd264f7b15c05006faa00694c88c56794edc54 Mon Sep 17 00:00:00 2001
From: Chocobozzz <florian.bigard@gmail.com>
Date: Sun, 11 Jun 2017 11:29:03 +0200
Subject: Better build/dev scripts

---
 scripts/build.sh                | 5 -----
 scripts/build/client.sh         | 7 +++++++
 scripts/build/client/prod.sh    | 7 -------
 scripts/build/server.sh         | 5 +++++
 scripts/build/server/prod.sh    | 5 -----
 scripts/dev.sh                  | 5 -----
 scripts/dev/client.sh           | 5 +++++
 scripts/dev/server.sh           | 8 ++++++++
 scripts/watch/client.sh         | 5 +++++
 scripts/watch/client/webpack.sh | 5 -----
 scripts/watch/server.sh         | 5 +++++
 11 files changed, 35 insertions(+), 27 deletions(-)
 delete mode 100755 scripts/build.sh
 create mode 100755 scripts/build/client.sh
 delete mode 100755 scripts/build/client/prod.sh
 create mode 100755 scripts/build/server.sh
 delete mode 100755 scripts/build/server/prod.sh
 delete mode 100755 scripts/dev.sh
 create mode 100755 scripts/dev/client.sh
 create mode 100755 scripts/dev/server.sh
 create mode 100755 scripts/watch/client.sh
 delete mode 100755 scripts/watch/client/webpack.sh
 create mode 100755 scripts/watch/server.sh

(limited to 'scripts')

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.sh b/scripts/build/client.sh
new file mode 100755
index 000000000..65b67edcf
--- /dev/null
+++ b/scripts/build/client.sh
@@ -0,0 +1,7 @@
+#!/usr/bin/env sh
+
+cd client || exit -1
+
+rm -rf ./compiled
+
+npm run webpack -- --config config/webpack.prod.js  --progress --profile --bail
diff --git a/scripts/build/client/prod.sh b/scripts/build/client/prod.sh
deleted file mode 100755
index 65b67edcf..000000000
--- a/scripts/build/client/prod.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env sh
-
-cd client || exit -1
-
-rm -rf ./compiled
-
-npm run webpack -- --config config/webpack.prod.js  --progress --profile --bail
diff --git a/scripts/build/server.sh b/scripts/build/server.sh
new file mode 100755
index 000000000..811da2154
--- /dev/null
+++ b/scripts/build/server.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+rm -rf ./dist
+
+npm run tsc
diff --git a/scripts/build/server/prod.sh b/scripts/build/server/prod.sh
deleted file mode 100755
index 811da2154..000000000
--- a/scripts/build/server/prod.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env sh
-
-rm -rf ./dist
-
-npm run tsc
diff --git a/scripts/dev.sh b/scripts/dev.sh
deleted file mode 100755
index 1cfa638ad..000000000
--- a/scripts/dev.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env sh
-
-NODE_ENV=test concurrently -k \
-  "npm run watch:client" \
-  "tsc && npm start"
diff --git a/scripts/dev/client.sh b/scripts/dev/client.sh
new file mode 100755
index 000000000..6d4e7000e
--- /dev/null
+++ b/scripts/dev/client.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+NODE_ENV=test concurrently -k \
+  "npm run watch:client" \
+  "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.sh b/scripts/watch/client.sh
new file mode 100755
index 000000000..3e4522547
--- /dev/null
+++ b/scripts/watch/client.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env sh
+
+cd client || exit -1
+
+npm run webpack -- --config config/webpack.dev.js --progress --profile --colors --display-error-details --display-cached --watch
diff --git a/scripts/watch/client/webpack.sh b/scripts/watch/client/webpack.sh
deleted file mode 100755
index 3e4522547..000000000
--- a/scripts/watch/client/webpack.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env sh
-
-cd client || exit -1
-
-npm run webpack -- --config config/webpack.dev.js --progress --profile --colors --display-error-details --display-cached --watch
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"
-- 
cgit v1.2.3