From 106a140e31be8cd0b090cd5c35cd1fe8789ab512 Mon Sep 17 00:00:00 2001 From: Yogthos Date: Sat, 6 Feb 2016 14:30:13 -0500 Subject: [PATCH 001/179] bumped up version --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index c484a1a..23d379d 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.45" +(defproject reagent/lein-template "0.9.46" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" From 567410eb4cffc2055c175e740122fc044df00ca4 Mon Sep 17 00:00:00 2001 From: Yogthos Date: Thu, 11 Feb 2016 18:33:48 -0500 Subject: [PATCH 002/179] bumped up dependencies --- project.clj | 2 +- src/leiningen/new/reagent/project.clj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project.clj b/project.clj index 23d379d..e2c7553 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.46" +(defproject reagent/lein-template "0.9.47" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/src/leiningen/new/reagent/project.clj b/src/leiningen/new/reagent/project.clj index 611efa8..e7ebe94 100644 --- a/src/leiningen/new/reagent/project.clj +++ b/src/leiningen/new/reagent/project.clj @@ -22,7 +22,7 @@ :plugins [[lein-environ "1.0.2"] [lein-cljsbuild "1.1.1"] - [lein-asset-minifier "0.2.4" + [lein-asset-minifier "0.2.5" :exclusions [org.clojure/clojure]]] :ring {:handler {{project-ns}}.handler/app @@ -68,7 +68,7 @@ :dependencies [[ring/ring-mock "0.3.0"] [ring/ring-devel "1.4.0"] - [prone "1.0.1"] + [prone "1.0.2"] [lein-figwheel "0.5.0-6" :exclusions [org.clojure/core.memoize ring/ring-core From 643dd752d5e73b779a4c7548a7367daa0a9b1c1f Mon Sep 17 00:00:00 2001 From: Yogthos Date: Thu, 11 Feb 2016 19:45:25 -0500 Subject: [PATCH 003/179] clean up for dependencies --- src/leiningen/new/reagent/project.clj | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/leiningen/new/reagent/project.clj b/src/leiningen/new/reagent/project.clj index e7ebe94..d8e4c34 100644 --- a/src/leiningen/new/reagent/project.clj +++ b/src/leiningen/new/reagent/project.clj @@ -79,8 +79,6 @@ org.clojure/clojurescript org.clojure/core.async org.clojure/tools.analyzer.jvm]] - [org.clojure/clojurescript "1.7.170" - :exclusions [org.clojure/clojure org.clojure/tools.reader]] [org.clojure/tools.nrepl "0.2.12"] [com.cemerick/piggieback "0.2.1"] {{#test-hook?}} @@ -107,7 +105,6 @@ org.clojure/clojurescript org.clojure/core.async org.clojure/tools.analyzer.jvm]] - [org.clojure/clojurescript "1.7.228"] {{#test-hook?}} [lein-doo "0.1.6"] {{/test-hook?}} From b4a19bad2506ecedeabdc2231a5118077a1b3c25 Mon Sep 17 00:00:00 2001 From: Yogthos Date: Thu, 11 Feb 2016 19:45:55 -0500 Subject: [PATCH 004/179] formatting --- src/leiningen/new/reagent/project.clj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/leiningen/new/reagent/project.clj b/src/leiningen/new/reagent/project.clj index d8e4c34..4a3a0ed 100644 --- a/src/leiningen/new/reagent/project.clj +++ b/src/leiningen/new/reagent/project.clj @@ -15,7 +15,8 @@ [compojure "1.4.0"] [hiccup "1.0.5"] [environ "1.0.2"] - [org.clojure/clojurescript "1.7.228" :scope "provided"] + [org.clojure/clojurescript "1.7.228" + :scope "provided"] [secretary "1.2.3"] [venantius/accountant "0.1.6" :exclusions [org.clojure/tools.reader]]] From 315748513634eb0cfa7f282cd474c9c4c108465b Mon Sep 17 00:00:00 2001 From: Yogthos Date: Sat, 13 Feb 2016 10:21:32 -0500 Subject: [PATCH 005/179] rolled back asset minifier version --- project.clj | 2 +- src/leiningen/new/reagent/project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index e2c7553..d72d78c 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.47" +(defproject reagent/lein-template "0.9.48" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/src/leiningen/new/reagent/project.clj b/src/leiningen/new/reagent/project.clj index 4a3a0ed..4145aa8 100644 --- a/src/leiningen/new/reagent/project.clj +++ b/src/leiningen/new/reagent/project.clj @@ -23,7 +23,7 @@ :plugins [[lein-environ "1.0.2"] [lein-cljsbuild "1.1.1"] - [lein-asset-minifier "0.2.5" + [lein-asset-minifier "0.2.4" :exclusions [org.clojure/clojure]]] :ring {:handler {{project-ns}}.handler/app From a103887a7864c95a06fc082466afb046d18f0666 Mon Sep 17 00:00:00 2001 From: Yogthos Date: Mon, 15 Feb 2016 12:55:35 -0500 Subject: [PATCH 006/179] moved template assets to the resources path --- {src => resources}/leiningen/new/reagent/LICENSE | 0 {src => resources}/leiningen/new/reagent/Procfile | 0 {src => resources}/leiningen/new/reagent/README.md | 0 .../leiningen/new/reagent/env/dev/clj/reagent/middleware.clj | 0 .../leiningen/new/reagent/env/dev/clj/reagent/repl.clj | 0 .../leiningen/new/reagent/env/dev/cljs/reagent/cards.cljs | 0 .../leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs | 0 .../leiningen/new/reagent/env/prod/clj/reagent/middleware.clj | 0 .../leiningen/new/reagent/env/prod/cljs/reagent/prod.cljs | 0 {src => resources}/leiningen/new/reagent/gitignore | 0 {src => resources}/leiningen/new/reagent/project.clj | 2 +- .../leiningen/new/reagent/resources/public/css/site.css | 0 .../leiningen/new/reagent/runners/doo_runner.cljs | 0 {src => resources}/leiningen/new/reagent/runners/speclj | 0 .../leiningen/new/reagent/spec/cljs/reagent/core_spec.cljs | 0 .../leiningen/new/reagent/src/clj/reagent/handler.clj | 0 .../leiningen/new/reagent/src/clj/reagent/server.clj | 0 .../leiningen/new/reagent/src/cljc/reagent/util.cljc | 0 .../leiningen/new/reagent/src/cljs/reagent/core.cljs | 0 {src => resources}/leiningen/new/reagent/src/less/site.less | 0 {src => resources}/leiningen/new/reagent/src/sass/index.sass | 0 {src => resources}/leiningen/new/reagent/src/sass/profile.scss | 0 {src => resources}/leiningen/new/reagent/system.properties | 0 .../leiningen/new/reagent/test/cljs/reagent/core_test.cljs | 0 .../leiningen/new/reagent/vendor/console-polyfill.js | 0 {src => resources}/leiningen/new/reagent/vendor/es5-sham.js | 0 {src => resources}/leiningen/new/reagent/vendor/es5-shim.js | 0 27 files changed, 1 insertion(+), 1 deletion(-) rename {src => resources}/leiningen/new/reagent/LICENSE (100%) rename {src => resources}/leiningen/new/reagent/Procfile (100%) rename {src => resources}/leiningen/new/reagent/README.md (100%) rename {src => resources}/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj (100%) rename {src => resources}/leiningen/new/reagent/env/dev/clj/reagent/repl.clj (100%) rename {src => resources}/leiningen/new/reagent/env/dev/cljs/reagent/cards.cljs (100%) rename {src => resources}/leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs (100%) rename {src => resources}/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj (100%) rename {src => resources}/leiningen/new/reagent/env/prod/cljs/reagent/prod.cljs (100%) rename {src => resources}/leiningen/new/reagent/gitignore (100%) rename {src => resources}/leiningen/new/reagent/project.clj (99%) rename {src => resources}/leiningen/new/reagent/resources/public/css/site.css (100%) rename {src => resources}/leiningen/new/reagent/runners/doo_runner.cljs (100%) rename {src => resources}/leiningen/new/reagent/runners/speclj (100%) rename {src => resources}/leiningen/new/reagent/spec/cljs/reagent/core_spec.cljs (100%) rename {src => resources}/leiningen/new/reagent/src/clj/reagent/handler.clj (100%) rename {src => resources}/leiningen/new/reagent/src/clj/reagent/server.clj (100%) rename {src => resources}/leiningen/new/reagent/src/cljc/reagent/util.cljc (100%) rename {src => resources}/leiningen/new/reagent/src/cljs/reagent/core.cljs (100%) rename {src => resources}/leiningen/new/reagent/src/less/site.less (100%) rename {src => resources}/leiningen/new/reagent/src/sass/index.sass (100%) rename {src => resources}/leiningen/new/reagent/src/sass/profile.scss (100%) rename {src => resources}/leiningen/new/reagent/system.properties (100%) rename {src => resources}/leiningen/new/reagent/test/cljs/reagent/core_test.cljs (100%) rename {src => resources}/leiningen/new/reagent/vendor/console-polyfill.js (100%) rename {src => resources}/leiningen/new/reagent/vendor/es5-sham.js (100%) rename {src => resources}/leiningen/new/reagent/vendor/es5-shim.js (100%) diff --git a/src/leiningen/new/reagent/LICENSE b/resources/leiningen/new/reagent/LICENSE similarity index 100% rename from src/leiningen/new/reagent/LICENSE rename to resources/leiningen/new/reagent/LICENSE diff --git a/src/leiningen/new/reagent/Procfile b/resources/leiningen/new/reagent/Procfile similarity index 100% rename from src/leiningen/new/reagent/Procfile rename to resources/leiningen/new/reagent/Procfile diff --git a/src/leiningen/new/reagent/README.md b/resources/leiningen/new/reagent/README.md similarity index 100% rename from src/leiningen/new/reagent/README.md rename to resources/leiningen/new/reagent/README.md diff --git a/src/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj b/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj similarity index 100% rename from src/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj rename to resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj diff --git a/src/leiningen/new/reagent/env/dev/clj/reagent/repl.clj b/resources/leiningen/new/reagent/env/dev/clj/reagent/repl.clj similarity index 100% rename from src/leiningen/new/reagent/env/dev/clj/reagent/repl.clj rename to resources/leiningen/new/reagent/env/dev/clj/reagent/repl.clj diff --git a/src/leiningen/new/reagent/env/dev/cljs/reagent/cards.cljs b/resources/leiningen/new/reagent/env/dev/cljs/reagent/cards.cljs similarity index 100% rename from src/leiningen/new/reagent/env/dev/cljs/reagent/cards.cljs rename to resources/leiningen/new/reagent/env/dev/cljs/reagent/cards.cljs diff --git a/src/leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs b/resources/leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs similarity index 100% rename from src/leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs rename to resources/leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs diff --git a/src/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj b/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj similarity index 100% rename from src/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj rename to resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj diff --git a/src/leiningen/new/reagent/env/prod/cljs/reagent/prod.cljs b/resources/leiningen/new/reagent/env/prod/cljs/reagent/prod.cljs similarity index 100% rename from src/leiningen/new/reagent/env/prod/cljs/reagent/prod.cljs rename to resources/leiningen/new/reagent/env/prod/cljs/reagent/prod.cljs diff --git a/src/leiningen/new/reagent/gitignore b/resources/leiningen/new/reagent/gitignore similarity index 100% rename from src/leiningen/new/reagent/gitignore rename to resources/leiningen/new/reagent/gitignore diff --git a/src/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj similarity index 99% rename from src/leiningen/new/reagent/project.clj rename to resources/leiningen/new/reagent/project.clj index 4145aa8..050665d 100644 --- a/src/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -23,7 +23,7 @@ :plugins [[lein-environ "1.0.2"] [lein-cljsbuild "1.1.1"] - [lein-asset-minifier "0.2.4" + [lein-asset-minifier "0.2.6" :exclusions [org.clojure/clojure]]] :ring {:handler {{project-ns}}.handler/app diff --git a/src/leiningen/new/reagent/resources/public/css/site.css b/resources/leiningen/new/reagent/resources/public/css/site.css similarity index 100% rename from src/leiningen/new/reagent/resources/public/css/site.css rename to resources/leiningen/new/reagent/resources/public/css/site.css diff --git a/src/leiningen/new/reagent/runners/doo_runner.cljs b/resources/leiningen/new/reagent/runners/doo_runner.cljs similarity index 100% rename from src/leiningen/new/reagent/runners/doo_runner.cljs rename to resources/leiningen/new/reagent/runners/doo_runner.cljs diff --git a/src/leiningen/new/reagent/runners/speclj b/resources/leiningen/new/reagent/runners/speclj similarity index 100% rename from src/leiningen/new/reagent/runners/speclj rename to resources/leiningen/new/reagent/runners/speclj diff --git a/src/leiningen/new/reagent/spec/cljs/reagent/core_spec.cljs b/resources/leiningen/new/reagent/spec/cljs/reagent/core_spec.cljs similarity index 100% rename from src/leiningen/new/reagent/spec/cljs/reagent/core_spec.cljs rename to resources/leiningen/new/reagent/spec/cljs/reagent/core_spec.cljs diff --git a/src/leiningen/new/reagent/src/clj/reagent/handler.clj b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj similarity index 100% rename from src/leiningen/new/reagent/src/clj/reagent/handler.clj rename to resources/leiningen/new/reagent/src/clj/reagent/handler.clj diff --git a/src/leiningen/new/reagent/src/clj/reagent/server.clj b/resources/leiningen/new/reagent/src/clj/reagent/server.clj similarity index 100% rename from src/leiningen/new/reagent/src/clj/reagent/server.clj rename to resources/leiningen/new/reagent/src/clj/reagent/server.clj diff --git a/src/leiningen/new/reagent/src/cljc/reagent/util.cljc b/resources/leiningen/new/reagent/src/cljc/reagent/util.cljc similarity index 100% rename from src/leiningen/new/reagent/src/cljc/reagent/util.cljc rename to resources/leiningen/new/reagent/src/cljc/reagent/util.cljc diff --git a/src/leiningen/new/reagent/src/cljs/reagent/core.cljs b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs similarity index 100% rename from src/leiningen/new/reagent/src/cljs/reagent/core.cljs rename to resources/leiningen/new/reagent/src/cljs/reagent/core.cljs diff --git a/src/leiningen/new/reagent/src/less/site.less b/resources/leiningen/new/reagent/src/less/site.less similarity index 100% rename from src/leiningen/new/reagent/src/less/site.less rename to resources/leiningen/new/reagent/src/less/site.less diff --git a/src/leiningen/new/reagent/src/sass/index.sass b/resources/leiningen/new/reagent/src/sass/index.sass similarity index 100% rename from src/leiningen/new/reagent/src/sass/index.sass rename to resources/leiningen/new/reagent/src/sass/index.sass diff --git a/src/leiningen/new/reagent/src/sass/profile.scss b/resources/leiningen/new/reagent/src/sass/profile.scss similarity index 100% rename from src/leiningen/new/reagent/src/sass/profile.scss rename to resources/leiningen/new/reagent/src/sass/profile.scss diff --git a/src/leiningen/new/reagent/system.properties b/resources/leiningen/new/reagent/system.properties similarity index 100% rename from src/leiningen/new/reagent/system.properties rename to resources/leiningen/new/reagent/system.properties diff --git a/src/leiningen/new/reagent/test/cljs/reagent/core_test.cljs b/resources/leiningen/new/reagent/test/cljs/reagent/core_test.cljs similarity index 100% rename from src/leiningen/new/reagent/test/cljs/reagent/core_test.cljs rename to resources/leiningen/new/reagent/test/cljs/reagent/core_test.cljs diff --git a/src/leiningen/new/reagent/vendor/console-polyfill.js b/resources/leiningen/new/reagent/vendor/console-polyfill.js similarity index 100% rename from src/leiningen/new/reagent/vendor/console-polyfill.js rename to resources/leiningen/new/reagent/vendor/console-polyfill.js diff --git a/src/leiningen/new/reagent/vendor/es5-sham.js b/resources/leiningen/new/reagent/vendor/es5-sham.js similarity index 100% rename from src/leiningen/new/reagent/vendor/es5-sham.js rename to resources/leiningen/new/reagent/vendor/es5-sham.js diff --git a/src/leiningen/new/reagent/vendor/es5-shim.js b/resources/leiningen/new/reagent/vendor/es5-shim.js similarity index 100% rename from src/leiningen/new/reagent/vendor/es5-shim.js rename to resources/leiningen/new/reagent/vendor/es5-shim.js From 140e99b32aad586bf7b956adea2209e029af6a30 Mon Sep 17 00:00:00 2001 From: Yogthos Date: Wed, 2 Mar 2016 19:33:24 -0500 Subject: [PATCH 007/179] bumped up dependencies --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/project.clj b/project.clj index d72d78c..7187ee8 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.48" +(defproject reagent/lein-template "0.9.50" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 050665d..eba0b5c 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -8,7 +8,7 @@ [ring-server "0.4.0"] [reagent "0.5.1" :exclusions [org.clojure/tools.reader]] - [reagent-forms "0.5.15"] + [reagent-forms "0.5.21"] [reagent-utils "0.1.7"] [ring "1.4.0"] [ring/ring-defaults "0.1.5"] @@ -18,12 +18,12 @@ [org.clojure/clojurescript "1.7.228" :scope "provided"] [secretary "1.2.3"] - [venantius/accountant "0.1.6" + [venantius/accountant "0.1.7" :exclusions [org.clojure/tools.reader]]] :plugins [[lein-environ "1.0.2"] [lein-cljsbuild "1.1.1"] - [lein-asset-minifier "0.2.6" + [lein-asset-minifier "0.2.7" :exclusions [org.clojure/clojure]]] :ring {:handler {{project-ns}}.handler/app From b37fe5c6e37717a67325a03a86bfd935b027b73a Mon Sep 17 00:00:00 2001 From: Yogthos Date: Wed, 2 Mar 2016 19:38:13 -0500 Subject: [PATCH 008/179] updated secretary config --- .../leiningen/new/reagent/src/cljs/reagent/core.cljs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs index fffcf4d..0a7567f 100644 --- a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs +++ b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs @@ -34,6 +34,12 @@ (reagent/render [current-page] (.getElementById js/document "app"))) (defn init! [] - (accountant/configure-navigation!) + (accountant/configure-navigation! + {:nav-handler + (fn [path] + (secretary/dispatch! path)) + :path-exists? + (fn [path] + (secretary/locate-route path))}) (accountant/dispatch-current!) (mount-root)) From af36c20ae611e335088437ef13beb7629911ba39 Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Thu, 3 Mar 2016 17:10:41 -0500 Subject: [PATCH 009/179] fixed resource path to be absolute --- resources/leiningen/new/reagent/src/clj/reagent/handler.clj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj index 8e5f89a..6989282 100644 --- a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj +++ b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj @@ -18,10 +18,10 @@ [:meta {:charset "utf-8"}] [:meta {:name "viewport" :content "width=device-width, initial-scale=1"}] - (include-css (if (env :dev) "css/site.css" "css/site.min.css"))] + (include-css (if (env :dev) "/css/site.css" "/css/site.min.css"))] [:body mount-target - (include-js "js/app.js")])) + (include-js "/js/app.js")])) {{#devcards-hook?}} (def cards-page @@ -30,7 +30,7 @@ [:meta {:charset "utf-8"}]] [:body mount-target - (include-js "js/app_devcards.js")])){{/devcards-hook?}} + (include-js "/js/app_devcards.js")])){{/devcards-hook?}} (defroutes routes (GET "/" [] loading-page) From b0809d960512c61bfc4086541ebf8219766e39c2 Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Thu, 3 Mar 2016 18:08:45 -0500 Subject: [PATCH 010/179] updated resources to use absolute path --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 7187ee8..e3e0bde 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.50" +(defproject reagent/lein-template "0.9.51" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index eba0b5c..701cfcb 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -52,7 +52,7 @@ :cljsbuild {:builds {:app {:source-paths ["src/cljs" "src/cljc"] :compiler {:output-to "target/cljsbuild/public/js/app.js" :output-dir "target/cljsbuild/public/js/out" - :asset-path "js/out" + :asset-path "/js/out" :optimizations :none :pretty-print true}}}} {{#less-hook?}} From 92f8c060348c5dfad3da99ae52e7956ae4e02d08 Mon Sep 17 00:00:00 2001 From: Yogthos Date: Mon, 7 Mar 2016 09:01:20 -0500 Subject: [PATCH 011/179] bumped up compojure --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index e3e0bde..1af9060 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.51" +(defproject reagent/lein-template "0.9.52" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 701cfcb..0960786 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -12,7 +12,7 @@ [reagent-utils "0.1.7"] [ring "1.4.0"] [ring/ring-defaults "0.1.5"] - [compojure "1.4.0"] + [compojure "1.5.0"] [hiccup "1.0.5"] [environ "1.0.2"] [org.clojure/clojurescript "1.7.228" From aa9067defa6aa947aecbcf50f4beaed406dacc41 Mon Sep 17 00:00:00 2001 From: Yogthos Date: Thu, 24 Mar 2016 08:52:54 -0400 Subject: [PATCH 012/179] bumped up dependencies --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 19 ++++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/project.clj b/project.clj index 1af9060..5127678 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.52" +(defproject reagent/lein-template "0.9.53" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 0960786..e02f8b7 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -8,14 +8,14 @@ [ring-server "0.4.0"] [reagent "0.5.1" :exclusions [org.clojure/tools.reader]] - [reagent-forms "0.5.21"] + [reagent-forms "0.5.22"] [reagent-utils "0.1.7"] [ring "1.4.0"] - [ring/ring-defaults "0.1.5"] + [ring/ring-defaults "0.2.0"] [compojure "1.5.0"] [hiccup "1.0.5"] [environ "1.0.2"] - [org.clojure/clojurescript "1.7.228" + [org.clojure/clojurescript "1.8.34" :scope "provided"] [secretary "1.2.3"] [venantius/accountant "0.1.7" @@ -35,9 +35,10 @@ :main {{project-ns}}.server - :clean-targets ^{:protect false} [:target-path - [:cljsbuild :builds :app :compiler :output-dir] - [:cljsbuild :builds :app :compiler :output-to]] + :clean-targets ^{:protect false} + [:target-path + [:cljsbuild :builds :app :compiler :output-dir] + [:cljsbuild :builds :app :compiler :output-to]] :source-paths ["src/clj" "src/cljc"] {{#spec-hook?}} @@ -69,8 +70,8 @@ :dependencies [[ring/ring-mock "0.3.0"] [ring/ring-devel "1.4.0"] - [prone "1.0.2"] - [lein-figwheel "0.5.0-6" + [prone "1.1.0"] + [lein-figwheel "0.5.1" :exclusions [org.clojure/core.memoize ring/ring-core org.clojure/clojure @@ -92,7 +93,7 @@ [devcards "0.2.0-8" :exclusions [org.clojure/tools.reader]] {{/devcards-hook?}} - [pjstadig/humane-test-output "0.7.1"] + [pjstadig/humane-test-output "0.8.0"] {{dev-dependencies}}] :source-paths ["env/dev/clj"] From c720763e74a5e0c220f45546e5247ee0d4940783 Mon Sep 17 00:00:00 2001 From: Yogthos Date: Mon, 28 Mar 2016 08:45:02 -0400 Subject: [PATCH 013/179] bumped up clojurescript --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project.clj b/project.clj index 5127678..6771ca7 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.53" +(defproject reagent/lein-template "0.9.55" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index e02f8b7..fa83eb6 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -15,7 +15,7 @@ [compojure "1.5.0"] [hiccup "1.0.5"] [environ "1.0.2"] - [org.clojure/clojurescript "1.8.34" + [org.clojure/clojurescript "1.8.40" :scope "provided"] [secretary "1.2.3"] [venantius/accountant "0.1.7" @@ -97,7 +97,7 @@ {{dev-dependencies}}] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.0-6" + :plugins [[lein-figwheel "0.5.1" :exclusions [org.clojure/core.memoize ring/ring-core org.clojure/clojure From 4c6d2d7d9e44d5b9a9773540f9e51b2d9fa26997 Mon Sep 17 00:00:00 2001 From: Yogthos Date: Sun, 3 Apr 2016 11:34:33 -0400 Subject: [PATCH 014/179] bumped up figwheel --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project.clj b/project.clj index 6771ca7..7f6907c 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.55" +(defproject reagent/lein-template "0.9.56" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index fa83eb6..9a3d9c4 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -71,7 +71,7 @@ :dependencies [[ring/ring-mock "0.3.0"] [ring/ring-devel "1.4.0"] [prone "1.1.0"] - [lein-figwheel "0.5.1" + [lein-figwheel "0.5.2" :exclusions [org.clojure/core.memoize ring/ring-core org.clojure/clojure @@ -97,7 +97,7 @@ {{dev-dependencies}}] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.1" + :plugins [[lein-figwheel "0.5.2" :exclusions [org.clojure/core.memoize ring/ring-core org.clojure/clojure From 2dcb4b92df5c4b25d099b8b60520bf9d349274c1 Mon Sep 17 00:00:00 2001 From: Yogthos Date: Fri, 8 Apr 2016 19:18:39 -0400 Subject: [PATCH 015/179] switch to use config instead of environ --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 4 ++-- resources/leiningen/new/reagent/src/clj/reagent/handler.clj | 2 +- resources/leiningen/new/reagent/src/clj/reagent/server.clj | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/project.clj b/project.clj index 7f6907c..c33d201 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.56" +(defproject reagent/lein-template "0.9.57" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 9a3d9c4..4ef7520 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -14,7 +14,7 @@ [ring/ring-defaults "0.2.0"] [compojure "1.5.0"] [hiccup "1.0.5"] - [environ "1.0.2"] + [yogthos/config "0.8"] [org.clojure/clojurescript "1.8.40" :scope "provided"] [secretary "1.2.3"] @@ -35,7 +35,7 @@ :main {{project-ns}}.server - :clean-targets ^{:protect false} + :clean-targets ^{:protect false} [:target-path [:cljsbuild :builds :app :compiler :output-dir] [:cljsbuild :builds :app :compiler :output-to]] diff --git a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj index 6989282..546778d 100644 --- a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj +++ b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj @@ -3,7 +3,7 @@ [compojure.route :refer [not-found resources]] [hiccup.page :refer [include-js include-css html5]] [{{name}}.middleware :refer [wrap-middleware]] - [environ.core :refer [env]])) + [config.core :refer [env]])) (def mount-target [:div#app diff --git a/resources/leiningen/new/reagent/src/clj/reagent/server.clj b/resources/leiningen/new/reagent/src/clj/reagent/server.clj index c460d15..de504ad 100644 --- a/resources/leiningen/new/reagent/src/clj/reagent/server.clj +++ b/resources/leiningen/new/reagent/src/clj/reagent/server.clj @@ -1,6 +1,6 @@ (ns {{project-ns}}.server (:require [{{project-ns}}.handler :refer [app]] - [environ.core :refer [env]] + [config.core :refer [env]] [ring.adapter.jetty :refer [run-jetty]]) (:gen-class)) From 26b79841cd013635caa3a343abccf8b37fa88f32 Mon Sep 17 00:00:00 2001 From: Yogthos Date: Fri, 8 Apr 2016 19:20:33 -0400 Subject: [PATCH 016/179] bumped up prone --- resources/leiningen/new/reagent/project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 4ef7520..5adabea 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -70,7 +70,7 @@ :dependencies [[ring/ring-mock "0.3.0"] [ring/ring-devel "1.4.0"] - [prone "1.1.0"] + [prone "1.1.1"] [lein-figwheel "0.5.2" :exclusions [org.clojure/core.memoize ring/ring-core From 46356b072160236e86bf5dc31570b221404a60b1 Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Tue, 26 Apr 2016 20:16:45 -0400 Subject: [PATCH 017/179] Update README.md --- README.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/README.md b/README.md index aa45737..5687969 100644 --- a/README.md +++ b/README.md @@ -47,6 +47,12 @@ To add [CIDER](https://github.com/clojure-emacs/cider) plugin, use the `+cider` lein new reagent +cider ``` +To add [less](https://github.com/montoux/lein-less)/[sass](https://github.com/vladh/lein-sassy) support +use `+less` or `+sass` flags: + +``` +lein new reagent +less +``` ### Development mode From c3bdd3a02952b0a431e6d384248d1fb1ce92ba39 Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Tue, 26 Apr 2016 20:17:10 -0400 Subject: [PATCH 018/179] Update README.md --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 5687969..b1e29de 100644 --- a/README.md +++ b/README.md @@ -182,6 +182,8 @@ The template supports the following options: * `+spec` - use [speclj](https://github.com/slagyr/speclj) for TDD/BDD * `+less` - use [less](https://github.com/montoux/lein-less) for compiling Less CSS files * `+sass` - use [sass](https://github.com/vladh/lein-sassy) for compiling Sass/Scss CSS files +* `+devcards` - add [Devcards](https://github.com/bhauman/devcards) support +* `+cider` - add [CIDER](https://github.com/clojure-emacs/cider) support ## Contributing & Customizing From 2dfe04c21cef339fc5bc1828cd9ee53f5af9af8f Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Thu, 28 Apr 2016 23:07:48 -0400 Subject: [PATCH 019/179] Update project.clj --- resources/leiningen/new/reagent/project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 5adabea..d0129d2 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -15,7 +15,7 @@ [compojure "1.5.0"] [hiccup "1.0.5"] [yogthos/config "0.8"] - [org.clojure/clojurescript "1.8.40" + [org.clojure/clojurescript "1.8.51" :scope "provided"] [secretary "1.2.3"] [venantius/accountant "0.1.7" From e66b7659830912acc159bb161eac60c932e4d913 Mon Sep 17 00:00:00 2001 From: Yogthos Date: Thu, 28 Apr 2016 23:09:07 -0400 Subject: [PATCH 020/179] bumped up version --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index c33d201..90da571 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.57" +(defproject reagent/lein-template "0.9.58" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" From 091008185d274856c52ba3f3eba4ce3f27db1b76 Mon Sep 17 00:00:00 2001 From: Yogthos Date: Thu, 28 Apr 2016 23:29:33 -0400 Subject: [PATCH 021/179] bumped up dependencies --- resources/leiningen/new/reagent/project.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index d0129d2..08d4c97 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -8,8 +8,8 @@ [ring-server "0.4.0"] [reagent "0.5.1" :exclusions [org.clojure/tools.reader]] - [reagent-forms "0.5.22"] - [reagent-utils "0.1.7"] + [reagent-forms "0.5.23"] + [reagent-utils "0.1.8"] [ring "1.4.0"] [ring/ring-defaults "0.2.0"] [compojure "1.5.0"] From d3871ed244e862dbc28fd87032318094da1a8110 Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Mon, 9 May 2016 13:37:25 -0400 Subject: [PATCH 022/179] updated dependencies, added css for devcards --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 6 +++--- .../new/reagent/src/clj/reagent/handler.clj | 16 +++++++++------- 3 files changed, 13 insertions(+), 11 deletions(-) diff --git a/project.clj b/project.clj index 90da571..6a6f30c 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.58" +(defproject reagent/lein-template "0.9.59" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 08d4c97..c2be8fe 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -71,7 +71,7 @@ :dependencies [[ring/ring-mock "0.3.0"] [ring/ring-devel "1.4.0"] [prone "1.1.1"] - [lein-figwheel "0.5.2" + [lein-figwheel "0.5.3-1" :exclusions [org.clojure/core.memoize ring/ring-core org.clojure/clojure @@ -90,14 +90,14 @@ [speclj "3.3.1"] {{/spec-hook?}} {{#devcards-hook?}} - [devcards "0.2.0-8" + [devcards "0.2.1-7" :exclusions [org.clojure/tools.reader]] {{/devcards-hook?}} [pjstadig/humane-test-output "0.8.0"] {{dev-dependencies}}] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.2" + :plugins [[lein-figwheel "0.5.3-1" :exclusions [org.clojure/core.memoize ring/ring-core org.clojure/clojure diff --git a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj index 546778d..77eed6a 100644 --- a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj +++ b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj @@ -12,13 +12,16 @@ [:b "lein figwheel"] " in order to start the compiler"]]) +(defn head [] + [:head + [:meta {:charset "utf-8"}] + [:meta {:name "viewport" + :content "width=device-width, initial-scale=1"}] + (include-css (if (env :dev) "/css/site.css" "/css/site.min.css"))]) + (def loading-page (html5 - [:head - [:meta {:charset "utf-8"}] - [:meta {:name "viewport" - :content "width=device-width, initial-scale=1"}] - (include-css (if (env :dev) "/css/site.css" "/css/site.min.css"))] + (head) [:body mount-target (include-js "/js/app.js")])) @@ -26,8 +29,7 @@ (def cards-page (html5 - [:head - [:meta {:charset "utf-8"}]] + (head) [:body mount-target (include-js "/js/app_devcards.js")])){{/devcards-hook?}} From f45d22c2bd45cbc58c1501b4a5791dfbf9b8ed3b Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Mon, 9 May 2016 15:47:05 -0400 Subject: [PATCH 023/179] rolled back devacrds version --- resources/leiningen/new/reagent/project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index c2be8fe..17dc331 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -90,7 +90,7 @@ [speclj "3.3.1"] {{/spec-hook?}} {{#devcards-hook?}} - [devcards "0.2.1-7" + [devcards "0.2.0-8" :exclusions [org.clojure/tools.reader]] {{/devcards-hook?}} [pjstadig/humane-test-output "0.8.0"] From 00203600c1c87bfd5cf46e18d5af80f51c22a340 Mon Sep 17 00:00:00 2001 From: Edipo L Federle Date: Tue, 10 May 2016 19:54:56 -0300 Subject: [PATCH 024/179] avoiding conflits between devcards css and reagent site.css --- resources/leiningen/new/reagent/resources/public/css/site.css | 2 +- resources/leiningen/new/reagent/src/clj/reagent/handler.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/leiningen/new/reagent/resources/public/css/site.css b/resources/leiningen/new/reagent/resources/public/css/site.css index b3e8203..5ab89cd 100644 --- a/resources/leiningen/new/reagent/resources/public/css/site.css +++ b/resources/leiningen/new/reagent/resources/public/css/site.css @@ -1,4 +1,4 @@ -body { +.body-container { font-family: 'Helvetica Neue', Verdana, Helvetica, Arial, sans-serif; max-width: 600px; margin: 0 auto; diff --git a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj index 77eed6a..8ea5872 100644 --- a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj +++ b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj @@ -22,7 +22,7 @@ (def loading-page (html5 (head) - [:body + [:body {:class "body-container"} mount-target (include-js "/js/app.js")])) {{#devcards-hook?}} From 96ffe7df36f38bfe81d53a273ae31d6f413c1e25 Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Tue, 10 May 2016 20:36:38 -0400 Subject: [PATCH 025/179] bumped up version --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 6a6f30c..be47569 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.59" +(defproject reagent/lein-template "0.9.61" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" From 6fd8490400f26ee1de13e3b48e57ebfd33965119 Mon Sep 17 00:00:00 2001 From: Yogthos Date: Wed, 1 Jun 2016 22:42:50 -0400 Subject: [PATCH 026/179] removed cljs profile merging --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 95 +++++++++++---------- 2 files changed, 53 insertions(+), 44 deletions(-) diff --git a/project.clj b/project.clj index be47569..a35fb0d 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.61" +(defproject reagent/lein-template "0.9.62" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 17dc331..eac5d46 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -50,12 +50,55 @@ {:assets {"resources/public/css/site.min.css" "resources/public/css/site.css"}} - :cljsbuild {:builds {:app {:source-paths ["src/cljs" "src/cljc"] - :compiler {:output-to "target/cljsbuild/public/js/app.js" - :output-dir "target/cljsbuild/public/js/out" - :asset-path "/js/out" - :optimizations :none - :pretty-print true}}}} + :cljsbuild + {:builds {:min + {:source-paths ["src/cljs" "src/cljc" "env/prod/cljs"] + :compiler + {:output-to "target/cljsbuild/public/js/app.js" + :output-dir "target/uberjar" + :optimizations :advanced + :pretty-print false}} + :app + {:source-paths ["src/cljs" "src/cljc" "env/dev/cljs"] + :compiler + {:main "{{name}}.dev" + :asset-path "/js/out" + :output-to "target/cljsbuild/public/js/app.js" + :output-dir "target/cljsbuild/public/js/out" + :source-map true + :optimizations :none + :pretty-print true}} + {{#test-hook?}} + :test + {:source-paths ["src/cljs" "src/cljc" "test/cljs"] + :compiler {:main {{project-ns}}.doo-runner + :asset-path "/js/out" + :output-to "target/test.js" + :output-dir "target/cljsbuild/public/js/out" + :optimizations :whitespace + :pretty-print true}}{{/test-hook?}} + {{#spec-hook?}} + :test + {:source-paths ["src/cljs" "src/cljc" "spec/cljs"] + :compiler {:output-to "target/test.js" + :optimizations :whitespace + :pretty-print true}}{{/spec-hook?}} + {{#devcards-hook?}} + :devcards + {:source-paths ["src/cljs" "src/cljc" "env/dev/cljs"] + :figwheel {:devcards true} + :compiler {:main "{{name}}.cards" + :asset-path "js/devcards_out" + :output-to "target/cljsbuild/public/js/app_devcards.js" + :output-dir "target/cljsbuild/public/js/devcards_out" + :source-map-timestamp true + :optimizations :none + :pretty-print true}}{{/devcards-hook?}} + } + {{#spec-hook?}} + :test-commands {"unit" ["phantomjs" "runners/speclj" "target/test.js"]} + {{/spec-hook?}} + } {{#less-hook?}} :less {:source-paths ["src/less"] :target-path "resources/public/css"} @@ -137,45 +180,11 @@ :css-dirs ["resources/public/css"] :ring-handler {{project-ns}}.handler/app} - :env {:dev true} - - :cljsbuild {:builds {:app {:source-paths ["env/dev/cljs"] - :compiler {:main "{{name}}.dev" - :source-map true}} - {{#test-hook?}} - :test {:source-paths ["src/cljs" "src/cljc" "test/cljs"] - :compiler {:output-to "target/test.js" - :main {{project-ns}}.doo-runner - :optimizations :whitespace - :pretty-print true}}{{/test-hook?}} - {{#spec-hook?}} - :test {:source-paths ["src/cljs" "src/cljc" "spec/cljs"] - :compiler {:output-to "target/test.js" - :optimizations :whitespace - :pretty-print true}}{{/spec-hook?}} - {{#devcards-hook?}} - :devcards {:source-paths ["src/cljs" "src/cljc" "env/dev/cljs"] - :figwheel {:devcards true} - :compiler {:main "{{name}}.cards" - :asset-path "js/devcards_out" - :output-to "target/cljsbuild/public/js/app_devcards.js" - :output-dir "target/cljsbuild/public/js/devcards_out" - :source-map-timestamp true}}{{/devcards-hook?}} - } - {{#spec-hook?}} - :test-commands {"unit" ["phantomjs" "runners/speclj" "target/test.js"]} - {{/spec-hook?}} - }} + :env {:dev true}} :uberjar {:hooks [minify-assets.plugin/hooks] :source-paths ["env/prod/clj"] - :prep-tasks ["compile" ["cljsbuild" "once"]] + :prep-tasks ["compile" ["cljsbuild" "once" "min"]] :env {:production true} :aot :all - :omit-source true - :cljsbuild {:jar true - :builds {:app - {:source-paths ["env/prod/cljs"] - :compiler - {:optimizations :advanced - :pretty-print false}}}}}}) + :omit-source true}}) From dd921aa32f4f17420eb6a3adbaffc1e1624f2842 Mon Sep 17 00:00:00 2001 From: Yogthos Date: Thu, 2 Jun 2016 08:15:24 -0400 Subject: [PATCH 027/179] moved figwheel to top level --- resources/leiningen/new/reagent/project.clj | 26 +++++++++++---------- 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index eac5d46..a1908ee 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -99,6 +99,20 @@ :test-commands {"unit" ["phantomjs" "runners/speclj" "target/test.js"]} {{/spec-hook?}} } + + :figwheel + {:http-server-root "public" + :server-port 3449 + :nrepl-port 7002 + :nrepl-middleware ["cemerick.piggieback/wrap-cljs-repl" + {{#cider-hook?}} + "cider.nrepl/cider-middleware" + "refactor-nrepl.middleware/wrap-refactor" + {{/cider-hook?}} + ] + :css-dirs ["resources/public/css"] + :ring-handler {{project-ns}}.handler/app} + {{#less-hook?}} :less {:source-paths ["src/less"] :target-path "resources/public/css"} @@ -168,18 +182,6 @@ :injections [(require 'pjstadig.humane-test-output) (pjstadig.humane-test-output/activate!)] - :figwheel {:http-server-root "public" - :server-port 3449 - :nrepl-port 7002 - :nrepl-middleware ["cemerick.piggieback/wrap-cljs-repl" - {{#cider-hook?}} - "cider.nrepl/cider-middleware" - "refactor-nrepl.middleware/wrap-refactor" - {{/cider-hook?}} - ] - :css-dirs ["resources/public/css"] - :ring-handler {{project-ns}}.handler/app} - :env {:dev true}} :uberjar {:hooks [minify-assets.plugin/hooks] From e10a1b56b123ee740fec2c6f792c741abe22dc46 Mon Sep 17 00:00:00 2001 From: Yogthos Date: Thu, 2 Jun 2016 08:30:06 -0400 Subject: [PATCH 028/179] fixes for tests --- resources/leiningen/new/reagent/project.clj | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index a1908ee..895604a 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -62,7 +62,7 @@ {:source-paths ["src/cljs" "src/cljc" "env/dev/cljs"] :compiler {:main "{{name}}.dev" - :asset-path "/js/out" + :asset-path "/js/out" :output-to "target/cljsbuild/public/js/app.js" :output-dir "target/cljsbuild/public/js/out" :source-map true @@ -72,9 +72,9 @@ :test {:source-paths ["src/cljs" "src/cljc" "test/cljs"] :compiler {:main {{project-ns}}.doo-runner - :asset-path "/js/out" + :asset-path "/js/out" :output-to "target/test.js" - :output-dir "target/cljsbuild/public/js/out" + :output-dir "target/cljstest/public/js/out" :optimizations :whitespace :pretty-print true}}{{/test-hook?}} {{#spec-hook?}} @@ -100,6 +100,10 @@ {{/spec-hook?}} } + {{#spec-hook?}} + :doo {:build "test"} + {{/spec-hook?}} + :figwheel {:http-server-root "public" :server-port 3449 From 55f54f95df323b57bd938337cd229fe6ac13720d Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Mon, 6 Jun 2016 18:54:48 -0400 Subject: [PATCH 029/179] bumped up clojurescript/reagent --- resources/leiningen/new/reagent/project.clj | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 895604a..5544af3 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -6,8 +6,7 @@ :dependencies [[org.clojure/clojure "1.8.0"] [ring-server "0.4.0"] - [reagent "0.5.1" - :exclusions [org.clojure/tools.reader]] + [reagent "0.6.0-alpha2"] [reagent-forms "0.5.23"] [reagent-utils "0.1.8"] [ring "1.4.0"] @@ -15,7 +14,7 @@ [compojure "1.5.0"] [hiccup "1.0.5"] [yogthos/config "0.8"] - [org.clojure/clojurescript "1.8.51" + [org.clojure/clojurescript "1.9.36" :scope "provided"] [secretary "1.2.3"] [venantius/accountant "0.1.7" From b9368c00300addf2ad5d3b61ce7005f65cc293fb Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Thu, 9 Jun 2016 11:43:15 -0400 Subject: [PATCH 030/179] bumped up reagent --- resources/leiningen/new/reagent/project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 5544af3..5f64193 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -6,7 +6,7 @@ :dependencies [[org.clojure/clojure "1.8.0"] [ring-server "0.4.0"] - [reagent "0.6.0-alpha2"] + [reagent "0.6.0-rc"] [reagent-forms "0.5.23"] [reagent-utils "0.1.8"] [ring "1.4.0"] From 4b838ff59dba433449cdc350c9e551677ae02bed Mon Sep 17 00:00:00 2001 From: Yogthos Date: Thu, 9 Jun 2016 18:43:39 -0400 Subject: [PATCH 031/179] bumped up dependencies --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/project.clj b/project.clj index a35fb0d..1c96a6b 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.62" +(defproject reagent/lein-template "0.9.63" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 5f64193..b5c7afc 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -7,10 +7,10 @@ :dependencies [[org.clojure/clojure "1.8.0"] [ring-server "0.4.0"] [reagent "0.6.0-rc"] - [reagent-forms "0.5.23"] + [reagent-forms "0.5.24"] [reagent-utils "0.1.8"] - [ring "1.4.0"] - [ring/ring-defaults "0.2.0"] + [ring "1.5.0"] + [ring/ring-defaults "0.2.1"] [compojure "1.5.0"] [hiccup "1.0.5"] [yogthos/config "0.8"] @@ -129,9 +129,9 @@ :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl} :dependencies [[ring/ring-mock "0.3.0"] - [ring/ring-devel "1.4.0"] + [ring/ring-devel "1.5.0"] [prone "1.1.1"] - [lein-figwheel "0.5.3-1" + [lein-figwheel "0.5.4-SNAPSHOT" :exclusions [org.clojure/core.memoize ring/ring-core org.clojure/clojure @@ -142,7 +142,7 @@ org.clojure/core.async org.clojure/tools.analyzer.jvm]] [org.clojure/tools.nrepl "0.2.12"] - [com.cemerick/piggieback "0.2.1"] + [com.cemerick/piggieback "0.2.2-SNAPSHOT"] {{#test-hook?}} [lein-doo "0.1.6"] {{/test-hook?}} @@ -157,7 +157,7 @@ {{dev-dependencies}}] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.3-1" + :plugins [[lein-figwheel "0.5.4-SNAPSHOT" :exclusions [org.clojure/core.memoize ring/ring-core org.clojure/clojure From d9eb8847cb09d87404729bf829731687714639e3 Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Sun, 12 Jun 2016 12:13:43 -0400 Subject: [PATCH 032/179] bumped down figwheel, bumped up devcards --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/project.clj b/project.clj index 1c96a6b..dab00c9 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.63" +(defproject reagent/lein-template "0.9.65" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index b5c7afc..3d1a721 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -131,7 +131,7 @@ :dependencies [[ring/ring-mock "0.3.0"] [ring/ring-devel "1.5.0"] [prone "1.1.1"] - [lein-figwheel "0.5.4-SNAPSHOT" + [lein-figwheel "0.5.3-2" :exclusions [org.clojure/core.memoize ring/ring-core org.clojure/clojure @@ -150,14 +150,14 @@ [speclj "3.3.1"] {{/spec-hook?}} {{#devcards-hook?}} - [devcards "0.2.0-8" + [devcards "0.2.1-7" :exclusions [org.clojure/tools.reader]] {{/devcards-hook?}} [pjstadig/humane-test-output "0.8.0"] {{dev-dependencies}}] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.4-SNAPSHOT" + :plugins [[lein-figwheel "0.5.3-2" :exclusions [org.clojure/core.memoize ring/ring-core org.clojure/clojure From 5bf255cc6f82a4b9daf767d6d7fdbc079e5d0a1c Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Wed, 15 Jun 2016 21:50:12 -0400 Subject: [PATCH 033/179] bumped up figwheel --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project.clj b/project.clj index dab00c9..0378f2a 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.65" +(defproject reagent/lein-template "0.9.67" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 3d1a721..581840b 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -131,7 +131,7 @@ :dependencies [[ring/ring-mock "0.3.0"] [ring/ring-devel "1.5.0"] [prone "1.1.1"] - [lein-figwheel "0.5.3-2" + [figwheel-sidecar "0.5.4-3" :exclusions [org.clojure/core.memoize ring/ring-core org.clojure/clojure @@ -157,7 +157,7 @@ {{dev-dependencies}}] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.3-2" + :plugins [[lein-figwheel "0.5.4-3" :exclusions [org.clojure/core.memoize ring/ring-core org.clojure/clojure From 06fd0c0c35ca3375e221c4fa42ed08f990fa7d84 Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Sun, 19 Jun 2016 10:43:57 -0400 Subject: [PATCH 034/179] bumped up dependencies --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 28 ++++----------------- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/project.clj b/project.clj index 0378f2a..7a2d6b2 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.67" +(defproject reagent/lein-template "0.9.68" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 581840b..8284755 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -8,13 +8,13 @@ [ring-server "0.4.0"] [reagent "0.6.0-rc"] [reagent-forms "0.5.24"] - [reagent-utils "0.1.8"] + [reagent-utils "0.1.9"] [ring "1.5.0"] [ring/ring-defaults "0.2.1"] - [compojure "1.5.0"] + [compojure "1.5.1"] [hiccup "1.0.5"] [yogthos/config "0.8"] - [org.clojure/clojurescript "1.9.36" + [org.clojure/clojurescript "1.9.76" :scope "provided"] [secretary "1.2.3"] [venantius/accountant "0.1.7" @@ -131,16 +131,7 @@ :dependencies [[ring/ring-mock "0.3.0"] [ring/ring-devel "1.5.0"] [prone "1.1.1"] - [figwheel-sidecar "0.5.4-3" - :exclusions [org.clojure/core.memoize - ring/ring-core - org.clojure/clojure - org.ow2.asm/asm-all - org.clojure/data.priority-map - org.clojure/tools.reader - org.clojure/clojurescript - org.clojure/core.async - org.clojure/tools.analyzer.jvm]] + [figwheel-sidecar "0.5.4-3"] [org.clojure/tools.nrepl "0.2.12"] [com.cemerick/piggieback "0.2.2-SNAPSHOT"] {{#test-hook?}} @@ -157,16 +148,7 @@ {{dev-dependencies}}] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.4-3" - :exclusions [org.clojure/core.memoize - ring/ring-core - org.clojure/clojure - org.ow2.asm/asm-all - org.clojure/data.priority-map - org.clojure/tools.reader - org.clojure/clojurescript - org.clojure/core.async - org.clojure/tools.analyzer.jvm]] + :plugins [[lein-figwheel "0.5.4-3"] {{#test-hook?}} [lein-doo "0.1.6"] {{/test-hook?}} From fb1a3e6e6477e5f051556ec3ab8105f96a1c7083 Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Thu, 23 Jun 2016 08:33:13 -0400 Subject: [PATCH 035/179] bumped up to latest cljs/figwheel --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/project.clj b/project.clj index 7a2d6b2..461031c 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.68" +(defproject reagent/lein-template "0.9.69" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 8284755..b0fa2bb 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -14,7 +14,7 @@ [compojure "1.5.1"] [hiccup "1.0.5"] [yogthos/config "0.8"] - [org.clojure/clojurescript "1.9.76" + [org.clojure/clojurescript "1.9.92" :scope "provided"] [secretary "1.2.3"] [venantius/accountant "0.1.7" @@ -131,7 +131,7 @@ :dependencies [[ring/ring-mock "0.3.0"] [ring/ring-devel "1.5.0"] [prone "1.1.1"] - [figwheel-sidecar "0.5.4-3"] + [figwheel-sidecar "0.5.4-4"] [org.clojure/tools.nrepl "0.2.12"] [com.cemerick/piggieback "0.2.2-SNAPSHOT"] {{#test-hook?}} @@ -148,7 +148,7 @@ {{dev-dependencies}}] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.4-3"] + :plugins [[lein-figwheel "0.5.4-4"] {{#test-hook?}} [lein-doo "0.1.6"] {{/test-hook?}} From 7ec46cf5bea2852833bc0b9331cd96a5a150eaf3 Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Sun, 3 Jul 2016 15:20:44 -0400 Subject: [PATCH 036/179] bumped up figwheel, cljs --- resources/leiningen/new/reagent/project.clj | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index b0fa2bb..2feeace 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -131,7 +131,7 @@ :dependencies [[ring/ring-mock "0.3.0"] [ring/ring-devel "1.5.0"] [prone "1.1.1"] - [figwheel-sidecar "0.5.4-4"] + [figwheel-sidecar "0.5.4-5"] [org.clojure/tools.nrepl "0.2.12"] [com.cemerick/piggieback "0.2.2-SNAPSHOT"] {{#test-hook?}} @@ -141,14 +141,13 @@ [speclj "3.3.1"] {{/spec-hook?}} {{#devcards-hook?}} - [devcards "0.2.1-7" - :exclusions [org.clojure/tools.reader]] + [devcards "0.2.1-7"] {{/devcards-hook?}} [pjstadig/humane-test-output "0.8.0"] {{dev-dependencies}}] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.4-4"] + :plugins [[lein-figwheel "0.5.4-5"] {{#test-hook?}} [lein-doo "0.1.6"] {{/test-hook?}} From 41f993be0b303c3cbf46b6282692402a2c09e59d Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Sun, 3 Jul 2016 15:34:25 -0400 Subject: [PATCH 037/179] bumped up version --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 461031c..a393c41 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.69" +(defproject reagent/lein-template "0.9.70" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" From ac07a6d98195e48fff6a4e93f4885a256aa84197 Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Sun, 3 Jul 2016 15:35:07 -0400 Subject: [PATCH 038/179] bumped up cljs --- resources/leiningen/new/reagent/project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 2feeace..9e3219e 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -14,7 +14,7 @@ [compojure "1.5.1"] [hiccup "1.0.5"] [yogthos/config "0.8"] - [org.clojure/clojurescript "1.9.92" + [org.clojure/clojurescript "1.9.93" :scope "provided"] [secretary "1.2.3"] [venantius/accountant "0.1.7" From abc39b0c4112172f19b8ddb7867453dfcb29a352 Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Tue, 16 Aug 2016 09:35:10 -0400 Subject: [PATCH 039/179] bumped up dependencies, changed pages to functions --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 10 +++++----- .../leiningen/new/reagent/src/clj/reagent/handler.clj | 10 +++++----- 3 files changed, 11 insertions(+), 11 deletions(-) diff --git a/project.clj b/project.clj index a393c41..bef33a3 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.70" +(defproject reagent/lein-template "0.9.71" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 9e3219e..a556a48 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -8,13 +8,13 @@ [ring-server "0.4.0"] [reagent "0.6.0-rc"] [reagent-forms "0.5.24"] - [reagent-utils "0.1.9"] + [reagent-utils "0.2.0"] [ring "1.5.0"] [ring/ring-defaults "0.2.1"] [compojure "1.5.1"] [hiccup "1.0.5"] [yogthos/config "0.8"] - [org.clojure/clojurescript "1.9.93" + [org.clojure/clojurescript "1.9.216" :scope "provided"] [secretary "1.2.3"] [venantius/accountant "0.1.7" @@ -131,7 +131,7 @@ :dependencies [[ring/ring-mock "0.3.0"] [ring/ring-devel "1.5.0"] [prone "1.1.1"] - [figwheel-sidecar "0.5.4-5"] + [figwheel-sidecar "0.5.4-7"] [org.clojure/tools.nrepl "0.2.12"] [com.cemerick/piggieback "0.2.2-SNAPSHOT"] {{#test-hook?}} @@ -143,11 +143,11 @@ {{#devcards-hook?}} [devcards "0.2.1-7"] {{/devcards-hook?}} - [pjstadig/humane-test-output "0.8.0"] + [pjstadig/humane-test-output "0.8.1"] {{dev-dependencies}}] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.4-5"] + :plugins [[lein-figwheel "0.5.4-7"] {{#test-hook?}} [lein-doo "0.1.6"] {{/test-hook?}} diff --git a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj index 8ea5872..86bc3e7 100644 --- a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj +++ b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj @@ -19,7 +19,7 @@ :content "width=device-width, initial-scale=1"}] (include-css (if (env :dev) "/css/site.css" "/css/site.min.css"))]) -(def loading-page +(defn loading-page [] (html5 (head) [:body {:class "body-container"} @@ -27,7 +27,7 @@ (include-js "/js/app.js")])) {{#devcards-hook?}} -(def cards-page +(defn cards-page [] (html5 (head) [:body @@ -35,9 +35,9 @@ (include-js "/js/app_devcards.js")])){{/devcards-hook?}} (defroutes routes - (GET "/" [] loading-page) - (GET "/about" [] loading-page) - {{#devcards-hook?}}(GET "/cards" [] cards-page){{/devcards-hook?}} + (GET "/" [] (loading-page)) + (GET "/about" [] (loading-page)) + {{#devcards-hook?}}(GET "/cards" [] (cards-page)){{/devcards-hook?}} (resources "/") (not-found "Not Found")) From 10c7d47782de445e4ca722cdb72fe1d0c69ddabe Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Thu, 18 Aug 2016 10:39:34 -0400 Subject: [PATCH 040/179] bumped up reagent-forms --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index bef33a3..23d041c 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.71" +(defproject reagent/lein-template "0.9.72" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index a556a48..30a09af 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -7,7 +7,7 @@ :dependencies [[org.clojure/clojure "1.8.0"] [ring-server "0.4.0"] [reagent "0.6.0-rc"] - [reagent-forms "0.5.24"] + [reagent-forms "0.5.25"] [reagent-utils "0.2.0"] [ring "1.5.0"] [ring/ring-defaults "0.2.1"] From 2a659eb6db03f47d90256806a2145693f7d2bc18 Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Wed, 14 Sep 2016 20:59:02 -0400 Subject: [PATCH 041/179] bumped up dependencies --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/project.clj b/project.clj index 23d041c..f93a8c3 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.72" +(defproject reagent/lein-template "0.9.73" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 30a09af..0219a5f 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -6,7 +6,7 @@ :dependencies [[org.clojure/clojure "1.8.0"] [ring-server "0.4.0"] - [reagent "0.6.0-rc"] + [reagent "0.6.0"] [reagent-forms "0.5.25"] [reagent-utils "0.2.0"] [ring "1.5.0"] @@ -14,7 +14,7 @@ [compojure "1.5.1"] [hiccup "1.0.5"] [yogthos/config "0.8"] - [org.clojure/clojurescript "1.9.216" + [org.clojure/clojurescript "1.9.229" :scope "provided"] [secretary "1.2.3"] [venantius/accountant "0.1.7" @@ -130,8 +130,8 @@ :dependencies [[ring/ring-mock "0.3.0"] [ring/ring-devel "1.5.0"] - [prone "1.1.1"] - [figwheel-sidecar "0.5.4-7"] + [prone "1.1.2"] + [figwheel-sidecar "0.5.7"] [org.clojure/tools.nrepl "0.2.12"] [com.cemerick/piggieback "0.2.2-SNAPSHOT"] {{#test-hook?}} @@ -147,7 +147,7 @@ {{dev-dependencies}}] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.4-7"] + :plugins [[lein-figwheel "0.5.7"] {{#test-hook?}} [lein-doo "0.1.6"] {{/test-hook?}} From 5a9fae85e6e17765c7b1dc7c1290df0e985348e1 Mon Sep 17 00:00:00 2001 From: joseluisdacruz Date: Sat, 15 Oct 2016 00:48:06 -0300 Subject: [PATCH 042/179] Solution for "unable to load piggieback" A call to the function cljs-repl gives the message "Exception Failed to launch Figwheel CLJS REPL: nREPL connection found but unable to load piggieback". --- resources/leiningen/new/reagent/project.clj | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 0219a5f..b4583da 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -99,7 +99,7 @@ {{/spec-hook?}} } - {{#spec-hook?}} +{{#spec-hook?}} :doo {:build "test"} {{/spec-hook?}} @@ -126,7 +126,8 @@ :dst "resources/public/css"} {{/sass-hook?}} - :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl} + :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl + :nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]} :dependencies [[ring/ring-mock "0.3.0"] [ring/ring-devel "1.5.0"] From 074cccc5bf6f61f4bf41f2bb25964169dfae6562 Mon Sep 17 00:00:00 2001 From: joseluisdacruz Date: Sat, 15 Oct 2016 00:53:02 -0300 Subject: [PATCH 043/179] Enable start-figwheel! and cljs-repl from the repl namespace --- resources/leiningen/new/reagent/env/dev/clj/reagent/repl.clj | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/leiningen/new/reagent/env/dev/clj/reagent/repl.clj b/resources/leiningen/new/reagent/env/dev/clj/reagent/repl.clj index 8de08e9..b81bd6f 100644 --- a/resources/leiningen/new/reagent/env/dev/clj/reagent/repl.clj +++ b/resources/leiningen/new/reagent/env/dev/clj/reagent/repl.clj @@ -1,5 +1,6 @@ (ns {{name}}.repl (:use {{name}}.handler + figwheel-sidecar.repl-api ring.server.standalone [ring.middleware file-info file])) From fdc7af2b03f1453f837879a734a43dce343b1921 Mon Sep 17 00:00:00 2001 From: "Sotnikov, Dmitri" Date: Mon, 21 Nov 2016 14:15:59 -0500 Subject: [PATCH 044/179] updated dependencies --- resources/leiningen/new/reagent/project.clj | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index b4583da..e3d9dc8 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -7,7 +7,6 @@ :dependencies [[org.clojure/clojure "1.8.0"] [ring-server "0.4.0"] [reagent "0.6.0"] - [reagent-forms "0.5.25"] [reagent-utils "0.2.0"] [ring "1.5.0"] [ring/ring-defaults "0.2.1"] @@ -132,7 +131,7 @@ :dependencies [[ring/ring-mock "0.3.0"] [ring/ring-devel "1.5.0"] [prone "1.1.2"] - [figwheel-sidecar "0.5.7"] + [figwheel-sidecar "0.5.8"] [org.clojure/tools.nrepl "0.2.12"] [com.cemerick/piggieback "0.2.2-SNAPSHOT"] {{#test-hook?}} @@ -148,7 +147,7 @@ {{dev-dependencies}}] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.7"] + :plugins [[lein-figwheel "0.5.8"] {{#test-hook?}} [lein-doo "0.1.6"] {{/test-hook?}} From ae81a1d3b1bc0768c275764bccb3509d558ebb93 Mon Sep 17 00:00:00 2001 From: "Sotnikov, Dmitri" Date: Mon, 21 Nov 2016 14:21:21 -0500 Subject: [PATCH 045/179] bumped up version --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index f93a8c3..2309cb3 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.73" +(defproject reagent/lein-template "0.9.74" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" From 4be337ec461446f9a7ad014c334a782ff99cc7dd Mon Sep 17 00:00:00 2001 From: Matthew Jaoudi Date: Tue, 20 Dec 2016 18:00:00 -0800 Subject: [PATCH 046/179] remove doo as dev dependency, fix for #128; --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/project.clj b/project.clj index 2309cb3..68347c0 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.74" +(defproject reagent/lein-template "0.9.75" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index e3d9dc8..8761b2e 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -134,9 +134,6 @@ [figwheel-sidecar "0.5.8"] [org.clojure/tools.nrepl "0.2.12"] [com.cemerick/piggieback "0.2.2-SNAPSHOT"] - {{#test-hook?}} - [lein-doo "0.1.6"] - {{/test-hook?}} {{#spec-hook?}} [speclj "3.3.1"] {{/spec-hook?}} From a542c24e68323b5cb8b7d5337f6b20d62fdd0973 Mon Sep 17 00:00:00 2001 From: Svante Date: Thu, 5 Jan 2017 16:45:01 +0100 Subject: [PATCH 047/179] Fix missing dependency Otherwise a lot of warnings is produced upon compilation (Use of undeclared Var). --- .../leiningen/new/reagent/env/dev/cljs/reagent/cards.cljs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/leiningen/new/reagent/env/dev/cljs/reagent/cards.cljs b/resources/leiningen/new/reagent/env/dev/cljs/reagent/cards.cljs index 530dbe7..601a200 100644 --- a/resources/leiningen/new/reagent/env/dev/cljs/reagent/cards.cljs +++ b/resources/leiningen/new/reagent/env/dev/cljs/reagent/cards.cljs @@ -1,7 +1,8 @@ (ns {{project-ns}}.cards (:require [reagent.core :as reagent :refer [atom]] [reagent.session :as session] - [{{project-ns}}.core :as core]) + [{{project-ns}}.core :as core] + [devcards.core :as dc]) (:require-macros [devcards.core :as dc From 35b625ad5ff5c4210e40a28a86c6a31f8251e9a5 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Thu, 5 Jan 2017 10:48:31 -0500 Subject: [PATCH 048/179] fix for devcards --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project.clj b/project.clj index 68347c0..57ef81f 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.75" +(defproject reagent/lein-template "0.9.76" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 8761b2e..236f0fc 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -13,7 +13,7 @@ [compojure "1.5.1"] [hiccup "1.0.5"] [yogthos/config "0.8"] - [org.clojure/clojurescript "1.9.229" + [org.clojure/clojurescript "1.9.293" :scope "provided"] [secretary "1.2.3"] [venantius/accountant "0.1.7" @@ -130,7 +130,7 @@ :dependencies [[ring/ring-mock "0.3.0"] [ring/ring-devel "1.5.0"] - [prone "1.1.2"] + [prone "1.1.4"] [figwheel-sidecar "0.5.8"] [org.clojure/tools.nrepl "0.2.12"] [com.cemerick/piggieback "0.2.2-SNAPSHOT"] From 0f8f050c643a0b56223727593d8efc4a371aa42e Mon Sep 17 00:00:00 2001 From: "Sotnikov, Dmitri" Date: Fri, 10 Feb 2017 16:40:11 -0500 Subject: [PATCH 049/179] bumped up clojurescript --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 57ef81f..3d8f73e 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.76" +(defproject reagent/lein-template "0.9.77" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 236f0fc..4966c37 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -13,7 +13,7 @@ [compojure "1.5.1"] [hiccup "1.0.5"] [yogthos/config "0.8"] - [org.clojure/clojurescript "1.9.293" + [org.clojure/clojurescript "1.9.473" :scope "provided"] [secretary "1.2.3"] [venantius/accountant "0.1.7" From 1b35846af49083c590986a5a84f1a7b5e77617c3 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Sun, 19 Mar 2017 20:47:57 -0400 Subject: [PATCH 050/179] updated dependencies --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 20 ++++++++++---------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/project.clj b/project.clj index 3d8f73e..164dce0 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.77" +(defproject reagent/lein-template "0.9.78" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 4966c37..1ed3449 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -6,17 +6,17 @@ :dependencies [[org.clojure/clojure "1.8.0"] [ring-server "0.4.0"] - [reagent "0.6.0"] - [reagent-utils "0.2.0"] - [ring "1.5.0"] - [ring/ring-defaults "0.2.1"] - [compojure "1.5.1"] + [reagent "0.6.1"] + [reagent-utils "0.2.1"] + [ring "1.5.1"] + [ring/ring-defaults "0.2.3"] + [compojure "1.5.2"] [hiccup "1.0.5"] [yogthos/config "0.8"] - [org.clojure/clojurescript "1.9.473" + [org.clojure/clojurescript "1.9.495" :scope "provided"] [secretary "1.2.3"] - [venantius/accountant "0.1.7" + [venantius/accountant "0.1.9" :exclusions [org.clojure/tools.reader]]] :plugins [[lein-environ "1.0.2"] @@ -129,9 +129,9 @@ :nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]} :dependencies [[ring/ring-mock "0.3.0"] - [ring/ring-devel "1.5.0"] + [ring/ring-devel "1.5.1"] [prone "1.1.4"] - [figwheel-sidecar "0.5.8"] + [figwheel-sidecar "0.5.9"] [org.clojure/tools.nrepl "0.2.12"] [com.cemerick/piggieback "0.2.2-SNAPSHOT"] {{#spec-hook?}} @@ -144,7 +144,7 @@ {{dev-dependencies}}] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.8"] + :plugins [[lein-figwheel "0.5.9"] {{#test-hook?}} [lein-doo "0.1.6"] {{/test-hook?}} From 943d6f27960e7b99e6ee3cca343a43fe3bfebebf Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Fri, 24 Mar 2017 17:46:44 -0400 Subject: [PATCH 051/179] bumped up lein-cljsbuild --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 164dce0..a447aad 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.78" +(defproject reagent/lein-template "0.9.79" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 1ed3449..93f1e00 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -20,7 +20,7 @@ :exclusions [org.clojure/tools.reader]]] :plugins [[lein-environ "1.0.2"] - [lein-cljsbuild "1.1.1"] + [lein-cljsbuild "1.1.5"] [lein-asset-minifier "0.2.7" :exclusions [org.clojure/clojure]]] From a0c2ef9268f8f120196d3db92c2af885af5a87ef Mon Sep 17 00:00:00 2001 From: Lucas Mancini Date: Thu, 27 Apr 2017 11:22:19 -0400 Subject: [PATCH 052/179] Sass enhancements - Adding a site.scss to illustrate the use of sass, and to be able to have live reloading of sass right from the start after running "lein sass watch" when a new project is created with the "+sass+" option. - Adding additional ignore entries to the gitignore file, to ignore the output of the CSS resources and also to ignore the folder that is generated when building sass stylesheets that is used as a local cache. --- resources/leiningen/new/reagent/gitignore | 2 + .../leiningen/new/reagent/src/sass/site.scss | 44 +++++++++++++++++++ src/leiningen/new/reagent.clj | 1 + 3 files changed, 47 insertions(+) create mode 100644 resources/leiningen/new/reagent/src/sass/site.scss diff --git a/resources/leiningen/new/reagent/gitignore b/resources/leiningen/new/reagent/gitignore index f7fcc1b..0c35f6a 100644 --- a/resources/leiningen/new/reagent/gitignore +++ b/resources/leiningen/new/reagent/gitignore @@ -9,7 +9,9 @@ pom.xml.asc /.lein-* /.nrepl-port /resources/public/js +/resources/public/css /out /.repl *.log /.env +/.sass-cache diff --git a/resources/leiningen/new/reagent/src/sass/site.scss b/resources/leiningen/new/reagent/src/sass/site.scss new file mode 100644 index 0000000..b1b76b8 --- /dev/null +++ b/resources/leiningen/new/reagent/src/sass/site.scss @@ -0,0 +1,44 @@ +// Uncomment to import other sass or scss files +// @import 'index'; +// @import 'profile'; + +// You can use any sass features, like variables, for instance: +$font-stack: 'Helvetica Neue', Verdana, Helvetica, Arial, sans-serif; +$base-font-size: 1.125em; + +.body-container { + font-family: $font-stack; + max-width: 600px; + margin: 0 auto; + padding-top: 72px; + -webkit-font-smoothing: antialiased; + font-size: $base-font-size; + color: #333; + line-height: 1.5em; +} + +h1, h2, h3 { + color: #000; +} + +h1 { + font-size: $base-font-size + 1.375; +} + +h2 { + font-size: $base-font-size + 0.875; +} + +h3 { + font-size: $base-font-size + 0.125; +} + +a { + text-decoration: none; + color: #09f; + + // nesting is also supported + &:hover { + text-decoration: underline; + } +} diff --git a/src/leiningen/new/reagent.clj b/src/leiningen/new/reagent.clj index 164f3f6..3c66cd5 100644 --- a/src/leiningen/new/reagent.clj +++ b/src/leiningen/new/reagent.clj @@ -112,6 +112,7 @@ args) args (if (sass? opts) (conj args + ["src/sass/site.scss" (render "src/sass/site.scss" data)] ["src/sass/index.sass" (render "src/sass/index.sass" data)] ["src/sass/profile.scss" (render "src/sass/profile.scss" data)]) args) From 74cd3545efafca27785bacc7e7b5cced5ac79207 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Thu, 27 Apr 2017 19:43:16 -0400 Subject: [PATCH 053/179] bumped up libraries --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/project.clj b/project.clj index a447aad..604320e 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.79" +(defproject reagent/lein-template "0.9.80" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 93f1e00..6acc62a 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -13,10 +13,10 @@ [compojure "1.5.2"] [hiccup "1.0.5"] [yogthos/config "0.8"] - [org.clojure/clojurescript "1.9.495" + [org.clojure/clojurescript "1.9.521" :scope "provided"] [secretary "1.2.3"] - [venantius/accountant "0.1.9" + [venantius/accountant "0.2.0" :exclusions [org.clojure/tools.reader]]] :plugins [[lein-environ "1.0.2"] @@ -131,8 +131,8 @@ :dependencies [[ring/ring-mock "0.3.0"] [ring/ring-devel "1.5.1"] [prone "1.1.4"] - [figwheel-sidecar "0.5.9"] - [org.clojure/tools.nrepl "0.2.12"] + [figwheel-sidecar "0.5.10"] + [org.clojure/tools.nrepl "0.2.13"] [com.cemerick/piggieback "0.2.2-SNAPSHOT"] {{#spec-hook?}} [speclj "3.3.1"] @@ -144,7 +144,7 @@ {{dev-dependencies}}] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.9"] + :plugins [[lein-figwheel "0.5.10"] {{#test-hook?}} [lein-doo "0.1.6"] {{/test-hook?}} From 7820f4afb490132694eeed472eba5630c0ddc17c Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Sat, 29 Apr 2017 11:35:20 -0400 Subject: [PATCH 054/179] moved figwheel reload config to project.clj --- project.clj | 2 +- resources/leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs | 4 ---- resources/leiningen/new/reagent/project.clj | 1 + 3 files changed, 2 insertions(+), 5 deletions(-) diff --git a/project.clj b/project.clj index 604320e..eb58913 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.80" +(defproject reagent/lein-template "0.9.81" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs b/resources/leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs index bf497ce..40c049f 100644 --- a/resources/leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs +++ b/resources/leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs @@ -4,8 +4,4 @@ (enable-console-print!) -(figwheel/watch-and-reload - :websocket-url "ws://localhost:3449/figwheel-ws" - :jsload-callback core/mount-root) - (core/init!) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 6acc62a..45c8189 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -58,6 +58,7 @@ :pretty-print false}} :app {:source-paths ["src/cljs" "src/cljc" "env/dev/cljs"] + :figwheel {:on-jsload "{{project-ns}}.core/mount-root"} :compiler {:main "{{name}}.dev" :asset-path "/js/out" From 3835409b0f74bf1c59c7387f43229442dfd504d4 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Sat, 29 Apr 2017 11:41:49 -0400 Subject: [PATCH 055/179] removed unused require for dev --- resources/leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs b/resources/leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs index 40c049f..76cc0a8 100644 --- a/resources/leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs +++ b/resources/leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs @@ -1,6 +1,5 @@ (ns ^:figwheel-no-load {{project-ns}}.dev - (:require [{{project-ns}}.core :as core] - [figwheel.client :as figwheel :include-macros true])) + (:require [{{project-ns}}.core :as core])) (enable-console-print!) From c27953b3fd30a816556c6821fbc7076247774848 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Thu, 1 Jun 2017 23:21:21 -0400 Subject: [PATCH 056/179] bumped up dependencies --- project.clj | 2 +- .../new/reagent/env/dev/cljs/reagent/cards.cljs | 1 - resources/leiningen/new/reagent/project.clj | 16 ++++++++-------- .../new/reagent/src/cljs/reagent/core.cljs | 13 +++++++------ 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/project.clj b/project.clj index eb58913..2d7dcb9 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.81" +(defproject reagent/lein-template "0.9.82" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/env/dev/cljs/reagent/cards.cljs b/resources/leiningen/new/reagent/env/dev/cljs/reagent/cards.cljs index 601a200..e9e6cbc 100644 --- a/resources/leiningen/new/reagent/env/dev/cljs/reagent/cards.cljs +++ b/resources/leiningen/new/reagent/env/dev/cljs/reagent/cards.cljs @@ -1,6 +1,5 @@ (ns {{project-ns}}.cards (:require [reagent.core :as reagent :refer [atom]] - [reagent.session :as session] [{{project-ns}}.core :as core] [devcards.core :as dc]) (:require-macros diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 45c8189..24cab0a 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -6,14 +6,14 @@ :dependencies [[org.clojure/clojure "1.8.0"] [ring-server "0.4.0"] - [reagent "0.6.1"] + [reagent "0.6.2"] [reagent-utils "0.2.1"] - [ring "1.5.1"] - [ring/ring-defaults "0.2.3"] - [compojure "1.5.2"] + [ring "1.6.1"] + [ring/ring-defaults "0.3.0"] + [compojure "1.6.0"] [hiccup "1.0.5"] [yogthos/config "0.8"] - [org.clojure/clojurescript "1.9.521" + [org.clojure/clojurescript "1.9.562" :scope "provided"] [secretary "1.2.3"] [venantius/accountant "0.2.0" @@ -130,7 +130,7 @@ :nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]} :dependencies [[ring/ring-mock "0.3.0"] - [ring/ring-devel "1.5.1"] + [ring/ring-devel "1.6.1"] [prone "1.1.4"] [figwheel-sidecar "0.5.10"] [org.clojure/tools.nrepl "0.2.13"] @@ -139,9 +139,9 @@ [speclj "3.3.1"] {{/spec-hook?}} {{#devcards-hook?}} - [devcards "0.2.1-7"] + [devcards "0.2.3" :exclusions [cljsjs/react]] {{/devcards-hook?}} - [pjstadig/humane-test-output "0.8.1"] + [pjstadig/humane-test-output "0.8.2"] {{dev-dependencies}}] :source-paths ["env/dev/clj"] diff --git a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs index 0a7567f..a812a67 100644 --- a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs +++ b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs @@ -1,6 +1,5 @@ (ns {{project-ns}}.core (:require [reagent.core :as reagent :refer [atom]] - [reagent.session :as session] [secretary.core :as secretary :include-macros true] [accountant.core :as accountant])) @@ -15,17 +14,19 @@ [:div [:h2 "About {{name}}"] [:div [:a {:href "/"} "go to the home page"]]]) -(defn current-page [] - [:div [(session/get :current-page)]]) - ;; ------------------------- ;; Routes +(def page (atom #'home-page)) + +(defn current-page [] + [:div [@page]]) + (secretary/defroute "/" [] - (session/put! :current-page #'home-page)) + (reset! page #'home-page)) (secretary/defroute "/about" [] - (session/put! :current-page #'about-page)) + (reset! page #'about-page)) ;; ------------------------- ;; Initialize app From d1da43da64ba1bd6c63b92b0e976d638b2ceea4e Mon Sep 17 00:00:00 2001 From: "Sotnikov, Dmitri" Date: Tue, 27 Jun 2017 12:21:52 -0400 Subject: [PATCH 057/179] bumped up reagent/cljs --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project.clj b/project.clj index 2d7dcb9..9484e87 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.82" +(defproject reagent/lein-template "0.9.83" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 24cab0a..a3a0de0 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -6,14 +6,14 @@ :dependencies [[org.clojure/clojure "1.8.0"] [ring-server "0.4.0"] - [reagent "0.6.2"] + [reagent "0.7.0"] [reagent-utils "0.2.1"] [ring "1.6.1"] [ring/ring-defaults "0.3.0"] [compojure "1.6.0"] [hiccup "1.0.5"] [yogthos/config "0.8"] - [org.clojure/clojurescript "1.9.562" + [org.clojure/clojurescript "1.9.660" :scope "provided"] [secretary "1.2.3"] [venantius/accountant "0.2.0" From efbd13b16ba43e0f9a1c82094c7817098a6fd7cf Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Sun, 2 Jul 2017 15:50:35 -0400 Subject: [PATCH 058/179] bumped up cljs --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 9484e87..255715e 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.83" +(defproject reagent/lein-template "0.9.84" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index a3a0de0..63e4af7 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -13,7 +13,7 @@ [compojure "1.6.0"] [hiccup "1.0.5"] [yogthos/config "0.8"] - [org.clojure/clojurescript "1.9.660" + [org.clojure/clojurescript "1.9.671" :scope "provided"] [secretary "1.2.3"] [venantius/accountant "0.2.0" From 8326f521055134450625f9b1d12a9850c8b1fafe Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Tue, 4 Jul 2017 15:42:04 -0400 Subject: [PATCH 059/179] bumped up figwheel, added dev-tools --- project.clj | 2 +- .../leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs | 6 +++++- resources/leiningen/new/reagent/project.clj | 9 +++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/project.clj b/project.clj index 255715e..1534b9f 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.84" +(defproject reagent/lein-template "0.9.85" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs b/resources/leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs index 76cc0a8..1fd0e08 100644 --- a/resources/leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs +++ b/resources/leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs @@ -1,5 +1,9 @@ (ns ^:figwheel-no-load {{project-ns}}.dev - (:require [{{project-ns}}.core :as core])) + (:require + [{{project-ns}}.core :as core] + [devtools.core :as devtools])) + +(devtools/install!) (enable-console-print!) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 63e4af7..a01cd25 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -129,12 +129,13 @@ :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl :nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]} - :dependencies [[ring/ring-mock "0.3.0"] + :dependencies [[binaryage/devtools "0.9.4"] + [ring/ring-mock "0.3.1"] [ring/ring-devel "1.6.1"] [prone "1.1.4"] - [figwheel-sidecar "0.5.10"] + [figwheel-sidecar "0.5.11"] [org.clojure/tools.nrepl "0.2.13"] - [com.cemerick/piggieback "0.2.2-SNAPSHOT"] + [com.cemerick/piggieback "0.2.2"] {{#spec-hook?}} [speclj "3.3.1"] {{/spec-hook?}} @@ -145,7 +146,7 @@ {{dev-dependencies}}] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.10"] + :plugins [[lein-figwheel "0.5.11"] {{#test-hook?}} [lein-doo "0.1.6"] {{/test-hook?}} From 9e1518f805c8d09002d38e553b527293c6a26935 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Fri, 28 Jul 2017 19:47:57 -0400 Subject: [PATCH 060/179] bumped up cljs --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 1534b9f..d74ee5c 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.85" +(defproject reagent/lein-template "0.9.86" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index a01cd25..670a504 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -13,7 +13,7 @@ [compojure "1.6.0"] [hiccup "1.0.5"] [yogthos/config "0.8"] - [org.clojure/clojurescript "1.9.671" + [org.clojure/clojurescript "1.9.854" :scope "provided"] [secretary "1.2.3"] [venantius/accountant "0.2.0" From ffff3a4d523e66050a9a3c89c98cc893739a1b0c Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Tue, 15 Aug 2017 18:31:53 -0400 Subject: [PATCH 061/179] fix for gitignore having invalid entries --- project.clj | 2 +- resources/leiningen/new/reagent/gitignore | 2 -- resources/leiningen/new/reagent/project.clj | 12 ++++++------ 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/project.clj b/project.clj index d74ee5c..5a30c1b 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.86" +(defproject reagent/lein-template "0.9.87" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/gitignore b/resources/leiningen/new/reagent/gitignore index 0c35f6a..ec686b7 100644 --- a/resources/leiningen/new/reagent/gitignore +++ b/resources/leiningen/new/reagent/gitignore @@ -8,8 +8,6 @@ pom.xml.asc *.class /.lein-* /.nrepl-port -/resources/public/js -/resources/public/css /out /.repl *.log diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 670a504..5f16945 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -8,11 +8,11 @@ [ring-server "0.4.0"] [reagent "0.7.0"] [reagent-utils "0.2.1"] - [ring "1.6.1"] - [ring/ring-defaults "0.3.0"] + [ring "1.6.2"] + [ring/ring-defaults "0.3.1"] [compojure "1.6.0"] [hiccup "1.0.5"] - [yogthos/config "0.8"] + [yogthos/config "0.9"] [org.clojure/clojurescript "1.9.854" :scope "provided"] [secretary "1.2.3"] @@ -131,9 +131,9 @@ :dependencies [[binaryage/devtools "0.9.4"] [ring/ring-mock "0.3.1"] - [ring/ring-devel "1.6.1"] + [ring/ring-devel "1.6.2"] [prone "1.1.4"] - [figwheel-sidecar "0.5.11"] + [figwheel-sidecar "0.5.12"] [org.clojure/tools.nrepl "0.2.13"] [com.cemerick/piggieback "0.2.2"] {{#spec-hook?}} @@ -146,7 +146,7 @@ {{dev-dependencies}}] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.11"] + :plugins [[lein-figwheel "0.5.12"] {{#test-hook?}} [lein-doo "0.1.6"] {{/test-hook?}} From 7c69f80763956b9b71ee2d2a1817df0f70fa1ac7 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Wed, 16 Aug 2017 18:38:32 -0400 Subject: [PATCH 062/179] updated to use source maps in advanced build --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/project.clj b/project.clj index d74ee5c..5a30c1b 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.86" +(defproject reagent/lein-template "0.9.87" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 670a504..23bfae0 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -52,8 +52,9 @@ {:builds {:min {:source-paths ["src/cljs" "src/cljc" "env/prod/cljs"] :compiler - {:output-to "target/cljsbuild/public/js/app.js" - :output-dir "target/uberjar" + {:output-to "target/cljsbuild/public/js/app.js" + :output-dir "target/cljsbuild/public/js" + :source-map "target/cljsbuild/public/js/app.js.map" :optimizations :advanced :pretty-print false}} :app From 43c3a7d1cff2d589f40d7d19e3a9af33b85990c2 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Wed, 16 Aug 2017 18:42:09 -0400 Subject: [PATCH 063/179] bumped up version --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 5a30c1b..f954df8 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.87" +(defproject reagent/lein-template "0.9.88" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" From aa9c90cfc5c491677c8986d76d70ff9be405aba6 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Thu, 17 Aug 2017 09:20:39 -0400 Subject: [PATCH 064/179] bumped up cljs --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index f954df8..19ce37c 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.88" +(defproject reagent/lein-template "0.9.89" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 524eed1..1942d53 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -13,7 +13,7 @@ [compojure "1.6.0"] [hiccup "1.0.5"] [yogthos/config "0.9"] - [org.clojure/clojurescript "1.9.854" + [org.clojure/clojurescript "1.9.908" :scope "provided"] [secretary "1.2.3"] [venantius/accountant "0.2.0" From a765384faaa5bb7f838c74850eb4d0ccd5b3fadb Mon Sep 17 00:00:00 2001 From: "Sotnikov, Dmitri" Date: Thu, 17 Aug 2017 11:14:11 -0400 Subject: [PATCH 065/179] bumped up figwheel --- resources/leiningen/new/reagent/project.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 1942d53..0f707d7 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -134,7 +134,7 @@ [ring/ring-mock "0.3.1"] [ring/ring-devel "1.6.2"] [prone "1.1.4"] - [figwheel-sidecar "0.5.12"] + [figwheel-sidecar "0.5.13"] [org.clojure/tools.nrepl "0.2.13"] [com.cemerick/piggieback "0.2.2"] {{#spec-hook?}} @@ -147,7 +147,7 @@ {{dev-dependencies}}] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.12"] + :plugins [[lein-figwheel "0.5.13"] {{#test-hook?}} [lein-doo "0.1.6"] {{/test-hook?}} From 7d0ca3243c6701675bb879634f2d25c591034fcb Mon Sep 17 00:00:00 2001 From: "Sotnikov, Dmitri" Date: Thu, 17 Aug 2017 11:15:25 -0400 Subject: [PATCH 066/179] bumped up version --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 19ce37c..2905fa3 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.89" +(defproject reagent/lein-template "0.9.90" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" From 6a498132c462f9af40f09f8bac6884455badd9e6 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Thu, 12 Oct 2017 09:19:28 -0400 Subject: [PATCH 067/179] bumped up dependencies --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/project.clj b/project.clj index 2905fa3..b3184e1 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.90" +(defproject reagent/lein-template "0.9.91" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 0f707d7..f61db25 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -5,7 +5,7 @@ :url "http://www.eclipse.org/legal/epl-v10.html"} :dependencies [[org.clojure/clojure "1.8.0"] - [ring-server "0.4.0"] + [ring-server "0.5.0"] [reagent "0.7.0"] [reagent-utils "0.2.1"] [ring "1.6.2"] @@ -13,7 +13,7 @@ [compojure "1.6.0"] [hiccup "1.0.5"] [yogthos/config "0.9"] - [org.clojure/clojurescript "1.9.908" + [org.clojure/clojurescript "1.9.946" :scope "provided"] [secretary "1.2.3"] [venantius/accountant "0.2.0" @@ -130,11 +130,11 @@ :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl :nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]} - :dependencies [[binaryage/devtools "0.9.4"] + :dependencies [[binaryage/devtools "0.9.7"] [ring/ring-mock "0.3.1"] [ring/ring-devel "1.6.2"] [prone "1.1.4"] - [figwheel-sidecar "0.5.13"] + [figwheel-sidecar "0.5.14"] [org.clojure/tools.nrepl "0.2.13"] [com.cemerick/piggieback "0.2.2"] {{#spec-hook?}} @@ -143,11 +143,11 @@ {{#devcards-hook?}} [devcards "0.2.3" :exclusions [cljsjs/react]] {{/devcards-hook?}} - [pjstadig/humane-test-output "0.8.2"] + [pjstadig/humane-test-output "0.8.3"] {{dev-dependencies}}] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.13"] + :plugins [[lein-figwheel "0.5.14"] {{#test-hook?}} [lein-doo "0.1.6"] {{/test-hook?}} From b9419ae79fe256d0ed3b4cd8512a07a24fb2fad4 Mon Sep 17 00:00:00 2001 From: Juho Teperi Date: Thu, 21 Dec 2017 20:11:24 +0200 Subject: [PATCH 068/179] Update README.md Fixes #136 --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index b1e29de..7be6b1e 100644 --- a/README.md +++ b/README.md @@ -61,7 +61,7 @@ To start the Figwheel compiler, navigate to the project folder and run the follo ``` lein figwheel ``` -To start the DevCards build run +To start the [DevCards](https://github.com/bhauman/devcards) (if enabled with `+devcards` flag) build run ``` lein figwheel devcards From 5d1ec246f7f6f7e812df4f7065317aa1c1258c05 Mon Sep 17 00:00:00 2001 From: Juho Teperi Date: Thu, 21 Dec 2017 20:55:02 +0200 Subject: [PATCH 069/179] Update deps --- resources/leiningen/new/reagent/project.clj | 28 ++++++++++----------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index f61db25..9d9bb70 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -4,11 +4,11 @@ :license {:name "Eclipse Public License" :url "http://www.eclipse.org/legal/epl-v10.html"} - :dependencies [[org.clojure/clojure "1.8.0"] + :dependencies [[org.clojure/clojure "1.9.0"] [ring-server "0.5.0"] [reagent "0.7.0"] [reagent-utils "0.2.1"] - [ring "1.6.2"] + [ring "1.6.3"] [ring/ring-defaults "0.3.1"] [compojure "1.6.0"] [hiccup "1.0.5"] @@ -16,11 +16,11 @@ [org.clojure/clojurescript "1.9.946" :scope "provided"] [secretary "1.2.3"] - [venantius/accountant "0.2.0" + [venantius/accountant "0.2.3" :exclusions [org.clojure/tools.reader]]] - :plugins [[lein-environ "1.0.2"] - [lein-cljsbuild "1.1.5"] + :plugins [[lein-environ "1.1.0"] + [lein-cljsbuild "1.1.7"] [lein-asset-minifier "0.2.7" :exclusions [org.clojure/clojure]]] @@ -130,15 +130,15 @@ :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl :nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]} - :dependencies [[binaryage/devtools "0.9.7"] - [ring/ring-mock "0.3.1"] - [ring/ring-devel "1.6.2"] + :dependencies [[binaryage/devtools "0.9.8"] + [ring/ring-mock "0.3.2"] + [ring/ring-devel "1.6.3"] [prone "1.1.4"] [figwheel-sidecar "0.5.14"] [org.clojure/tools.nrepl "0.2.13"] [com.cemerick/piggieback "0.2.2"] {{#spec-hook?}} - [speclj "3.3.1"] + [speclj "3.3.2"] {{/spec-hook?}} {{#devcards-hook?}} [devcards "0.2.3" :exclusions [cljsjs/react]] @@ -149,16 +149,16 @@ :source-paths ["env/dev/clj"] :plugins [[lein-figwheel "0.5.14"] {{#test-hook?}} - [lein-doo "0.1.6"] + [lein-doo "0.1.8"] {{/test-hook?}} {{#spec-hook?}} - [speclj "3.3.1"] + [speclj "3.3.2"] {{/spec-hook?}} {{#cider-hook?}} - [cider/cider-nrepl "0.10.0-SNAPSHOT"] - [org.clojure/tools.namespace "0.3.0-alpha2" + [cider/cider-nrepl "0.15.1"] + [org.clojure/tools.namespace "0.3.0-alpha4" :exclusions [org.clojure/tools.reader]] - [refactor-nrepl "2.0.0-SNAPSHOT" + [refactor-nrepl "2.3.1" :exclusions [org.clojure/clojure]] {{/cider-hook?}} {{{project-dev-plugins}}}] From 4467584772abb419f0b6568cbe306811862c244e Mon Sep 17 00:00:00 2001 From: Juho Teperi Date: Thu, 21 Dec 2017 20:55:32 +0200 Subject: [PATCH 070/179] Show error if both +spec and +test flags are used --- src/leiningen/new/reagent.clj | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/src/leiningen/new/reagent.clj b/src/leiningen/new/reagent.clj index 3c66cd5..be9a072 100644 --- a/src/leiningen/new/reagent.clj +++ b/src/leiningen/new/reagent.clj @@ -21,9 +21,6 @@ (def valid-opts ["+test" "+spec" "+less" "+sass" "+devcards" "+cider"]) -(defn valid-opts? [opts] - (every? #(some #{%} valid-opts) opts)) - (defn less? [opts] (some #{"+less"} opts)) @@ -45,6 +42,15 @@ (defn cider? [opts] (some #{"+cider"} opts)) +(defn validate-opts [opts] + (let [invalid-opts (remove (set valid-opts) opts)] + (cond + (seq invalid-opts) + (str "invalid options supplied: " (clojure.string/join " " invalid-opts) + "\nvalid options are: " (join " " valid-opts)) + + (and (test? opts) (spec? opts)) "Both +test and +spec options can't be used together, select one."))) + (defn project-plugins [opts] (cond-> [] (less? opts) (conj less-plugin) @@ -123,7 +129,6 @@ (defn reagent [name & opts] (main/info "Generating fresh 'lein new' Reagent project.") - (if-not (valid-opts? opts) - (println "invalid options supplied:" (clojure.string/join " " opts) - "\nvalid options are:" (join " " valid-opts)) + (if-let [error (validate-opts opts)] + (println error ) (apply ->files (format-files-args name opts)))) From 9b952b89078457241175f1122782d331b6765f80 Mon Sep 17 00:00:00 2001 From: Juho Teperi Date: Thu, 21 Dec 2017 21:30:28 +0200 Subject: [PATCH 071/179] Replace less and sass plugins --- README.md | 10 ++++----- resources/leiningen/new/reagent/project.clj | 21 +++++++++++++++---- .../new/reagent/src/less/profile.less | 1 + .../src/less/{site.less => site.main.less} | 5 +++++ .../src/sass/{profile.scss => _profile.scss} | 0 .../leiningen/new/reagent/src/sass/index.sass | 3 --- .../leiningen/new/reagent/src/sass/site.scss | 6 ++++-- src/leiningen/new/reagent.clj | 20 +++++------------- 8 files changed, 37 insertions(+), 29 deletions(-) create mode 100644 resources/leiningen/new/reagent/src/less/profile.less rename resources/leiningen/new/reagent/src/less/{site.less => site.main.less} (72%) rename resources/leiningen/new/reagent/src/sass/{profile.scss => _profile.scss} (100%) delete mode 100644 resources/leiningen/new/reagent/src/sass/index.sass diff --git a/README.md b/README.md index 7be6b1e..c6a9176 100644 --- a/README.md +++ b/README.md @@ -47,7 +47,7 @@ To add [CIDER](https://github.com/clojure-emacs/cider) plugin, use the `+cider` lein new reagent +cider ``` -To add [less](https://github.com/montoux/lein-less)/[sass](https://github.com/vladh/lein-sassy) support +To add [less](https://github.com/Deraen/less4clj)/[sass](https://github.com/Deraen/sass4clj) support use `+less` or `+sass` flags: ``` @@ -86,13 +86,13 @@ The application will now be available at [http://localhost:3000](http://localhos In case of using `+less` option you may also want to run ``` -lein less auto +lein less4j auto ``` to autocompile less files. In case of using `+sass` option you may also want to run ``` -lein sass watch +lein sass4clj watch ``` to autocompile sass/scss files. @@ -180,8 +180,8 @@ The template supports the following options: * `+test` - ClojureScript testing support * `+spec` - use [speclj](https://github.com/slagyr/speclj) for TDD/BDD -* `+less` - use [less](https://github.com/montoux/lein-less) for compiling Less CSS files -* `+sass` - use [sass](https://github.com/vladh/lein-sassy) for compiling Sass/Scss CSS files +* `+less` - use [less](https://github.com/Deraen/less4clj) for compiling Less CSS files +* `+sass` - use [sass](https://github.com/Deraen/sass4clj) for compiling Sass/Scss CSS files * `+devcards` - add [Devcards](https://github.com/bhauman/devcards) support * `+cider` - add [CIDER](https://github.com/clojure-emacs/cider) support diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 9d9bb70..85a6e9c 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -123,8 +123,8 @@ {{/less-hook?}} {{#sass-hook?}} - :sass {:src "src/sass" - :dst "resources/public/css"} + :sass {:source-paths ["src/sass"] + :target-path "resources/public/css"} {{/sass-hook?}} :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl @@ -144,7 +144,15 @@ [devcards "0.2.3" :exclusions [cljsjs/react]] {{/devcards-hook?}} [pjstadig/humane-test-output "0.8.3"] - {{dev-dependencies}}] + {{dev-dependencies}} + {{#less-hook?}} + ;; To silence warnings from less4clj dependecies about missing logger implementation + [org.slf4j/slf4j-nop "1.7.25"] + {{/less-hook?}} + {{#sass-hook?}} + ;; To silence warnings from sass4clj dependecies about missing logger implementation + [org.slf4j/slf4j-nop "1.7.25"] + {{/sass-hook?}} ] :source-paths ["env/dev/clj"] :plugins [[lein-figwheel "0.5.14"] @@ -161,7 +169,12 @@ [refactor-nrepl "2.3.1" :exclusions [org.clojure/clojure]] {{/cider-hook?}} - {{{project-dev-plugins}}}] + {{#less-hook?}} + [deraen/lein-less4j "0.6.2"] + {{/less-hook?}} + {{#sass-hook?}} + [deraen/lein-sass4clj "0.3.1"] + {{/sass-hook?}}] :injections [(require 'pjstadig.humane-test-output) (pjstadig.humane-test-output/activate!)] diff --git a/resources/leiningen/new/reagent/src/less/profile.less b/resources/leiningen/new/reagent/src/less/profile.less new file mode 100644 index 0000000..8b13789 --- /dev/null +++ b/resources/leiningen/new/reagent/src/less/profile.less @@ -0,0 +1 @@ + diff --git a/resources/leiningen/new/reagent/src/less/site.less b/resources/leiningen/new/reagent/src/less/site.main.less similarity index 72% rename from resources/leiningen/new/reagent/src/less/site.less rename to resources/leiningen/new/reagent/src/less/site.main.less index b3e8203..fa28d81 100644 --- a/resources/leiningen/new/reagent/src/less/site.less +++ b/resources/leiningen/new/reagent/src/less/site.main.less @@ -1,3 +1,8 @@ +// Less4clj considers files ending in .main.less entrypoints, i.e. they are compiled to .css files +// Other files can be included using @import: + +// @import "profile"; + body { font-family: 'Helvetica Neue', Verdana, Helvetica, Arial, sans-serif; max-width: 600px; diff --git a/resources/leiningen/new/reagent/src/sass/profile.scss b/resources/leiningen/new/reagent/src/sass/_profile.scss similarity index 100% rename from resources/leiningen/new/reagent/src/sass/profile.scss rename to resources/leiningen/new/reagent/src/sass/_profile.scss diff --git a/resources/leiningen/new/reagent/src/sass/index.sass b/resources/leiningen/new/reagent/src/sass/index.sass deleted file mode 100644 index 7d6f439..0000000 --- a/resources/leiningen/new/reagent/src/sass/index.sass +++ /dev/null @@ -1,3 +0,0 @@ -body - background: tomato - color: pink diff --git a/resources/leiningen/new/reagent/src/sass/site.scss b/resources/leiningen/new/reagent/src/sass/site.scss index b1b76b8..df1fe84 100644 --- a/resources/leiningen/new/reagent/src/sass/site.scss +++ b/resources/leiningen/new/reagent/src/sass/site.scss @@ -1,5 +1,7 @@ -// Uncomment to import other sass or scss files -// @import 'index'; +// Files not starting with _ are consided entrypoints, i.e. they are compiled to .css files +// Partials (files starting with _) can be inclued using @import: +// (import path can include _ but it is not needed) + // @import 'profile'; // You can use any sass features, like variables, for instance: diff --git a/src/leiningen/new/reagent.clj b/src/leiningen/new/reagent.clj index be9a072..f0c29b9 100644 --- a/src/leiningen/new/reagent.clj +++ b/src/leiningen/new/reagent.clj @@ -13,9 +13,6 @@ (map #(str "\n" (apply str (repeat n " ")) (wrap %))) (join "")))) -(defn dep-list [n list] - (wrap-indent #(str "[" % "]") n list)) - (defn indent [n list] (wrap-indent identity n list)) @@ -27,9 +24,6 @@ (defn sass? [opts] (some #{"+sass"} opts)) -(def less-plugin "lein-less \"1.7.5\"") -(def sass-plugin "lein-sassy \"1.0.7\"") - (defn test? [opts] (some #{"+test"} opts)) @@ -51,18 +45,12 @@ (and (test? opts) (spec? opts)) "Both +test and +spec options can't be used together, select one."))) -(defn project-plugins [opts] - (cond-> [] - (less? opts) (conj less-plugin) - (sass? opts) (conj sass-plugin))) - (defn template-data [name opts] {:full-name name :name (project-name name) :project-goog-module (sanitize (sanitize-ns name)) :project-ns (sanitize-ns name) :sanitized (name-to-path name) - :project-dev-plugins (dep-list 29 (project-plugins opts)) ;; test :test-hook? (fn [block] (if (test? opts) (str block "") "")) @@ -114,13 +102,15 @@ ["runners/speclj" (render "runners/speclj" data)]) args) args (if (less? opts) - (conj args ["src/less/site.less" (render "src/less/site.less" data)]) + (conj args + ["src/less/site.main.less" (render "src/less/site.main.less" data)] + ["src/less/profile.less" (render "src/less/profile.less" data)] + ) args) args (if (sass? opts) (conj args ["src/sass/site.scss" (render "src/sass/site.scss" data)] - ["src/sass/index.sass" (render "src/sass/index.sass" data)] - ["src/sass/profile.scss" (render "src/sass/profile.scss" data)]) + ["src/sass/_profile.scss" (render "src/sass/_profile.scss" data)]) args) args (if (devcards? opts) (conj args ["env/dev/cljs/{{sanitized}}/cards.cljs" (render "env/dev/cljs/reagent/cards.cljs" data)]) From 1393b9eefc73607cecc65678d193e85f36b44adc Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Thu, 21 Dec 2017 18:56:16 -0500 Subject: [PATCH 072/179] bumped up version --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index b3184e1..3a410b8 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.91" +(defproject reagent/lein-template "0.9.92" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" From 2135914e7edf81617453861531f14d258ad4ea25 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Fri, 5 Jan 2018 19:42:57 -0500 Subject: [PATCH 073/179] changed page to use defonce --- project.clj | 2 +- resources/leiningen/new/reagent/src/cljs/reagent/core.cljs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 3a410b8..7ada952 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.92" +(defproject reagent/lein-template "0.9.93" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs index a812a67..5f12e8d 100644 --- a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs +++ b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs @@ -17,7 +17,7 @@ ;; ------------------------- ;; Routes -(def page (atom #'home-page)) +(defonce page (atom #'home-page)) (defn current-page [] [:div [@page]]) From a285bfbe89de744ca139c8f2e066e9c42e2adf91 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Fri, 12 Jan 2018 17:50:55 -0500 Subject: [PATCH 074/179] bumped up yogthos/config to 1.1 --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 7ada952..3a6e706 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.93" +(defproject reagent/lein-template "0.9.94" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 85a6e9c..345647b 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -12,7 +12,7 @@ [ring/ring-defaults "0.3.1"] [compojure "1.6.0"] [hiccup "1.0.5"] - [yogthos/config "0.9"] + [yogthos/config "1.1"] [org.clojure/clojurescript "1.9.946" :scope "provided"] [secretary "1.2.3"] From b2da7bdf6e60f7e3fb5cbc3ac465703858d9cbc7 Mon Sep 17 00:00:00 2001 From: Adam Niederer Date: Fri, 23 Feb 2018 22:14:11 -0500 Subject: [PATCH 075/179] Change sass4clj command It looks like `lein sass4clj watch` isn't a valid command. I think y'all want `lein sass4clj auto`. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c6a9176..253f58b 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ to autocompile less files. In case of using `+sass` option you may also want to run ``` -lein sass4clj watch +lein sass4clj auto ``` to autocompile sass/scss files. From a8444bec598a1686836a7fed18b01cbcee87f339 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Fri, 23 Feb 2018 23:08:26 -0500 Subject: [PATCH 076/179] bumped up dependencies --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/project.clj b/project.clj index 3a6e706..852381c 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.94" +(defproject reagent/lein-template "0.9.96" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 345647b..b10888f 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -7,7 +7,7 @@ :dependencies [[org.clojure/clojure "1.9.0"] [ring-server "0.5.0"] [reagent "0.7.0"] - [reagent-utils "0.2.1"] + [reagent-utils "0.3.1"] [ring "1.6.3"] [ring/ring-defaults "0.3.1"] [compojure "1.6.0"] @@ -16,7 +16,7 @@ [org.clojure/clojurescript "1.9.946" :scope "provided"] [secretary "1.2.3"] - [venantius/accountant "0.2.3" + [venantius/accountant "0.2.4" :exclusions [org.clojure/tools.reader]]] :plugins [[lein-environ "1.1.0"] @@ -130,10 +130,10 @@ :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl :nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]} - :dependencies [[binaryage/devtools "0.9.8"] + :dependencies [[binaryage/devtools "0.9.9"] [ring/ring-mock "0.3.2"] [ring/ring-devel "1.6.3"] - [prone "1.1.4"] + [prone "1.5.0"] [figwheel-sidecar "0.5.14"] [org.clojure/tools.nrepl "0.2.13"] [com.cemerick/piggieback "0.2.2"] From 9228f654032fc59e8685dc8c4fb9ee28104c4d62 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Fri, 2 Mar 2018 19:13:28 -0500 Subject: [PATCH 077/179] bumped up figwheel --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project.clj b/project.clj index 852381c..177b48a 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.96" +(defproject reagent/lein-template "0.9.97" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index b10888f..65a17a3 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -134,7 +134,7 @@ [ring/ring-mock "0.3.2"] [ring/ring-devel "1.6.3"] [prone "1.5.0"] - [figwheel-sidecar "0.5.14"] + [figwheel-sidecar "0.5.15"] [org.clojure/tools.nrepl "0.2.13"] [com.cemerick/piggieback "0.2.2"] {{#spec-hook?}} @@ -155,7 +155,7 @@ {{/sass-hook?}} ] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.14"] + :plugins [[lein-figwheel "0.5.15"] {{#test-hook?}} [lein-doo "0.1.8"] {{/test-hook?}} From 8ac0ececa482b26d1dee54eea3191cff41914a03 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Mon, 26 Mar 2018 09:12:31 -0400 Subject: [PATCH 078/179] bumped up cljs, lein-doo --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project.clj b/project.clj index 177b48a..2412c2c 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.97" +(defproject reagent/lein-template "0.9.98" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 65a17a3..3549225 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -13,7 +13,7 @@ [compojure "1.6.0"] [hiccup "1.0.5"] [yogthos/config "1.1"] - [org.clojure/clojurescript "1.9.946" + [org.clojure/clojurescript "1.10.238" :scope "provided"] [secretary "1.2.3"] [venantius/accountant "0.2.4" @@ -157,7 +157,7 @@ :source-paths ["env/dev/clj"] :plugins [[lein-figwheel "0.5.15"] {{#test-hook?}} - [lein-doo "0.1.8"] + [lein-doo "0.1.10"] {{/test-hook?}} {{#spec-hook?}} [speclj "3.3.2"] From 15f825ef4aea736f39cc543449e9fcba8dc51bb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Yrj=C3=B6=20Kari-Koskinen?= Date: Wed, 4 Apr 2018 23:12:17 +0300 Subject: [PATCH 079/179] add generated README.md with some optional parts --- resources/leiningen/new/reagent/README.md | 135 ++++++++++++++++++++++ src/leiningen/new/reagent.clj | 6 + 2 files changed, 141 insertions(+) diff --git a/resources/leiningen/new/reagent/README.md b/resources/leiningen/new/reagent/README.md index e69de29..f156d80 100644 --- a/resources/leiningen/new/reagent/README.md +++ b/resources/leiningen/new/reagent/README.md @@ -0,0 +1,135 @@ +# {{name}} + +This is the {{name}} project. + +## Development mode + +To start the Figwheel compiler, navigate to the project folder and run the following command in the terminal: + +``` +lein figwheel +``` +{{#devcards?}} + +To start the [DevCards](https://github.com/bhauman/devcards) build, run + +``` +lein figwheel devcards +``` +{{/devcards?}} + +Figwheel will automatically push cljs changes to the browser. The server will be available at [http://localhost:3449](http://localhost:3449) once Figwheel starts up. {{#devcards-hook?}} To view your devcards, type `(switch-to-build devcards)` at the Figwheel REPL and navigate to [http://localhost:3449/cards](http://localhost:3449/cards). {{/devcards-hook?}} + +Figwheel also starts `nREPL` using the value of the `:nrepl-port` in the `:figwheel` +config found in `project.clj`. By default the port is set to `7002`. + +The figwheel server can have unexpected behaviors in some situations such as when using +websockets. In this case it's recommended to run a standalone instance of a web server as follows: + +``` +lein do clean, run +``` + +The application will now be available at [http://localhost:3000](http://localhost:3000). + +{{#less-or-sass-hook?}} +### Style compilation +{{/less-or-sass-hook?}} +{{#less-hook?}} +To compile [less](https://github.com/Deraen/less4clj) sources and then watch for changes and recompile until interrupted, run +``` +lein less4j auto +``` +{{/less-hook?}} +{{#sass-hook?}} +To compile [sass](https://github.com/Deraen/sass4clj) sources and then watch for changes and recompile until interrupted, run +``` +lein sass4clj auto +``` +{{/sass-hook?}} + +### Optional development tools + +Start the browser REPL: + +``` +$ lein repl +``` +The Jetty server can be started by running: + +```clojure +(start-server) +``` +and stopped by running: +```clojure +(stop-server) +``` + +{{#test-or-spec-hook?}} +## Running the tests +{{/test-or-spec-hook?}} +{{#test-hook?}} +To run [cljs.test](https://github.com/clojure/clojurescript/blob/master/src/main/cljs/cljs/test.cljs) tests, please use + +``` +lein doo phantom test once +``` +{{/test-hook?}} +{{#spec-hook?}} + +To run [speclj](https://github.com/slagyr/speclj) tests, please use + +``` +lein cljsbuild test +``` +{{/spec-hook?}} +{{#test-or-spec-hook?}} + +For installation instructions of PhantomJS, please see [this](http://phantomjs.org/download.html). +{{/test-or-spec-hook?}} + +## Building for release + +``` +lein do clean, uberjar +``` + +## Deploying to Heroku + +Make sure you have [Git](http://git-scm.com/downloads) and [Heroku toolbelt](https://toolbelt.heroku.com/) installed, then simply follow the steps below. + +Optionally, test that your application runs locally with foreman by running. + +``` +foreman start +``` + +Now, you can initialize your git repo and commit your application. + +``` +git init +git add . +git commit -m "init" +``` +create your app on Heroku + +``` +heroku create +``` + +optionally, create a database for the application + +``` +heroku addons:add heroku-postgresql +``` + +The connection settings can be found at your [Heroku dashboard](https://dashboard.heroku.com/apps/) under the add-ons for the app. + +deploy the application + +``` +git push heroku master +``` + +Your application should now be deployed to Heroku! +For further instructions see the [official documentation](https://devcenter.heroku.com/articles/clojure). diff --git a/src/leiningen/new/reagent.clj b/src/leiningen/new/reagent.clj index f0c29b9..70e2ee4 100644 --- a/src/leiningen/new/reagent.clj +++ b/src/leiningen/new/reagent.clj @@ -58,12 +58,18 @@ ;; spec :spec-hook? (fn [block] (if (spec? opts) (str block "") "")) + :test-or-spec-hook? + (fn [block] (if (or (test? opts) (spec? opts)) (str block "") "")) + ;; less :less-hook? (fn [block] (if (less? opts) (str block "") "")) ;; sass :sass-hook? (fn [block] (if (sass? opts) (str block "") "")) + :less-or-sass-hook? + (fn [block] (if (or (less? opts) (sass? opts)) (str block "") "")) + ;; devcards :devcards-hook? (fn [block] (if (devcards? opts) (str block "") "")) From 0145481c9a46a0a52f1ec3178dbeaaa997a6591d Mon Sep 17 00:00:00 2001 From: "Sotnikov, Dmitri" Date: Wed, 4 Apr 2018 17:26:54 -0400 Subject: [PATCH 080/179] bumped up version --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 2412c2c..fcfa9e6 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.98" +(defproject reagent/lein-template "0.9.99" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" From 1989907da1edbaf2c5e660c661db308d90cf7da3 Mon Sep 17 00:00:00 2001 From: "Sotnikov, Dmitri" Date: Wed, 4 Apr 2018 17:28:13 -0400 Subject: [PATCH 081/179] bumped up dependencies --- resources/leiningen/new/reagent/project.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 3549225..dde6f29 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -12,7 +12,7 @@ [ring/ring-defaults "0.3.1"] [compojure "1.6.0"] [hiccup "1.0.5"] - [yogthos/config "1.1"] + [yogthos/config "1.1.1"] [org.clojure/clojurescript "1.10.238" :scope "provided"] [secretary "1.2.3"] @@ -133,7 +133,7 @@ :dependencies [[binaryage/devtools "0.9.9"] [ring/ring-mock "0.3.2"] [ring/ring-devel "1.6.3"] - [prone "1.5.0"] + [prone "1.5.1"] [figwheel-sidecar "0.5.15"] [org.clojure/tools.nrepl "0.2.13"] [com.cemerick/piggieback "0.2.2"] From 56cb091a9b54331ef9ae1badebee8b5d2ccb3bcb Mon Sep 17 00:00:00 2001 From: "Sotnikov, Dmitri" Date: Fri, 6 Apr 2018 11:00:50 -0400 Subject: [PATCH 082/179] improvements for jdk 9 --- resources/leiningen/new/reagent/project.clj | 6 +++--- src/leiningen/new/reagent.clj | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index dde6f29..bf12cc8 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -28,11 +28,11 @@ :uberwar-name "{{name}}.war"} :min-lein-version "2.5.0" - :uberjar-name "{{name}}.jar" - :main {{project-ns}}.server - + {{#jvm-opts-hook?}} + :jvm-opts ["--add-modules" "java.xml.bind"] + {{/jvm-opts-hook?}} :clean-targets ^{:protect false} [:target-path [:cljsbuild :builds :app :compiler :output-dir] diff --git a/src/leiningen/new/reagent.clj b/src/leiningen/new/reagent.clj index 70e2ee4..84d43de 100644 --- a/src/leiningen/new/reagent.clj +++ b/src/leiningen/new/reagent.clj @@ -45,6 +45,11 @@ (and (test? opts) (spec? opts)) "Both +test and +spec options can't be used together, select one."))) +(defn jvm>8? [] + (try + (> (Double/parseDouble (subs (System/getProperty "java.version") 0 3)) 1.8) + (catch Exception _))) + (defn template-data [name opts] {:full-name name :name (project-name name) @@ -52,6 +57,7 @@ :project-ns (sanitize-ns name) :sanitized (name-to-path name) + :jvm-opts-hook? (fn [block] (if (jvm>8?) (str block "") "")) ;; test :test-hook? (fn [block] (if (test? opts) (str block "") "")) From 4e0d554d8fdbbb987335e3338d846355bba6143d Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Fri, 6 Apr 2018 22:01:34 -0400 Subject: [PATCH 083/179] bumped up version --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index fcfa9e6..d503e9e 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.9.99" +(defproject reagent/lein-template "0.10.0" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" From d5a521e07ef1f389a15727c1676df4409bd26ffe Mon Sep 17 00:00:00 2001 From: "Sotnikov, Dmitri" Date: Fri, 20 Apr 2018 12:03:35 -0400 Subject: [PATCH 084/179] bumped up reagent --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index d503e9e..b85685f 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.0" +(defproject reagent/lein-template "0.10.1" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index bf12cc8..d5c2f48 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -6,7 +6,7 @@ :dependencies [[org.clojure/clojure "1.9.0"] [ring-server "0.5.0"] - [reagent "0.7.0"] + [reagent "0.8.0"] [reagent-utils "0.3.1"] [ring "1.6.3"] [ring/ring-defaults "0.3.1"] From c070ad6fddde4eee7fb9f7d61ac85b0ecfae2600 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Wed, 25 Apr 2018 22:24:05 -0400 Subject: [PATCH 085/179] updated tests, docs --- README.md | 2 +- project.clj | 2 +- resources/leiningen/new/reagent/README.md | 2 +- resources/leiningen/new/reagent/project.clj | 11 +++++++---- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 253f58b..3d7f40f 100644 --- a/README.md +++ b/README.md @@ -21,7 +21,7 @@ Create a new application project: lein new reagent ``` -To enable [cljs.test](https://github.com/clojure/clojurescript/blob/master/src/main/cljs/cljs/test.cljs) and [doo](https://github.com/bensu/doo) with [PhantomJS](http://phantomjs.org/), use `+test` flag: +To enable [cljs.test](https://github.com/clojure/clojurescript/blob/master/src/main/cljs/cljs/test.cljs) and [doo](https://github.com/bensu/doo) use `+test` flag: ``` lein new reagent +test diff --git a/project.clj b/project.clj index b85685f..8bb7be9 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.1" +(defproject reagent/lein-template "0.10.2" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/README.md b/resources/leiningen/new/reagent/README.md index f156d80..a156bfe 100644 --- a/resources/leiningen/new/reagent/README.md +++ b/resources/leiningen/new/reagent/README.md @@ -72,7 +72,7 @@ and stopped by running: To run [cljs.test](https://github.com/clojure/clojurescript/blob/master/src/main/cljs/cljs/test.cljs) tests, please use ``` -lein doo phantom test once +lein doo ``` {{/test-hook?}} {{#spec-hook?}} diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index d5c2f48..db42978 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -10,7 +10,7 @@ [reagent-utils "0.3.1"] [ring "1.6.3"] [ring/ring-defaults "0.3.1"] - [compojure "1.6.0"] + [compojure "1.6.1"] [hiccup "1.0.5"] [yogthos/config "1.1.1"] [org.clojure/clojurescript "1.10.238" @@ -99,7 +99,10 @@ :test-commands {"unit" ["phantomjs" "runners/speclj" "target/test.js"]} {{/spec-hook?}} } - +{{#test-hook?}} + :doo {:build "test" + :alias {:default [:chrome]}} +{{/test-hook?}} {{#spec-hook?}} :doo {:build "test"} {{/spec-hook?}} @@ -130,10 +133,10 @@ :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl :nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]} - :dependencies [[binaryage/devtools "0.9.9"] + :dependencies [[binaryage/devtools "0.9.10"] [ring/ring-mock "0.3.2"] [ring/ring-devel "1.6.3"] - [prone "1.5.1"] + [prone "1.5.2"] [figwheel-sidecar "0.5.15"] [org.clojure/tools.nrepl "0.2.13"] [com.cemerick/piggieback "0.2.2"] From 82ac86daa1a5180221f82be3fe183b060bc7bbcb Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Mon, 7 May 2018 19:42:09 -0400 Subject: [PATCH 086/179] bumped figwheel to 0.5.16 --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project.clj b/project.clj index 8bb7be9..30e868f 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.2" +(defproject reagent/lein-template "0.10.3" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index db42978..141ea4b 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -137,7 +137,7 @@ [ring/ring-mock "0.3.2"] [ring/ring-devel "1.6.3"] [prone "1.5.2"] - [figwheel-sidecar "0.5.15"] + [figwheel-sidecar "0.5.16"] [org.clojure/tools.nrepl "0.2.13"] [com.cemerick/piggieback "0.2.2"] {{#spec-hook?}} @@ -158,7 +158,7 @@ {{/sass-hook?}} ] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.15"] + :plugins [[lein-figwheel "0.5.16"] {{#test-hook?}} [lein-doo "0.1.10"] {{/test-hook?}} From 0ff3d9367b3494da7ed31ef4fdb607816cdf7d53 Mon Sep 17 00:00:00 2001 From: Mark Stuart Date: Sun, 27 May 2018 17:44:22 +0100 Subject: [PATCH 087/179] Fix foreman start Running `forman start` or `forman start -p 1234` gives rise to `java.lang.ClassCastException: java.lang.Long cannot be cast to java.lang.String` since `(env :port` is a Long. --- .../new/reagent/src/clj/reagent/server.clj | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/leiningen/new/reagent/src/clj/reagent/server.clj b/resources/leiningen/new/reagent/src/clj/reagent/server.clj index de504ad..62513bd 100644 --- a/resources/leiningen/new/reagent/src/clj/reagent/server.clj +++ b/resources/leiningen/new/reagent/src/clj/reagent/server.clj @@ -1,9 +1,9 @@ (ns {{project-ns}}.server - (:require [{{project-ns}}.handler :refer [app]] - [config.core :refer [env]] - [ring.adapter.jetty :refer [run-jetty]]) - (:gen-class)) + (:require [{{project-ns}}.handler :refer [app]] + [config.core :refer [env]] + [ring.adapter.jetty :refer [run-jetty]]) + (:gen-class)) - (defn -main [& args] - (let [port (Integer/parseInt (or (env :port) "3000"))] - (run-jetty app {:port port :join? false}))) +(defn -main [& args] + (let [port (or (env :port) 3000)] + (run-jetty app {:port port :join? false}))) From ca1d31f1db8fd2a0702c3ba3f9c0765ce1b777c0 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Sun, 27 May 2018 15:22:44 -0400 Subject: [PATCH 088/179] bumepd up version for the release --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 30e868f..feaf739 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.3" +(defproject reagent/lein-template "0.10.4" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" From 6e4ff78fc56b5862aa4cddf6540c48e616ed1af8 Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Fri, 1 Jun 2018 10:44:07 -0400 Subject: [PATCH 089/179] bumped up reagent --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index feaf739..15c60ef 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.4" +(defproject reagent/lein-template "0.10.5" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 141ea4b..b054573 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -6,7 +6,7 @@ :dependencies [[org.clojure/clojure "1.9.0"] [ring-server "0.5.0"] - [reagent "0.8.0"] + [reagent "0.8.1"] [reagent-utils "0.3.1"] [ring "1.6.3"] [ring/ring-defaults "0.3.1"] From 9d2f2a89da7f04f73a964fda7ae86afb9e378d3c Mon Sep 17 00:00:00 2001 From: "Sotnikov, Dmitri" Date: Fri, 15 Jun 2018 11:59:20 -0400 Subject: [PATCH 090/179] bumped up cljs --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 15c60ef..4d2e272 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.5" +(defproject reagent/lein-template "0.10.6" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index b054573..d6c3f86 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -13,7 +13,7 @@ [compojure "1.6.1"] [hiccup "1.0.5"] [yogthos/config "1.1.1"] - [org.clojure/clojurescript "1.10.238" + [org.clojure/clojurescript "1.10.312" :scope "provided"] [secretary "1.2.3"] [venantius/accountant "0.2.4" From b6c958ff6b1091fd7c8296e79b2178a8773c59aa Mon Sep 17 00:00:00 2001 From: "Sotnikov, Dmitri" Date: Mon, 25 Jun 2018 15:00:51 -0400 Subject: [PATCH 091/179] bumped up cljs --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 4d2e272..3f6f34b 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.6" +(defproject reagent/lein-template "0.10.7" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index d6c3f86..a95482d 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -13,7 +13,7 @@ [compojure "1.6.1"] [hiccup "1.0.5"] [yogthos/config "1.1.1"] - [org.clojure/clojurescript "1.10.312" + [org.clojure/clojurescript "1.10.339" :scope "provided"] [secretary "1.2.3"] [venantius/accountant "0.2.4" From 67aff9bae9e7f5668d1a24c551e47c4407b9ee42 Mon Sep 17 00:00:00 2001 From: "Sotnikov, Dmitri" Date: Fri, 3 Aug 2018 15:05:28 -0400 Subject: [PATCH 092/179] bumped up dependencies --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 11 ++++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/project.clj b/project.clj index 3f6f34b..1c9afc0 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.7" +(defproject reagent/lein-template "0.10.8" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index a95482d..72a2f85 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -111,10 +111,11 @@ {:http-server-root "public" :server-port 3449 :nrepl-port 7002 - :nrepl-middleware ["cemerick.piggieback/wrap-cljs-repl" + :nrepl-middleware [cider/wrap-cljs-repl + cider.piggieback/wrap-cljs-repl {{#cider-hook?}} - "cider.nrepl/cider-middleware" - "refactor-nrepl.middleware/wrap-refactor" + cider.nrepl/cider-middleware + refactor-nrepl.middleware/wrap-refactor {{/cider-hook?}} ] :css-dirs ["resources/public/css"] @@ -138,8 +139,8 @@ [ring/ring-devel "1.6.3"] [prone "1.5.2"] [figwheel-sidecar "0.5.16"] - [org.clojure/tools.nrepl "0.2.13"] - [com.cemerick/piggieback "0.2.2"] + [nrepl "0.4.4"] + [cider/piggieback "0.3.8"] {{#spec-hook?}} [speclj "3.3.2"] {{/spec-hook?}} From 47061c8d8b1be614fce55eee8c1cef9a256bf94e Mon Sep 17 00:00:00 2001 From: Roman Ponomarev Date: Thu, 9 Aug 2018 22:59:25 +0300 Subject: [PATCH 093/179] Add dependencies for cemerick.piggieback --- resources/leiningen/new/reagent/project.clj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 72a2f85..c00d3dc 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -134,7 +134,8 @@ :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl :nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]} - :dependencies [[binaryage/devtools "0.9.10"] + :dependencies [[com.cemerick/piggieback "0.2.0"] + [binaryage/devtools "0.9.10"] [ring/ring-mock "0.3.2"] [ring/ring-devel "1.6.3"] [prone "1.5.2"] From 0f42f8e45ed6154863b12ad57312c94f2b1ff111 Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Thu, 9 Aug 2018 18:08:29 -0400 Subject: [PATCH 094/179] clean up for cljs REPL --- project.clj | 2 +- resources/leiningen/new/reagent/env/dev/clj/user.clj | 11 +++++++++++ resources/leiningen/new/reagent/project.clj | 9 +++------ src/leiningen/new/reagent.clj | 1 + 4 files changed, 16 insertions(+), 7 deletions(-) create mode 100644 resources/leiningen/new/reagent/env/dev/clj/user.clj diff --git a/project.clj b/project.clj index 1c9afc0..4ba4276 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.8" +(defproject reagent/lein-template "0.10.9" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/env/dev/clj/user.clj b/resources/leiningen/new/reagent/env/dev/clj/user.clj new file mode 100644 index 0000000..4ba997c --- /dev/null +++ b/resources/leiningen/new/reagent/env/dev/clj/user.clj @@ -0,0 +1,11 @@ +(ns user + (:require [figwheel-sidecar.repl-api :as ra])) + +(defn start-fw [] + (ra/start-figwheel!)) + +(defn stop-fw [] + (ra/stop-figwheel!)) + +(defn cljs [] + (ra/cljs-repl)) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index c00d3dc..47a3f69 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -111,8 +111,7 @@ {:http-server-root "public" :server-port 3449 :nrepl-port 7002 - :nrepl-middleware [cider/wrap-cljs-repl - cider.piggieback/wrap-cljs-repl + :nrepl-middleware [cider.piggieback/wrap-cljs-repl {{#cider-hook?}} cider.nrepl/cider-middleware refactor-nrepl.middleware/wrap-refactor @@ -131,10 +130,8 @@ :target-path "resources/public/css"} {{/sass-hook?}} - :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl - :nrepl-middleware [cemerick.piggieback/wrap-cljs-repl]} - - :dependencies [[com.cemerick/piggieback "0.2.0"] + :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl} + :dependencies [[cider/piggieback "0.3.8"] [binaryage/devtools "0.9.10"] [ring/ring-mock "0.3.2"] [ring/ring-devel "1.6.3"] diff --git a/src/leiningen/new/reagent.clj b/src/leiningen/new/reagent.clj index 84d43de..142dc9d 100644 --- a/src/leiningen/new/reagent.clj +++ b/src/leiningen/new/reagent.clj @@ -92,6 +92,7 @@ ["env/prod/clj/{{sanitized}}/middleware.clj" (render "env/prod/clj/reagent/middleware.clj" data)] ["env/dev/clj/{{sanitized}}/middleware.clj" (render "env/dev/clj/reagent/middleware.clj" data)] ["env/dev/clj/{{sanitized}}/repl.clj" (render "env/dev/clj/reagent/repl.clj" data)] + ["env/dev/clj/user.clj" (render "env/dev/clj/user.clj" data)] ["src/cljs/{{sanitized}}/core.cljs" (render "src/cljs/reagent/core.cljs" data)] ["src/cljc/{{sanitized}}/util.cljc" (render "src/cljc/reagent/util.cljc" data)] ["env/dev/cljs/{{sanitized}}/dev.cljs" (render "env/dev/cljs/reagent/dev.cljs" data)] From c1f8967e471dc7eb75dc836639152475a88d7296 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Str=C3=B6mberg?= Date: Tue, 16 Oct 2018 23:04:41 +0200 Subject: [PATCH 095/179] Update cider dependencies to please Calva requirements See [this issue](https://github.com/BetterThanTomorrow/calva/issues/81) --- resources/leiningen/new/reagent/project.clj | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 47a3f69..b443582 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -131,14 +131,13 @@ {{/sass-hook?}} :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl} - :dependencies [[cider/piggieback "0.3.8"] + :dependencies [[cider/piggieback "0.3.9"] [binaryage/devtools "0.9.10"] [ring/ring-mock "0.3.2"] [ring/ring-devel "1.6.3"] [prone "1.5.2"] [figwheel-sidecar "0.5.16"] - [nrepl "0.4.4"] - [cider/piggieback "0.3.8"] + [nrepl "0.4.5"] {{#spec-hook?}} [speclj "3.3.2"] {{/spec-hook?}} @@ -165,10 +164,10 @@ [speclj "3.3.2"] {{/spec-hook?}} {{#cider-hook?}} - [cider/cider-nrepl "0.15.1"] + [cider/cider-nrepl "0.18.0"] [org.clojure/tools.namespace "0.3.0-alpha4" :exclusions [org.clojure/tools.reader]] - [refactor-nrepl "2.3.1" + [refactor-nrepl "2.4.0" :exclusions [org.clojure/clojure]] {{/cider-hook?}} {{#less-hook?}} From f465e61f2dab6a0e5b5be4a04c04927f5a85f1da Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Tue, 16 Oct 2018 22:02:18 -0400 Subject: [PATCH 096/179] bumped up version --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 4ba4276..af09ca6 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.9" +(defproject reagent/lein-template "0.10.10" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" From 50c7935bbbe668e077f4a78ff716aefcd6d339f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Str=C3=B6mberg?= Date: Sun, 21 Oct 2018 16:01:20 +0200 Subject: [PATCH 097/179] Add option to use Bidi instead of Secretary --- .nrepl-port | 1 + README.md | 11 +- resources/leiningen/new/reagent/project.clj | 5 + .../new/reagent/src/cljs/reagent/core.cljs | 122 +++++++++++++++++- src/leiningen/new/reagent.clj | 36 ++++-- 5 files changed, 159 insertions(+), 16 deletions(-) create mode 100644 .nrepl-port diff --git a/.nrepl-port b/.nrepl-port new file mode 100644 index 0000000..4a72052 --- /dev/null +++ b/.nrepl-port @@ -0,0 +1 @@ +60102 \ No newline at end of file diff --git a/README.md b/README.md index 3d7f40f..b18e277 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,12 @@ use `+less` or `+sass` flags: lein new reagent +less ``` +To use [bidi](https://github.com/juxt/bidi) instead of [secretary](https://github.com/gf3/secretary), use the `+bidi` flag: + +```bash +lein new reagent +bidi +``` + ### Development mode To start the Figwheel compiler, navigate to the project folder and run the following command in the terminal: @@ -166,7 +172,9 @@ The template packages everything you need to create a production ready ClojureSc * [Reagent](https://github.com/reagent-project/reagent) - ClojureScript interface to Facebook's React * [reagent-forms](https://github.com/reagent-project/reagent-forms) - data binding library for Reagent * [reagent-utils](https://github.com/reagent-project/reagent-utils) - utilities such as session and cookie management -* [Secretary](https://github.com/gf3/secretary) - client-side routing +* Client side routing, choose between: + * [Secretary](https://github.com/gf3/secretary) + * [Bidi](https://github.com/juxt/bidi) * [Accountant](https://github.com/venantius/accountant) - additional setup facilities for client-side routing in SPA way * [Hiccup](https://github.com/weavejester/hiccup) - server-side HTML templating * [Compojure](https://github.com/weavejester/compojure) - a popular routing library @@ -184,6 +192,7 @@ The template supports the following options: * `+sass` - use [sass](https://github.com/Deraen/sass4clj) for compiling Sass/Scss CSS files * `+devcards` - add [Devcards](https://github.com/bhauman/devcards) support * `+cider` - add [CIDER](https://github.com/clojure-emacs/cider) support +* `+bidi` - use [bidi](https://github.com/juxt/bidi) instead of Secretary ## Contributing & Customizing diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index b443582..21a5bac 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -15,7 +15,12 @@ [yogthos/config "1.1.1"] [org.clojure/clojurescript "1.10.339" :scope "provided"] + {{#bidi-hook?}} + [bidi "2.1.4"] + {{/bidi-hook?}} + {{#secretary-hook?}} [secretary "1.2.3"] + {{/secretary-hook?}} [venantius/accountant "0.2.4" :exclusions [org.clojure/tools.reader]]] diff --git a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs index 5f12e8d..8836251 100644 --- a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs +++ b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs @@ -1,8 +1,15 @@ (ns {{project-ns}}.core (:require [reagent.core :as reagent :refer [atom]] + {{#secretary-hook?}} [secretary.core :as secretary :include-macros true] + {{/secretary-hook?}} + {{#bidi-hook?}} + [reagent.session :as session] + [bidi.bidi :as bidi] + {{/bidi-hook?}} [accountant.core :as accountant])) +{{#secretary-hook?}} ;; ------------------------- ;; Views @@ -27,6 +34,104 @@ (secretary/defroute "/about" [] (reset! page #'about-page)) +{{/secretary-hook?}} + +{{#bidi-hook?}} + + +;; ------------------------- +;; Routes + +(def app-routes + ["/" {"" :index + "items" {"" :items + ["/item-" :item-id] :item} + "about" :about + "missing-route" :missing-route + true :four-o-four}]) + + +;; ------------------------- +;; Page components + +(defmulti page-contents identity) + + +(defmethod page-contents :index [] + (fn [] + [:span.main + [:h1 "Welcome to {{name}}"] + [:ul + [:li [:a {:href (bidi/path-for app-routes :items)} "Items of {{name}}"]] + [:li [:a {:href (bidi/path-for app-routes :missing-route)} "Missing-route"]] + [:li [:a {:href "/borken/link"} "Borken link"]]]])) + + +(defmethod page-contents :items [] + (fn [] + [:span.main + [:h1 "The items of {{name}}"] + [:ul (map (fn [item-id] + [:li {:name (str "item-" item-id) :key (str "item-" item-id)} + [:a {:href (bidi/path-for app-routes :item :item-id item-id)} "Item: " item-id]]) + (range 1 6))]])) + + +(defmethod page-contents :item [] + (fn [] + (let [routing-data (session/get :route) + item (get-in routing-data [:route-params :item-id])] + [:span.main + [:h1 (str "Item " item " of {{name}}")] + [:p [:a {:href (bidi/path-for app-routes :items)} "Back to the list of items"]]]))) + + +(defmethod page-contents :about [] + (fn [] [:span.main + [:h1 "About {{name}}"]])) + + +(defmethod page-contents :four-o-four [] + "Non-existing routes go here" + (fn [] + [:span.main + [:h1 "404: It is not here"] + [:pre.verse + "What you are looking for, +I do not have. +How could I have, +what does not exist?"]])) + + +(defmethod page-contents :default [] + "Configured routes, missing an implementation, go here" + (fn [] + [:span.main + [:h1 "404: My bad"] + [:pre.verse + "This page should be here, +but it is not."]])) + + +;; ------------------------- +;; Page mounting component + +(defn current-page [] + (fn [] + (let [page (:current-page (session/get :route))] + [:div + [:header + [:p [:a {:href (bidi/path-for app-routes :index)} "Go home"] " | " + [:a {:href (bidi/path-for app-routes :about)} "See about"]]] + ^{:key page} [page-contents page] + [:footer + [:p "(Using " + [:a {:href "https://reagent-project.github.io/"} "Reagent"] ", " + [:a {:href "https://github.com/juxt/bidi"} "Bidi"] " & " + [:a {:href "https://github.com/venantius/accountant"} "Accountant"] + ")"]]]))) +{{/bidi-hook?}} + ;; ------------------------- ;; Initialize app @@ -38,9 +143,24 @@ (accountant/configure-navigation! {:nav-handler (fn [path] + {{#secretary-hook?}} (secretary/dispatch! path)) + {{/secretary-hook?}} + {{#bidi-hook?}} + (let [match (bidi/match-route app-routes path) + current-page (:handler match) + route-params (:route-params match)] + (session/put! :route {:current-page current-page + :route-params route-params}))) + {{/bidi-hook?}} :path-exists? (fn [path] - (secretary/locate-route path))}) + {{#secretary-hook?}} + (secretary/locate-route path)) + {{/secretary-hook?}} + {{#bidi-hook?}} + (boolean (bidi/match-route app-routes path))) + {{/bidi-hook?}} + :reload-same-path? true}) (accountant/dispatch-current!) (mount-root)) diff --git a/src/leiningen/new/reagent.clj b/src/leiningen/new/reagent.clj index 142dc9d..3a298d5 100644 --- a/src/leiningen/new/reagent.clj +++ b/src/leiningen/new/reagent.clj @@ -16,7 +16,7 @@ (defn indent [n list] (wrap-indent identity n list)) -(def valid-opts ["+test" "+spec" "+less" "+sass" "+devcards" "+cider"]) +(def valid-opts ["+test" "+spec" "+less" "+sass" "+devcards" "+cider" "+bidi"]) (defn less? [opts] (some #{"+less"} opts)) @@ -36,6 +36,9 @@ (defn cider? [opts] (some #{"+cider"} opts)) +(defn bidi? [opts] + (some #{"+bidi"} opts)) + (defn validate-opts [opts] (let [invalid-opts (remove (set valid-opts) opts)] (cond @@ -58,29 +61,35 @@ :sanitized (name-to-path name) :jvm-opts-hook? (fn [block] (if (jvm>8?) (str block "") "")) - ;; test + ;; test :test-hook? (fn [block] (if (test? opts) (str block "") "")) - ;; spec + ;; spec :spec-hook? (fn [block] (if (spec? opts) (str block "") "")) :test-or-spec-hook? - (fn [block] (if (or (test? opts) (spec? opts)) (str block "") "")) + (fn [block] (if (or (test? opts) (spec? opts)) (str block "") "")) - ;; less + ;; less :less-hook? (fn [block] (if (less? opts) (str block "") "")) - ;; sass + ;; sass :sass-hook? (fn [block] (if (sass? opts) (str block "") "")) :less-or-sass-hook? - (fn [block] (if (or (less? opts) (sass? opts)) (str block "") "")) + (fn [block] (if (or (less? opts) (sass? opts)) (str block "") "")) - ;; devcards + ;; devcards :devcards-hook? (fn [block] (if (devcards? opts) (str block "") "")) - ;; cider - :cider-hook? (fn [block] (if (cider? opts) (str block "") ""))}) + ;; cider + :cider-hook? (fn [block] (if (cider? opts) (str block "") "")) + + ;; bidi + :bidi-hook? (fn [block] (if (bidi? opts) (str block "") "")) + + ;; default to secretary if not bidi + :secretary-hook? (fn [block] (if-not (bidi? opts) (str block "") ""))}) (defn format-files-args [name opts] (let [data (template-data name opts) @@ -101,7 +110,7 @@ ["README.md" (render "README.md" data)] [".gitignore" (render "gitignore" data)] ;; Heroku support - ["system.properties" (render "system.properties" data)] + ["system.properties" (render "system.properties" data)] ["Procfile" (render "Procfile" data)]] args (if (test? opts) (conj args ["test/cljs/{{sanitized}}/core_test.cljs" (render "test/cljs/reagent/core_test.cljs" data)] @@ -117,8 +126,7 @@ args (if (less? opts) (conj args ["src/less/site.main.less" (render "src/less/site.main.less" data)] - ["src/less/profile.less" (render "src/less/profile.less" data)] - ) + ["src/less/profile.less" (render "src/less/profile.less" data)]) args) args (if (sass? opts) (conj args @@ -133,5 +141,5 @@ (defn reagent [name & opts] (main/info "Generating fresh 'lein new' Reagent project.") (if-let [error (validate-opts opts)] - (println error ) + (println error) (apply ->files (format-files-args name opts)))) From da3c9976ca02abf8130ee5b7d01194e41fde37df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Str=C3=B6mberg?= Date: Mon, 22 Oct 2018 00:12:27 +0200 Subject: [PATCH 098/179] WIP Start add bidi routing for the server handler --- .../env/dev/clj/reagent/middleware.clj | 18 +++++++++-- .../new/reagent/src/clj/reagent/handler.clj | 31 ++++++++++++++++++- src/leiningen/new/reagent.clj | 5 ++- 3 files changed, 50 insertions(+), 4 deletions(-) diff --git a/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj b/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj index 10082ca..aa23a4d 100644 --- a/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj +++ b/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj @@ -1,10 +1,24 @@ (ns {{name}}.middleware - (:require [ring.middleware.defaults :refer [site-defaults wrap-defaults]] + (:require {{#compojure-hook?}} + [ring.middleware.defaults :refer [site-defaults wrap-defaults]] [prone.middleware :refer [wrap-exceptions]] - [ring.middleware.reload :refer [wrap-reload]])) + [ring.middleware.reload :refer [wrap-reload]] + {{/compojure-hook?}} + {{#bidi-hook?}} + [ring.middleware.session :refer [wrap-session] + [ring.middleware.flash :refer [wrap-flash] + {{/bidi-hook?}})) +{{#compojure-hook?}} (defn wrap-middleware [handler] (-> handler (wrap-defaults site-defaults) wrap-exceptions wrap-reload)) +{{/compojure-hook?}} +{{#bidi-hook?}} +(defn wrap-middleware [handler] + (-> handler + wrap-session + wrap-flash)) +{{/bidi-hook?}} \ No newline at end of file diff --git a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj index 86bc3e7..92a5e16 100644 --- a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj +++ b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj @@ -1,6 +1,12 @@ (ns {{project-ns}}.handler - (:require [compojure.core :refer [GET defroutes]] + (:require {{#compojure-hook?}} + [compojure.core :refer [GET defroutes]] [compojure.route :refer [not-found resources]] + {{/compojure-hook?}} + {{#bidi-hook?}} + [bidi.ring :refer [make-handler]] + [ring.util.response :as res] + {{/bidi-hook?}} [hiccup.page :refer [include-js include-css html5]] [{{name}}.middleware :refer [wrap-middleware]] [config.core :refer [env]])) @@ -34,6 +40,7 @@ mount-target (include-js "/js/app_devcards.js")])){{/devcards-hook?}} +{{#compojure-hook?}} (defroutes routes (GET "/" [] (loading-page)) (GET "/about" [] (loading-page)) @@ -42,3 +49,25 @@ (not-found "Not Found")) (def app (wrap-middleware #'routes)) +{{/compojure-hook?}} + +{{#bidi-hook?}} +(defn index-handler + [request] + (-> (loading-page) + (res/response) + (res/content-type "text/html"))) + +(def about-handler index-handler) +(def items-handler index-handler) +(def item-handler index-handler) + +(def handler + (make-handler ["/" {"" index-handler + "items" {"" items-handler + ["/item-" :item-id] item-handler} + "about" about-handler} + true (res/not-found "Not found")])) + +(def app (wrap-middleware handler)) +{{/bidi-hook?}} diff --git a/src/leiningen/new/reagent.clj b/src/leiningen/new/reagent.clj index 3a298d5..417fc6d 100644 --- a/src/leiningen/new/reagent.clj +++ b/src/leiningen/new/reagent.clj @@ -89,7 +89,10 @@ :bidi-hook? (fn [block] (if (bidi? opts) (str block "") "")) ;; default to secretary if not bidi - :secretary-hook? (fn [block] (if-not (bidi? opts) (str block "") ""))}) + :secretary-hook? (fn [block] (if-not (bidi? opts) (str block "") "")) + + ;; also default to compojure if not bidi + :compojure-hook? (fn [block] (if-not (bidi? opts) (str block "") ""))}) (defn format-files-args [name opts] (let [data (template-data name opts) From 1b3dbd0f2f29dc943afe5b461966f58d9f066c63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Str=C3=B6mberg?= Date: Wed, 24 Oct 2018 15:30:46 +0200 Subject: [PATCH 099/179] Add bidi routing in handler.clj for the bidi options Also fixed some missing devcards entries for the bidi options. (But devcards seem to be not working with our without the bidi patch.) --- .gitignore | 1 + .nrepl-port | 1 - .../env/dev/clj/reagent/middleware.clj | 18 +-------- .../new/reagent/src/clj/reagent/handler.clj | 23 ++++++++--- .../new/reagent/src/cljs/reagent/core.cljs | 38 +++++++++++-------- 5 files changed, 43 insertions(+), 38 deletions(-) delete mode 100644 .nrepl-port diff --git a/.gitignore b/.gitignore index 0ef5d3f..47fed6c 100644 --- a/.gitignore +++ b/.gitignore @@ -9,3 +9,4 @@ pom.xml.asc .lein-repl-history .lein-plugins/ .lein-failures +.nrepl-port diff --git a/.nrepl-port b/.nrepl-port deleted file mode 100644 index 4a72052..0000000 --- a/.nrepl-port +++ /dev/null @@ -1 +0,0 @@ -60102 \ No newline at end of file diff --git a/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj b/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj index aa23a4d..10082ca 100644 --- a/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj +++ b/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj @@ -1,24 +1,10 @@ (ns {{name}}.middleware - (:require {{#compojure-hook?}} - [ring.middleware.defaults :refer [site-defaults wrap-defaults]] + (:require [ring.middleware.defaults :refer [site-defaults wrap-defaults]] [prone.middleware :refer [wrap-exceptions]] - [ring.middleware.reload :refer [wrap-reload]] - {{/compojure-hook?}} - {{#bidi-hook?}} - [ring.middleware.session :refer [wrap-session] - [ring.middleware.flash :refer [wrap-flash] - {{/bidi-hook?}})) + [ring.middleware.reload :refer [wrap-reload]])) -{{#compojure-hook?}} (defn wrap-middleware [handler] (-> handler (wrap-defaults site-defaults) wrap-exceptions wrap-reload)) -{{/compojure-hook?}} -{{#bidi-hook?}} -(defn wrap-middleware [handler] - (-> handler - wrap-session - wrap-flash)) -{{/bidi-hook?}} \ No newline at end of file diff --git a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj index 92a5e16..4af2123 100644 --- a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj +++ b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj @@ -4,7 +4,7 @@ [compojure.route :refer [not-found resources]] {{/compojure-hook?}} {{#bidi-hook?}} - [bidi.ring :refer [make-handler]] + [bidi.ring :as bidi-ring] [ring.util.response :as res] {{/bidi-hook?}} [hiccup.page :refer [include-js include-css html5]] @@ -62,12 +62,23 @@ (def items-handler index-handler) (def item-handler index-handler) +{{#devcards-hook?}} +(defn cards-handler + [request] + (-> (cards-page) + (res/response) + (res/content-type "text/html"))) +{{/devcards-hook?}} (def handler - (make-handler ["/" {"" index-handler - "items" {"" items-handler - ["/item-" :item-id] item-handler} - "about" about-handler} - true (res/not-found "Not found")])) + (bidi-ring/make-handler ["/" {"" index-handler + "items" {"" items-handler + ["/item-" :item-id] item-handler} + "about" about-handler} + "/" (bidi-ring/resources-maybe {:prefix "public/"}) + {{#devcards-hook?}} + "/cards" cards-handler + {{/devcards-hook?}} + true (res/not-found "Not found")])) (def app (wrap-middleware handler)) {{/bidi-hook?}} diff --git a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs index 8836251..dfda7e7 100644 --- a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs +++ b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs @@ -35,17 +35,14 @@ (secretary/defroute "/about" [] (reset! page #'about-page)) {{/secretary-hook?}} - {{#bidi-hook?}} - - ;; ------------------------- ;; Routes (def app-routes ["/" {"" :index "items" {"" :items - ["/item-" :item-id] :item} + ["/item-" :item-id] :item} "about" :about "missing-route" :missing-route true :four-o-four}]) @@ -54,10 +51,8 @@ ;; ------------------------- ;; Page components -(defmulti page-contents identity) - -(defmethod page-contents :index [] +(defn home-page [] (fn [] [:span.main [:h1 "Welcome to {{name}}"] @@ -67,7 +62,8 @@ [:li [:a {:href "/borken/link"} "Borken link"]]]])) -(defmethod page-contents :items [] + +(defn items-page [] (fn [] [:span.main [:h1 "The items of {{name}}"] @@ -77,7 +73,7 @@ (range 1 6))]])) -(defmethod page-contents :item [] +(defn item-page [] (fn [] (let [routing-data (session/get :route) item (get-in routing-data [:route-params :item-id])] @@ -86,12 +82,12 @@ [:p [:a {:href (bidi/path-for app-routes :items)} "Back to the list of items"]]]))) -(defmethod page-contents :about [] +(defn about-page [] (fn [] [:span.main [:h1 "About {{name}}"]])) -(defmethod page-contents :four-o-four [] +(defn four-o-four-page [] "Non-existing routes go here" (fn [] [:span.main @@ -103,7 +99,7 @@ How could I have, what does not exist?"]])) -(defmethod page-contents :default [] +(defn default-page [] "Configured routes, missing an implementation, go here" (fn [] [:span.main @@ -113,6 +109,19 @@ what does not exist?"]])) but it is not."]])) +;; ------------------------- +;; Translate routes -> page components + +(defn page-for [route] + (case route + :index #'home-page + :about #'about-page + :items #'items-page + :item #'item-page + :four-o-four #'four-o-four-page + #'default-page)) + + ;; ------------------------- ;; Page mounting component @@ -123,7 +132,7 @@ but it is not."]])) [:header [:p [:a {:href (bidi/path-for app-routes :index)} "Go home"] " | " [:a {:href (bidi/path-for app-routes :about)} "See about"]]] - ^{:key page} [page-contents page] + [page] [:footer [:p "(Using " [:a {:href "https://reagent-project.github.io/"} "Reagent"] ", " @@ -132,7 +141,6 @@ but it is not."]])) ")"]]]))) {{/bidi-hook?}} - ;; ------------------------- ;; Initialize app @@ -150,7 +158,7 @@ but it is not."]])) (let [match (bidi/match-route app-routes path) current-page (:handler match) route-params (:route-params match)] - (session/put! :route {:current-page current-page + (session/put! :route {:current-page (page-for current-page) :route-params route-params}))) {{/bidi-hook?}} :path-exists? From 2e6ac0560e6bbeac5feca615ded594f475d4fc38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Str=C3=B6mberg?= Date: Sat, 27 Oct 2018 16:33:17 +0200 Subject: [PATCH 100/179] Change to reitit for routing, client and server side --- README.md | 11 +- .../env/dev/clj/reagent/middleware.clj | 17 +-- resources/leiningen/new/reagent/project.clj | 7 +- .../new/reagent/src/clj/reagent/handler.clj | 86 +++++------ .../new/reagent/src/cljs/reagent/core.cljs | 133 +++++------------- src/leiningen/new/reagent.clj | 16 +-- 6 files changed, 80 insertions(+), 190 deletions(-) diff --git a/README.md b/README.md index b18e277..5462c4c 100644 --- a/README.md +++ b/README.md @@ -54,12 +54,6 @@ use `+less` or `+sass` flags: lein new reagent +less ``` -To use [bidi](https://github.com/juxt/bidi) instead of [secretary](https://github.com/gf3/secretary), use the `+bidi` flag: - -```bash -lein new reagent +bidi -``` - ### Development mode To start the Figwheel compiler, navigate to the project folder and run the following command in the terminal: @@ -172,9 +166,7 @@ The template packages everything you need to create a production ready ClojureSc * [Reagent](https://github.com/reagent-project/reagent) - ClojureScript interface to Facebook's React * [reagent-forms](https://github.com/reagent-project/reagent-forms) - data binding library for Reagent * [reagent-utils](https://github.com/reagent-project/reagent-utils) - utilities such as session and cookie management -* Client side routing, choose between: - * [Secretary](https://github.com/gf3/secretary) - * [Bidi](https://github.com/juxt/bidi) +* [Reitit](https://metosin.github.io/reitit/) - Routing, server and client side * [Accountant](https://github.com/venantius/accountant) - additional setup facilities for client-side routing in SPA way * [Hiccup](https://github.com/weavejester/hiccup) - server-side HTML templating * [Compojure](https://github.com/weavejester/compojure) - a popular routing library @@ -192,7 +184,6 @@ The template supports the following options: * `+sass` - use [sass](https://github.com/Deraen/sass4clj) for compiling Sass/Scss CSS files * `+devcards` - add [Devcards](https://github.com/bhauman/devcards) support * `+cider` - add [CIDER](https://github.com/clojure-emacs/cider) support -* `+bidi` - use [bidi](https://github.com/juxt/bidi) instead of Secretary ## Contributing & Customizing diff --git a/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj b/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj index 10082ca..07ff80d 100644 --- a/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj +++ b/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj @@ -1,10 +1,11 @@ (ns {{name}}.middleware - (:require [ring.middleware.defaults :refer [site-defaults wrap-defaults]] - [prone.middleware :refer [wrap-exceptions]] - [ring.middleware.reload :refer [wrap-reload]])) + (:require [ring.middleware.content-type :refer [wrap-content-type]] + [ring.middleware.params :refer [wrap-params]] + [prone.middleware :refer [wrap-exceptions]] + [ring.middleware.reload :refer [wrap-reload]])) -(defn wrap-middleware [handler] - (-> handler - (wrap-defaults site-defaults) - wrap-exceptions - wrap-reload)) +(def middleware + [wrap-params + wrap-content-type + wrap-exceptions + wrap-reload]) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 21a5bac..c2c3db4 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -15,12 +15,7 @@ [yogthos/config "1.1.1"] [org.clojure/clojurescript "1.10.339" :scope "provided"] - {{#bidi-hook?}} - [bidi "2.1.4"] - {{/bidi-hook?}} - {{#secretary-hook?}} - [secretary "1.2.3"] - {{/secretary-hook?}} + [metosin/reitit "0.2.4"] [venantius/accountant "0.2.4" :exclusions [org.clojure/tools.reader]]] diff --git a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj index 4af2123..1fc8380 100644 --- a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj +++ b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj @@ -1,22 +1,14 @@ -(ns {{project-ns}}.handler - (:require {{#compojure-hook?}} - [compojure.core :refer [GET defroutes]] - [compojure.route :refer [not-found resources]] - {{/compojure-hook?}} - {{#bidi-hook?}} - [bidi.ring :as bidi-ring] - [ring.util.response :as res] - {{/bidi-hook?}} +(ns {{name}}.handler + (:require [reitit.ring :as reitit-ring] + [{{name}}.middleware :refer [middleware]] [hiccup.page :refer [include-js include-css html5]] - [{{name}}.middleware :refer [wrap-middleware]] [config.core :refer [env]])) (def mount-target [:div#app - [:h3 "ClojureScript has not been compiled!"] - [:p "please run " - [:b "lein figwheel"] - " in order to start the compiler"]]) + [:h2 "Welcome to {{name}}"] + [:p "please wait while Figwheel is waking up ..."] + [:p "(Check the js console for hints if nothing exiting happens.)"]]) (defn head [] [:head @@ -27,10 +19,10 @@ (defn loading-page [] (html5 - (head) - [:body {:class "body-container"} - mount-target - (include-js "/js/app.js")])) + (head) + [:body {:class "body-container"} + mount-target + (include-js "/js/app.js")])) {{#devcards-hook?}} (defn cards-page [] @@ -38,47 +30,37 @@ (head) [:body mount-target - (include-js "/js/app_devcards.js")])){{/devcards-hook?}} - -{{#compojure-hook?}} -(defroutes routes - (GET "/" [] (loading-page)) - (GET "/about" [] (loading-page)) - {{#devcards-hook?}}(GET "/cards" [] (cards-page)){{/devcards-hook?}} - (resources "/") - (not-found "Not Found")) - -(def app (wrap-middleware #'routes)) -{{/compojure-hook?}} + (include-js "/js/app_devcards.js")])) +{{/devcards-hook?}} -{{#bidi-hook?}} (defn index-handler - [request] - (-> (loading-page) - (res/response) - (res/content-type "text/html"))) + [_request] + {:status 200 + :headers {"Content-Type" "text/html"} + :body (loading-page)}) (def about-handler index-handler) (def items-handler index-handler) (def item-handler index-handler) - {{#devcards-hook?}} (defn cards-handler - [request] - (-> (cards-page) - (res/response) - (res/content-type "text/html"))) + [_] + {:status 200 :body (cards-page)}) {{/devcards-hook?}} -(def handler - (bidi-ring/make-handler ["/" {"" index-handler - "items" {"" items-handler - ["/item-" :item-id] item-handler} - "about" about-handler} - "/" (bidi-ring/resources-maybe {:prefix "public/"}) - {{#devcards-hook?}} - "/cards" cards-handler - {{/devcards-hook?}} - true (res/not-found "Not found")])) -(def app (wrap-middleware handler)) -{{/bidi-hook?}} +(def app + (reitit-ring/ring-handler + (reitit-ring/router + [["/" {:get {:handler index-handler}}] + ["/items" + ["" {:get {:handler items-handler}}] + ["/:item-id" {:get {:handler item-handler + :parameters {:path {:item-id int?}}}}]] + {{#devcards-hook?}} + ["cards" {:get {:handler cards-handler}}] + {{/devcards-hook?}} + ["/about" {:get {:handler about-handler}}]] + {:data {:middleware middleware}}) + (reitit-ring/routes + (reitit-ring/create-resource-handler {:path "/" :root "/public"}) + (reitit-ring/create-default-handler)))) diff --git a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs index dfda7e7..50556e6 100644 --- a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs +++ b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs @@ -1,64 +1,35 @@ -(ns {{project-ns}}.core +(ns {{name}}.core (:require [reagent.core :as reagent :refer [atom]] - {{#secretary-hook?}} - [secretary.core :as secretary :include-macros true] - {{/secretary-hook?}} - {{#bidi-hook?}} [reagent.session :as session] - [bidi.bidi :as bidi] - {{/bidi-hook?}} + [reitit.frontend :as reitit] [accountant.core :as accountant])) -{{#secretary-hook?}} -;; ------------------------- -;; Views - -(defn home-page [] - [:div [:h2 "Welcome to {{name}}"] - [:div [:a {:href "/about"} "go to about page"]]]) - -(defn about-page [] - [:div [:h2 "About {{name}}"] - [:div [:a {:href "/"} "go to the home page"]]]) - -;; ------------------------- -;; Routes - -(defonce page (atom #'home-page)) - -(defn current-page [] - [:div [@page]]) - -(secretary/defroute "/" [] - (reset! page #'home-page)) - -(secretary/defroute "/about" [] - (reset! page #'about-page)) -{{/secretary-hook?}} -{{#bidi-hook?}} ;; ------------------------- ;; Routes -(def app-routes - ["/" {"" :index - "items" {"" :items - ["/item-" :item-id] :item} - "about" :about - "missing-route" :missing-route - true :four-o-four}]) +(def router + (reitit/router + [["/" :index] + ["/items" + ["" :items] + ["/:item-id" :item]] + ["/about" :about]])) +(defn path-for [route & [params]] + (if params + (:path (reitit/match-by-name router route params)) + (:path (reitit/match-by-name router route)))) +(path-for :about) ;; ------------------------- ;; Page components - (defn home-page [] (fn [] [:span.main [:h1 "Welcome to {{name}}"] [:ul - [:li [:a {:href (bidi/path-for app-routes :items)} "Items of {{name}}"]] - [:li [:a {:href (bidi/path-for app-routes :missing-route)} "Missing-route"]] + [:li [:a {:href (path-for :items)} "Items of {{name}}"]] [:li [:a {:href "/borken/link"} "Borken link"]]]])) @@ -69,7 +40,7 @@ [:h1 "The items of {{name}}"] [:ul (map (fn [item-id] [:li {:name (str "item-" item-id) :key (str "item-" item-id)} - [:a {:href (bidi/path-for app-routes :item :item-id item-id)} "Item: " item-id]]) + [:a {:href (path-for :item {:item-id item-id})} "Item: " item-id]]) (range 1 6))]])) @@ -79,7 +50,7 @@ item (get-in routing-data [:route-params :item-id])] [:span.main [:h1 (str "Item " item " of {{name}}")] - [:p [:a {:href (bidi/path-for app-routes :items)} "Back to the list of items"]]]))) + [:p [:a {:href (path-for :items)} "Back to the list of items"]]]))) (defn about-page [] @@ -87,28 +58,6 @@ [:h1 "About {{name}}"]])) -(defn four-o-four-page [] - "Non-existing routes go here" - (fn [] - [:span.main - [:h1 "404: It is not here"] - [:pre.verse - "What you are looking for, -I do not have. -How could I have, -what does not exist?"]])) - - -(defn default-page [] - "Configured routes, missing an implementation, go here" - (fn [] - [:span.main - [:h1 "404: My bad"] - [:pre.verse - "This page should be here, -but it is not."]])) - - ;; ------------------------- ;; Translate routes -> page components @@ -117,9 +66,7 @@ but it is not."]])) :index #'home-page :about #'about-page :items #'items-page - :item #'item-page - :four-o-four #'four-o-four-page - #'default-page)) + :item #'item-page)) ;; ------------------------- @@ -130,16 +77,12 @@ but it is not."]])) (let [page (:current-page (session/get :route))] [:div [:header - [:p [:a {:href (bidi/path-for app-routes :index)} "Go home"] " | " - [:a {:href (bidi/path-for app-routes :about)} "See about"]]] + [:p [:a {:href (path-for :index)} "Home"] " | " + [:a {:href (path-for :about)} "About {{name}}"]]] [page] [:footer - [:p "(Using " - [:a {:href "https://reagent-project.github.io/"} "Reagent"] ", " - [:a {:href "https://github.com/juxt/bidi"} "Bidi"] " & " - [:a {:href "https://github.com/venantius/accountant"} "Accountant"] - ")"]]]))) -{{/bidi-hook?}} + [:p "{{name}} was generatated by the " + [:a {:href "https://github.com/reagent-project/reagent-template"} "Reagent Template"] "."]]]))) ;; ------------------------- ;; Initialize app @@ -149,26 +92,16 @@ but it is not."]])) (defn init! [] (accountant/configure-navigation! - {:nav-handler - (fn [path] - {{#secretary-hook?}} - (secretary/dispatch! path)) - {{/secretary-hook?}} - {{#bidi-hook?}} - (let [match (bidi/match-route app-routes path) - current-page (:handler match) - route-params (:route-params match)] - (session/put! :route {:current-page (page-for current-page) - :route-params route-params}))) - {{/bidi-hook?}} - :path-exists? - (fn [path] - {{#secretary-hook?}} - (secretary/locate-route path)) - {{/secretary-hook?}} - {{#bidi-hook?}} - (boolean (bidi/match-route app-routes path))) - {{/bidi-hook?}} - :reload-same-path? true}) + {:nav-handler + (fn [path] + (let [match (reitit/match-by-path router path) + current-page (:name (:data match)) + route-params (:path-params match)] + (session/put! :route {:current-page (page-for current-page) + :route-params route-params}))) + :path-exists? + (fn [path] + (boolean (reitit/match-by-path router path))) + :reload-same-path? true}) (accountant/dispatch-current!) (mount-root)) diff --git a/src/leiningen/new/reagent.clj b/src/leiningen/new/reagent.clj index 417fc6d..7c71a15 100644 --- a/src/leiningen/new/reagent.clj +++ b/src/leiningen/new/reagent.clj @@ -16,7 +16,7 @@ (defn indent [n list] (wrap-indent identity n list)) -(def valid-opts ["+test" "+spec" "+less" "+sass" "+devcards" "+cider" "+bidi"]) +(def valid-opts ["+test" "+spec" "+less" "+sass" "+devcards" "+cider" "+reitit"]) (defn less? [opts] (some #{"+less"} opts)) @@ -36,9 +36,6 @@ (defn cider? [opts] (some #{"+cider"} opts)) -(defn bidi? [opts] - (some #{"+bidi"} opts)) - (defn validate-opts [opts] (let [invalid-opts (remove (set valid-opts) opts)] (cond @@ -83,16 +80,7 @@ :devcards-hook? (fn [block] (if (devcards? opts) (str block "") "")) ;; cider - :cider-hook? (fn [block] (if (cider? opts) (str block "") "")) - - ;; bidi - :bidi-hook? (fn [block] (if (bidi? opts) (str block "") "")) - - ;; default to secretary if not bidi - :secretary-hook? (fn [block] (if-not (bidi? opts) (str block "") "")) - - ;; also default to compojure if not bidi - :compojure-hook? (fn [block] (if-not (bidi? opts) (str block "") ""))}) + :cider-hook? (fn [block] (if (cider? opts) (str block "") ""))}) (defn format-files-args [name opts] (let [data (template-data name opts) From 9d24b02919956593bba03f7cfdbcc133a4539095 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Str=C3=B6mberg?= Date: Sat, 27 Oct 2018 16:39:53 +0200 Subject: [PATCH 101/179] Remove compojure remnants --- README.md | 1 - resources/leiningen/new/reagent/project.clj | 1 - 2 files changed, 2 deletions(-) diff --git a/README.md b/README.md index 5462c4c..2dfb0a4 100644 --- a/README.md +++ b/README.md @@ -169,7 +169,6 @@ The template packages everything you need to create a production ready ClojureSc * [Reitit](https://metosin.github.io/reitit/) - Routing, server and client side * [Accountant](https://github.com/venantius/accountant) - additional setup facilities for client-side routing in SPA way * [Hiccup](https://github.com/weavejester/hiccup) - server-side HTML templating -* [Compojure](https://github.com/weavejester/compojure) - a popular routing library * [Ring](https://github.com/ring-clojure/ring) - Clojure HTTP interface * [Prone](https://github.com/magnars/prone) - better exception reporting middleware for Ring * [Heroku](https://www.heroku.com/) - the template is setup to work on Heroku out of the box, simply run `git push heroku master` diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index c2c3db4..ac13992 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -10,7 +10,6 @@ [reagent-utils "0.3.1"] [ring "1.6.3"] [ring/ring-defaults "0.3.1"] - [compojure "1.6.1"] [hiccup "1.0.5"] [yogthos/config "1.1.1"] [org.clojure/clojurescript "1.10.339" From a0f9e6bca24589fbbbc9595f4451c8bdf66982cb Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Sat, 27 Oct 2018 12:37:17 -0400 Subject: [PATCH 102/179] fix for prod middleware, version bumps --- project.clj | 2 +- .../new/reagent/env/dev/clj/reagent/middleware.clj | 6 +++--- .../reagent/env/prod/clj/reagent/middleware.clj | 4 ++-- resources/leiningen/new/reagent/project.clj | 14 +++++++------- .../new/reagent/src/clj/reagent/handler.clj | 11 ++++------- 5 files changed, 17 insertions(+), 20 deletions(-) diff --git a/project.clj b/project.clj index af09ca6..ffe8dfc 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.10" +(defproject reagent/lein-template "0.10.12" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj b/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj index 07ff80d..8c189c6 100644 --- a/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj +++ b/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj @@ -2,10 +2,10 @@ (:require [ring.middleware.content-type :refer [wrap-content-type]] [ring.middleware.params :refer [wrap-params]] [prone.middleware :refer [wrap-exceptions]] - [ring.middleware.reload :refer [wrap-reload]])) + [ring.middleware.reload :refer [wrap-reload]] + [ring.middleware.defaults :refer [site-defaults wrap-defaults]])) (def middleware - [wrap-params - wrap-content-type + [#(wrap-defaults % site-defaults) wrap-exceptions wrap-reload]) diff --git a/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj b/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj index dacd1df..0b14861 100644 --- a/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj +++ b/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj @@ -1,5 +1,5 @@ (ns {{name}}.middleware (:require [ring.middleware.defaults :refer [site-defaults wrap-defaults]])) -(defn wrap-middleware [handler] - (wrap-defaults handler site-defaults)) +(def middleware + [#(wrap-defaults % site-defaults)]) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index ac13992..5e4d560 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -8,8 +8,8 @@ [ring-server "0.5.0"] [reagent "0.8.1"] [reagent-utils "0.3.1"] - [ring "1.6.3"] - [ring/ring-defaults "0.3.1"] + [ring "1.7.0"] + [ring/ring-defaults "0.3.2"] [hiccup "1.0.5"] [yogthos/config "1.1.1"] [org.clojure/clojurescript "1.10.339" @@ -130,12 +130,12 @@ {{/sass-hook?}} :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl} - :dependencies [[cider/piggieback "0.3.9"] + :dependencies [[cider/piggieback "0.3.10"] [binaryage/devtools "0.9.10"] [ring/ring-mock "0.3.2"] - [ring/ring-devel "1.6.3"] - [prone "1.5.2"] - [figwheel-sidecar "0.5.16"] + [ring/ring-devel "1.7.0"] + [prone "1.6.1"] + [figwheel-sidecar "0.5.17"] [nrepl "0.4.5"] {{#spec-hook?}} [speclj "3.3.2"] @@ -155,7 +155,7 @@ {{/sass-hook?}} ] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.16"] + :plugins [[lein-figwheel "0.5.17"] {{#test-hook?}} [lein-doo "0.1.10"] {{/test-hook?}} diff --git a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj index 1fc8380..bc0d2fb 100644 --- a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj +++ b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj @@ -38,11 +38,8 @@ {:status 200 :headers {"Content-Type" "text/html"} :body (loading-page)}) + {{#devcards-hook?}} -(def about-handler index-handler) -(def items-handler index-handler) -(def item-handler index-handler) -{{#devcards-hook?}} (defn cards-handler [_] {:status 200 :body (cards-page)}) @@ -53,13 +50,13 @@ (reitit-ring/router [["/" {:get {:handler index-handler}}] ["/items" - ["" {:get {:handler items-handler}}] - ["/:item-id" {:get {:handler item-handler + ["" {:get {:handler index-handler}}] + ["/:item-id" {:get {:handler index-handler :parameters {:path {:item-id int?}}}}]] {{#devcards-hook?}} ["cards" {:get {:handler cards-handler}}] {{/devcards-hook?}} - ["/about" {:get {:handler about-handler}}]] + ["/about" {:get {:handler index-handler}}]] {:data {:middleware middleware}}) (reitit-ring/routes (reitit-ring/create-resource-handler {:path "/" :root "/public"}) From a0fc422baea16b29ddcbffe0e21a1a8f3ee694c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Peter=20Str=C3=B6mberg?= Date: Sat, 27 Oct 2018 22:38:15 +0200 Subject: [PATCH 103/179] Add Clerk as an opt-out --- README.md | 4 ++- resources/leiningen/new/reagent/project.clj | 3 ++ .../new/reagent/src/cljs/reagent/core.cljs | 19 ++++++++--- src/leiningen/new/reagent.clj | 32 +++++++++---------- 4 files changed, 37 insertions(+), 21 deletions(-) diff --git a/README.md b/README.md index 2dfb0a4..227b4fc 100644 --- a/README.md +++ b/README.md @@ -167,7 +167,8 @@ The template packages everything you need to create a production ready ClojureSc * [reagent-forms](https://github.com/reagent-project/reagent-forms) - data binding library for Reagent * [reagent-utils](https://github.com/reagent-project/reagent-utils) - utilities such as session and cookie management * [Reitit](https://metosin.github.io/reitit/) - Routing, server and client side -* [Accountant](https://github.com/venantius/accountant) - additional setup facilities for client-side routing in SPA way +* [Accountant](https://github.com/venantius/accountant) - HTML5 history management, enabling href navigation in SPAs +* [Clerk](https://github.com/PEZ/clerk) - In page navigation for SPAs. Scroll restoration, anchor targeting, and such. * [Hiccup](https://github.com/weavejester/hiccup) - server-side HTML templating * [Ring](https://github.com/ring-clojure/ring) - Clojure HTTP interface * [Prone](https://github.com/magnars/prone) - better exception reporting middleware for Ring @@ -183,6 +184,7 @@ The template supports the following options: * `+sass` - use [sass](https://github.com/Deraen/sass4clj) for compiling Sass/Scss CSS files * `+devcards` - add [Devcards](https://github.com/bhauman/devcards) support * `+cider` - add [CIDER](https://github.com/clojure-emacs/cider) support +* `-clerk` - do not add [Clerk](https://github.com/PEZ/clerk) support ## Contributing & Customizing diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 5e4d560..ce828c3 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -15,6 +15,9 @@ [org.clojure/clojurescript "1.10.339" :scope "provided"] [metosin/reitit "0.2.4"] + {{#clerk-hook?}} + [pez/clerk "1.0.0"] + {{/clerk-hook?}} [venantius/accountant "0.2.4" :exclusions [org.clojure/tools.reader]]] diff --git a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs index 50556e6..2f1457a 100644 --- a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs +++ b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs @@ -2,6 +2,9 @@ (:require [reagent.core :as reagent :refer [atom]] [reagent.session :as session] [reitit.frontend :as reitit] + {{#clerk-hook?}} + [clerk.core :as clerk] + {{/clerk-hook?}} [accountant.core :as accountant])) ;; ------------------------- @@ -41,7 +44,7 @@ [:ul (map (fn [item-id] [:li {:name (str "item-" item-id) :key (str "item-" item-id)} [:a {:href (path-for :item {:item-id item-id})} "Item: " item-id]]) - (range 1 6))]])) + (range 1 60))]])) (defn item-page [] @@ -91,17 +94,25 @@ (reagent/render [current-page] (.getElementById js/document "app"))) (defn init! [] + {{#clerk-hook?}} + (clerk/initialize!) + {{/clerk-hook?}} (accountant/configure-navigation! {:nav-handler (fn [path] (let [match (reitit/match-by-path router path) current-page (:name (:data match)) route-params (:path-params match)] + {{#clerk-hook?}} + (reagent/after-render clerk/after-render!) + {{/clerk-hook?}} (session/put! :route {:current-page (page-for current-page) - :route-params route-params}))) + :route-params route-params}) + {{#clerk-hook?}} + (clerk/navigate-page! path) + {{/clerk-hook?}})) :path-exists? (fn [path] - (boolean (reitit/match-by-path router path))) - :reload-same-path? true}) + (boolean (reitit/match-by-path router path)))}) (accountant/dispatch-current!) (mount-root)) diff --git a/src/leiningen/new/reagent.clj b/src/leiningen/new/reagent.clj index 7c71a15..3b33306 100644 --- a/src/leiningen/new/reagent.clj +++ b/src/leiningen/new/reagent.clj @@ -16,7 +16,7 @@ (defn indent [n list] (wrap-indent identity n list)) -(def valid-opts ["+test" "+spec" "+less" "+sass" "+devcards" "+cider" "+reitit"]) +(def valid-opts ["+test" "+spec" "+less" "+sass" "+devcards" "+cider" "-clerk"]) (defn less? [opts] (some #{"+less"} opts)) @@ -36,6 +36,9 @@ (defn cider? [opts] (some #{"+cider"} opts)) +(defn clerk? [opts] + (not (some #{"-clerk"} opts))) + (defn validate-opts [opts] (let [invalid-opts (remove (set valid-opts) opts)] (cond @@ -56,31 +59,28 @@ :project-goog-module (sanitize (sanitize-ns name)) :project-ns (sanitize-ns name) :sanitized (name-to-path name) - + :jvm-opts-hook? (fn [block] (if (jvm>8?) (str block "") "")) - ;; test + :test-hook? (fn [block] (if (test? opts) (str block "") "")) - - ;; spec + :spec-hook? (fn [block] (if (spec? opts) (str block "") "")) - + :test-or-spec-hook? (fn [block] (if (or (test? opts) (spec? opts)) (str block "") "")) - - ;; less + :less-hook? (fn [block] (if (less? opts) (str block "") "")) - - ;; sass + :sass-hook? (fn [block] (if (sass? opts) (str block "") "")) - + :less-or-sass-hook? (fn [block] (if (or (less? opts) (sass? opts)) (str block "") "")) - - ;; devcards + :devcards-hook? (fn [block] (if (devcards? opts) (str block "") "")) - - ;; cider - :cider-hook? (fn [block] (if (cider? opts) (str block "") ""))}) + + :cider-hook? (fn [block] (if (cider? opts) (str block "") "")) + + :clerk-hook? (fn [block] (if (clerk? opts) (str block "") ""))}) (defn format-files-args [name opts] (let [data (template-data name opts) From b5f59766222ef188d4f9365c07865a0bfa5281ea Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Tue, 30 Oct 2018 09:20:41 -0400 Subject: [PATCH 104/179] bumped up version --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index ffe8dfc..26f8335 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.12" +(defproject reagent/lein-template "0.10.13" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" From 5d369362092b277ec0015bdf7b98fdf7afd3eda9 Mon Sep 17 00:00:00 2001 From: "Sotnikov, Dmitri" Date: Mon, 5 Nov 2018 15:55:34 -0500 Subject: [PATCH 105/179] bumped up cljs --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 26f8335..e6220ec 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.13" +(defproject reagent/lein-template "0.10.14" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index ce828c3..24d2d9e 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -12,7 +12,7 @@ [ring/ring-defaults "0.3.2"] [hiccup "1.0.5"] [yogthos/config "1.1.1"] - [org.clojure/clojurescript "1.10.339" + [org.clojure/clojurescript "1.10.439" :scope "provided"] [metosin/reitit "0.2.4"] {{#clerk-hook?}} From 85a121a9598de2a7fef378ea9bb4ef527c59bc92 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Fri, 9 Nov 2018 18:45:02 -0500 Subject: [PATCH 106/179] removed java.xml.bind module --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 11 ++++------- src/leiningen/new/reagent.clj | 5 +---- 3 files changed, 6 insertions(+), 12 deletions(-) diff --git a/project.clj b/project.clj index e6220ec..dd22570 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.14" +(defproject reagent/lein-template "0.10.15" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 24d2d9e..43ae461 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -8,13 +8,13 @@ [ring-server "0.5.0"] [reagent "0.8.1"] [reagent-utils "0.3.1"] - [ring "1.7.0"] + [ring "1.7.1"] [ring/ring-defaults "0.3.2"] [hiccup "1.0.5"] [yogthos/config "1.1.1"] [org.clojure/clojurescript "1.10.439" :scope "provided"] - [metosin/reitit "0.2.4"] + [metosin/reitit "0.2.6"] {{#clerk-hook?}} [pez/clerk "1.0.0"] {{/clerk-hook?}} @@ -32,9 +32,6 @@ :min-lein-version "2.5.0" :uberjar-name "{{name}}.jar" :main {{project-ns}}.server - {{#jvm-opts-hook?}} - :jvm-opts ["--add-modules" "java.xml.bind"] - {{/jvm-opts-hook?}} :clean-targets ^{:protect false} [:target-path [:cljsbuild :builds :app :compiler :output-dir] @@ -136,7 +133,7 @@ :dependencies [[cider/piggieback "0.3.10"] [binaryage/devtools "0.9.10"] [ring/ring-mock "0.3.2"] - [ring/ring-devel "1.7.0"] + [ring/ring-devel "1.7.1"] [prone "1.6.1"] [figwheel-sidecar "0.5.17"] [nrepl "0.4.5"] @@ -146,7 +143,7 @@ {{#devcards-hook?}} [devcards "0.2.3" :exclusions [cljsjs/react]] {{/devcards-hook?}} - [pjstadig/humane-test-output "0.8.3"] + [pjstadig/humane-test-output "0.9.0"] {{dev-dependencies}} {{#less-hook?}} ;; To silence warnings from less4clj dependecies about missing logger implementation diff --git a/src/leiningen/new/reagent.clj b/src/leiningen/new/reagent.clj index 3b33306..bcf5ae8 100644 --- a/src/leiningen/new/reagent.clj +++ b/src/leiningen/new/reagent.clj @@ -59,11 +59,8 @@ :project-goog-module (sanitize (sanitize-ns name)) :project-ns (sanitize-ns name) :sanitized (name-to-path name) - - :jvm-opts-hook? (fn [block] (if (jvm>8?) (str block "") "")) - + :test-hook? (fn [block] (if (test? opts) (str block "") "")) - :spec-hook? (fn [block] (if (spec? opts) (str block "") "")) :test-or-spec-hook? From cf8096ae347991532216faaa493bd5afe8a4ead0 Mon Sep 17 00:00:00 2001 From: Evgeni Latuhin Date: Thu, 15 Nov 2018 00:21:21 +0300 Subject: [PATCH 107/179] fix devcards defaults. * bump devcards version to 0.2.6 * fix server side route for devcards * add headers for devcards page --- resources/leiningen/new/reagent/project.clj | 2 +- resources/leiningen/new/reagent/src/clj/reagent/handler.clj | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 43ae461..69a718c 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -141,7 +141,7 @@ [speclj "3.3.2"] {{/spec-hook?}} {{#devcards-hook?}} - [devcards "0.2.3" :exclusions [cljsjs/react]] + [devcards "0.2.6" :exclusions [cljsjs/react]] {{/devcards-hook?}} [pjstadig/humane-test-output "0.9.0"] {{dev-dependencies}} diff --git a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj index bc0d2fb..420a507 100644 --- a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj +++ b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj @@ -42,7 +42,9 @@ (defn cards-handler [_] - {:status 200 :body (cards-page)}) + {:status 200 + :headers {"Content-Type" "text/html"} + :body (cards-page)}) {{/devcards-hook?}} (def app @@ -54,7 +56,7 @@ ["/:item-id" {:get {:handler index-handler :parameters {:path {:item-id int?}}}}]] {{#devcards-hook?}} - ["cards" {:get {:handler cards-handler}}] + ["/cards" {:get {:handler cards-handler}}] {{/devcards-hook?}} ["/about" {:get {:handler index-handler}}]] {:data {:middleware middleware}}) From 3fec76dc342acdb76601606d1191bdf6ad2c170f Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Wed, 14 Nov 2018 19:05:04 -0500 Subject: [PATCH 108/179] bumped up version --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index dd22570..2c4664e 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.15" +(defproject reagent/lein-template "0.10.16" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" From 5c24deba108f5fa8be184d3b1fb855be3de48f75 Mon Sep 17 00:00:00 2001 From: Stepan Anchugov Date: Fri, 23 Nov 2018 16:33:04 +0500 Subject: [PATCH 109/179] Update handler.clj MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Typofix: `exiting` → `exciting` --- resources/leiningen/new/reagent/src/clj/reagent/handler.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj index 420a507..447ef05 100644 --- a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj +++ b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj @@ -8,7 +8,7 @@ [:div#app [:h2 "Welcome to {{name}}"] [:p "please wait while Figwheel is waking up ..."] - [:p "(Check the js console for hints if nothing exiting happens.)"]]) + [:p "(Check the js console for hints if nothing exсiting happens.)"]]) (defn head [] [:head From 5bfc8e3582f4ed92b7dda4c49337be7b626c79f8 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Fri, 23 Nov 2018 08:39:13 -0500 Subject: [PATCH 110/179] bumped up version --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 2c4664e..9ee5f1c 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.16" +(defproject reagent/lein-template "0.10.17" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" From db1eb22c4fd8febad0b14fcbcdef3d3eb93046a4 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Fri, 23 Nov 2018 08:40:41 -0500 Subject: [PATCH 111/179] bumped up reitit --- resources/leiningen/new/reagent/project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 69a718c..815a6f4 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -14,7 +14,7 @@ [yogthos/config "1.1.1"] [org.clojure/clojurescript "1.10.439" :scope "provided"] - [metosin/reitit "0.2.6"] + [metosin/reitit "0.2.9"] {{#clerk-hook?}} [pez/clerk "1.0.0"] {{/clerk-hook?}} From 4b4e2da786dfd6097034a502bb5ad952d67b8c9b Mon Sep 17 00:00:00 2001 From: Vincent TAING Date: Tue, 4 Dec 2018 21:25:25 -0800 Subject: [PATCH 112/179] Fix typo generatated > generated --- resources/leiningen/new/reagent/src/cljs/reagent/core.cljs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs index 2f1457a..c64a43e 100644 --- a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs +++ b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs @@ -84,7 +84,7 @@ [:a {:href (path-for :about)} "About {{name}}"]]] [page] [:footer - [:p "{{name}} was generatated by the " + [:p "{{name}} was generated by the " [:a {:href "https://github.com/reagent-project/reagent-template"} "Reagent Template"] "."]]]))) ;; ------------------------- From fb00b185983ba5003aebb076b3256fd8c23da5e9 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Mon, 7 Jan 2019 07:53:40 -0500 Subject: [PATCH 113/179] bumped up dependencies --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/project.clj b/project.clj index 9ee5f1c..7070390 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.17" +(defproject reagent/lein-template "0.10.18" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 815a6f4..f3533a7 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -4,17 +4,17 @@ :license {:name "Eclipse Public License" :url "http://www.eclipse.org/legal/epl-v10.html"} - :dependencies [[org.clojure/clojure "1.9.0"] + :dependencies [[org.clojure/clojure "1.10.0"] [ring-server "0.5.0"] [reagent "0.8.1"] - [reagent-utils "0.3.1"] + [reagent-utils "0.3.2"] [ring "1.7.1"] [ring/ring-defaults "0.3.2"] [hiccup "1.0.5"] [yogthos/config "1.1.1"] [org.clojure/clojurescript "1.10.439" :scope "provided"] - [metosin/reitit "0.2.9"] + [metosin/reitit "0.2.10"] {{#clerk-hook?}} [pez/clerk "1.0.0"] {{/clerk-hook?}} @@ -135,8 +135,8 @@ [ring/ring-mock "0.3.2"] [ring/ring-devel "1.7.1"] [prone "1.6.1"] - [figwheel-sidecar "0.5.17"] - [nrepl "0.4.5"] + [figwheel-sidecar "0.5.18"] + [nrepl "0.5.3"] {{#spec-hook?}} [speclj "3.3.2"] {{/spec-hook?}} @@ -155,7 +155,7 @@ {{/sass-hook?}} ] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.17"] + :plugins [[lein-figwheel "0.5.18"] {{#test-hook?}} [lein-doo "0.1.10"] {{/test-hook?}} @@ -163,7 +163,7 @@ [speclj "3.3.2"] {{/spec-hook?}} {{#cider-hook?}} - [cider/cider-nrepl "0.18.0"] + [cider/cider-nrepl "0.19.0"] [org.clojure/tools.namespace "0.3.0-alpha4" :exclusions [org.clojure/tools.reader]] [refactor-nrepl "2.4.0" From c6104258a39765d976ebc2ac084763e430bf7612 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Thu, 31 Jan 2019 11:12:49 -0500 Subject: [PATCH 114/179] switched middleware wrapping to address issue 157 --- project.clj | 2 +- .../env/dev/clj/reagent/middleware.clj | 9 ++++--- .../env/prod/clj/reagent/middleware.clj | 4 +-- .../new/reagent/src/clj/reagent/handler.clj | 26 +++++++++---------- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/project.clj b/project.clj index 7070390..abf1059 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.18" +(defproject reagent/lein-template "0.10.19" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj b/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj index 8c189c6..a801878 100644 --- a/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj +++ b/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj @@ -5,7 +5,8 @@ [ring.middleware.reload :refer [wrap-reload]] [ring.middleware.defaults :refer [site-defaults wrap-defaults]])) -(def middleware - [#(wrap-defaults % site-defaults) - wrap-exceptions - wrap-reload]) +(defn wrap-middleware [handler] + (-> handler + (wrap-defaults site-defaults) + (wrap-exceptions) + (wrap-reload))) diff --git a/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj b/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj index 0b14861..dacd1df 100644 --- a/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj +++ b/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj @@ -1,5 +1,5 @@ (ns {{name}}.middleware (:require [ring.middleware.defaults :refer [site-defaults wrap-defaults]])) -(def middleware - [#(wrap-defaults % site-defaults)]) +(defn wrap-middleware [handler] + (wrap-defaults handler site-defaults)) diff --git a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj index 447ef05..e5297c3 100644 --- a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj +++ b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj @@ -1,6 +1,6 @@ (ns {{name}}.handler (:require [reitit.ring :as reitit-ring] - [{{name}}.middleware :refer [middleware]] + [{{name}}.middleware :refer [wrap-middleware]] [hiccup.page :refer [include-js include-css html5]] [config.core :refer [env]])) @@ -48,18 +48,18 @@ {{/devcards-hook?}} (def app - (reitit-ring/ring-handler - (reitit-ring/router - [["/" {:get {:handler index-handler}}] - ["/items" - ["" {:get {:handler index-handler}}] - ["/:item-id" {:get {:handler index-handler - :parameters {:path {:item-id int?}}}}]] + (wrap-middleware + (reitit-ring/ring-handler + (reitit-ring/router + [["/" {:get {:handler index-handler}}] + ["/items" + ["" {:get {:handler index-handler}}] + ["/:item-id" {:get {:handler index-handler + :parameters {:path {:item-id int?}}}}]] {{#devcards-hook?}} ["/cards" {:get {:handler cards-handler}}] {{/devcards-hook?}} - ["/about" {:get {:handler index-handler}}]] - {:data {:middleware middleware}}) - (reitit-ring/routes - (reitit-ring/create-resource-handler {:path "/" :root "/public"}) - (reitit-ring/create-default-handler)))) + ["/about" {:get {:handler index-handler}}]]) + (reitit-ring/routes + (reitit-ring/create-resource-handler {:path "/" :root "/public"}) + (reitit-ring/create-default-handler))))) From 4c31914c92803e2d1c42ce401abacc87d63a8c55 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Thu, 31 Jan 2019 21:43:54 -0500 Subject: [PATCH 115/179] improved middleware setup --- project.clj | 2 +- .../env/dev/clj/reagent/middleware.clj | 20 +++++------ .../env/prod/clj/reagent/middleware.clj | 7 ++-- .../new/reagent/src/clj/reagent/handler.clj | 36 +++++++++---------- .../new/reagent/src/clj/reagent/server.clj | 7 ++-- .../new/reagent/src/cljs/reagent/core.cljs | 13 ++++--- .../reagent/test/cljs/reagent/core_test.cljs | 7 ++-- 7 files changed, 46 insertions(+), 46 deletions(-) diff --git a/project.clj b/project.clj index abf1059..b855b27 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.19" +(defproject reagent/lein-template "0.10.20" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj b/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj index a801878..278fdcf 100644 --- a/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj +++ b/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj @@ -1,12 +1,12 @@ (ns {{name}}.middleware - (:require [ring.middleware.content-type :refer [wrap-content-type]] - [ring.middleware.params :refer [wrap-params]] - [prone.middleware :refer [wrap-exceptions]] - [ring.middleware.reload :refer [wrap-reload]] - [ring.middleware.defaults :refer [site-defaults wrap-defaults]])) + (:require + [ring.middleware.content-type :refer [wrap-content-type]] + [ring.middleware.params :refer [wrap-params]] + [prone.middleware :refer [wrap-exceptions]] + [ring.middleware.reload :refer [wrap-reload]] + [ring.middleware.defaults :refer [site-defaults wrap-defaults]])) -(defn wrap-middleware [handler] - (-> handler - (wrap-defaults site-defaults) - (wrap-exceptions) - (wrap-reload))) +(def middleware + [#(wrap-defaults % site-defaults) + wrap-exceptions + wrap-reload]) diff --git a/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj b/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj index dacd1df..9d4516f 100644 --- a/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj +++ b/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj @@ -1,5 +1,6 @@ (ns {{name}}.middleware - (:require [ring.middleware.defaults :refer [site-defaults wrap-defaults]])) + (:require + [ring.middleware.defaults :refer [site-defaults wrap-defaults]])) -(defn wrap-middleware [handler] - (wrap-defaults handler site-defaults)) +(def middleware + [site-defaults]) diff --git a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj index e5297c3..c4108b0 100644 --- a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj +++ b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj @@ -1,8 +1,9 @@ (ns {{name}}.handler - (:require [reitit.ring :as reitit-ring] - [{{name}}.middleware :refer [wrap-middleware]] - [hiccup.page :refer [include-js include-css html5]] - [config.core :refer [env]])) + (:require + [reitit.ring :as reitit-ring] + [{{name}}.middleware :refer [middleware]] + [hiccup.page :refer [include-js include-css html5]] + [config.core :refer [env]])) (def mount-target [:div#app @@ -48,18 +49,15 @@ {{/devcards-hook?}} (def app - (wrap-middleware - (reitit-ring/ring-handler - (reitit-ring/router - [["/" {:get {:handler index-handler}}] - ["/items" - ["" {:get {:handler index-handler}}] - ["/:item-id" {:get {:handler index-handler - :parameters {:path {:item-id int?}}}}]] - {{#devcards-hook?}} - ["/cards" {:get {:handler cards-handler}}] - {{/devcards-hook?}} - ["/about" {:get {:handler index-handler}}]]) - (reitit-ring/routes - (reitit-ring/create-resource-handler {:path "/" :root "/public"}) - (reitit-ring/create-default-handler))))) + (reitit-ring/ring-handler + (reitit-ring/router + [["/" {:get {:handler index-handler}}] + ["/items" + ["" {:get {:handler index-handler}}] + ["/:item-id" {:get {:handler index-handler + :parameters {:path {:item-id int?}}}}]] + ["/about" {:get {:handler index-handler}}]]) + (reitit-ring/routes + (reitit-ring/create-resource-handler {:path "/" :root "/public"}) + (reitit-ring/create-default-handler)) + {:middleware middleware})) diff --git a/resources/leiningen/new/reagent/src/clj/reagent/server.clj b/resources/leiningen/new/reagent/src/clj/reagent/server.clj index 62513bd..e088673 100644 --- a/resources/leiningen/new/reagent/src/clj/reagent/server.clj +++ b/resources/leiningen/new/reagent/src/clj/reagent/server.clj @@ -1,7 +1,8 @@ (ns {{project-ns}}.server - (:require [{{project-ns}}.handler :refer [app]] - [config.core :refer [env]] - [ring.adapter.jetty :refer [run-jetty]]) + (:require + [{{project-ns}}.handler :refer [app]] + [config.core :refer [env]] + [ring.adapter.jetty :refer [run-jetty]]) (:gen-class)) (defn -main [& args] diff --git a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs index c64a43e..898c913 100644 --- a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs +++ b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs @@ -1,11 +1,10 @@ (ns {{name}}.core - (:require [reagent.core :as reagent :refer [atom]] - [reagent.session :as session] - [reitit.frontend :as reitit] - {{#clerk-hook?}} - [clerk.core :as clerk] - {{/clerk-hook?}} - [accountant.core :as accountant])) + (:require + [reagent.core :as reagent :refer [atom]] + [reagent.session :as session] + [reitit.frontend :as reitit] + {{#clerk-hook?}}[clerk.core :as clerk]{{/clerk-hook?}} + [accountant.core :as accountant])) ;; ------------------------- ;; Routes diff --git a/resources/leiningen/new/reagent/test/cljs/reagent/core_test.cljs b/resources/leiningen/new/reagent/test/cljs/reagent/core_test.cljs index ad7792d..410aec8 100644 --- a/resources/leiningen/new/reagent/test/cljs/reagent/core_test.cljs +++ b/resources/leiningen/new/reagent/test/cljs/reagent/core_test.cljs @@ -1,7 +1,8 @@ (ns {{project-ns}}.core-test - (:require [cljs.test :refer-macros [is are deftest testing use-fixtures]] - [reagent.core :as reagent :refer [atom]] - [{{project-ns}}.core :as rc])) + (:require + [cljs.test :refer-macros [is are deftest testing use-fixtures]] + [reagent.core :as reagent :refer [atom]] + [{{project-ns}}.core :as rc])) (def isClient (not (nil? (try (.-document js/window) From 70e77731c0e52fe66afe85e024b2a38b1fdc802b Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Fri, 1 Feb 2019 09:17:20 -0500 Subject: [PATCH 116/179] bumped up cljs --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index b855b27..4973e11 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.20" +(defproject reagent/lein-template "0.10.21" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index f3533a7..9e46015 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -12,7 +12,7 @@ [ring/ring-defaults "0.3.2"] [hiccup "1.0.5"] [yogthos/config "1.1.1"] - [org.clojure/clojurescript "1.10.439" + [org.clojure/clojurescript "1.10.516" :scope "provided"] [metosin/reitit "0.2.10"] {{#clerk-hook?}} From 1b05a84637a27ac98d516e57baa4bbc5f2bc52f0 Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Tue, 5 Feb 2019 11:12:58 -0500 Subject: [PATCH 117/179] updated to infer externs by default when minifying --- resources/leiningen/new/reagent/project.clj | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 9e46015..cfc46c4 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -55,6 +55,7 @@ :output-dir "target/cljsbuild/public/js" :source-map "target/cljsbuild/public/js/app.js.map" :optimizations :advanced + :infer-externs true :pretty-print false}} :app {:source-paths ["src/cljs" "src/cljc" "env/dev/cljs"] From a6f3588f36fc46fcd0176b676a4849194344598d Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Tue, 5 Feb 2019 11:14:03 -0500 Subject: [PATCH 118/179] bumped up version --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 4973e11..5b4153f 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.21" +(defproject reagent/lein-template "0.10.22" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" From ad992ec388056f3375aa8516ec7fdce29a093ee6 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Wed, 6 Feb 2019 09:29:14 -0500 Subject: [PATCH 119/179] nrepl 0.6.0 --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 5b4153f..d3360cf 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.22" +(defproject reagent/lein-template "0.10.23" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index cfc46c4..e723364 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -137,7 +137,7 @@ [ring/ring-devel "1.7.1"] [prone "1.6.1"] [figwheel-sidecar "0.5.18"] - [nrepl "0.5.3"] + [nrepl "0.6.0"] {{#spec-hook?}} [speclj "3.3.2"] {{/spec-hook?}} From 799b2334217e4869be78815b08be972425bc0ec5 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Thu, 14 Feb 2019 16:44:57 -0500 Subject: [PATCH 120/179] updated dependencies --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project.clj b/project.clj index d3360cf..74bce6c 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.23" +(defproject reagent/lein-template "0.10.24" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index e723364..1b4a728 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -12,7 +12,7 @@ [ring/ring-defaults "0.3.2"] [hiccup "1.0.5"] [yogthos/config "1.1.1"] - [org.clojure/clojurescript "1.10.516" + [org.clojure/clojurescript "1.10.520" :scope "provided"] [metosin/reitit "0.2.10"] {{#clerk-hook?}} @@ -131,7 +131,7 @@ {{/sass-hook?}} :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl} - :dependencies [[cider/piggieback "0.3.10"] + :dependencies [[cider/piggieback "0.4.0"] [binaryage/devtools "0.9.10"] [ring/ring-mock "0.3.2"] [ring/ring-devel "1.7.1"] From d88914f24d0ff21afe431a1ea3ff0011e3e7489c Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Thu, 14 Feb 2019 16:47:40 -0500 Subject: [PATCH 121/179] bumped up reitit --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 74bce6c..cbcad1c 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.24" +(defproject reagent/lein-template "0.10.25" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 1b4a728..80531a1 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -14,7 +14,7 @@ [yogthos/config "1.1.1"] [org.clojure/clojurescript "1.10.520" :scope "provided"] - [metosin/reitit "0.2.10"] + [metosin/reitit "0.2.13"] {{#clerk-hook?}} [pez/clerk "1.0.0"] {{/clerk-hook?}} From 9d94a843044dcd822a3b6a74c86c6d1e3e5c1ece Mon Sep 17 00:00:00 2001 From: aardvark Date: Tue, 19 Feb 2019 00:29:32 +0300 Subject: [PATCH 122/179] add default devcards route Adds default devcards route when devcards is enabled. --- resources/leiningen/new/reagent/src/clj/reagent/handler.clj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj index c4108b0..9739443 100644 --- a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj +++ b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj @@ -56,7 +56,8 @@ ["" {:get {:handler index-handler}}] ["/:item-id" {:get {:handler index-handler :parameters {:path {:item-id int?}}}}]] - ["/about" {:get {:handler index-handler}}]]) + ["/about" {:get {:handler index-handler}}]{{#devcards-hook?}} + ["/cards" {:get {:handler cards-handler}}]{{/devcards-hook?}}]) (reitit-ring/routes (reitit-ring/create-resource-handler {:path "/" :root "/public"}) (reitit-ring/create-default-handler)) From e9579872e25b732c169a388c4b004a48a8cbd1ad Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Mon, 18 Feb 2019 17:08:45 -0500 Subject: [PATCH 123/179] bumped up version --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index cbcad1c..99708dc 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.25" +(defproject reagent/lein-template "0.10.26" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" From e5897b3e543d116b503c0d41982d1fba52bbb3de Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Wed, 20 Feb 2019 20:23:03 -0500 Subject: [PATCH 124/179] added js symbol printing for dev --- .../leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs b/resources/leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs index 1fd0e08..6b2a6d5 100644 --- a/resources/leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs +++ b/resources/leiningen/new/reagent/env/dev/cljs/reagent/dev.cljs @@ -3,6 +3,11 @@ [{{project-ns}}.core :as core] [devtools.core :as devtools])) +(extend-protocol IPrintWithWriter + js/Symbol + (-pr-writer [sym writer _] + (-write writer (str "\"" (.toString sym) "\"")))) + (devtools/install!) (enable-console-print!) From 2d1edb69df4ac3f6ecfe9fdf3c56e3bca320d72a Mon Sep 17 00:00:00 2001 From: r6eve Date: Fri, 8 Mar 2019 12:11:33 +0900 Subject: [PATCH 125/179] =?UTF-8?q?Fix=20typo=20of=20=D1=81=20which=20has?= =?UTF-8?q?=20ASCII=20code=201089?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- resources/leiningen/new/reagent/src/clj/reagent/handler.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj index 9739443..6f599a7 100644 --- a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj +++ b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj @@ -9,7 +9,7 @@ [:div#app [:h2 "Welcome to {{name}}"] [:p "please wait while Figwheel is waking up ..."] - [:p "(Check the js console for hints if nothing exсiting happens.)"]]) + [:p "(Check the js console for hints if nothing exciting happens.)"]]) (defn head [] [:head From 94d5d9535d2b0b2887e1762b654e6d2bf9055813 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Sun, 24 Mar 2019 16:41:26 -0400 Subject: [PATCH 126/179] updated reiti, lein-asset-minifier versions --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/project.clj b/project.clj index 99708dc..8b24d21 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.26" +(defproject reagent/lein-template "0.10.27" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 80531a1..1d53419 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -14,7 +14,7 @@ [yogthos/config "1.1.1"] [org.clojure/clojurescript "1.10.520" :scope "provided"] - [metosin/reitit "0.2.13"] + [metosin/reitit "0.3.1"] {{#clerk-hook?}} [pez/clerk "1.0.0"] {{/clerk-hook?}} @@ -23,7 +23,7 @@ :plugins [[lein-environ "1.1.0"] [lein-cljsbuild "1.1.7"] - [lein-asset-minifier "0.2.7" + [lein-asset-minifier "0.4.6" :exclusions [org.clojure/clojure]]] :ring {:handler {{project-ns}}.handler/app @@ -44,9 +44,9 @@ :resource-paths ["resources" "target/cljsbuild"] :minify-assets - {:assets - {"resources/public/css/site.min.css" "resources/public/css/site.css"}} - + [[:css {:source "resources/public/css/site.css" + :target "resources/public/css/site.min.css"}]] + :cljsbuild {:builds {:min {:source-paths ["src/cljs" "src/cljc" "env/prod/cljs"] From 1895f3cb7290e113cec78bfd90ef261e9a77bc2f Mon Sep 17 00:00:00 2001 From: Christian Egli Date: Thu, 28 Mar 2019 14:08:26 +0100 Subject: [PATCH 127/179] Update cider/cider-nrepl to latest version Fixes #161 --- resources/leiningen/new/reagent/project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 1d53419..1decb06 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -164,7 +164,7 @@ [speclj "3.3.2"] {{/spec-hook?}} {{#cider-hook?}} - [cider/cider-nrepl "0.19.0"] + [cider/cider-nrepl "0.21.1"] [org.clojure/tools.namespace "0.3.0-alpha4" :exclusions [org.clojure/tools.reader]] [refactor-nrepl "2.4.0" From 4ede0c55e54f413c7cef0638eaf2c0d7236f0a73 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Thu, 28 Mar 2019 09:31:37 -0400 Subject: [PATCH 128/179] bumped up version --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 8b24d21..456955e 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.27" +(defproject reagent/lein-template "0.10.28" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" From 8f87a20da1164b0a8a5c8080df146f5663cb10e9 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Sat, 27 Apr 2019 12:00:07 -0400 Subject: [PATCH 129/179] fix for namespace sanitizing --- project.clj | 2 +- .../env/dev/clj/reagent/middleware.clj | 2 +- .../new/reagent/env/dev/clj/reagent/repl.clj | 4 ++-- .../env/prod/clj/reagent/middleware.clj | 2 +- resources/leiningen/new/reagent/project.clj | 4 ++-- .../new/reagent/src/clj/reagent/handler.clj | 4 ++-- .../new/reagent/src/cljs/reagent/core.cljs | 2 +- src/leiningen/new/reagent.clj | 22 +++++++++---------- 8 files changed, 21 insertions(+), 21 deletions(-) diff --git a/project.clj b/project.clj index 456955e..505bfe0 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.28" +(defproject reagent/lein-template "0.10.29" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj b/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj index 278fdcf..9caa5d9 100644 --- a/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj +++ b/resources/leiningen/new/reagent/env/dev/clj/reagent/middleware.clj @@ -1,4 +1,4 @@ -(ns {{name}}.middleware +(ns {{project-ns}}.middleware (:require [ring.middleware.content-type :refer [wrap-content-type]] [ring.middleware.params :refer [wrap-params]] diff --git a/resources/leiningen/new/reagent/env/dev/clj/reagent/repl.clj b/resources/leiningen/new/reagent/env/dev/clj/reagent/repl.clj index b81bd6f..10409ed 100644 --- a/resources/leiningen/new/reagent/env/dev/clj/reagent/repl.clj +++ b/resources/leiningen/new/reagent/env/dev/clj/reagent/repl.clj @@ -1,5 +1,5 @@ -(ns {{name}}.repl - (:use {{name}}.handler +(ns {{project-ns}}.repl + (:use {{project-ns}}.handler figwheel-sidecar.repl-api ring.server.standalone [ring.middleware file-info file])) diff --git a/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj b/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj index 9d4516f..6708cf3 100644 --- a/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj +++ b/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj @@ -1,4 +1,4 @@ -(ns {{name}}.middleware +(ns {{project-ns}}.middleware (:require [ring.middleware.defaults :refer [site-defaults wrap-defaults]])) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 1decb06..547439f 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -46,7 +46,7 @@ :minify-assets [[:css {:source "resources/public/css/site.css" :target "resources/public/css/site.min.css"}]] - + :cljsbuild {:builds {:min {:source-paths ["src/cljs" "src/cljc" "env/prod/cljs"] @@ -135,7 +135,7 @@ [binaryage/devtools "0.9.10"] [ring/ring-mock "0.3.2"] [ring/ring-devel "1.7.1"] - [prone "1.6.1"] + [prone "1.6.3"] [figwheel-sidecar "0.5.18"] [nrepl "0.6.0"] {{#spec-hook?}} diff --git a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj index 6f599a7..9112a79 100644 --- a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj +++ b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj @@ -1,7 +1,7 @@ -(ns {{name}}.handler +(ns {{project-ns}}.handler (:require [reitit.ring :as reitit-ring] - [{{name}}.middleware :refer [middleware]] + [{{project-ns}}.middleware :refer [middleware]] [hiccup.page :refer [include-js include-css html5]] [config.core :refer [env]])) diff --git a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs index 898c913..2d3dd7b 100644 --- a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs +++ b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs @@ -1,4 +1,4 @@ -(ns {{name}}.core +(ns {{project-ns}}.core (:require [reagent.core :as reagent :refer [atom]] [reagent.session :as session] diff --git a/src/leiningen/new/reagent.clj b/src/leiningen/new/reagent.clj index bcf5ae8..f4e21e8 100644 --- a/src/leiningen/new/reagent.clj +++ b/src/leiningen/new/reagent.clj @@ -3,7 +3,7 @@ :refer [renderer name-to-path ->files sanitize sanitize-ns project-name]] [leiningen.core.main :as main] - [clojure.string :refer [join]])) + [clojure.string :as string])) (def render (renderer "reagent")) @@ -11,7 +11,7 @@ (fn [] (->> list (map #(str "\n" (apply str (repeat n " ")) (wrap %))) - (join "")))) + (string/join "")))) (defn indent [n list] (wrap-indent identity n list)) @@ -43,8 +43,8 @@ (let [invalid-opts (remove (set valid-opts) opts)] (cond (seq invalid-opts) - (str "invalid options supplied: " (clojure.string/join " " invalid-opts) - "\nvalid options are: " (join " " valid-opts)) + (str "invalid options supplied: " (string/join " " invalid-opts) + "\nvalid options are: " (string/join " " valid-opts)) (and (test? opts) (spec? opts)) "Both +test and +spec options can't be used together, select one."))) @@ -62,21 +62,21 @@ :test-hook? (fn [block] (if (test? opts) (str block "") "")) :spec-hook? (fn [block] (if (spec? opts) (str block "") "")) - + :test-or-spec-hook? (fn [block] (if (or (test? opts) (spec? opts)) (str block "") "")) - + :less-hook? (fn [block] (if (less? opts) (str block "") "")) - + :sass-hook? (fn [block] (if (sass? opts) (str block "") "")) - + :less-or-sass-hook? (fn [block] (if (or (less? opts) (sass? opts)) (str block "") "")) - + :devcards-hook? (fn [block] (if (devcards? opts) (str block "") "")) - + :cider-hook? (fn [block] (if (cider? opts) (str block "") "")) - + :clerk-hook? (fn [block] (if (clerk? opts) (str block "") ""))}) (defn format-files-args [name opts] From 2e458923fd70eebe4b523da164d037e3b30268ec Mon Sep 17 00:00:00 2001 From: Caleb Black Date: Wed, 1 May 2019 22:18:08 +1000 Subject: [PATCH 130/179] Add shadow-cljs option --- README.md | 22 +++++++++++++++++++ resources/leiningen/new/reagent/package.json | 10 +++++++++ resources/leiningen/new/reagent/project.clj | 9 ++++++-- .../leiningen/new/reagent/shadow-cljs.edn | 9 ++++++++ .../new/reagent/src/clj/reagent/handler.clj | 6 +++-- src/leiningen/new/reagent.clj | 12 +++++++++- 6 files changed, 63 insertions(+), 5 deletions(-) create mode 100644 resources/leiningen/new/reagent/package.json create mode 100644 resources/leiningen/new/reagent/shadow-cljs.edn diff --git a/README.md b/README.md index 227b4fc..5df6f40 100644 --- a/README.md +++ b/README.md @@ -54,6 +54,11 @@ use `+less` or `+sass` flags: lein new reagent +less ``` +To add [shadow-cljs](https://github.com/thheller/shadow-cljs), use the `+shadow-cljs` flag: +``` +lein new reagent +shadow-cljs +``` + ### Development mode To start the Figwheel compiler, navigate to the project folder and run the following command in the terminal: @@ -96,6 +101,17 @@ lein sass4clj auto ``` to autocompile sass/scss files. +#### Development mode with [shadow-cljs](https://github.com/thheller/shadow-cljs) + +To start the [shadow-cljs](https://github.com/thheller/shadow-cljs) (if enabled with `+shadow-cljs` flag) compiler run +``` +shadow-cljs watch app +``` + +Similarly to Figwheel, shadow-cljs also automatically pushes cljs changes to the browser + +The application will now be available at [http://localhost:3000](http://localhost:3000). + #### Optional development tools Start the browser REPL: @@ -119,6 +135,12 @@ and stopped by running: lein do clean, uberjar ``` +#### Building for release with [shadow-cljs](https://github.com/thheller/shadow-cljs) +(if enabled with `+shadow-cljs` flag) +``` +shadow-cljs release app +``` + ### Deploying to Heroku Make sure you have [Git](http://git-scm.com/downloads) and [Heroku toolbelt](https://toolbelt.heroku.com/) installed, then simply follow the steps below. diff --git a/resources/leiningen/new/reagent/package.json b/resources/leiningen/new/reagent/package.json new file mode 100644 index 0000000..1d7c3f8 --- /dev/null +++ b/resources/leiningen/new/reagent/package.json @@ -0,0 +1,10 @@ +{ + "devDependencies": { + "shadow-cljs": "^2.8.36" + }, + "dependencies":{ + "create-react-class": "^15.6.3", + "react": "^16.4.0", + "react-dom": "^16.4.0" + } +} diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 547439f..89c616d 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -13,7 +13,9 @@ [hiccup "1.0.5"] [yogthos/config "1.1.1"] [org.clojure/clojurescript "1.10.520" - :scope "provided"] + :scope "provided"]{{#shadow-cljs-hook?}} + [com.google.javascript/closure-compiler-unshaded "v20190325"] + [org.clojure/google-closure-library "0.0-20190213-2033d5d9"]{{/shadow-cljs-hook?}} [metosin/reitit "0.3.1"] {{#clerk-hook?}} [pez/clerk "1.0.0"] @@ -37,7 +39,7 @@ [:cljsbuild :builds :app :compiler :output-dir] [:cljsbuild :builds :app :compiler :output-to]] - :source-paths ["src/clj" "src/cljc"] + :source-paths ["src/clj" "src/cljc" "src/cljs"] {{#spec-hook?}} :test-paths ["spec/clj"] {{/spec-hook?}} @@ -138,6 +140,9 @@ [prone "1.6.3"] [figwheel-sidecar "0.5.18"] [nrepl "0.6.0"] + {{#shadow-cljs-hook?}} + [thheller/shadow-cljs "2.8.36"] + {{/shadow-cljs-hook?}} {{#spec-hook?}} [speclj "3.3.2"] {{/spec-hook?}} diff --git a/resources/leiningen/new/reagent/shadow-cljs.edn b/resources/leiningen/new/reagent/shadow-cljs.edn new file mode 100644 index 0000000..cce2da9 --- /dev/null +++ b/resources/leiningen/new/reagent/shadow-cljs.edn @@ -0,0 +1,9 @@ +{:lein true + :source-paths ["src/cljs"] + :builds {:app {:target :browser + :output-dir "resources/public/js" + :asset-path "/js" + :modules {:app {:entries [{{project-ns}}.core]}} + :devtools {:after-load {{project-ns}}.core/mount-root}}} + :dev-http {3000 {:root "resources/public" + :handler {{project-ns}}.handler/app}}} diff --git a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj index 9112a79..5c85f14 100644 --- a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj +++ b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj @@ -8,7 +8,7 @@ (def mount-target [:div#app [:h2 "Welcome to {{name}}"] - [:p "please wait while Figwheel is waking up ..."] + [:p "please wait while Figwheel{{#shadow-cljs-hook?}}/shadow-cljs{{/shadow-cljs-hook?}} is waking up ..."] [:p "(Check the js console for hints if nothing exciting happens.)"]]) (defn head [] @@ -23,7 +23,9 @@ (head) [:body {:class "body-container"} mount-target - (include-js "/js/app.js")])) + (include-js "/js/app.js"){{#shadow-cljs-hook?}} + [:script "{{project-ns}}.core.init_BANG_()"]{{/shadow-cljs-hook?}}])) + {{#devcards-hook?}} (defn cards-page [] diff --git a/src/leiningen/new/reagent.clj b/src/leiningen/new/reagent.clj index f4e21e8..9b8561f 100644 --- a/src/leiningen/new/reagent.clj +++ b/src/leiningen/new/reagent.clj @@ -16,7 +16,7 @@ (defn indent [n list] (wrap-indent identity n list)) -(def valid-opts ["+test" "+spec" "+less" "+sass" "+devcards" "+cider" "-clerk"]) +(def valid-opts ["+test" "+spec" "+less" "+sass" "+devcards" "+cider" "+shadow-cljs" "-clerk"]) (defn less? [opts] (some #{"+less"} opts)) @@ -36,6 +36,9 @@ (defn cider? [opts] (some #{"+cider"} opts)) +(defn shadow-cljs? [opts] + (some #{"+shadow-cljs"} opts)) + (defn clerk? [opts] (not (some #{"-clerk"} opts))) @@ -77,6 +80,8 @@ :cider-hook? (fn [block] (if (cider? opts) (str block "") "")) + :shadow-cljs-hook? (fn [block] (if (shadow-cljs? opts) (str block "") "")) + :clerk-hook? (fn [block] (if (clerk? opts) (str block "") ""))}) (defn format-files-args [name opts] @@ -123,6 +128,11 @@ args) args (if (devcards? opts) (conj args ["env/dev/cljs/{{sanitized}}/cards.cljs" (render "env/dev/cljs/reagent/cards.cljs" data)]) + args) + args (if (shadow-cljs? opts) + (conj args + ["shadow-cljs.edn" (render "shadow-cljs.edn" data)] + ["package.json" (render "package.json" data)]) args)] args)) From 7486a829d5f8bbcc944b1abe1e412cb5bd1dcfed Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Wed, 1 May 2019 08:49:03 -0400 Subject: [PATCH 131/179] bumped up version --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 505bfe0..3e3c57f 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.29" +(defproject reagent/lein-template "0.10.30" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" From b29316529b2b2344d6146fca6b44ac99c61ba93d Mon Sep 17 00:00:00 2001 From: Deven Blackburn Date: Thu, 9 May 2019 13:56:13 -0400 Subject: [PATCH 132/179] Mispelling :zap: --- resources/leiningen/new/reagent/src/cljs/reagent/core.cljs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs index 2d3dd7b..afe82d3 100644 --- a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs +++ b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs @@ -32,7 +32,7 @@ [:h1 "Welcome to {{name}}"] [:ul [:li [:a {:href (path-for :items)} "Items of {{name}}"]] - [:li [:a {:href "/borken/link"} "Borken link"]]]])) + [:li [:a {:href "/borken/link"} "Broken link"]]]])) From 1adb82dcfc46d65271635d9f2de1109b36d91af4 Mon Sep 17 00:00:00 2001 From: Xiang-Bo Mao Date: Fri, 31 May 2019 09:45:04 -0700 Subject: [PATCH 133/179] link typo fix: /borken/link -> /broken/link; site.css max-width change to 640px --- resources/leiningen/new/reagent/resources/public/css/site.css | 2 +- resources/leiningen/new/reagent/src/cljs/reagent/core.cljs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/leiningen/new/reagent/resources/public/css/site.css b/resources/leiningen/new/reagent/resources/public/css/site.css index 5ab89cd..f5bdfaf 100644 --- a/resources/leiningen/new/reagent/resources/public/css/site.css +++ b/resources/leiningen/new/reagent/resources/public/css/site.css @@ -1,6 +1,6 @@ .body-container { font-family: 'Helvetica Neue', Verdana, Helvetica, Arial, sans-serif; - max-width: 600px; + max-width: 640px; margin: 0 auto; padding-top: 72px; -webkit-font-smoothing: antialiased; diff --git a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs index afe82d3..e65c3dd 100644 --- a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs +++ b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs @@ -32,7 +32,7 @@ [:h1 "Welcome to {{name}}"] [:ul [:li [:a {:href (path-for :items)} "Items of {{name}}"]] - [:li [:a {:href "/borken/link"} "Broken link"]]]])) + [:li [:a {:href "/broken/link"} "Broken link"]]]])) From 29d80f28aa21a2b3d52ac92cb0d7f6fdd3ca59e4 Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Fri, 31 May 2019 15:56:35 -0400 Subject: [PATCH 134/179] bumped up shadow-cljs --- resources/leiningen/new/reagent/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/leiningen/new/reagent/package.json b/resources/leiningen/new/reagent/package.json index 1d7c3f8..c40d8b9 100644 --- a/resources/leiningen/new/reagent/package.json +++ b/resources/leiningen/new/reagent/package.json @@ -1,6 +1,6 @@ { "devDependencies": { - "shadow-cljs": "^2.8.36" + "shadow-cljs": "^2.8.37" }, "dependencies":{ "create-react-class": "^15.6.3", From 12468416c18cf1d0cf204943cc9a381f4bba0dfd Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Fri, 31 May 2019 15:59:06 -0400 Subject: [PATCH 135/179] bumped up shadow-cljs dev dependency --- resources/leiningen/new/reagent/project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 89c616d..b93fe6e 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -141,7 +141,7 @@ [figwheel-sidecar "0.5.18"] [nrepl "0.6.0"] {{#shadow-cljs-hook?}} - [thheller/shadow-cljs "2.8.36"] + [thheller/shadow-cljs "2.8.37"] {{/shadow-cljs-hook?}} {{#spec-hook?}} [speclj "3.3.2"] From 26ce8cf09fd3794a6ddf45e331be41760d3785ab Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Fri, 31 May 2019 16:05:35 -0400 Subject: [PATCH 136/179] fixed source path for shaodw-cljs.edn config --- resources/leiningen/new/reagent/shadow-cljs.edn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/leiningen/new/reagent/shadow-cljs.edn b/resources/leiningen/new/reagent/shadow-cljs.edn index cce2da9..790598d 100644 --- a/resources/leiningen/new/reagent/shadow-cljs.edn +++ b/resources/leiningen/new/reagent/shadow-cljs.edn @@ -1,5 +1,5 @@ {:lein true - :source-paths ["src/cljs"] + :source-paths ["src"] :builds {:app {:target :browser :output-dir "resources/public/js" :asset-path "/js" From 66f46a39c0b37b9d98cf003d18fdc81cdeb4f0d2 Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Thu, 6 Jun 2019 15:45:48 -0400 Subject: [PATCH 137/179] updated dependencies --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/project.clj b/project.clj index 3e3c57f..dd18c5e 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.30" +(defproject reagent/lein-template "0.10.31" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index b93fe6e..730cc28 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -4,19 +4,19 @@ :license {:name "Eclipse Public License" :url "http://www.eclipse.org/legal/epl-v10.html"} - :dependencies [[org.clojure/clojure "1.10.0"] + :dependencies [[org.clojure/clojure "1.10.1"] [ring-server "0.5.0"] [reagent "0.8.1"] - [reagent-utils "0.3.2"] + [reagent-utils "0.3.3"] [ring "1.7.1"] [ring/ring-defaults "0.3.2"] [hiccup "1.0.5"] - [yogthos/config "1.1.1"] + [yogthos/config "1.1.2"] [org.clojure/clojurescript "1.10.520" :scope "provided"]{{#shadow-cljs-hook?}} [com.google.javascript/closure-compiler-unshaded "v20190325"] [org.clojure/google-closure-library "0.0-20190213-2033d5d9"]{{/shadow-cljs-hook?}} - [metosin/reitit "0.3.1"] + [metosin/reitit "0.3.7"] {{#clerk-hook?}} [pez/clerk "1.0.0"] {{/clerk-hook?}} @@ -133,9 +133,9 @@ {{/sass-hook?}} :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl} - :dependencies [[cider/piggieback "0.4.0"] + :dependencies [[cider/piggieback "0.4.1"] [binaryage/devtools "0.9.10"] - [ring/ring-mock "0.3.2"] + [ring/ring-mock "0.4.0"] [ring/ring-devel "1.7.1"] [prone "1.6.3"] [figwheel-sidecar "0.5.18"] From 4a6d44d554cde1f3d4c22ee0b30e3ebc57c8c8a1 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Fri, 14 Jun 2019 10:07:43 -0400 Subject: [PATCH 138/179] bumped up config --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index dd18c5e..22ae24c 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.31" +(defproject reagent/lein-template "0.10.32" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 730cc28..f43f460 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -11,7 +11,7 @@ [ring "1.7.1"] [ring/ring-defaults "0.3.2"] [hiccup "1.0.5"] - [yogthos/config "1.1.2"] + [yogthos/config "1.1.3"] [org.clojure/clojurescript "1.10.520" :scope "provided"]{{#shadow-cljs-hook?}} [com.google.javascript/closure-compiler-unshaded "v20190325"] From f3287ea495ad5407c1b966be0f625cc07ee42ddd Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Wed, 3 Jul 2019 23:43:09 -0400 Subject: [PATCH 139/179] fixed wrapping defaults for prod --- project.clj | 2 +- .../leiningen/new/reagent/env/prod/clj/reagent/middleware.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 22ae24c..1d243ee 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.32" +(defproject reagent/lein-template "0.10.33" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj b/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj index 6708cf3..994dd25 100644 --- a/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj +++ b/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj @@ -3,4 +3,4 @@ [ring.middleware.defaults :refer [site-defaults wrap-defaults]])) (def middleware - [site-defaults]) + [#(wrap-defaults %site-defaults)]) From fd7cd44d7e8118989a67ce46f9a0723f7e153d03 Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Wed, 3 Jul 2019 23:44:02 -0400 Subject: [PATCH 140/179] fix typo --- project.clj | 2 +- .../leiningen/new/reagent/env/prod/clj/reagent/middleware.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 1d243ee..100ed07 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.33" +(defproject reagent/lein-template "0.10.34" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj b/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj index 994dd25..a8a6f2e 100644 --- a/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj +++ b/resources/leiningen/new/reagent/env/prod/clj/reagent/middleware.clj @@ -3,4 +3,4 @@ [ring.middleware.defaults :refer [site-defaults wrap-defaults]])) (def middleware - [#(wrap-defaults %site-defaults)]) + [#(wrap-defaults % site-defaults)]) From d80c40884103cb780fe9b5d81afb56be5c57d8f0 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Tue, 19 Nov 2019 21:36:12 -0500 Subject: [PATCH 141/179] bumped up dependencies --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 24 ++++++++++----------- 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/project.clj b/project.clj index 100ed07..275354b 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.34" +(defproject reagent/lein-template "0.10.35" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index f43f460..236c1f1 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -6,13 +6,13 @@ :dependencies [[org.clojure/clojure "1.10.1"] [ring-server "0.5.0"] - [reagent "0.8.1"] + [reagent "0.9.0-rc3"] [reagent-utils "0.3.3"] - [ring "1.7.1"] + [ring "1.8.0"] [ring/ring-defaults "0.3.2"] [hiccup "1.0.5"] - [yogthos/config "1.1.3"] - [org.clojure/clojurescript "1.10.520" + [yogthos/config "1.1.6"] + [org.clojure/clojurescript "1.10.597" :scope "provided"]{{#shadow-cljs-hook?}} [com.google.javascript/closure-compiler-unshaded "v20190325"] [org.clojure/google-closure-library "0.0-20190213-2033d5d9"]{{/shadow-cljs-hook?}} @@ -20,7 +20,7 @@ {{#clerk-hook?}} [pez/clerk "1.0.0"] {{/clerk-hook?}} - [venantius/accountant "0.2.4" + [venantius/accountant "0.2.5" :exclusions [org.clojure/tools.reader]]] :plugins [[lein-environ "1.1.0"] @@ -133,12 +133,12 @@ {{/sass-hook?}} :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl} - :dependencies [[cider/piggieback "0.4.1"] - [binaryage/devtools "0.9.10"] + :dependencies [[cider/piggieback "0.4.2"] + [binaryage/devtools "0.9.11"] [ring/ring-mock "0.4.0"] - [ring/ring-devel "1.7.1"] - [prone "1.6.3"] - [figwheel-sidecar "0.5.18"] + [ring/ring-devel "1.8.0"] + [prone "2019-07-08"] + [figwheel-sidecar "0.5.19"] [nrepl "0.6.0"] {{#shadow-cljs-hook?}} [thheller/shadow-cljs "2.8.37"] @@ -149,7 +149,7 @@ {{#devcards-hook?}} [devcards "0.2.6" :exclusions [cljsjs/react]] {{/devcards-hook?}} - [pjstadig/humane-test-output "0.9.0"] + [pjstadig/humane-test-output "0.10.0"] {{dev-dependencies}} {{#less-hook?}} ;; To silence warnings from less4clj dependecies about missing logger implementation @@ -161,7 +161,7 @@ {{/sass-hook?}} ] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.18"] + :plugins [[lein-figwheel "0.5.19"] {{#test-hook?}} [lein-doo "0.1.10"] {{/test-hook?}} From 64c3aa7d6fdd7ff5b7342516b5fa0743b8b3a340 Mon Sep 17 00:00:00 2001 From: JerryShen Date: Fri, 10 Jan 2020 13:41:22 +0800 Subject: [PATCH 142/179] Use `project-goog-module` inside script tag --- resources/leiningen/new/reagent/src/clj/reagent/handler.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj index 5c85f14..2454dc7 100644 --- a/resources/leiningen/new/reagent/src/clj/reagent/handler.clj +++ b/resources/leiningen/new/reagent/src/clj/reagent/handler.clj @@ -24,7 +24,7 @@ [:body {:class "body-container"} mount-target (include-js "/js/app.js"){{#shadow-cljs-hook?}} - [:script "{{project-ns}}.core.init_BANG_()"]{{/shadow-cljs-hook?}}])) + [:script "{{project-goog-module}}.core.init_BANG_()"]{{/shadow-cljs-hook?}}])) {{#devcards-hook?}} From 1fa2ff20ef149ba2006ab52d7e23b7c684cb727d Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Fri, 10 Jan 2020 09:21:30 -0500 Subject: [PATCH 143/179] bumped up version for release --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project.clj b/project.clj index 275354b..64e73fe 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.35" +(defproject reagent/lein-template "0.10.36" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 236c1f1..db16d6c 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -11,12 +11,12 @@ [ring "1.8.0"] [ring/ring-defaults "0.3.2"] [hiccup "1.0.5"] - [yogthos/config "1.1.6"] + [yogthos/config "1.1.7"] [org.clojure/clojurescript "1.10.597" :scope "provided"]{{#shadow-cljs-hook?}} [com.google.javascript/closure-compiler-unshaded "v20190325"] [org.clojure/google-closure-library "0.0-20190213-2033d5d9"]{{/shadow-cljs-hook?}} - [metosin/reitit "0.3.7"] + [metosin/reitit "0.3.10"] {{#clerk-hook?}} [pez/clerk "1.0.0"] {{/clerk-hook?}} From b3c623209cbe6dd0bdf68dc14be129193b7b70f0 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Sat, 21 Mar 2020 16:53:13 -0400 Subject: [PATCH 144/179] bumped up dependencies --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 8 ++++---- .../leiningen/new/reagent/src/cljs/reagent/core.cljs | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/project.clj b/project.clj index 64e73fe..46d33f0 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.36" +(defproject reagent/lein-template "0.10.37" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index db16d6c..b312710 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -6,7 +6,7 @@ :dependencies [[org.clojure/clojure "1.10.1"] [ring-server "0.5.0"] - [reagent "0.9.0-rc3"] + [reagent "0.10.0"] [reagent-utils "0.3.3"] [ring "1.8.0"] [ring/ring-defaults "0.3.2"] @@ -16,7 +16,7 @@ :scope "provided"]{{#shadow-cljs-hook?}} [com.google.javascript/closure-compiler-unshaded "v20190325"] [org.clojure/google-closure-library "0.0-20190213-2033d5d9"]{{/shadow-cljs-hook?}} - [metosin/reitit "0.3.10"] + [metosin/reitit "0.4.2"] {{#clerk-hook?}} [pez/clerk "1.0.0"] {{/clerk-hook?}} @@ -134,10 +134,10 @@ :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl} :dependencies [[cider/piggieback "0.4.2"] - [binaryage/devtools "0.9.11"] + [binaryage/devtools "1.0.0"] [ring/ring-mock "0.4.0"] [ring/ring-devel "1.8.0"] - [prone "2019-07-08"] + [prone "2020-01-17"] [figwheel-sidecar "0.5.19"] [nrepl "0.6.0"] {{#shadow-cljs-hook?}} diff --git a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs index e65c3dd..c92d6c1 100644 --- a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs +++ b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs @@ -22,7 +22,6 @@ (:path (reitit/match-by-name router route params)) (:path (reitit/match-by-name router route)))) -(path-for :about) ;; ------------------------- ;; Page components From a8473f1ac071e9b74f08858bb468778dbf6dcf17 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Sat, 21 Mar 2020 20:18:12 -0400 Subject: [PATCH 145/179] fix for reloading in dev --- project.clj | 2 +- resources/leiningen/new/reagent/src/clj/reagent/server.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 46d33f0..2a86ccd 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.37" +(defproject reagent/lein-template "0.10.38" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/src/clj/reagent/server.clj b/resources/leiningen/new/reagent/src/clj/reagent/server.clj index e088673..83560db 100644 --- a/resources/leiningen/new/reagent/src/clj/reagent/server.clj +++ b/resources/leiningen/new/reagent/src/clj/reagent/server.clj @@ -7,4 +7,4 @@ (defn -main [& args] (let [port (or (env :port) 3000)] - (run-jetty app {:port port :join? false}))) + (run-jetty #'app {:port port :join? false}))) From dd0fda2cb052b81e2555f5eb025fa8ba8862c520 Mon Sep 17 00:00:00 2001 From: Coby Tamayo Date: Sat, 28 Mar 2020 23:01:33 -0700 Subject: [PATCH 146/179] Fix reagent.core/render deprecated warning reagent.core/render was deprecated in 0.10.0 in favor of reagent.dom/render. https://reagent-project.github.io/docs/master/reagent.core.html#var-render --- resources/leiningen/new/reagent/src/cljs/reagent/core.cljs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs index c92d6c1..537e5d4 100644 --- a/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs +++ b/resources/leiningen/new/reagent/src/cljs/reagent/core.cljs @@ -1,6 +1,7 @@ (ns {{project-ns}}.core (:require [reagent.core :as reagent :refer [atom]] + [reagent.dom :as rdom] [reagent.session :as session] [reitit.frontend :as reitit] {{#clerk-hook?}}[clerk.core :as clerk]{{/clerk-hook?}} @@ -89,7 +90,7 @@ ;; Initialize app (defn mount-root [] - (reagent/render [current-page] (.getElementById js/document "app"))) + (rdom/render [current-page] (.getElementById js/document "app"))) (defn init! [] {{#clerk-hook?}} From 11511df8258de8a521222741d72ff52abcc2bdc7 Mon Sep 17 00:00:00 2001 From: Franco Biasin Date: Sat, 4 Apr 2020 15:40:44 -0300 Subject: [PATCH 147/179] Fix reagent deprecation warnings in tests --- .../leiningen/new/reagent/test/cljs/reagent/core_test.cljs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/leiningen/new/reagent/test/cljs/reagent/core_test.cljs b/resources/leiningen/new/reagent/test/cljs/reagent/core_test.cljs index 410aec8..99a7c35 100644 --- a/resources/leiningen/new/reagent/test/cljs/reagent/core_test.cljs +++ b/resources/leiningen/new/reagent/test/cljs/reagent/core_test.cljs @@ -2,6 +2,7 @@ (:require [cljs.test :refer-macros [is are deftest testing use-fixtures]] [reagent.core :as reagent :refer [atom]] + [reagent.dom :as rdom] [{{project-ns}}.core :as rc])) @@ -20,9 +21,9 @@ (defn with-mounted-component [comp f] (when isClient (let [div (add-test-div "_testreagent")] - (let [comp (reagent/render-component comp div #(f comp div))] - (reagent/unmount-component-at-node div) - (reagent/flush) + (let [comp (rdom/render comp div #(f comp div))] + (rdom/unmount-component-at-node div) + (rflush) (.removeChild (.-body js/document) div))))) From 714ee525e87c956b9de2616c4418f35bd4f461b9 Mon Sep 17 00:00:00 2001 From: Franco Biasin Date: Sat, 4 Apr 2020 19:22:27 -0300 Subject: [PATCH 148/179] Update READMEs to run chrome-headless tests --- README.md | 2 +- resources/leiningen/new/reagent/README.md | 9 +++++++-- resources/leiningen/new/reagent/gitignore | 1 + 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 5df6f40..cb8db65 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,7 @@ To enable [cljs.test](https://github.com/clojure/clojurescript/blob/master/src/m ``` lein new reagent +test ``` -To run the tests, please use `lein doo phantom test once`. For installation instructions of PhantomJS, please see [this](http://phantomjs.org/download.html). +To run the tests using headless chrome first install karma and its plugins `npm install -g karma-cli && npm install karma karma-cljs-test karma-chrome-launcher --save-dev`, then use `lein doo chrome-headless test once`. For other environments please check [doo's documentation](https://github.com/bensu/doo#setting-up-environments). To enable [speclj](https://github.com/slagyr/speclj) with [PhantomJS](http://phantomjs.org/), use `+spec` flag: diff --git a/resources/leiningen/new/reagent/README.md b/resources/leiningen/new/reagent/README.md index a156bfe..af8dddc 100644 --- a/resources/leiningen/new/reagent/README.md +++ b/resources/leiningen/new/reagent/README.md @@ -69,11 +69,16 @@ and stopped by running: ## Running the tests {{/test-or-spec-hook?}} {{#test-hook?}} -To run [cljs.test](https://github.com/clojure/clojurescript/blob/master/src/main/cljs/cljs/test.cljs) tests, please use +To run [cljs.test](https://github.com/clojure/clojurescript/blob/master/src/main/cljs/cljs/test.cljs) tests using headless chrome install karma and its plugins: ``` -lein doo +npm install -g karma-cli +npm install karma karma-cljs-test karma-chrome-launcher --save-dev +lein doo chrome-headless test once ``` + +For other environments please check [doo's documentation](https://github.com/bensu/doo#setting-up-environments). + {{/test-hook?}} {{#spec-hook?}} diff --git a/resources/leiningen/new/reagent/gitignore b/resources/leiningen/new/reagent/gitignore index ec686b7..493ee76 100644 --- a/resources/leiningen/new/reagent/gitignore +++ b/resources/leiningen/new/reagent/gitignore @@ -13,3 +13,4 @@ pom.xml.asc *.log /.env /.sass-cache +/node_modules From af050f82c669f3377340ffd825776a34f3d35049 Mon Sep 17 00:00:00 2001 From: Franco Biasin Date: Sat, 4 Apr 2020 19:28:37 -0300 Subject: [PATCH 149/179] Fix reagent deprecation warnings in speclj tests --- .../leiningen/new/reagent/spec/cljs/reagent/core_spec.cljs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/resources/leiningen/new/reagent/spec/cljs/reagent/core_spec.cljs b/resources/leiningen/new/reagent/spec/cljs/reagent/core_spec.cljs index 5c96e43..d18e7c2 100644 --- a/resources/leiningen/new/reagent/spec/cljs/reagent/core_spec.cljs +++ b/resources/leiningen/new/reagent/spec/cljs/reagent/core_spec.cljs @@ -2,6 +2,7 @@ (:require-macros [speclj.core :refer [describe it should= should should-not]]) (:require [speclj.core] [reagent.core :as reagent :refer [atom]] + [reagent.dom :as rdom] [{{project-ns}}.core :as rc])) @@ -20,9 +21,9 @@ (defn with-mounted-component [comp f] (when isClient (let [div (add-test-div "_testreagent")] - (let [comp (reagent/render-component comp div #(f comp div))] - (reagent/unmount-component-at-node div) - (reagent/flush) + (let [comp (rdom/render comp div #(f comp div))] + (rdom/unmount-component-at-node div) + (rflush) (.removeChild (.-body js/document) div))))) From dc81b3d1bf753073555b36269e15ff59ab186712 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Fri, 24 Apr 2020 16:59:41 -0400 Subject: [PATCH 150/179] bumped up cljs --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 2a86ccd..2e657ef 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.38" +(defproject reagent/lein-template "0.10.39" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index b312710..bb6703c 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -12,7 +12,7 @@ [ring/ring-defaults "0.3.2"] [hiccup "1.0.5"] [yogthos/config "1.1.7"] - [org.clojure/clojurescript "1.10.597" + [org.clojure/clojurescript "1.10.741" :scope "provided"]{{#shadow-cljs-hook?}} [com.google.javascript/closure-compiler-unshaded "v20190325"] [org.clojure/google-closure-library "0.0-20190213-2033d5d9"]{{/shadow-cljs-hook?}} From d9824784a13ea29944bd962df3472fe09f333e04 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Fri, 24 Apr 2020 17:02:05 -0400 Subject: [PATCH 151/179] bumped up nrepl --- resources/leiningen/new/reagent/project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index bb6703c..c6c77c6 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -139,7 +139,7 @@ [ring/ring-devel "1.8.0"] [prone "2020-01-17"] [figwheel-sidecar "0.5.19"] - [nrepl "0.6.0"] + [nrepl "0.7.0"] {{#shadow-cljs-hook?}} [thheller/shadow-cljs "2.8.37"] {{/shadow-cljs-hook?}} From ee1d814e846cbcfa41fca1c1f67df01eb8eebfdc Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Mon, 18 May 2020 09:44:25 -0400 Subject: [PATCH 152/179] bumped up dependencies --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 15 ++++++++------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/project.clj b/project.clj index 2e657ef..f62f8d3 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.39" +(defproject reagent/lein-template "0.10.40" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index c6c77c6..9f31ddd 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -8,15 +8,16 @@ [ring-server "0.5.0"] [reagent "0.10.0"] [reagent-utils "0.3.3"] - [ring "1.8.0"] + [ring "1.8.1"] [ring/ring-defaults "0.3.2"] [hiccup "1.0.5"] [yogthos/config "1.1.7"] - [org.clojure/clojurescript "1.10.741" + [org.clojure/clojurescript "1.10.764" :scope "provided"]{{#shadow-cljs-hook?}} [com.google.javascript/closure-compiler-unshaded "v20190325"] [org.clojure/google-closure-library "0.0-20190213-2033d5d9"]{{/shadow-cljs-hook?}} - [metosin/reitit "0.4.2"] + [metosin/reitit "0.5.1"] + [metosin/jsonista "0.2.6"] {{#clerk-hook?}} [pez/clerk "1.0.0"] {{/clerk-hook?}} @@ -133,12 +134,12 @@ {{/sass-hook?}} :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl} - :dependencies [[cider/piggieback "0.4.2"] + :dependencies [[cider/piggieback "0.5.0"] [binaryage/devtools "1.0.0"] [ring/ring-mock "0.4.0"] - [ring/ring-devel "1.8.0"] + [ring/ring-devel "1.8.1"] [prone "2020-01-17"] - [figwheel-sidecar "0.5.19"] + [figwheel-sidecar "0.5.20"] [nrepl "0.7.0"] {{#shadow-cljs-hook?}} [thheller/shadow-cljs "2.8.37"] @@ -161,7 +162,7 @@ {{/sass-hook?}} ] :source-paths ["env/dev/clj"] - :plugins [[lein-figwheel "0.5.19"] + :plugins [[lein-figwheel "0.5.20"] {{#test-hook?}} [lein-doo "0.1.10"] {{/test-hook?}} From 74efffd6263274b3b129b09ff0bb315288de846a Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Wed, 20 May 2020 16:28:53 -0400 Subject: [PATCH 153/179] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index cb8db65..2edf927 100644 --- a/README.md +++ b/README.md @@ -143,7 +143,7 @@ shadow-cljs release app ### Deploying to Heroku -Make sure you have [Git](http://git-scm.com/downloads) and [Heroku toolbelt](https://toolbelt.heroku.com/) installed, then simply follow the steps below. +The project generates a `system.properties` used for Heroku deployments. Make sure you have [Git](http://git-scm.com/downloads) and [Heroku toolbelt](https://toolbelt.heroku.com/) installed, then simply follow the steps below. Optionally, test that your application runs locally with foreman by running. From 733c0218c29011b46a8a7a3e02da314a53f73ee1 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Tue, 7 Jul 2020 15:23:30 -0400 Subject: [PATCH 154/179] bumped up dependencies --- project.clj | 2 +- resources/leiningen/new/reagent/package.json | 7 ++----- resources/leiningen/new/reagent/project.clj | 4 ++-- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/project.clj b/project.clj index f62f8d3..40c83a5 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.40" +(defproject reagent/lein-template "0.10.41" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/package.json b/resources/leiningen/new/reagent/package.json index c40d8b9..afa2a79 100644 --- a/resources/leiningen/new/reagent/package.json +++ b/resources/leiningen/new/reagent/package.json @@ -1,10 +1,7 @@ { "devDependencies": { - "shadow-cljs": "^2.8.37" + "shadow-cljs": "^2.10.14" }, - "dependencies":{ - "create-react-class": "^15.6.3", - "react": "^16.4.0", - "react-dom": "^16.4.0" + "dependencies":{ } } diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 9f31ddd..b5ffc5c 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -12,7 +12,7 @@ [ring/ring-defaults "0.3.2"] [hiccup "1.0.5"] [yogthos/config "1.1.7"] - [org.clojure/clojurescript "1.10.764" + [org.clojure/clojurescript "1.10.773" :scope "provided"]{{#shadow-cljs-hook?}} [com.google.javascript/closure-compiler-unshaded "v20190325"] [org.clojure/google-closure-library "0.0-20190213-2033d5d9"]{{/shadow-cljs-hook?}} @@ -135,7 +135,7 @@ :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl} :dependencies [[cider/piggieback "0.5.0"] - [binaryage/devtools "1.0.0"] + [binaryage/devtools "1.0.2"] [ring/ring-mock "0.4.0"] [ring/ring-devel "1.8.1"] [prone "2020-01-17"] From 2831e646d9340bb24c410308d6753808fb936be9 Mon Sep 17 00:00:00 2001 From: Anders Eriksson Date: Sun, 16 Aug 2020 05:00:22 +0200 Subject: [PATCH 155/179] fix faulty template data option name in README.md --- resources/leiningen/new/reagent/README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/leiningen/new/reagent/README.md b/resources/leiningen/new/reagent/README.md index af8dddc..344261b 100644 --- a/resources/leiningen/new/reagent/README.md +++ b/resources/leiningen/new/reagent/README.md @@ -9,14 +9,14 @@ To start the Figwheel compiler, navigate to the project folder and run the follo ``` lein figwheel ``` -{{#devcards?}} +{{#devcards-hook?}} To start the [DevCards](https://github.com/bhauman/devcards) build, run ``` lein figwheel devcards ``` -{{/devcards?}} +{{/devcards-hook?}} Figwheel will automatically push cljs changes to the browser. The server will be available at [http://localhost:3449](http://localhost:3449) once Figwheel starts up. {{#devcards-hook?}} To view your devcards, type `(switch-to-build devcards)` at the Figwheel REPL and navigate to [http://localhost:3449/cards](http://localhost:3449/cards). {{/devcards-hook?}} From eeeb7cedaaaee239711dfe3abcb13400e2ed2d7f Mon Sep 17 00:00:00 2001 From: Anders Eriksson Date: Sun, 16 Aug 2020 13:47:23 +0200 Subject: [PATCH 156/179] remove use of deprecated reagent.core/render --- .../leiningen/new/reagent/env/dev/cljs/reagent/cards.cljs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/leiningen/new/reagent/env/dev/cljs/reagent/cards.cljs b/resources/leiningen/new/reagent/env/dev/cljs/reagent/cards.cljs index e9e6cbc..57a1271 100644 --- a/resources/leiningen/new/reagent/env/dev/cljs/reagent/cards.cljs +++ b/resources/leiningen/new/reagent/env/dev/cljs/reagent/cards.cljs @@ -1,5 +1,6 @@ (ns {{project-ns}}.cards (:require [reagent.core :as reagent :refer [atom]] + [reagent.dom :as rdom] [{{project-ns}}.core :as core] [devcards.core :as dc]) (:require-macros @@ -13,7 +14,7 @@ (defcard-rg home-page-card [core/home-page]) -(reagent/render [:div] (.getElementById js/document "app")) +(rdom/render [:div] (.getElementById js/document "app")) ;; remember to run 'lein figwheel devcards' and then browse to ;; http://localhost:3449/cards From 11015bfcc4e60c81836416f8590bfc8e625f8eb4 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Sun, 16 Aug 2020 12:13:47 -0400 Subject: [PATCH 157/179] bumped up version --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index 40c83a5..c0da0be 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.41" +(defproject reagent/lein-template "0.10.42" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" From ddf6d8e39aa7b685e4c63179a15d3ffd67245a85 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Sun, 16 Aug 2020 12:14:45 -0400 Subject: [PATCH 158/179] bumped up dev dependencies --- resources/leiningen/new/reagent/project.clj | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index b5ffc5c..5b79bc0 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -134,13 +134,13 @@ {{/sass-hook?}} :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl} - :dependencies [[cider/piggieback "0.5.0"] + :dependencies [[cider/piggieback "0.5.1"] [binaryage/devtools "1.0.2"] [ring/ring-mock "0.4.0"] [ring/ring-devel "1.8.1"] [prone "2020-01-17"] [figwheel-sidecar "0.5.20"] - [nrepl "0.7.0"] + [nrepl "0.8.0"] {{#shadow-cljs-hook?}} [thheller/shadow-cljs "2.8.37"] {{/shadow-cljs-hook?}} From 9ace77bd11a88c897b57868ef54062cd52924ec6 Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Sun, 23 Aug 2020 10:00:03 -0400 Subject: [PATCH 159/179] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2edf927..0e87893 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ a batteries included setup for development and deployment. ### Getting Help -For any questions or discussion please come join us at the [Reagent Google Group](https://groups.google.com/forum/#!forum/reagent-project). +For any questions or discussion please come join us in the #reagent channel on the [Clojurians Slack](http://clojurians.net/). ## Usage From 01b974288070570414a519f57d2ac6fe9b0d7eed Mon Sep 17 00:00:00 2001 From: Teodor Heggelund Date: Wed, 26 Aug 2020 03:08:12 +0200 Subject: [PATCH 160/179] Ignore /.shadow-cljs and /resources/public/js (#177) --- resources/leiningen/new/reagent/gitignore | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/leiningen/new/reagent/gitignore b/resources/leiningen/new/reagent/gitignore index 493ee76..4e11e91 100644 --- a/resources/leiningen/new/reagent/gitignore +++ b/resources/leiningen/new/reagent/gitignore @@ -14,3 +14,5 @@ pom.xml.asc /.env /.sass-cache /node_modules +/.shadow-cljs/ +/resources/public/js/ From 18bcfdb6f59ef62e8b39ad5f12bc0f858f1bffa4 Mon Sep 17 00:00:00 2001 From: Paul Butcher Date: Tue, 27 Oct 2020 17:25:03 +0000 Subject: [PATCH 161/179] Use heroku local instead of foreman (#178) Heroku local has replaced foreman: https://devcenter.heroku.com/changelog-items/692 (it is still possible to use foreman https://devcenter.heroku.com/articles/heroku-local#run-your-app-locally-using-foreman but not officially supported, so the documentation should probably suggest the supported approach?). --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0e87893..ccb221f 100644 --- a/README.md +++ b/README.md @@ -145,10 +145,11 @@ shadow-cljs release app The project generates a `system.properties` used for Heroku deployments. Make sure you have [Git](http://git-scm.com/downloads) and [Heroku toolbelt](https://toolbelt.heroku.com/) installed, then simply follow the steps below. -Optionally, test that your application runs locally with foreman by running. +Optionally, test that your application runs locally by running. ``` -foreman start +lein do clean, uberjar +heroku local ``` Now, you can initialize your git repo and commit your application. From ec7e3bcf0aadc23890cc81306cdac0759eac1dd4 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Mon, 21 Dec 2020 10:25:07 -0500 Subject: [PATCH 162/179] switched to shadow-cljs as the default, updated dependencies --- README.md | 26 +++++++++---------- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 19 ++++++-------- .../leiningen/new/reagent/shadow-cljs.edn | 1 - src/leiningen/new/reagent.clj | 14 +++++----- 5 files changed, 28 insertions(+), 34 deletions(-) diff --git a/README.md b/README.md index ccb221f..d45f487 100644 --- a/README.md +++ b/README.md @@ -54,12 +54,21 @@ use `+less` or `+sass` flags: lein new reagent +less ``` -To add [shadow-cljs](https://github.com/thheller/shadow-cljs), use the `+shadow-cljs` flag: +To add [figwheel](https://github.com/bhauman/lein-figwheel/) (legacy), use the `+figwheel` flag: ``` -lein new reagent +shadow-cljs +lein new reagent +figwheel ``` -### Development mode +#### Development mode with [shadow-cljs](https://github.com/thheller/shadow-cljs) + +To start the [shadow-cljs](https://github.com/thheller/shadow-cljs) (if enabled with `+shadow-cljs` flag) compiler run +``` +shadow-cljs watch app +``` + +Shadow-cljs also automatically pushes cljs changes to the browser. The application will now be available at [http://localhost:3000](http://localhost:3000). + +### Development mode with Figwheel To start the Figwheel compiler, navigate to the project folder and run the following command in the terminal: @@ -72,7 +81,6 @@ To start the [DevCards](https://github.com/bhauman/devcards) (if enabled with `+ lein figwheel devcards ``` - Figwheel will automatically push cljs changes to the browser. The server will be available at [http://localhost:3449](http://localhost:3449) once Figwheel starts up. To view your devcards, type `(switch-to-build devcards)` at the Figwheel REPL and navigate to [http://localhost:3449/cards](http://localhost:3449/cards). @@ -101,16 +109,6 @@ lein sass4clj auto ``` to autocompile sass/scss files. -#### Development mode with [shadow-cljs](https://github.com/thheller/shadow-cljs) - -To start the [shadow-cljs](https://github.com/thheller/shadow-cljs) (if enabled with `+shadow-cljs` flag) compiler run -``` -shadow-cljs watch app -``` - -Similarly to Figwheel, shadow-cljs also automatically pushes cljs changes to the browser - -The application will now be available at [http://localhost:3000](http://localhost:3000). #### Optional development tools diff --git a/project.clj b/project.clj index c0da0be..f6732cd 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.42" +(defproject reagent/lein-template "0.10.43" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 5b79bc0..e90d345 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -6,18 +6,15 @@ :dependencies [[org.clojure/clojure "1.10.1"] [ring-server "0.5.0"] - [reagent "0.10.0"] + [reagent "1.0.0"] [reagent-utils "0.3.3"] - [ring "1.8.1"] + [ring "1.8.2"] [ring/ring-defaults "0.3.2"] [hiccup "1.0.5"] [yogthos/config "1.1.7"] [org.clojure/clojurescript "1.10.773" - :scope "provided"]{{#shadow-cljs-hook?}} - [com.google.javascript/closure-compiler-unshaded "v20190325"] - [org.clojure/google-closure-library "0.0-20190213-2033d5d9"]{{/shadow-cljs-hook?}} - [metosin/reitit "0.5.1"] - [metosin/jsonista "0.2.6"] + :scope "provided"] + [metosin/reitit "0.5.10"] {{#clerk-hook?}} [pez/clerk "1.0.0"] {{/clerk-hook?}} @@ -134,15 +131,15 @@ {{/sass-hook?}} :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl} - :dependencies [[cider/piggieback "0.5.1"] + :dependencies [[cider/piggieback "0.5.2"] [binaryage/devtools "1.0.2"] [ring/ring-mock "0.4.0"] - [ring/ring-devel "1.8.1"] + [ring/ring-devel "1.8.2"] [prone "2020-01-17"] [figwheel-sidecar "0.5.20"] - [nrepl "0.8.0"] + [nrepl "0.8.3"] {{#shadow-cljs-hook?}} - [thheller/shadow-cljs "2.8.37"] + [thheller/shadow-cljs "2.11.9"] {{/shadow-cljs-hook?}} {{#spec-hook?}} [speclj "3.3.2"] diff --git a/resources/leiningen/new/reagent/shadow-cljs.edn b/resources/leiningen/new/reagent/shadow-cljs.edn index 790598d..043212a 100644 --- a/resources/leiningen/new/reagent/shadow-cljs.edn +++ b/resources/leiningen/new/reagent/shadow-cljs.edn @@ -1,5 +1,4 @@ {:lein true - :source-paths ["src"] :builds {:app {:target :browser :output-dir "resources/public/js" :asset-path "/js" diff --git a/src/leiningen/new/reagent.clj b/src/leiningen/new/reagent.clj index 9b8561f..a6ef0c9 100644 --- a/src/leiningen/new/reagent.clj +++ b/src/leiningen/new/reagent.clj @@ -16,7 +16,7 @@ (defn indent [n list] (wrap-indent identity n list)) -(def valid-opts ["+test" "+spec" "+less" "+sass" "+devcards" "+cider" "+shadow-cljs" "-clerk"]) +(def valid-opts ["+test" "+spec" "+less" "+sass" "+devcards" "+cider" "+figwheel" "-clerk"]) (defn less? [opts] (some #{"+less"} opts)) @@ -36,8 +36,8 @@ (defn cider? [opts] (some #{"+cider"} opts)) -(defn shadow-cljs? [opts] - (some #{"+shadow-cljs"} opts)) +(defn figwheel? [opts] + (some #{"+figwheel"} opts)) (defn clerk? [opts] (not (some #{"-clerk"} opts))) @@ -80,7 +80,7 @@ :cider-hook? (fn [block] (if (cider? opts) (str block "") "")) - :shadow-cljs-hook? (fn [block] (if (shadow-cljs? opts) (str block "") "")) + :shadow-cljs-hook? (fn [block] (if (figwheel? opts) "" (str block ""))) :clerk-hook? (fn [block] (if (clerk? opts) (str block "") ""))}) @@ -129,11 +129,11 @@ args (if (devcards? opts) (conj args ["env/dev/cljs/{{sanitized}}/cards.cljs" (render "env/dev/cljs/reagent/cards.cljs" data)]) args) - args (if (shadow-cljs? opts) + args (if (figwheel? opts) + args (conj args ["shadow-cljs.edn" (render "shadow-cljs.edn" data)] - ["package.json" (render "package.json" data)]) - args)] + ["package.json" (render "package.json" data)]))] args)) (defn reagent [name & opts] From 9c85ebcd976c19b97fd6c8ebcdfd164b1d2a94bb Mon Sep 17 00:00:00 2001 From: Dmitri Sotnikov Date: Wed, 23 Dec 2020 11:06:32 -0500 Subject: [PATCH 163/179] Update project.clj --- resources/leiningen/new/reagent/project.clj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index e90d345..05a2e87 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -21,6 +21,8 @@ [venantius/accountant "0.2.5" :exclusions [org.clojure/tools.reader]]] + :jvm-opts ["-Xmx1G"] + :plugins [[lein-environ "1.1.0"] [lein-cljsbuild "1.1.7"] [lein-asset-minifier "0.4.6" From 17ca24083703284c241a06fec0ef72eaf3c84063 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Mon, 25 Jan 2021 16:12:54 -0500 Subject: [PATCH 164/179] bumped up shadow-cljs --- project.clj | 2 +- resources/leiningen/new/reagent/package.json | 2 +- resources/leiningen/new/reagent/project.clj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project.clj b/project.clj index f6732cd..a03546b 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.43" +(defproject reagent/lein-template "0.10.44" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/package.json b/resources/leiningen/new/reagent/package.json index afa2a79..6f4aa21 100644 --- a/resources/leiningen/new/reagent/package.json +++ b/resources/leiningen/new/reagent/package.json @@ -1,6 +1,6 @@ { "devDependencies": { - "shadow-cljs": "^2.10.14" + "shadow-cljs": "^2.11.14" }, "dependencies":{ } diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 05a2e87..33400f8 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -141,7 +141,7 @@ [figwheel-sidecar "0.5.20"] [nrepl "0.8.3"] {{#shadow-cljs-hook?}} - [thheller/shadow-cljs "2.11.9"] + [thheller/shadow-cljs "2.11.14"] {{/shadow-cljs-hook?}} {{#spec-hook?}} [speclj "3.3.2"] From b4591e1ab94ca198f3274309a6145a7ff78a0ab7 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Tue, 9 Mar 2021 14:27:19 -0500 Subject: [PATCH 165/179] bumped up dependencies --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/project.clj b/project.clj index a03546b..489984c 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.44" +(defproject reagent/lein-template "0.10.45" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 33400f8..20a26f0 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -4,17 +4,17 @@ :license {:name "Eclipse Public License" :url "http://www.eclipse.org/legal/epl-v10.html"} - :dependencies [[org.clojure/clojure "1.10.1"] + :dependencies [[org.clojure/clojure "1.10.3"] [ring-server "0.5.0"] [reagent "1.0.0"] [reagent-utils "0.3.3"] - [ring "1.8.2"] + [ring "1.8.1"] [ring/ring-defaults "0.3.2"] [hiccup "1.0.5"] [yogthos/config "1.1.7"] [org.clojure/clojurescript "1.10.773" :scope "provided"] - [metosin/reitit "0.5.10"] + [metosin/reitit "0.5.12"] {{#clerk-hook?}} [pez/clerk "1.0.0"] {{/clerk-hook?}} @@ -136,12 +136,12 @@ :dependencies [[cider/piggieback "0.5.2"] [binaryage/devtools "1.0.2"] [ring/ring-mock "0.4.0"] - [ring/ring-devel "1.8.2"] + [ring/ring-devel "1.9.1"] [prone "2020-01-17"] [figwheel-sidecar "0.5.20"] [nrepl "0.8.3"] {{#shadow-cljs-hook?}} - [thheller/shadow-cljs "2.11.14"] + [thheller/shadow-cljs "2.11.22"] {{/shadow-cljs-hook?}} {{#spec-hook?}} [speclj "3.3.2"] From c769c6806540a9faafec36c27b07a1c86ae5eff7 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Tue, 6 Apr 2021 21:54:13 -0400 Subject: [PATCH 166/179] bumped up clojurescript, shadow-cljs --- project.clj | 2 +- resources/leiningen/new/reagent/package.json | 2 +- resources/leiningen/new/reagent/project.clj | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/project.clj b/project.clj index 489984c..d312e7d 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.45" +(defproject reagent/lein-template "0.10.46" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/package.json b/resources/leiningen/new/reagent/package.json index 6f4aa21..7f1b165 100644 --- a/resources/leiningen/new/reagent/package.json +++ b/resources/leiningen/new/reagent/package.json @@ -1,6 +1,6 @@ { "devDependencies": { - "shadow-cljs": "^2.11.14" + "shadow-cljs": "^2.12.1" }, "dependencies":{ } diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 20a26f0..17693a5 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -12,7 +12,7 @@ [ring/ring-defaults "0.3.2"] [hiccup "1.0.5"] [yogthos/config "1.1.7"] - [org.clojure/clojurescript "1.10.773" + [org.clojure/clojurescript "1.10.844" :scope "provided"] [metosin/reitit "0.5.12"] {{#clerk-hook?}} @@ -141,7 +141,7 @@ [figwheel-sidecar "0.5.20"] [nrepl "0.8.3"] {{#shadow-cljs-hook?}} - [thheller/shadow-cljs "2.11.22"] + [thheller/shadow-cljs "2.12.1"] {{/shadow-cljs-hook?}} {{#spec-hook?}} [speclj "3.3.2"] From 27057fd16002dbe4061feaef1c823d5c7185155a Mon Sep 17 00:00:00 2001 From: Michael Salihi Date: Tue, 4 May 2021 14:26:26 +0200 Subject: [PATCH 167/179] Since Shadow-cljs is now default, some changes needed in the readme (#181) --- README.md | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index d45f487..64a1b5b 100644 --- a/README.md +++ b/README.md @@ -59,18 +59,18 @@ To add [figwheel](https://github.com/bhauman/lein-figwheel/) (legacy), use the ` lein new reagent +figwheel ``` -#### Development mode with [shadow-cljs](https://github.com/thheller/shadow-cljs) +### Development mode with [shadow-cljs](https://github.com/thheller/shadow-cljs) -To start the [shadow-cljs](https://github.com/thheller/shadow-cljs) (if enabled with `+shadow-cljs` flag) compiler run +To start the [shadow-cljs](https://github.com/thheller/shadow-cljs) compiler run ``` shadow-cljs watch app ``` -Shadow-cljs also automatically pushes cljs changes to the browser. The application will now be available at [http://localhost:3000](http://localhost:3000). +Shadow-cljs automatically pushes cljs changes to the browser. The application will now be available at [http://localhost:3000](http://localhost:3000). ### Development mode with Figwheel -To start the Figwheel compiler, navigate to the project folder and run the following command in the terminal: +To start the Figwheel compiler (if enabled with `+figwheel` flag), navigate to the project folder and run the following command in the terminal: ``` lein figwheel @@ -81,7 +81,7 @@ To start the [DevCards](https://github.com/bhauman/devcards) (if enabled with `+ lein figwheel devcards ``` -Figwheel will automatically push cljs changes to the browser. The server will be available at [http://localhost:3449](http://localhost:3449) +Figwheel will also automatically push cljs changes to the browser. The server will be available at [http://localhost:3449](http://localhost:3449) once Figwheel starts up. To view your devcards, type `(switch-to-build devcards)` at the Figwheel REPL and navigate to [http://localhost:3449/cards](http://localhost:3449/cards). Figwheel also starts `nREPL` using the value of the `:nrepl-port` in the `:figwheel` @@ -133,8 +133,7 @@ and stopped by running: lein do clean, uberjar ``` -#### Building for release with [shadow-cljs](https://github.com/thheller/shadow-cljs) -(if enabled with `+shadow-cljs` flag) +#### Building for release with [shadow-cljs](https://github.com/thheller/shadow-cljs) ``` shadow-cljs release app ``` From e956ffff92f09916210e4026c03995b8668d4f55 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Tue, 25 May 2021 14:19:28 -0400 Subject: [PATCH 168/179] bumped up cljs --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index d312e7d..f6e5d7b 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.46" +(defproject reagent/lein-template "0.10.47" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 17693a5..97cdc47 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -12,7 +12,7 @@ [ring/ring-defaults "0.3.2"] [hiccup "1.0.5"] [yogthos/config "1.1.7"] - [org.clojure/clojurescript "1.10.844" + [org.clojure/clojurescript "1.10.866" :scope "provided"] [metosin/reitit "0.5.12"] {{#clerk-hook?}} From 39d16aaff9ba106c01b055ba81867a11f69c6217 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Thu, 27 May 2021 16:07:11 -0400 Subject: [PATCH 169/179] removed LICENSE file from the generated template --- project.clj | 2 +- src/leiningen/new/reagent.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index f6e5d7b..e5905a0 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.47" +(defproject reagent/lein-template "0.10.48" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/src/leiningen/new/reagent.clj b/src/leiningen/new/reagent.clj index a6ef0c9..868663e 100644 --- a/src/leiningen/new/reagent.clj +++ b/src/leiningen/new/reagent.clj @@ -99,7 +99,7 @@ ["src/cljc/{{sanitized}}/util.cljc" (render "src/cljc/reagent/util.cljc" data)] ["env/dev/cljs/{{sanitized}}/dev.cljs" (render "env/dev/cljs/reagent/dev.cljs" data)] ["env/prod/cljs/{{sanitized}}/prod.cljs" (render "env/prod/cljs/reagent/prod.cljs" data)] - ["LICENSE" (render "LICENSE" data)] + #_["LICENSE" (render "LICENSE" data)] ["README.md" (render "README.md" data)] [".gitignore" (render "gitignore" data)] ;; Heroku support From 0512f25e3b3d0b5c4f5eb8bf2192a0e29184e54e Mon Sep 17 00:00:00 2001 From: Juho Teperi Date: Sat, 5 Jun 2021 19:56:37 +0300 Subject: [PATCH 170/179] Reagent 1.1.0 (#183) * Update Reagent and add React dependencies * Update shadow-cljs and use specific closure-compiler version with it --- README.md | 1 + resources/leiningen/new/reagent/package.json | 6 ++++-- resources/leiningen/new/reagent/project.clj | 11 +++++++++-- resources/leiningen/new/reagent/shadow-cljs.edn | 2 +- 4 files changed, 15 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 64a1b5b..510ea96 100644 --- a/README.md +++ b/README.md @@ -63,6 +63,7 @@ lein new reagent +figwheel To start the [shadow-cljs](https://github.com/thheller/shadow-cljs) compiler run ``` +npm install shadow-cljs watch app ``` diff --git a/resources/leiningen/new/reagent/package.json b/resources/leiningen/new/reagent/package.json index 7f1b165..eaa81fc 100644 --- a/resources/leiningen/new/reagent/package.json +++ b/resources/leiningen/new/reagent/package.json @@ -1,7 +1,9 @@ { "devDependencies": { - "shadow-cljs": "^2.12.1" + "shadow-cljs": "^2.14.3" }, - "dependencies":{ + "dependencies":{ + "react": "^17.0.2", + "react-dom": "^17.0.2" } } diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 97cdc47..aedfe51 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -6,14 +6,17 @@ :dependencies [[org.clojure/clojure "1.10.3"] [ring-server "0.5.0"] - [reagent "1.0.0"] + [reagent "1.1.0"] [reagent-utils "0.3.3"] + [cljsjs/react "17.0.2-0"] + [cljsjs/react-dom "17.0.2-0"] [ring "1.8.1"] [ring/ring-defaults "0.3.2"] [hiccup "1.0.5"] [yogthos/config "1.1.7"] [org.clojure/clojurescript "1.10.866" :scope "provided"] + [com.google.javascript/closure-compiler-unshaded "v20210302"] [metosin/reitit "0.5.12"] {{#clerk-hook?}} [pez/clerk "1.0.0"] @@ -141,7 +144,7 @@ [figwheel-sidecar "0.5.20"] [nrepl "0.8.3"] {{#shadow-cljs-hook?}} - [thheller/shadow-cljs "2.12.1"] + [thheller/shadow-cljs "2.14.3"] {{/shadow-cljs-hook?}} {{#spec-hook?}} [speclj "3.3.2"] @@ -187,6 +190,10 @@ :env {:dev true}} + {{#shadow-cljs-hook?}} + :shadow-cljs {:dependencies [[com.google.javascript/closure-compiler-unshaded "v20210505"]]} + {{/shadow-cljs-hook?}} + :uberjar {:hooks [minify-assets.plugin/hooks] :source-paths ["env/prod/clj"] :prep-tasks ["compile" ["cljsbuild" "once" "min"]] diff --git a/resources/leiningen/new/reagent/shadow-cljs.edn b/resources/leiningen/new/reagent/shadow-cljs.edn index 043212a..5a90360 100644 --- a/resources/leiningen/new/reagent/shadow-cljs.edn +++ b/resources/leiningen/new/reagent/shadow-cljs.edn @@ -1,4 +1,4 @@ -{:lein true +{:lein {:profile "+shadow-cljs"} :builds {:app {:target :browser :output-dir "resources/public/js" :asset-path "/js" From 9de74de55c2be13f119c4304f87501946091305f Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Sat, 5 Jun 2021 12:57:28 -0400 Subject: [PATCH 171/179] bumped up version --- project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/project.clj b/project.clj index e5905a0..1282117 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.48" +(defproject reagent/lein-template "0.10.49" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" From dc0205abba9458c3ed9fb6827840ec124efc4edb Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Sat, 5 Jun 2021 13:20:37 -0400 Subject: [PATCH 172/179] removed unused google closure dependency --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 1282117..47ef5c5 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.49" +(defproject reagent/lein-template "0.10.50" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index aedfe51..728dc23 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -16,7 +16,6 @@ [yogthos/config "1.1.7"] [org.clojure/clojurescript "1.10.866" :scope "provided"] - [com.google.javascript/closure-compiler-unshaded "v20210302"] [metosin/reitit "0.5.12"] {{#clerk-hook?}} [pez/clerk "1.0.0"] From 4b9f2d9b4d95c270a15a4b157c32146e7e2bd2ba Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Thu, 4 Nov 2021 16:15:38 -0400 Subject: [PATCH 173/179] updated ClojureScript to 1.10.891 --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/project.clj b/project.clj index 47ef5c5..71a81ea 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.50" +(defproject reagent/lein-template "0.10.51" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 728dc23..bd27250 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -14,7 +14,7 @@ [ring/ring-defaults "0.3.2"] [hiccup "1.0.5"] [yogthos/config "1.1.7"] - [org.clojure/clojurescript "1.10.866" + [org.clojure/clojurescript "1.10.891" :scope "provided"] [metosin/reitit "0.5.12"] {{#clerk-hook?}} From 4e22bd3ae4f4631b8d354cfa84f5928ef96db601 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Fri, 19 Nov 2021 08:40:33 -0500 Subject: [PATCH 174/179] bumped up shadow-cljs --- project.clj | 2 +- resources/leiningen/new/reagent/package.json | 2 +- resources/leiningen/new/reagent/project.clj | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project.clj b/project.clj index 71a81ea..3c78649 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.51" +(defproject reagent/lein-template "0.10.52" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/package.json b/resources/leiningen/new/reagent/package.json index eaa81fc..8ed6abb 100644 --- a/resources/leiningen/new/reagent/package.json +++ b/resources/leiningen/new/reagent/package.json @@ -1,6 +1,6 @@ { "devDependencies": { - "shadow-cljs": "^2.14.3" + "shadow-cljs": "^2.16.5" }, "dependencies":{ "react": "^17.0.2", diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index bd27250..e9322fa 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -143,7 +143,7 @@ [figwheel-sidecar "0.5.20"] [nrepl "0.8.3"] {{#shadow-cljs-hook?}} - [thheller/shadow-cljs "2.14.3"] + [thheller/shadow-cljs "2.16.5"] {{/shadow-cljs-hook?}} {{#spec-hook?}} [speclj "3.3.2"] From ba8011c3c55fea7c96befb0605504ee740c8ed12 Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Tue, 7 Dec 2021 12:09:39 -0500 Subject: [PATCH 175/179] updated dependencies --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 26 ++++++++++----------- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/project.clj b/project.clj index 3c78649..a97a51c 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.52" +(defproject reagent/lein-template "0.10.53" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index e9322fa..0ba9953 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -7,16 +7,16 @@ :dependencies [[org.clojure/clojure "1.10.3"] [ring-server "0.5.0"] [reagent "1.1.0"] - [reagent-utils "0.3.3"] + [reagent-utils "0.3.4"] [cljsjs/react "17.0.2-0"] [cljsjs/react-dom "17.0.2-0"] - [ring "1.8.1"] - [ring/ring-defaults "0.3.2"] + [ring "1.9.4"] + [ring/ring-defaults "0.3.3"] [hiccup "1.0.5"] - [yogthos/config "1.1.7"] - [org.clojure/clojurescript "1.10.891" + [yogthos/config "1.1.8"] + [org.clojure/clojurescript "1.10.896" :scope "provided"] - [metosin/reitit "0.5.12"] + [metosin/reitit "0.5.15"] {{#clerk-hook?}} [pez/clerk "1.0.0"] {{/clerk-hook?}} @@ -135,15 +135,15 @@ {{/sass-hook?}} :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl} - :dependencies [[cider/piggieback "0.5.2"] - [binaryage/devtools "1.0.2"] + :dependencies [[cider/piggieback "0.5.3"] + [binaryage/devtools "1.0.4"] [ring/ring-mock "0.4.0"] - [ring/ring-devel "1.9.1"] - [prone "2020-01-17"] + [ring/ring-devel "1.9.4"] + [prone "2021-04-23"] [figwheel-sidecar "0.5.20"] [nrepl "0.8.3"] {{#shadow-cljs-hook?}} - [thheller/shadow-cljs "2.16.5"] + [thheller/shadow-cljs "2.16.7"] {{/shadow-cljs-hook?}} {{#spec-hook?}} [speclj "3.3.2"] @@ -151,7 +151,7 @@ {{#devcards-hook?}} [devcards "0.2.6" :exclusions [cljsjs/react]] {{/devcards-hook?}} - [pjstadig/humane-test-output "0.10.0"] + [pjstadig/humane-test-output "0.11.0"] {{dev-dependencies}} {{#less-hook?}} ;; To silence warnings from less4clj dependecies about missing logger implementation @@ -190,7 +190,7 @@ :env {:dev true}} {{#shadow-cljs-hook?}} - :shadow-cljs {:dependencies [[com.google.javascript/closure-compiler-unshaded "v20210505"]]} + :shadow-cljs {:dependencies [[com.google.javascript/closure-compiler-unshaded "v20211201"]]} {{/shadow-cljs-hook?}} :uberjar {:hooks [minify-assets.plugin/hooks] From b57b128bba00fc21da12a9d207a9e884459566ed Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Sat, 14 May 2022 16:31:23 -0400 Subject: [PATCH 176/179] bumped up dependencies --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/project.clj b/project.clj index a97a51c..66de19e 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.53" +(defproject reagent/lein-template "0.10.55" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index 0ba9953..e3f5f23 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -4,7 +4,7 @@ :license {:name "Eclipse Public License" :url "http://www.eclipse.org/legal/epl-v10.html"} - :dependencies [[org.clojure/clojure "1.10.3"] + :dependencies [[org.clojure/clojure "1.11.1"] [ring-server "0.5.0"] [reagent "1.1.0"] [reagent-utils "0.3.4"] @@ -14,7 +14,7 @@ [ring/ring-defaults "0.3.3"] [hiccup "1.0.5"] [yogthos/config "1.1.8"] - [org.clojure/clojurescript "1.10.896" + [org.clojure/clojurescript "1.11.51" :scope "provided"] [metosin/reitit "0.5.15"] {{#clerk-hook?}} From c54f0bc9e183783c12a3c151af9061bbbae5a0ac Mon Sep 17 00:00:00 2001 From: "dmitri.sotnikov@gmail.com" Date: Thu, 9 Jun 2022 14:46:57 -0400 Subject: [PATCH 177/179] updated dependencies --- project.clj | 2 +- resources/leiningen/new/reagent/project.clj | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/project.clj b/project.clj index 66de19e..35f841d 100644 --- a/project.clj +++ b/project.clj @@ -1,4 +1,4 @@ -(defproject reagent/lein-template "0.10.55" +(defproject reagent/lein-template "0.10.56" :description "A Leiningen template for a ClojureScript setup with Figwheel, Austin, and Reagent." :url "https://github.com/reagent-project/reagent-template" :license {:name "MIT License" diff --git a/resources/leiningen/new/reagent/project.clj b/resources/leiningen/new/reagent/project.clj index e3f5f23..e677310 100644 --- a/resources/leiningen/new/reagent/project.clj +++ b/resources/leiningen/new/reagent/project.clj @@ -6,17 +6,17 @@ :dependencies [[org.clojure/clojure "1.11.1"] [ring-server "0.5.0"] - [reagent "1.1.0"] + [reagent "1.1.1"] [reagent-utils "0.3.4"] [cljsjs/react "17.0.2-0"] [cljsjs/react-dom "17.0.2-0"] - [ring "1.9.4"] + [ring "1.9.5"] [ring/ring-defaults "0.3.3"] [hiccup "1.0.5"] - [yogthos/config "1.1.8"] - [org.clojure/clojurescript "1.11.51" + [yogthos/config "1.2.0"] + [org.clojure/clojurescript "1.11.54" :scope "provided"] - [metosin/reitit "0.5.15"] + [metosin/reitit "0.5.18"] {{#clerk-hook?}} [pez/clerk "1.0.0"] {{/clerk-hook?}} @@ -136,12 +136,12 @@ :profiles {:dev {:repl-options {:init-ns {{project-ns}}.repl} :dependencies [[cider/piggieback "0.5.3"] - [binaryage/devtools "1.0.4"] + [binaryage/devtools "1.0.6"] [ring/ring-mock "0.4.0"] - [ring/ring-devel "1.9.4"] + [ring/ring-devel "1.9.5"] [prone "2021-04-23"] [figwheel-sidecar "0.5.20"] - [nrepl "0.8.3"] + [nrepl "0.9.0"] {{#shadow-cljs-hook?}} [thheller/shadow-cljs "2.16.7"] {{/shadow-cljs-hook?}} From 5038c2c75ac61e965cf7afd05cdb6d975745b16f Mon Sep 17 00:00:00 2001 From: Thomas Heller Date: Mon, 27 Jun 2022 13:34:35 +0200 Subject: [PATCH 178/179] use recommend shadow-cljs setup for init/reload (#185) Should use :init-fn instead of having html emit a function call. :init-fn ensures the function is called when the JS file is loaded and enables using