From 3f62d7cb659ac59e81b43e0b124a4a51a4db9209 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Fri, 19 Jul 2019 08:37:21 +0000
Subject: [PATCH] misc: simplify the build scripts

---
 docker/devenv/files/build-release.sh    | 10 ----------
 docker/devenv/files/start.sh            |  6 +++---
 frontend/package.json                   | 18 +-----------------
 frontend/scripts/build-and-run-tests.sh |  5 ++++-
 frontend/scripts/build-develop.sh       |  9 ++++++---
 frontend/scripts/build-production.sh    | 11 ++++++++---
 6 files changed, 22 insertions(+), 37 deletions(-)
 delete mode 100755 docker/devenv/files/build-release.sh

diff --git a/docker/devenv/files/build-release.sh b/docker/devenv/files/build-release.sh
deleted file mode 100755
index 8124ba2de..000000000
--- a/docker/devenv/files/build-release.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-source ~/.bashrc
-
-echo `env`
-
-cd /home/uxbox/uxbox/frontend
-npm install || exit 1;
-npm run dist
-# TODO: WIP
diff --git a/docker/devenv/files/start.sh b/docker/devenv/files/start.sh
index a373a2a27..d5bb65752 100755
--- a/docker/devenv/files/start.sh
+++ b/docker/devenv/files/start.sh
@@ -5,7 +5,7 @@ tmux -2 new-session -d -s uxbox
 tmux new-window -t uxbox:1 -n 'figwheel'
 tmux select-window -t uxbox:1
 tmux send-keys -t uxbox 'cd uxbox/frontend' enter C-l
-tmux send-keys -t uxbox 'npm run start' enter
+tmux send-keys -t uxbox 'clojure -Adev tools.clj figwheel' enter
 
 tmux new-window -t uxbox:2 -n 'backend'
 tmux select-window -t uxbox:2
@@ -16,7 +16,7 @@ tmux send-keys -t uxbox 'clojure -Adev:repl' enter
 tmux rename-window -t uxbox:0 'gulp'
 tmux select-window -t uxbox:0
 tmux send-keys -t uxbox 'cd uxbox/frontend' enter C-l
-tmux send-keys -t uxbox 'if [ ! -e ./node_modules ]; then npm install; fi' enter C-l
-tmux send-keys -t uxbox 'npm run watch' enter
+tmux send-keys -t uxbox 'if [ ! -e ./node_modules ]; then npm ci; fi' enter C-l
+tmux send-keys -t uxbox 'npx gulp watch' enter
 
 tmux -2 attach-session -t uxbox
diff --git a/frontend/package.json b/frontend/package.json
index ea0daace7..d0f98d036 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -8,23 +8,7 @@
     "type": "git",
     "url": "https://github.com/uxbox/uxbox"
   },
-  "scripts": {
-    "watch": "gulp watch",
-    "dist:clean": "gulp dist:clean",
-    "dist:main": "clojure -Adev tools.clj dist main",
-    "dist:view": "clojure -Adev tools.clj dist view",
-    "dist:worker": "clojure -Adev tools.clj dist worker",
-    "dist:all": "clojure -Adev tools.clj dist-all",
-    "dist:assets": "NODE_ENV=production gulp dist",
-    "build:main": "clojure -Adev tools.clj build main",
-    "build:view": "clojure -Adev tools.clj build view",
-    "build:worker": "clojure -Adev tools.clj build worker",
-    "build:all": "clojure -Adev tools.clj build-all",
-    "build:assets": "gulp dist",
-    "start": "npm run figwheel",
-    "build:test": "clojure -Adev tools.clj build-tests",
-    "figwheel": "clojure -Adev tools.clj figwheel"
-  },
+  "scripts": {},
   "devDependencies": {
     "gulp": "4.0.2",
     "gulp-autoprefixer": "^6.1.0",
diff --git a/frontend/scripts/build-and-run-tests.sh b/frontend/scripts/build-and-run-tests.sh
index d5a73ad8f..4a388a63c 100755
--- a/frontend/scripts/build-and-run-tests.sh
+++ b/frontend/scripts/build-and-run-tests.sh
@@ -1,7 +1,10 @@
 #!/usr/bin/env bash
 source ~/.bashrc
 
+set -ex;
+
 npm ci
-npm run build:test || exit 1;
+
+clojure -Adev tools.clj build-tests
 
 node ./target/tests/main
diff --git a/frontend/scripts/build-develop.sh b/frontend/scripts/build-develop.sh
index f20918be9..95fdfa847 100755
--- a/frontend/scripts/build-develop.sh
+++ b/frontend/scripts/build-develop.sh
@@ -1,8 +1,11 @@
 #!/usr/bin/env bash
 source ~/.bashrc
 
+set -ex
+
 npm ci
 
-npm run dist:clean || exit 1;
-npm run build:assets || exit 1;
-npm run build:all || exit 1;
+npx gulp dist:clean || exit 1
+npx gulp dist || exit 1
+
+clojure -Adev tools.clj build-all || exit 1
diff --git a/frontend/scripts/build-production.sh b/frontend/scripts/build-production.sh
index 4bdb3af67..d09aefc18 100755
--- a/frontend/scripts/build-production.sh
+++ b/frontend/scripts/build-production.sh
@@ -1,8 +1,13 @@
 #!/usr/bin/env bash
 source ~/.bashrc
 
+set -ex
+
 npm ci
 
-npm run dist:clean || exit 1;
-npm run dist:assets || exit 1;
-npm run dist:all || exit 1;
+export NODE_ENV=production;
+
+npx gulp dist:clean || exit 1;
+npx gulp dist || exit 1;
+
+clojure -Adev tools.clj dist-all