Skip to content

Commit c0ac3cd

Browse files
author
Yogthos
committed
Merge branch 'master' of github.com:kit-clj/kit
2 parents 372c2b9 + 62e720d commit c0ac3cd

File tree

8 files changed

+26
-27
lines changed

8 files changed

+26
-27
lines changed

‎build/deps.edn

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
aero/aero {:mvn/version "1.1.6"}
44
integrant/integrant {:mvn/version "0.9.0"}
55
org.clojure/tools.logging {:mvn/version "1.2.4"}
6-
ch.qos.logback/logback-classic {:mvn/version "1.5.10"}
6+
ch.qos.logback/logback-classic {:mvn/version "1.5.16"}
77
com.lambdaisland/classpath {:mvn/version "0.4.44"}
88
;; kit-hato
99
hato/hato {:mvn/version "1.0.0"}

‎libs/deps-template/resources/io/github/kit_clj/kit/resources/system.edn

+14-13
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,12 @@
99
<% if repl? %>
1010
:repl/server
1111
{:port #long #or [#env REPL_PORT 7200]
12-
:host #or [#env REPL_HOST "127.0.0.1"]}<% endif %> <% if nrepl? %>
12+
:host #or [#env REPL_HOST "127.0.0.1"]}<% endif %>
13+
<% if nrepl? %>
1314
:nrepl/server
1415
{:port #long #or [#env NREPL_PORT 7000]
1516
:bind #or [#env NREPL_HOST "127.0.0.1"]}<% endif %>
16-
<% if redis? %>
17+
<% if redis? %>
1718
:cache/redis
1819
{:ttl 3600
1920
:conn {:pool {}
@@ -25,8 +26,8 @@
2526
:handler #ig/ref :handler/ring}
2627

2728
:handler/ring
28-
{:router #ig/ref :router/core <% if metrics? %>
29-
:metrics #ig/ref :metrics/prometheus <% endif %>
29+
{:router #ig/ref :router/core<% if metrics? %>
30+
:metrics #ig/ref :metrics/prometheus<% endif %>
3031
:api-path "/api"
3132
:cookie-secret #or [#env COOKIE_SECRET "<<default-cookie-secret>>"]
3233
;; from ring.middleware.defaults. anti-forgery `false` by default because services may not require it
@@ -53,8 +54,8 @@
5354

5455
:reitit.routes/api
5556
{:base-path "/api"
56-
:env #ig/ref :system/env <% if metrics? %>
57-
:metrics #ig/ref :metrics/prometheus <% endif %><% if conman? %>
57+
:env #ig/ref :system/env<% if metrics? %>
58+
:metrics #ig/ref :metrics/prometheus<% endif %><% if conman? %>
5859
:query-fn #ig/ref :db.sql/query-fn<% endif %>
5960
}
6061

@@ -63,13 +64,13 @@
6364

6465
:router/core
6566
{:routes #ig/ref :router/routes
66-
:env #ig/ref :system/env} <% if quartz? %>
67+
:env #ig/ref :system/env}<% if quartz? %>
6768

6869
:cronut/scheduler
69-
{:schedule []}<% endif %> <% if selmer? %>
70+
{:schedule []}<% endif %><% if selmer? %>
7071

7172
:templating/selmer
72-
{}<% endif %> <% if xtdb? %>
73+
{}<% endif %><% if xtdb? %>
7374

7475
;; https://docs.xtdb.com/administration/configuring/
7576
:db.xtdb/node
@@ -84,7 +85,7 @@
8485
:db-dir "data/dev/index-store"
8586
:sync? true}}}
8687
:test {}
87-
:prod {}} <% endif %><% if hikari? %>
88+
:prod {}}<% endif %><% if hikari? %>
8889

8990
:db.sql/hikari-connection
9091
#profile {:dev {:jdbc-url "jdbc:mysql://127.0.0.1:3306/<<name>>?characterEncoding=utf8"}
@@ -102,7 +103,7 @@
102103
:password "123456"
103104
:jdbc-url #env JDBC_URL
104105
:driver-class-name "com.mysql.jdbc.Driver"
105-
:register-mbeans false}} <% endif %><% if conman? %>
106+
:register-mbeans false}}<% endif %><% if conman? %>
106107

