From a0d527f79533ea7d05f1073ed896a3869a85b6c8 Mon Sep 17 00:00:00 2001
From: Andrey Antukh <niwi@niwi.nz>
Date: Fri, 10 Dec 2021 09:45:17 +0100
Subject: [PATCH] :paperclip: Add some minor changes to package.json scripts
 section.

---
 frontend/package.json    | 16 +++++++---------
 frontend/shadow-cljs.edn | 26 ++++++++++----------------
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/frontend/package.json b/frontend/package.json
index 86a06d80b..a20610ba3 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -12,17 +12,15 @@
     "defaults"
   ],
   "scripts": {
-    "validate-translations": "node ./scripts/validate-translations.js",
-    "watch-main": "shadow-cljs watch main",
+    "compile-test": "clojure -M:dev:shadow-cljs compile test --config-merge '{:autorun false}'",
+    "run-test": "node target/test.js",
+    "test": "yarn run compile-test && yarn run run-test",
     "watch-gulp": "gulp watch",
-    "test-watch-compile": "shadow-cljs watch test",
-    "test-run": "node target/tests.js",
-    "test-watch-run": "nodemon --signal SIGKILL --watch target --exec npm run test-run",
-    "test-watch": "npm-run-all --parallel test-watch-compile test-watch-run",
-    "test": "npm run test-watch",
+    "watch-main": "shadow-cljs watch main",
+    "watch-test": "clojure -M:dev:shadow-cljs watch test",
+    "validate-translations": "node ./scripts/validate-translations.js",
     "test-e2e": "cypress run",
-    "test-e2e-gui": "cypress open",
-    "start": "npm-run-all --parallel watch-gulp watch-main"
+    "test-e2e-gui": "cypress open"
   },
   "devDependencies": {
     "autoprefixer": "^10.4.0",
diff --git a/frontend/shadow-cljs.edn b/frontend/shadow-cljs.edn
index 6dda88e7f..4bab9ad72 100644
--- a/frontend/shadow-cljs.edn
+++ b/frontend/shadow-cljs.edn
@@ -62,23 +62,17 @@
   :test
   {:target :node-test
    :output-to "target/tests.js"
+   :output-dir "target/test/"
    :ns-regexp "^app.*-test$"
-   ;; :autorun true
+   :autorun true
 
-   :release
-   {:compiler-options
-    {:pseudo-names true
-     :pretty-print true
-     :source-map true
-     :source-map-include-sources-content true
-     :source-map-detail-level :all
-     :optimizations :whitespace
-     :fn-invoke-direct true}}
+   :compiler-options
+   {:output-feature-set :es8
+    :output-wrapper false
+    :source-map true
+    :source-map-include-sources-content true
+    :source-map-detail-level :all
+    :warnings {:fn-deprecated false}}}
 
-   :dev
-   {:compiler-options
-    {:output-feature-set :es8
-     :output-wrapper false}}
-
-   }}}
+  }}