Skip to content

Commit 039e3e4

Browse files
committed
Add Makefile, build uberjar via uberdeps
The Makefile mostly serves as a task runner.
1 parent 8bafd47 commit 039e3e4

File tree

4 files changed

+37
-12
lines changed

4 files changed

+37
-12
lines changed

.gitignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,5 @@ out
1111
resources/public/js
1212
.shadow-cljs
1313
.cpcache
14-
node_modules
14+
node_modules
15+
classes

Makefile

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
all: css
2+
3+
resources/public/css/root.css: src/css/main.scss
4+
mkdir -p $(dir $@)
5+
sassc $< $@
6+
7+
css: resources/public/css/root.css
8+
9+
aot:
10+
mkdir -p classes
11+
clojure -M:prod -e "(compile 'smyrna.server)"
12+
13+
clean:
14+
rm -rf classes target resources/public/js resources/public/css
15+
16+
js-dist:
17+
shadow-cljs release app
18+
19+
uberjar: css js-dist aot
20+
clojure -M:uberdeps
21+
22+
.PHONY: aot css js-dist uberjar

deps.edn

+9-2
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,23 @@
22
{nio/nio {:mvn/version "1.0.4"}
33
polelum/polelum {:mvn/version "0.1.0-SNAPSHOT"}
44
com.taoensso/timbre {:mvn/version "5.2.1"}
5+
org.clojure/clojure {:mvn/version "1.11.0"}
56
org.clojure/data.csv {:mvn/version "1.0.0"}
67
org.clojure/core.memoize {:mvn/version "1.0.257"}
78
org.carrot2/morfologik-fsa-builders {:mvn/version "2.0.1"}
89
reaver/reaver {:mvn/version "0.1.3"
9-
:exclusions [org.jsoup/jsoup]}
10+
:exclusions [org.jsoup/jsoup]}
1011
org.jsoup/jsoup {:mvn/version "1.14.3"}
1112
ring/ring {:mvn/version "1.9.5"}
1213
ring/ring-defaults {:mvn/version "0.3.3"}
1314
ring-server/ring-server {:mvn/version "0.5.0"}
1415
environ/environ {:mvn/version "1.2.0"}
1516
compojure/compojure {:mvn/version "1.6.2"}
1617
prone/prone {:mvn/version "2021-04-23"}}
17-
:paths ["src/clj" "env/dev/clj" "resources"]}
18+
:paths ["classes" "src/clj" "env/dev/clj" "resources"]
19+
:aliases {:prod {:replace-paths ["classes" "src/clj" "env/prod/clj" "resources"]}
20+
:uberdeps {:replace-deps {uberdeps/uberdeps {:mvn/version "1.1.4"}}
21+
:replace-paths []
22+
:main-opts ["-m" "uberdeps.uberjar"
23+
"--aliases" "prod"
24+
"--main-class" "smyrna.server"]}}}

env/dev/clj/smyrna/repl.clj

+4-9
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
(ns smyrna.repl
2-
(:require cemerick.piggieback
3-
weasel.repl.websocket)
4-
(:use smyrna.handler
5-
ring.server.standalone
6-
[ring.middleware file-info file]))
2+
(:require [ring.middleware.file :refer [wrap-file]]
3+
[ring.middleware.file-info :refer [wrap-file-info]]
4+
[ring.server.standalone :refer [serve]]
5+
[smyrna.handler :refer [app]]))
76

87
(defonce server (atom nil))
98

@@ -23,10 +22,6 @@
2322
:join? false}))
2423
(println (str "You can view the site at http://localhost:" port))))
2524

26-
(defn weasel []
27-
(cemerick.piggieback/cljs-repl
28-
(weasel.repl.websocket/repl-env :ip "0.0.0.0" :port 9001)))
29-
3025
(defn stop-server []
3126
(.stop @server)
3227
(reset! server nil))

0 commit comments

Comments
 (0)