dep bumps

pink-gorilla · Apr 21, 2024 · 06492b7 · 06492b7
1 parent b57d434
commit 06492b7
Show file tree

Hide file tree

Showing 5 changed files with 23 additions and 11 deletions.
diff --git a/demo/deps.edn b/demo/deps.edn
@@ -2,15 +2,13 @@
          "resources"
          "target/webly"]
  :deps {org.pinkgorilla/goldly {:local/root ".." :deps/manifest :deps}
-        org.pinkgorilla/webly {:mvn/version "0.5.676"}
+        org.pinkgorilla/webly {:mvn/version "0.5.683"}
         org.pinkgorilla/ui-repl {:mvn/version "0.1.104"}
         org.pinkgorilla/ui-site {:mvn/version "0.0.30"}
         org.pinkgorilla/ui-binaryclock {:mvn/version "0.2.19"}
         ;org.pinkgorilla/ui-input {:mvn/version "0.2.44"} ; spaces
-        org.pinkgorilla/ui-tailwind {:mvn/version "0.0.5"}
+        org.pinkgorilla/ui-tailwind {:mvn/version "0.1.8"}
         ;org.pinkgorilla/devtools {:mvn/version "0.0.17"}
-        org.pinkgorilla/pinkie {:mvn/version "0.5.232"} ; higher version
-        org.pinkgorilla/ui-bidi {:mvn/version "0.0.30"} ; higher version
         }
 
  :aliases

diff --git a/goldly-sci/deps.edn b/goldly-sci/deps.edn
@@ -9,8 +9,8 @@
   funcool/promesa {:mvn/version "11.0.674"}
   cljs-http/cljs-http {:mvn/version "0.1.46"} ; cljs-sci source loader
   org.babashka/sci {:mvn/version "0.8.40"}
-  org.pinkgorilla/ui-dialog-keybindings {:mvn/version "0.1.8"}
-  org.pinkgorilla/timbre {:mvn/version "0.0.4"}}
+  org.pinkgorilla/ui-dialog-keybindings {:mvn/version "0.1.10"}
+  org.pinkgorilla/timbre {:mvn/version "0.0.6"}}
 
  :aliases
  {;; developer tooling

diff --git a/goldly-sci/resources/ext/goldly.edn b/goldly-sci/resources/ext/goldly.edn
@@ -3,13 +3,17 @@
  :lazy true
  :cljs-namespace [goldly.sci
                   goldly.sci.eventhandler ; move to ui-repl or ui-gorilla
-                  goldly.sci.error]
+                  goldly.sci.error
+                  goldly.sci.init]
  :cljs-ns-bindings {'goldly.sci {'require-async goldly.sci/require-async
                                  'resolve-symbol goldly.sci/resolve-symbol
                                  'requiring-resolve goldly.sci/requiring-resolve
                                  'compile-code goldly.sci/compile-code
                                  'compile-code-async goldly.sci/compile-code-async}
                     'goldly.sci.eventhandler {'eventhandler-fn  goldly.sci.eventhandler/eventhandler-fn}
                     'goldly.sci.error {'error-view goldly.sci.error/error-view
-                                       'exception->error goldly.sci.error/exception->error}}}
+                                       'exception->error goldly.sci.error/exception->error}
+                    'goldly.sci.init {'set-goldly-resolver goldly.sci.init/set-goldly-resolver}}
+ ; runtime
+ :cljs-service {:start-fn goldly.sci.init/set-goldly-resolver}}
 
diff --git a/goldly-sci/src/goldly/sci/init.cljs b/goldly-sci/src/goldly/sci/init.cljs
@@ -0,0 +1,11 @@
+(ns goldly.sci.init
+  (:require
+   [taoensso.timbre :as timbre :refer [info warn]]
+   [webly.spa.resolve :refer [set-resolver!]]
+   [goldly.sci :refer [requiring-resolve]]))
+
+(defn set-goldly-resolver []
+  (info "setting webly.spa.resolver to sci-requiring resolve..")
+  (set-resolver! requiring-resolve))
+
+
diff --git a/reval-sci/resources/ext/reval-sci.edn b/reval-sci/resources/ext/reval-sci.edn
@@ -7,6 +7,5 @@
                   reval.init]
  :cljs-ns-bindings {'reval.kernel.cljs-sci {'eval-cljs  reval.kernel.cljs-sci/eval-cljs}
                     'reval.init {'reval-cljs-kernel-init reval.init/reval-cljs-kernel-init}}
- :cljs-service {:start-fn reval.init/reval-cljs-kernel-init}
-; 
- }
+ ; runtime
+ :cljs-service {:start-fn reval.init/reval-cljs-kernel-init}}