Merge pull request #130 from markokocic/reitit-reload

Implement reitit reloading

.gitignore

@@ -5,6 +5,7 @@ profiles.clj
 pom.xml.asc
 *.jar
 *.class
+*.bak
 .lein-*/
 .nrepl-port/
 .prepl-port/

libs/deps-template/resources/io/github/kit_clj/kit/gitignore

@@ -12,6 +12,7 @@ modules/
 # IntelliJ
 *.iml
 .idea/
+*.bak
 
 # clj-kondo
 .clj-kondo/.cache/

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

@@ -62,7 +62,8 @@
  {:routes #ig/refset :reitit/routes}
 
  :router/core
- {:routes #ig/ref :router/routes} <% if quartz? %>
+ {:routes #ig/ref :router/routes
+  :env #ig/ref :system/env} <% if quartz? %>
 
  :cronut/scheduler
  {:schedule []}<% endif %> <% if selmer? %>

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

@@ -9,7 +9,7 @@
 (defmethod ig/init-key :handler/ring
   [_ {:keys [router api-path] :as opts}]
   (ring/ring-handler
-    router
+   (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 
@@ -32,8 +32,15 @@
 
 (defmethod ig/init-key :router/routes
   [_ {:keys [routes]}]
-  (apply conj [] routes))
+  (mapv (fn [route]
+          (if (fn? route)
+            (route)
+            route))
+        routes))
 
 (defmethod ig/init-key :router/core
-  [_ {:keys [routes] :as opts}]
-  (ring/router ["" opts routes]))
+  [_ {:keys [routes env] :as opts}]
+  (let [router #(ring/router ["" opts routes])]
+    (if (= env :dev)
+      router
+      (constantly router))))

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

@@ -46,4 +46,4 @@
   [_ {:keys [base-path]
       :or   {base-path ""}
       :as   opts}]
-  [base-path route-data (api-routes opts)])
+  (fn [] [base-path route-data (api-routes opts)]))