107108
:db.sql/connection
108109
#profile {:dev {:jdbc-url "jdbc:postgresql://localhost/<<name>>?user=<<name>>&password=<<name>>"}
@@ -117,10 +118,10 @@
117118
{:conn #ig/ref :db.sql/connection
118119
:options {}
119120
:filename "queries.sql"
120-
:env #ig/ref :system/env} <% endif %><% if migratus? %>
121+
:env #ig/ref :system/env}<% endif %><% if migratus? %>
121122

122123
:db.sql/migrations
123124
{:store :database
124125
:db {:datasource #ig/ref :db.sql/connection}
125-
:migrate-on-init? true} <% endif %>
126+
:migrate-on-init? true}<% endif %>
126127
}

‎libs/deps-template/resources/io/github/kit_clj/kit/src/clj/core.clj

+7-7
Original file line numberDiff line numberDiff line change
@@ -5,19 +5,19 @@
55
[<<ns-name>>.config :as config]
66
[<<ns-name>>.env :refer [defaults]]
77

8-
;; Edges <% if redis? %>
9-
[kit.edge.cache.redis]<% endif %> <% if xtdb? %>
8+
;; Edges<% if redis? %>
9+
[kit.edge.cache.redis]<% endif %><% if xtdb? %>
1010
[kit.edge.db.xtdb]<% endif %><% if hikari? %>
1111
[kit.edge.db.sql.hikari]<% endif %><% if conman? %>
1212
[kit.edge.db.sql.conman]<% endif %><% if migratus? %>
1313
[kit.edge.db.sql.migratus]<% endif %><% if postgres? %>
1414
[kit.edge.db.postgres]<% endif %><% if mysql? %>
1515
[kit.edge.db.mysql]<% endif %><% if hato? %>
16-
[kit.edge.http.hato]<% endif %> <% if quartz? %>
17-
[kit.edge.scheduling.quartz]<% endif %> <% if selmer? %>
18-
[kit.edge.templating.selmer]<% endif %> <% if metrics? %>
19-
[kit.edge.utils.metrics]<% endif %> <% if repl? %>
20-
[kit.edge.utils.repl]<% endif %> <% if nrepl? %>
16+
[kit.edge.http.hato]<% endif %><% if quartz? %>
17+
[kit.edge.scheduling.quartz]<% endif %><% if selmer? %>
18+
[kit.edge.templating.selmer]<% endif %><% if metrics? %>
19+
[kit.edge.utils.metrics]<% endif %><% if repl? %>
20+
[kit.edge.utils.repl]<% endif %><% if nrepl? %>
2121
[kit.edge.utils.nrepl]<% endif %>
2222
[kit.edge.server.undertow]
2323
[<<ns-name>>.web.handler]

‎libs/deps-template/resources/io/github/kit_clj/kit/src/clj/web/handler.clj

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
(router)
1313
(ring/routes
1414
;; Handle trailing slash in routes - add it + redirect to it
15-
;; https://github.com/metosin/reitit/blob/master/doc/ring/slash_handler.md
15+
;; https://github.com/metosin/reitit/blob/master/doc/ring/slash_handler.md
1616
(ring/redirect-trailing-slash-handler)
1717
(ring/create-resource-handler {:path "/"})
1818
(when (some? api-path)

‎libs/deps-template/resources/io/github/kit_clj/kit/test/clj/test_utils.clj

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
[<<ns-name>>.core :as core]
44
[integrant.repl.state :as state]))
55

6-
(defn system-state
6+
(defn system-state
77
[]
88
(or @core/system state/system))
99

‎libs/deps-template/resources/io/github/kit_clj/kit/versions.edn

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,6 @@
1717
"kit-sql-conman" "1.10.5"
1818
"kit-sql-hikari" "1.0.6"
1919
"kit-sql" "1.1.4"
20-
"kit-undertow" "1.0.7"
20+
"kit-undertow" "1.0.8"
2121
"lein-template" "0.1.71"
2222
"deps-template" "0.1.71"}

‎libs/kit-generator/src/kit/generator/modules/generator.clj

-2
Original file line numberDiff line numberDiff line change
@@ -157,5 +157,3 @@
157157
:name "kit"}]
158158
:modules {:html {:path "html"}}}}]
159159
(generate ctx :html {:feature-flag :default})))
160-
161-

‎libs/kit-undertow/deps.edn

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
{:paths ["src"]
22
:deps {org.clojure/tools.logging {:mvn/version "1.2.4"}
33
integrant/integrant {:mvn/version "0.9.0"}
4-
luminus/ring-undertow-adapter {:mvn/version "1.3.1"}}}
4+
luminus/ring-undertow-adapter {:mvn/version "1.4.0"}}}

0 commit comments

Comments
 (0)