Make development easier (ditch Makefile)

nenadalm · Jan 6, 2024 · 71850db · 71850db
1 parent 21a4645
commit 71850db
Show file tree

Hide file tree

Showing 8 changed files with 24 additions and 34 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -44,7 +44,8 @@ jobs:
       - name: Build artifacts
         run: |
           clojure -Stree
-          make
+          yarn install
+          yarn release
       - name: Deploy
         uses: JamesIves/[email protected]
         with:

diff --git a/Makefile b/Makefile
diff --git a/package.json b/package.json
@@ -3,7 +3,9 @@
     "release": "shadow-cljs release app",
     "watch": "shadow-cljs watch app",
     "test": "shadow-cljs compile test && node ./target/node-test.js",
-    "test:watch": "shadow-cljs --config-merge '{:autorun true}' watch test"
+    "test:all": "clojure -M:cljfmt check && clojure -M:clj-kondo && yarn test",
+    "test:watch": "shadow-cljs --config-merge '{:autorun true}' watch test",
+    "clean": "rm -rf resources/public/js resources/public/index.html resources/public/worker.js resources/public/manifest.json"
   },
   "devDependencies": {
     "shadow-cljs": "^2.20.20"

diff --git a/shadow-cljs.edn b/shadow-cljs.edn
@@ -10,6 +10,7 @@
         :dev {:closure-defines {"re_frame.trace.trace_enabled_QMARK_" true}}
         :release {:module-hash-names true}
         :devtools {:preloads [day8.re-frame-10x.preload]}
+        :build-hooks [(build.hook/hook)]
         :target :browser}
   :test {:target :node-test
          :output-to "target/node-test.js"

diff --git a/src/build/create_index.clj b/src/build/create_index.clj
@@ -13,7 +13,7 @@
 (defn- app-version []
   (sh "git" "rev-parse" "HEAD"))
 
-(defn- render []
+(defn render []
   (str
    "<!doctype html>
 <html lang=\"en-US\">

diff --git a/src/build/create_manifest.clj b/src/build/create_manifest.clj
@@ -3,7 +3,7 @@
    [jsonista.core :as j]
    [build.util :as u]))
 
-(defn- render []
+(defn render []
   (j/write-value-as-string
    {:name "Backgammon"
     :icons [{:src (u/asset "img/icon.svg")

diff --git a/src/build/create_worker.clj b/src/build/create_worker.clj
@@ -11,7 +11,7 @@
    (u/asset "js/app.js")
    (u/asset "css/styles.css")])
 
-(defn- render []
+(defn render []
   (str/replace
    (slurp "./resources/private/worker.js")
    #".*prop:urlsToCache.*"

diff --git a/src/build/hook.clj b/src/build/hook.clj
@@ -0,0 +1,15 @@
+(ns build.hook
+  (:require
+   [clojure.java.io :as io]
+   [build.create-manifest]
+   [build.create-index]
+   [build.create-worker]))
+
+(defn hook
+  {:shadow.build/stage :flush}
+  [build-state & _args]
+  (when-not (.exists (io/file "resources/public/worker.js"))
+    (spit "resources/public/manifest.json" (build.create-manifest/render))
+    (spit "resources/public/index.html" (build.create-index/render))
+    (spit "resources/public/worker.js" (build.create-worker/render)))
+  build-state)