From 0ceda6ec9fce0503ee159c580ebda4e8f8c2653d Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Wed, 23 Nov 2022 11:39:41 +0100 Subject: [PATCH 1/4] Add all public vars of cljs ajax core --- CHANGELOG.md | 1 + src/scittle/cljs_ajax.cljs | 5 ++--- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c854b63..22045e8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,7 @@ ## Unreleased - Fix for [44](https://github.com/babashka/scittle/issues/44): Honoring `SCITTLE_NREPL_WEBSOCKET_PORT` in `scittle.nrepl` +- Add all public vars of `cljs-ajax` `ajax.core` ## v0.3.10 diff --git a/src/scittle/cljs_ajax.cljs b/src/scittle/cljs_ajax.cljs index a129e6e..8d1df17 100644 --- a/src/scittle/cljs_ajax.cljs +++ b/src/scittle/cljs_ajax.cljs @@ -1,13 +1,12 @@ (ns scittle.cljs-ajax - (:require [ajax.core :as ajx] + (:require [ajax.core] [sci.core :as sci] [scittle.core :as scittle])) (def ans (sci/create-ns 'ajax.core nil)) (def ajax-namespace - {'GET (sci/copy-var ajx/GET ans) - 'POST (sci/copy-var ajx/POST ans)}) + (sci/copy-ns ajax.core ans)) (scittle/register-plugin! ::ajax From 2db6f44219be79da79edc32818aa51f9c5593ce7 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Wed, 23 Nov 2022 11:42:45 +0100 Subject: [PATCH 2/4] Upgrade libs --- deps.edn | 22 ++++++++++++---------- resources/public/index.html | 4 ++-- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/deps.edn b/deps.edn index 8181e2d..e1539cf 100644 --- a/deps.edn +++ b/deps.edn @@ -1,24 +1,26 @@ {:paths ["src" "resources"] :deps - {org.clojure/clojure {:mvn/version "1.10.3"} + {org.clojure/clojure {:mvn/version "1.11.1"} org.babashka/sci {:git/url "https://github.com/babashka/sci" :git/sha "a201fd70567437e228359999ecdca337c3060b70"} #_{:local/root "../babashka/sci"} - reagent/reagent {:mvn/version "1.1.0"} - cljsjs/react {:mvn/version "17.0.2-0"} - cljsjs/react-dom {:mvn/version "17.0.2-0"} - cljsjs/react-dom-server {:mvn/version "17.0.2-0"} - cljs-ajax/cljs-ajax {:mvn/version "0.8.3"} - funcool/promesa {:mvn/version "8.0.450"} + reagent/reagent {:mvn/version "1.1.1"} + cljsjs/react {:mvn/version "18.2.0-1"} + cljsjs/react-dom {:mvn/version "18.2.0-1"} + cljsjs/react-dom-server {:mvn/version "18.2.0-1"} + cljs-ajax/cljs-ajax {:mvn/version "0.8.4"} + funcool/promesa {:mvn/version "9.1.540"} io.github.babashka/sci.nrepl #_{:local/root "../sci.nrepl"} - {:git/sha "e83421ce9349c36df56a2eb936196dbb65b0de63"} + {:git/url "https://github.com/babashka/sci.nrepl" + :git/sha "b75700da7797f9fc2b4ef1bef9df7230f9fd1e8c"} io.github.babashka/sci.configs - {:git/sha "f5f1bd84d96f6a4be93cc695861649a4a0b3e45b"}} + {:git/url "https://github.com/babashka/sci.configs" + :git/sha "2717e545e5a61d4cccd85350b9ad6265afc9146c"}} :aliases {:dev {:extra-paths ["dev"] - :extra-deps {thheller/shadow-cljs {:mvn/version "2.14.0"}}}}} + :extra-deps {thheller/shadow-cljs {:mvn/version "2.20.12"}}}}} diff --git a/resources/public/index.html b/resources/public/index.html index 6ac811d..0933342 100644 --- a/resources/public/index.html +++ b/resources/public/index.html @@ -3,8 +3,8 @@ - - + + From b10afa88acbba190d784d5a803f49dc7db3192b1 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Wed, 23 Nov 2022 11:43:21 +0100 Subject: [PATCH 3/4] Upgrade libs --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 22045e8..d898031 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Fix for [44](https://github.com/babashka/scittle/issues/44): Honoring `SCITTLE_NREPL_WEBSOCKET_PORT` in `scittle.nrepl` - Add all public vars of `cljs-ajax` `ajax.core` +- Upgrade several built-in libraries ## v0.3.10 From 623e9707bdfe0840dcec912bbdb5f3c75c14e910 Mon Sep 17 00:00:00 2001 From: Michiel Borkent Date: Wed, 23 Nov 2022 12:48:34 +0100 Subject: [PATCH 4/4] Upgrade SCI --- deps.edn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deps.edn b/deps.edn index e1539cf..3428f7a 100644 --- a/deps.edn +++ b/deps.edn @@ -3,7 +3,7 @@ :deps {org.clojure/clojure {:mvn/version "1.11.1"} org.babashka/sci {:git/url "https://github.com/babashka/sci" - :git/sha "a201fd70567437e228359999ecdca337c3060b70"} + :git/sha "914919f248b7e3fc2ec59c435320145f588899d0"} #_{:local/root "../babashka/sci"} reagent/reagent {:mvn/version "1.1.1"} cljsjs/react {:mvn/version "18.2.0-1"}