Merge branch 'master' of github.com:kit-clj/kit

Author: Yogthos

build/deps.edn

@@ -3,7 +3,7 @@
   aero/aero                              {:mvn/version "1.1.6"}
   integrant/integrant                    {:mvn/version "0.9.0"}
   org.clojure/tools.logging              {:mvn/version "1.2.4"}
-  ch.qos.logback/logback-classic         {:mvn/version "1.5.10"}
+  ch.qos.logback/logback-classic         {:mvn/version "1.5.16"}
   com.lambdaisland/classpath             {:mvn/version "0.4.44"}
   ;; kit-hato
   hato/hato                              {:mvn/version "1.0.0"}

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

@@ -9,11 +9,12 @@
 <% if repl? %>
  :repl/server
  {:port #long #or [#env REPL_PORT 7200]
-  :host #or [#env REPL_HOST "127.0.0.1"]}<% endif %> <% if nrepl? %>
+  :host #or [#env REPL_HOST "127.0.0.1"]}<% endif %>
+<% if nrepl? %>
  :nrepl/server
  {:port #long #or [#env NREPL_PORT 7000]
   :bind #or [#env NREPL_HOST "127.0.0.1"]}<% endif %>
- <% if redis? %>
+<% if redis? %>
  :cache/redis
  {:ttl  3600
   :conn {:pool {}
@@ -25,8 +26,8 @@
   :handler #ig/ref :handler/ring}
 
  :handler/ring
- {:router                #ig/ref :router/core <% if metrics? %>
-  :metrics               #ig/ref :metrics/prometheus <% endif %>
+ {:router                #ig/ref :router/core<% if metrics? %>
+  :metrics               #ig/ref :metrics/prometheus<% endif %>
   :api-path              "/api"
   :cookie-secret         #or [#env COOKIE_SECRET "<<default-cookie-secret>>"]
   ;; from ring.middleware.defaults. anti-forgery `false` by default because services may not require it
@@ -53,8 +54,8 @@
 
  :reitit.routes/api
  {:base-path "/api"
-  :env       #ig/ref :system/env <% if metrics? %>
-  :metrics   #ig/ref :metrics/prometheus <% endif %><% if conman? %>
+  :env       #ig/ref :system/env<% if metrics? %>
+  :metrics   #ig/ref :metrics/prometheus<% endif %><% if conman? %>
   :query-fn #ig/ref :db.sql/query-fn<% endif %>
   }
 
@@ -63,13 +64,13 @@
 
  :router/core
  {:routes #ig/ref :router/routes
-  :env #ig/ref :system/env} <% if quartz? %>
+  :env #ig/ref :system/env}<% if quartz? %>
 
  :cronut/scheduler
- {:schedule []}<% endif %> <% if selmer? %>
+ {:schedule []}<% endif %><% if selmer? %>
 
  :templating/selmer
- {}<% endif %> <% if xtdb? %>
+ {}<% endif %><% if xtdb? %>
 
  ;; https://docs.xtdb.com/administration/configuring/
  :db.xtdb/node
@@ -84,7 +85,7 @@
                                                   :db-dir      "data/dev/index-store"
                                                   :sync?       true}}}
            :test {}
-           :prod {}} <% endif %><% if hikari? %>
+           :prod {}}<% endif %><% if hikari? %>
 
  :db.sql/hikari-connection
  #profile {:dev  {:jdbc-url "jdbc:mysql://127.0.0.1:3306/<<name>>?characterEncoding=utf8"}
@@ -102,7 +103,7 @@
                   :password           "123456"
                   :jdbc-url           #env JDBC_URL
                   :driver-class-name  "com.mysql.jdbc.Driver"
-                  :register-mbeans    false}} <% endif %><% if conman? %>
+                  :register-mbeans    false}}<% endif %><% if conman? %>
 
  :db.sql/connection
  #profile {:dev  {:jdbc-url "jdbc:postgresql://localhost/<<name>>?user=<<name>>&password=<<name>>"}
@@ -117,10 +118,10 @@
  {:conn     #ig/ref :db.sql/connection
   :options  {}
   :filename "queries.sql"
-  :env #ig/ref :system/env} <% endif %><% if migratus? %>
+  :env #ig/ref :system/env}<% endif %><% if migratus? %>
 
  :db.sql/migrations
  {:store            :database
   :db               {:datasource #ig/ref :db.sql/connection}
-  :migrate-on-init? true} <% endif %>
+  :migrate-on-init? true}<% endif %>
 }

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

@@ -5,19 +5,19 @@
     [<<ns-name>>.config :as config]
     [<<ns-name>>.env :refer [defaults]]
 
-    ;; Edges <% if redis? %>
-    [kit.edge.cache.redis]<% endif %> <% if xtdb? %>
+    ;; Edges<% if redis? %>
+    [kit.edge.cache.redis]<% endif %><% if xtdb? %>
     [kit.edge.db.xtdb]<% endif %><% if hikari? %>
     [kit.edge.db.sql.hikari]<% endif %><% if conman? %>
     [kit.edge.db.sql.conman]<% endif %><% if migratus? %>
     [kit.edge.db.sql.migratus]<% endif %><% if postgres? %>
     [kit.edge.db.postgres]<% endif %><% if mysql? %>
     [kit.edge.db.mysql]<% endif %><% if hato? %>
-    [kit.edge.http.hato]<% endif %> <% if quartz? %>
-    [kit.edge.scheduling.quartz]<% endif %> <% if selmer? %>
-    [kit.edge.templating.selmer]<% endif %> <% if metrics? %>
-    [kit.edge.utils.metrics]<% endif %> <% if repl? %>
-    [kit.edge.utils.repl]<% endif %> <% if nrepl? %>
+    [kit.edge.http.hato]<% endif %><% if quartz? %>
+    [kit.edge.scheduling.quartz]<% endif %><% if selmer? %>
+    [kit.edge.templating.selmer]<% endif %><% if metrics? %>
+    [kit.edge.utils.metrics]<% endif %><% if repl? %>
+    [kit.edge.utils.repl]<% endif %><% if nrepl? %>
     [kit.edge.utils.nrepl]<% endif %>
     [kit.edge.server.undertow]
     [<<ns-name>>.web.handler]

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

@@ -12,7 +12,7 @@
    (router)
     (ring/routes
      ;; Handle trailing slash in routes - add it + redirect to it
-     ;; https://github.com/metosin/reitit/blob/master/doc/ring/slash_handler.md 
+     ;; https://github.com/metosin/reitit/blob/master/doc/ring/slash_handler.md
      (ring/redirect-trailing-slash-handler)
      (ring/create-resource-handler {:path "/"})
      (when (some? api-path)

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

@@ -3,7 +3,7 @@
     [<<ns-name>>.core :as core]
     [integrant.repl.state :as state]))
 
-(defn system-state 
+(defn system-state
   []
   (or @core/system state/system))
 

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

@@ -17,6 +17,6 @@
  "kit-sql-conman"   "1.10.5"
  "kit-sql-hikari"   "1.0.6"
  "kit-sql"          "1.1.4"
- "kit-undertow"     "1.0.7"
+ "kit-undertow"     "1.0.8"
  "lein-template"    "0.1.71"
  "deps-template"    "0.1.71"}

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

@@ -157,5 +157,3 @@
                                          :name "kit"}]
                          :modules      {:html {:path "html"}}}}]
     (generate ctx :html {:feature-flag :default})))
-
-    

libs/kit-undertow/deps.edn

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