From 59df1f995b6a2f70afa619ca684d29f1f67338d1 Mon Sep 17 00:00:00 2001 From: Joel Kaasinen Date: Fri, 19 Apr 2024 13:51:26 +0300 Subject: [PATCH 1/8] deps: bump clojure version in examples --- examples/openapi/project.clj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/examples/openapi/project.clj b/examples/openapi/project.clj index 0e88cac8..f4999325 100644 --- a/examples/openapi/project.clj +++ b/examples/openapi/project.clj @@ -1,6 +1,6 @@ (defproject openapi "0.1.0-SNAPSHOT" :description "Reitit OpenAPI example" - :dependencies [[org.clojure/clojure "1.10.0"] + :dependencies [[org.clojure/clojure "1.11.2"] [metosin/jsonista "0.2.6"] [ring/ring-jetty-adapter "1.7.1"] [metosin/reitit "0.7.0-alpha7"] From cc9863c95fc4acaddbc74f3f1df65715e688ed96 Mon Sep 17 00:00:00 2001 From: Joel Kaasinen Date: Fri, 19 Apr 2024 14:05:42 +0300 Subject: [PATCH 2/8] deps: bump deps in examples/buddy-auth --- examples/buddy-auth/project.clj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/examples/buddy-auth/project.clj b/examples/buddy-auth/project.clj index b87654f5..e728ddb2 100644 --- a/examples/buddy-auth/project.clj +++ b/examples/buddy-auth/project.clj @@ -1,7 +1,7 @@ -(defproject ring-example "0.1.0-SNAPSHOT" +(defproject buddy-auth "0.1.0-SNAPSHOT" :description "Reitit Buddy Auth App" - :dependencies [[org.clojure/clojure "1.10.1"] - [ring/ring-jetty-adapter "1.8.1"] + :dependencies [[org.clojure/clojure "1.11.2"] + [ring/ring-jetty-adapter "1.12.1"] [metosin/reitit "0.7.0-alpha7"] [buddy "2.0.0"]] :repl-options {:init-ns example.server}) From ff76f5d8889f849d2cb7a6cdf2eb71d531aa8740 Mon Sep 17 00:00:00 2001 From: Joel Kaasinen Date: Fri, 19 Apr 2024 14:11:58 +0300 Subject: [PATCH 3/8] deps: update deps on some examples --- examples/frontend-auth/project.clj | 2 +- examples/frontend/project.clj | 2 +- examples/http-swagger/project.clj | 8 ++++---- examples/http/project.clj | 12 ++++++------ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/examples/frontend-auth/project.clj b/examples/frontend-auth/project.clj index 066bc4b5..9153907d 100644 --- a/examples/frontend-auth/project.clj +++ b/examples/frontend-auth/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.0"] + :dependencies [[org.clojure/clojure "1.11.2"] [ring-server "0.5.0"] [reagent "0.8.1"] [ring "1.7.1"] diff --git a/examples/frontend/project.clj b/examples/frontend/project.clj index 11a0f6d1..5b1cf54a 100644 --- a/examples/frontend/project.clj +++ b/examples/frontend/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.1"] + :dependencies [[org.clojure/clojure "1.11.2"] [ring-server "0.5.0"] [reagent "0.10.0"] [ring "1.8.1"] diff --git a/examples/http-swagger/project.clj b/examples/http-swagger/project.clj index 52c4b7cd..59e17a67 100644 --- a/examples/http-swagger/project.clj +++ b/examples/http-swagger/project.clj @@ -1,8 +1,8 @@ -(defproject ring-example "0.1.0-SNAPSHOT" +(defproject http-swagger "0.1.0-SNAPSHOT" :description "Reitit Http App with Swagger" - :dependencies [[org.clojure/clojure "1.11.1"] - [ring/ring-jetty-adapter "1.7.1"] - [aleph "0.4.7-alpha5"] + :dependencies [[org.clojure/clojure "1.11.2"] + [ring/ring-jetty-adapter "1.12.1"] + [aleph "0.7.1"] [metosin/reitit "0.7.0-alpha7"] [metosin/ring-swagger-ui "5.9.0"]] :repl-options {:init-ns example.server}) diff --git a/examples/http/project.clj b/examples/http/project.clj index eec85837..a3da846d 100644 --- a/examples/http/project.clj +++ b/examples/http/project.clj @@ -1,9 +1,9 @@ -(defproject ring-example "0.1.0-SNAPSHOT" +(defproject http "0.1.0-SNAPSHOT" :description "Reitit Ring App with Swagger" - :dependencies [[org.clojure/clojure "1.10.0"] - [org.clojure/core.async "0.4.490"] - [funcool/promesa "1.9.0"] - [manifold "0.1.8"] - [ring/ring-jetty-adapter "1.7.1"] + :dependencies [[org.clojure/clojure "1.11.2"] + [org.clojure/core.async "1.6.681"] + [funcool/promesa "11.0.678"] + [manifold "0.4.2"] + [ring/ring-jetty-adapter "1.12.1"] [metosin/reitit "0.7.0-alpha7"]] :repl-options {:init-ns example.server}) From cd6c23823c1b8970c7afadaf370d622519f47310 Mon Sep 17 00:00:00 2001 From: Joel Kaasinen Date: Fri, 19 Apr 2024 14:16:27 +0300 Subject: [PATCH 4/8] deps: bump the deps of some examples --- examples/just-coercion-with-ring/project.clj | 4 ++-- examples/openapi/project.clj | 6 +++--- examples/pedestal/project.clj | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/examples/just-coercion-with-ring/project.clj b/examples/just-coercion-with-ring/project.clj index 5927cbda..cef0db78 100644 --- a/examples/just-coercion-with-ring/project.clj +++ b/examples/just-coercion-with-ring/project.clj @@ -1,5 +1,5 @@ (defproject just-coercion-with-ring "0.1.0-SNAPSHOT" :description "Reitit coercion with vanilla ring" - :dependencies [[org.clojure/clojure "1.10.0"] - [ring/ring-jetty-adapter "1.7.1"] + :dependencies [[org.clojure/clojure "1.11.2"] + [ring/ring-jetty-adapter "1.12.1"] [metosin/reitit "0.7.0-alpha7"]]) diff --git a/examples/openapi/project.clj b/examples/openapi/project.clj index f4999325..2673c18a 100644 --- a/examples/openapi/project.clj +++ b/examples/openapi/project.clj @@ -1,9 +1,9 @@ (defproject openapi "0.1.0-SNAPSHOT" :description "Reitit OpenAPI example" :dependencies [[org.clojure/clojure "1.11.2"] - [metosin/jsonista "0.2.6"] - [ring/ring-jetty-adapter "1.7.1"] + [metosin/jsonista "0.3.8"] + [ring/ring-jetty-adapter "1.12.1"] [metosin/reitit "0.7.0-alpha7"] [metosin/ring-swagger-ui "5.9.0"]] :repl-options {:init-ns example.server} - :profiles {:dev {:dependencies [[ring/ring-mock "0.3.2"]]}}) + :profiles {:dev {:dependencies [[ring/ring-mock "0.4.0"]]}}) diff --git a/examples/pedestal/project.clj b/examples/pedestal/project.clj index 3b068503..272fe834 100644 --- a/examples/pedestal/project.clj +++ b/examples/pedestal/project.clj @@ -1,8 +1,8 @@ -(defproject ring-example "0.1.0-SNAPSHOT" +(defproject pedestal-example "0.1.0-SNAPSHOT" :description "Reitit-http with pedestal" - :dependencies [[org.clojure/clojure "1.10.0"] - [io.pedestal/pedestal.service "0.5.5"] - [io.pedestal/pedestal.jetty "0.5.5"] + :dependencies [[org.clojure/clojure "1.11.2"] + [io.pedestal/pedestal.service "0.6.3"] + [io.pedestal/pedestal.jetty "0.6.3"] [metosin/reitit-pedestal "0.7.0-alpha7"] [metosin/reitit "0.7.0-alpha7"]] :repl-options {:init-ns example.server}) From 06c0fd856655d14bf5570716e660d3e1484d8a15 Mon Sep 17 00:00:00 2001 From: Joel Kaasinen Date: Fri, 19 Apr 2024 14:22:10 +0300 Subject: [PATCH 5/8] fix: ns name in examples/pedestal-malli-swagger, bump deps --- examples/pedestal-malli-swagger/project.clj | 6 +++--- examples/pedestal-malli-swagger/src/server.clj | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/pedestal-malli-swagger/project.clj b/examples/pedestal-malli-swagger/project.clj index b6d911cf..0753075d 100644 --- a/examples/pedestal-malli-swagger/project.clj +++ b/examples/pedestal-malli-swagger/project.clj @@ -1,8 +1,8 @@ (defproject pedestal-malli-swagger-example "0.1.0-SNAPSHOT" :description "Reitit-http with pedestal" - :dependencies [[org.clojure/clojure "1.11.1"] - [io.pedestal/pedestal.service "0.5.5"] - [io.pedestal/pedestal.jetty "0.5.5"] + :dependencies [[org.clojure/clojure "1.11.2"] + [io.pedestal/pedestal.service "0.6.3"] + [io.pedestal/pedestal.jetty "0.6.3"] [metosin/reitit-malli "0.7.0-alpha7"] [metosin/reitit-pedestal "0.7.0-alpha7"] [metosin/reitit "0.7.0-alpha7"]] diff --git a/examples/pedestal-malli-swagger/src/server.clj b/examples/pedestal-malli-swagger/src/server.clj index 72c93967..9a95b593 100644 --- a/examples/pedestal-malli-swagger/src/server.clj +++ b/examples/pedestal-malli-swagger/src/server.clj @@ -1,4 +1,4 @@ -(ns example.server +(ns server (:require [clojure.java.io :as io] [io.pedestal.http.route] [reitit.interceptor] @@ -161,4 +161,4 @@ (->> (reset! server))) (println "server running in port 3000")) -#_(start server config) \ No newline at end of file +#_(start server config) From 13e8dd86e514d0c307ea20f997931c5e574de3dc Mon Sep 17 00:00:00 2001 From: Joel Kaasinen Date: Fri, 19 Apr 2024 14:26:03 +0300 Subject: [PATCH 6/8] deps: bump deps on some examples --- examples/pedestal-swagger/project.clj | 6 +++--- examples/ring-example/project.clj | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/examples/pedestal-swagger/project.clj b/examples/pedestal-swagger/project.clj index 279a9444..beb3fa38 100644 --- a/examples/pedestal-swagger/project.clj +++ b/examples/pedestal-swagger/project.clj @@ -1,8 +1,8 @@ (defproject ring-example "0.1.0-SNAPSHOT" :description "Reitit-http with pedestal" - :dependencies [[org.clojure/clojure "1.11.1"] - [io.pedestal/pedestal.service "0.5.5"] - [io.pedestal/pedestal.jetty "0.5.5"] + :dependencies [[org.clojure/clojure "1.11.2"] + [io.pedestal/pedestal.service "0.6.3"] + [io.pedestal/pedestal.jetty "0.6.3"] [metosin/reitit-pedestal "0.7.0-alpha7"] [metosin/reitit "0.7.0-alpha7"]] :repl-options {:init-ns example.server}) diff --git a/examples/ring-example/project.clj b/examples/ring-example/project.clj index b2ae33b2..350f46e6 100644 --- a/examples/ring-example/project.clj +++ b/examples/ring-example/project.clj @@ -1,6 +1,6 @@ (defproject ring-example "0.1.0-SNAPSHOT" :description "Reitit Ring App" - :dependencies [[org.clojure/clojure "1.10.0"] - [ring/ring-jetty-adapter "1.7.1"] + :dependencies [[org.clojure/clojure "1.11.2"] + [ring/ring-jetty-adapter "1.12.1"] [metosin/reitit "0.7.0-alpha7"]] :repl-options {:init-ns example.server}) From 1b7fc0fc58fe1ef0994d99798e549593c34df902 Mon Sep 17 00:00:00 2001 From: Joel Kaasinen Date: Fri, 19 Apr 2024 14:30:58 +0300 Subject: [PATCH 7/8] deps: bump the deps on some examples --- examples/ring-integrant/project.clj | 8 ++++---- examples/ring-malli-lite-swagger/project.clj | 10 +++++----- examples/ring-malli-swagger/project.clj | 10 +++++----- examples/ring-spec-swagger/project.clj | 6 +++--- 4 files changed, 17 insertions(+), 17 deletions(-) diff --git a/examples/ring-integrant/project.clj b/examples/ring-integrant/project.clj index 96d6b786..eda57622 100644 --- a/examples/ring-integrant/project.clj +++ b/examples/ring-integrant/project.clj @@ -1,10 +1,10 @@ (defproject ring-integrant-example "0.1.0-SNAPSHOT" :description "Reitit Ring App with Integrant" - :dependencies [[org.clojure/clojure "1.10.1"] - [ring/ring-jetty-adapter "1.7.1"] + :dependencies [[org.clojure/clojure "1.11.2"] + [ring/ring-jetty-adapter "1.12.1"] [metosin/reitit "0.7.0-alpha7"] - [integrant "0.7.0"]] + [integrant "0.8.1"]] :main example.server :repl-options {:init-ns user} - :profiles {:dev {:dependencies [[integrant/repl "0.3.1"]] + :profiles {:dev {:dependencies [[integrant/repl "0.3.3"]] :source-paths ["dev"]}}) diff --git a/examples/ring-malli-lite-swagger/project.clj b/examples/ring-malli-lite-swagger/project.clj index 14fab206..3a987bef 100644 --- a/examples/ring-malli-lite-swagger/project.clj +++ b/examples/ring-malli-lite-swagger/project.clj @@ -1,8 +1,8 @@ -(defproject ring-example "0.1.0-SNAPSHOT" +(defproject ring-malli-lite-swagger "0.1.0-SNAPSHOT" :description "Reitit Ring App with Swagger" - :dependencies [[org.clojure/clojure "1.11.1"] - [metosin/jsonista "0.2.6"] - [ring/ring-jetty-adapter "1.7.1"] + :dependencies [[org.clojure/clojure "1.11.2"] + [metosin/jsonista "0.3.8"] + [ring/ring-jetty-adapter "1.12.1"] [metosin/reitit "0.7.0-alpha7"]] :repl-options {:init-ns example.server} - :profiles {:dev {:dependencies [[ring/ring-mock "0.3.2"]]}}) + :profiles {:dev {:dependencies [[ring/ring-mock "0.4.0"]]}}) diff --git a/examples/ring-malli-swagger/project.clj b/examples/ring-malli-swagger/project.clj index ac57b927..cf5d1049 100644 --- a/examples/ring-malli-swagger/project.clj +++ b/examples/ring-malli-swagger/project.clj @@ -1,9 +1,9 @@ -(defproject ring-example "0.1.0-SNAPSHOT" +(defproject ring-malli-swagger "0.1.0-SNAPSHOT" :description "Reitit Ring App with Swagger" - :dependencies [[org.clojure/clojure "1.11.1"] - [metosin/jsonista "0.2.6"] - [ring/ring-jetty-adapter "1.7.1"] + :dependencies [[org.clojure/clojure "1.11.2"] + [metosin/jsonista "0.3.8"] + [ring/ring-jetty-adapter "1.12.1"] [metosin/reitit "0.7.0-alpha7"] [metosin/ring-swagger-ui "5.9.0"]] :repl-options {:init-ns example.server} - :profiles {:dev {:dependencies [[ring/ring-mock "0.3.2"]]}}) + :profiles {:dev {:dependencies [[ring/ring-mock "0.4.0"]]}}) diff --git a/examples/ring-spec-swagger/project.clj b/examples/ring-spec-swagger/project.clj index befb6be7..572f3f78 100644 --- a/examples/ring-spec-swagger/project.clj +++ b/examples/ring-spec-swagger/project.clj @@ -1,8 +1,8 @@ (defproject ring-example "0.1.0-SNAPSHOT" :description "Reitit Ring App with Swagger" - :dependencies [[org.clojure/clojure "1.11.1"] - [ring/ring-jetty-adapter "1.7.1"] + :dependencies [[org.clojure/clojure "1.11.2"] + [ring/ring-jetty-adapter "1.12.1"] [metosin/reitit "0.7.0-alpha7"] [metosin/ring-swagger-ui "5.9.0"]] :repl-options {:init-ns example.server} - :profiles {:dev {:dependencies [[ring/ring-mock "0.3.2"]]}}) + :profiles {:dev {:dependencies [[ring/ring-mock "0.4.0"]]}}) From 81b9464f682f9dcc14e4d701ef4a26cab636fb68 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mart=C3=ADn=20Varela?= Date: Fri, 19 Apr 2024 15:39:25 +0300 Subject: [PATCH 8/8] deps: bump deps for frontend example Also fix frontend example to work with current reagent version --- examples/frontend-auth/project.clj | 14 +++++++------ examples/frontend-auth/src/frontend/core.cljs | 3 ++- examples/frontend-controllers/project.clj | 16 +++++++------- .../src/frontend/core.cljs | 3 ++- examples/frontend-links/project.clj | 16 +++++++------- .../frontend-links/src/frontend/core.cljs | 3 ++- examples/frontend-malli/project.clj | 10 +++++---- .../frontend-malli/src/frontend/core.cljs | 3 ++- examples/frontend-prompt/project.clj | 21 +++++++++++-------- .../frontend-prompt/src/frontend/core.cljs | 3 ++- examples/frontend-re-frame/project.clj | 18 +++++++++------- .../src/cljs/frontend_re_frame/core.cljs | 3 ++- examples/frontend/project.clj | 8 ++++--- examples/frontend/src/frontend/core.cljs | 3 ++- 14 files changed, 73 insertions(+), 51 deletions(-) diff --git a/examples/frontend-auth/project.clj b/examples/frontend-auth/project.clj index 9153907d..4213cd4c 100644 --- a/examples/frontend-auth/project.clj +++ b/examples/frontend-auth/project.clj @@ -1,4 +1,4 @@ -(defproject frontend "0.1.0-SNAPSHOT" +(defproject frontend-auth "0.1.0-SNAPSHOT" :description "FIXME: write description" :url "http://example.com/FIXME" :license {:name "Eclipse Public License" @@ -6,18 +6,20 @@ :dependencies [[org.clojure/clojure "1.11.2"] [ring-server "0.5.0"] - [reagent "0.8.1"] - [ring "1.7.1"] + [reagent "1.2.0"] + [ring "1.12.1"] [hiccup "1.0.5"] - [org.clojure/clojurescript "1.10.439"] + [org.clojure/clojurescript "1.11.132"] [metosin/reitit "0.7.0-alpha7"] [metosin/reitit-schema "0.7.0-alpha7"] [metosin/reitit-frontend "0.7.0-alpha7"] + [cljsjs/react "17.0.2-0"] + [cljsjs/react-dom "17.0.2-0"] ;; Just for pretty printting the match [fipp "0.6.14"]] - :plugins [[lein-cljsbuild "1.1.7"] - [lein-figwheel "0.5.18"]] + :plugins [[lein-cljsbuild "1.1.8"] + [lein-figwheel "0.5.20"]] :source-paths [] :resource-paths ["resources" "target/cljsbuild"] diff --git a/examples/frontend-auth/src/frontend/core.cljs b/examples/frontend-auth/src/frontend/core.cljs index 5b393dcf..bf0da24a 100644 --- a/examples/frontend-auth/src/frontend/core.cljs +++ b/examples/frontend-auth/src/frontend/core.cljs @@ -1,5 +1,6 @@ (ns frontend.core (:require [reagent.core :as r] + [reagent.dom :as rd] [reitit.frontend :as rf] [reitit.frontend.easy :as rfe] [reitit.frontend.controllers :as rfc] @@ -147,6 +148,6 @@ (assoc state :match (assoc new-match :controllers (rfc/apply-controllers (:controllers (:match state)) new-match))) (assoc state :match new-match)))))) {:use-fragment true}) - (r/render [main-view] (.getElementById js/document "app"))) + (rd/render [main-view] (.getElementById js/document "app"))) (init!) diff --git a/examples/frontend-controllers/project.clj b/examples/frontend-controllers/project.clj index 066bc4b5..6c8dc4a7 100644 --- a/examples/frontend-controllers/project.clj +++ b/examples/frontend-controllers/project.clj @@ -1,23 +1,25 @@ -(defproject frontend "0.1.0-SNAPSHOT" +(defproject frontend-controllers "0.1.0-SNAPSHOT" :description "FIXME: write description" :url "http://example.com/FIXME" :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.11.2"] [ring-server "0.5.0"] - [reagent "0.8.1"] - [ring "1.7.1"] + [reagent "1.2.0"] + [ring "1.12.1"] [hiccup "1.0.5"] - [org.clojure/clojurescript "1.10.439"] + [org.clojure/clojurescript "1.11.132"] [metosin/reitit "0.7.0-alpha7"] [metosin/reitit-schema "0.7.0-alpha7"] [metosin/reitit-frontend "0.7.0-alpha7"] + [cljsjs/react "17.0.2-0"] + [cljsjs/react-dom "17.0.2-0"] ;; Just for pretty printting the match [fipp "0.6.14"]] - :plugins [[lein-cljsbuild "1.1.7"] - [lein-figwheel "0.5.18"]] + :plugins [[lein-cljsbuild "1.1.8"] + [lein-figwheel "0.5.20"]] :source-paths [] :resource-paths ["resources" "target/cljsbuild"] diff --git a/examples/frontend-controllers/src/frontend/core.cljs b/examples/frontend-controllers/src/frontend/core.cljs index 851e11ce..a28541c0 100644 --- a/examples/frontend-controllers/src/frontend/core.cljs +++ b/examples/frontend-controllers/src/frontend/core.cljs @@ -1,5 +1,6 @@ (ns frontend.core (:require [reagent.core :as r] + [reagent.dom :as rd] [reitit.frontend :as rf] [reitit.frontend.easy :as rfe] [reitit.frontend.controllers :as rfc] @@ -88,6 +89,6 @@ (if new-match (assoc new-match :controllers (rfc/apply-controllers (:controllers old-match) new-match)))))) {:use-fragment true}) - (r/render [current-page] (.getElementById js/document "app"))) + (rd/render [current-page] (.getElementById js/document "app"))) (init!) diff --git a/examples/frontend-links/project.clj b/examples/frontend-links/project.clj index cebf8609..16af39dd 100644 --- a/examples/frontend-links/project.clj +++ b/examples/frontend-links/project.clj @@ -1,24 +1,26 @@ -(defproject frontend "0.1.0-SNAPSHOT" +(defproject frontend-links "0.1.0-SNAPSHOT" :description "FIXME: write description" :url "http://example.com/FIXME" :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.11.2"] [ring-server "0.5.0"] - [reagent "0.8.1"] - [ring "1.7.1"] + [reagent "1.2.0"] + [ring "1.12.1"] [hiccup "1.0.5"] [org.clojure/clojurescript "1.10.520"] [metosin/reitit "0.7.0-alpha7"] [metosin/reitit-spec "0.7.0-alpha7"] [metosin/reitit-frontend "0.7.0-alpha7"] + [cljsjs/react "17.0.2-0"] + [cljsjs/react-dom "17.0.2-0"] ;; Just for pretty printting the match [fipp "0.6.14"]] - :plugins [[lein-cljsbuild "1.1.7"] - [lein-figwheel "0.5.18"] - [cider/cider-nrepl "0.21.1"]] + :plugins [[lein-cljsbuild "1.1.8"] + [lein-figwheel "0.5.20"] + [cider/cider-nrepl "0.47.1"]] :repl-options {:nrepl-middleware [cider.piggieback/wrap-cljs-repl]} diff --git a/examples/frontend-links/src/frontend/core.cljs b/examples/frontend-links/src/frontend/core.cljs index 77a7d55f..d42eaec1 100644 --- a/examples/frontend-links/src/frontend/core.cljs +++ b/examples/frontend-links/src/frontend/core.cljs @@ -2,6 +2,7 @@ (:require [clojure.string :as string] [fipp.edn :as fedn] [reagent.core :as r] + [reagent.dom :as rd] [reitit.coercion.spec :as rss] [reitit.frontend :as rf] [reitit.frontend.easy :as rfe] @@ -137,7 +138,7 @@ (fn [m] (reset! current-match m)) ;; set to false to enable HistoryAPI {:use-fragment true}) - (r/render [current-page] (.getElementById js/document "app"))) + (rd/render [current-page] (.getElementById js/document "app"))) (init!) diff --git a/examples/frontend-malli/project.clj b/examples/frontend-malli/project.clj index 13579427..5dd7fd5f 100644 --- a/examples/frontend-malli/project.clj +++ b/examples/frontend-malli/project.clj @@ -1,4 +1,4 @@ -(defproject frontend "0.1.0-SNAPSHOT" +(defproject frontend-malli "0.1.0-SNAPSHOT" :description "FIXME: write description" :url "http://example.com/FIXME" :license {:name "Eclipse Public License" @@ -6,13 +6,15 @@ :dependencies [[org.clojure/clojure "1.10.1"] [ring-server "0.5.0"] - [reagent "0.10.0"] - [ring "1.8.1"] + [reagent "1.2.0"] + [ring "1.12.1"] [hiccup "1.0.5"] - [org.clojure/clojurescript "1.10.773"] + [org.clojure/clojurescript "1.11.132"] [metosin/reitit "0.7.0-alpha7"] [metosin/reitit-malli "0.7.0-alpha7"] [metosin/reitit-frontend "0.7.0-alpha7"] + [cljsjs/react "17.0.2-0"] + [cljsjs/react-dom "17.0.2-0"] ;; Just for pretty printting the match [fipp "0.6.23"]] diff --git a/examples/frontend-malli/src/frontend/core.cljs b/examples/frontend-malli/src/frontend/core.cljs index 4b29a3a8..1414d76f 100644 --- a/examples/frontend-malli/src/frontend/core.cljs +++ b/examples/frontend-malli/src/frontend/core.cljs @@ -1,5 +1,6 @@ (ns frontend.core (:require [reagent.core :as r] + [reagent.dom :as rd] [reitit.frontend :as rf] [reitit.frontend.easy :as rfe] [reitit.coercion.malli :as rsm] @@ -78,6 +79,6 @@ (fn [m] (reset! match m)) ;; set to false to enable HistoryAPI {:use-fragment true}) - (r/render [current-page] (.getElementById js/document "app"))) + (rd/render [current-page] (.getElementById js/document "app"))) (init!) diff --git a/examples/frontend-prompt/project.clj b/examples/frontend-prompt/project.clj index cebf8609..a605d0f0 100644 --- a/examples/frontend-prompt/project.clj +++ b/examples/frontend-prompt/project.clj @@ -1,24 +1,27 @@ -(defproject frontend "0.1.0-SNAPSHOT" +(defproject frontend-prompt "0.1.0-SNAPSHOT" :description "FIXME: write description" :url "http://example.com/FIXME" :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.11.2"] [ring-server "0.5.0"] - [reagent "0.8.1"] - [ring "1.7.1"] + [reagent "1.2.0"] + [ring "1.12.1"] [hiccup "1.0.5"] - [org.clojure/clojurescript "1.10.520"] + [org.clojure/clojurescript "1.11.132"] [metosin/reitit "0.7.0-alpha7"] [metosin/reitit-spec "0.7.0-alpha7"] [metosin/reitit-frontend "0.7.0-alpha7"] + [cljsjs/react "17.0.2-0"] + [cljsjs/react-dom "17.0.2-0"] ;; Just for pretty printting the match - [fipp "0.6.14"]] + [fipp "0.6.23"]] + + :plugins [[lein-cljsbuild "1.1.8"] + [lein-figwheel "0.5.20"] + [cider/cider-nrepl "0.47.1"]] - :plugins [[lein-cljsbuild "1.1.7"] - [lein-figwheel "0.5.18"] - [cider/cider-nrepl "0.21.1"]] :repl-options {:nrepl-middleware [cider.piggieback/wrap-cljs-repl]} diff --git a/examples/frontend-prompt/src/frontend/core.cljs b/examples/frontend-prompt/src/frontend/core.cljs index 9a6ec058..1380c742 100644 --- a/examples/frontend-prompt/src/frontend/core.cljs +++ b/examples/frontend-prompt/src/frontend/core.cljs @@ -1,6 +1,7 @@ (ns frontend.core (:require [fipp.edn :as fedn] [reagent.core :as r] + [reagent.dom :as rd] [reitit.coercion.spec :as rss] [reitit.frontend :as rf] [reitit.frontend.easy :as rfe])) @@ -63,6 +64,6 @@ on-navigate ;; set to false to enable HistoryAPI {:use-fragment true}) - (r/render [current-page] (.getElementById js/document "app"))) + (rd/render [current-page] (.getElementById js/document "app"))) (init!) diff --git a/examples/frontend-re-frame/project.clj b/examples/frontend-re-frame/project.clj index 277a4e57..980d2294 100644 --- a/examples/frontend-re-frame/project.clj +++ b/examples/frontend-re-frame/project.clj @@ -1,13 +1,15 @@ (defproject frontend-re-frame "0.1.0-SNAPSHOT" - :dependencies [[org.clojure/clojure "1.10.0"] - [org.clojure/clojurescript "1.10.520"] + :dependencies [[org.clojure/clojure "1.11.2"] + [org.clojure/clojurescript "1.11.132"] [metosin/reitit "0.7.0-alpha7"] - [reagent "0.8.1"] - [re-frame "0.10.6"]] - - :plugins [[lein-cljsbuild "1.1.7"] - [lein-figwheel "0.5.18"] - [cider/cider-nrepl "0.21.1"]] + [reagent "1.2.0"] + [re-frame "0.10.6"] + [cljsjs/react "17.0.2-0"] + [cljsjs/react-dom "17.0.2-0"]] + + :plugins [[lein-cljsbuild "1.1.8"] + [lein-figwheel "0.5.20"] + [cider/cider-nrepl "0.47.1"]] :repl-options {:nrepl-middleware [cider.piggieback/wrap-cljs-repl]} :min-lein-version "2.5.3" diff --git a/examples/frontend-re-frame/src/cljs/frontend_re_frame/core.cljs b/examples/frontend-re-frame/src/cljs/frontend_re_frame/core.cljs index dcd3774a..d53a91e4 100644 --- a/examples/frontend-re-frame/src/cljs/frontend_re_frame/core.cljs +++ b/examples/frontend-re-frame/src/cljs/frontend_re_frame/core.cljs @@ -1,6 +1,7 @@ (ns frontend-re-frame.core (:require [re-frame.core :as re-frame] [reagent.core :as reagent] + [reagent.dom :as rd] [reitit.core :as r] [reitit.coercion.spec :as rss] [reitit.frontend :as rf] @@ -143,7 +144,7 @@ (re-frame/dispatch-sync [::initialize-db]) (dev-setup) (init-routes!) ;; Reset routes on figwheel reload - (reagent/render [router-component {:router router}] + (rd/render [router-component {:router router}] (.getElementById js/document "app"))) (init) diff --git a/examples/frontend/project.clj b/examples/frontend/project.clj index 5b1cf54a..1918b990 100644 --- a/examples/frontend/project.clj +++ b/examples/frontend/project.clj @@ -6,13 +6,15 @@ :dependencies [[org.clojure/clojure "1.11.2"] [ring-server "0.5.0"] - [reagent "0.10.0"] - [ring "1.8.1"] + [reagent "1.2.0"] + [ring "1.12.1"] [hiccup "1.0.5"] - [org.clojure/clojurescript "1.10.773"] + [org.clojure/clojurescript "1.11.132"] [metosin/reitit "0.7.0-alpha7"] [metosin/reitit-spec "0.7.0-alpha7"] [metosin/reitit-frontend "0.7.0-alpha7"] + [cljsjs/react "17.0.2-0"] + [cljsjs/react-dom "17.0.2-0"] ;; Just for pretty printting the match [fipp "0.6.23"]] diff --git a/examples/frontend/src/frontend/core.cljs b/examples/frontend/src/frontend/core.cljs index 904305f5..81d62ff0 100644 --- a/examples/frontend/src/frontend/core.cljs +++ b/examples/frontend/src/frontend/core.cljs @@ -1,5 +1,6 @@ (ns frontend.core (:require [reagent.core :as r] + [reagent.dom :as rd] [reitit.frontend :as rf] [reitit.frontend.easy :as rfe] [reitit.coercion.spec :as rss] @@ -77,6 +78,6 @@ (fn [m] (reset! match m)) ;; set to false to enable HistoryAPI {:use-fragment true}) - (r/render [current-page] (.getElementById js/document "app"))) + (rd/render [current-page] (.getElementById js/document "app"))) (init!)