diff --git a/deps.edn b/deps.edn index f8ffc60..cada36a 100644 --- a/deps.edn +++ b/deps.edn @@ -1,4 +1,4 @@ -{:deps {com.hyperfiddle/electric {:git/url "https://github.com/hyperfiddle/electric" :git/sha "2f99c9637e4b3b9fa2f51156e516e8fa5740ffe7"} +{:deps {com.hyperfiddle/electric {:git/url "https://github.com/hyperfiddle/electric" :git/sha "7b28afb3887ac7d96edf4f4b7603305093a20ad2"} ring/ring {:mvn/version "1.11.0"} ; comes with Jetty org.clojure/clojure {:mvn/version "1.12.0-alpha5"} org.clojure/clojurescript {:mvn/version "1.11.121"} diff --git a/shadow-cljs.edn b/shadow-cljs.edn index 890df23..d8716d0 100644 --- a/shadow-cljs.edn +++ b/shadow-cljs.edn @@ -4,7 +4,7 @@ :output-dir "resources/public/electric_starter_app/js" :asset-path "/js" :modules {:main {:entries [dev] :init-fn dev/start!}} - :build-hooks [(hyperfiddle.electric.shadow-cljs.hooks-de/reload-clj)]} + :build-hooks [(hyperfiddle.electric.shadow-cljs.hooks3/reload-clj)]} :prod {:target :browser :output-dir "resources/public/electric_starter_app/js" :asset-path "/js" diff --git a/src-build/build.clj b/src-build/build.clj index ab3d4c3..9517b4c 100644 --- a/src-build/build.clj +++ b/src-build/build.clj @@ -32,7 +32,7 @@ :verbose verbose, :config-merge [{:compiler-options {:optimizations (if optimize :advanced :simple)} - :closure-defines {'hyperfiddle.electric-client-de/ELECTRIC_USER_VERSION electric-user-version}}]}) + :closure-defines {'hyperfiddle.electric-client3/ELECTRIC_USER_VERSION electric-user-version}}]}) shadow-status (assert (= shadow-status :done) "shadow-api/release error")) ; fail build on error (shadow-server/stop!) (log/info "Client build successful. Version:" electric-user-version))) diff --git a/src-dev/dev.cljc b/src-dev/dev.cljc index e11d27f..7bb3b0c 100644 --- a/src-dev/dev.cljc +++ b/src-dev/dev.cljc @@ -1,8 +1,8 @@ (ns dev (:require electric-starter-app.main - [hyperfiddle.electric-de :as e :refer [$]] - #?(:cljs [hyperfiddle.electric-client-de]) + [hyperfiddle.electric3 :as e :refer [$]] + #?(:cljs [hyperfiddle.electric-client3]) #?(:clj [electric-starter-app.server-jetty :as jetty]) #?(:clj [shadow.cljs.devtools.api :as shadow]) #?(:clj [shadow.cljs.devtools.server :as shadow-server]) diff --git a/src-prod/prod.cljc b/src-prod/prod.cljc index 80c68e0..625dac4 100644 --- a/src-prod/prod.cljc +++ b/src-prod/prod.cljc @@ -6,8 +6,8 @@ [contrib.assert :refer [check]] electric-starter-app.main #?(:clj [electric-starter-app.server-jetty :as jetty]) - [hyperfiddle.electric-de :as e] - #?(:cljs [hyperfiddle.electric-client-de])) + [hyperfiddle.electric3 :as e] + #?(:cljs [hyperfiddle.electric-client3])) #?(:cljs (:require-macros [prod :refer [compile-time-resource]]))) (defmacro compile-time-resource [filename] (some-> filename io/resource slurp edn/read-string)) diff --git a/src/electric_starter_app/main.cljc b/src/electric_starter_app/main.cljc index 7c9523c..358decb 100644 --- a/src/electric_starter_app/main.cljc +++ b/src/electric_starter_app/main.cljc @@ -1,5 +1,5 @@ (ns electric-starter-app.main - (:require [hyperfiddle.electric-de :as e :refer [$]] + (:require [hyperfiddle.electric3 :as e :refer [$]] [hyperfiddle.electric-dom3 :as dom])) (e/defn Main [ring-request] diff --git a/src/electric_starter_app/server_jetty.clj b/src/electric_starter_app/server_jetty.clj index 30c99da..e7edcb2 100644 --- a/src/electric_starter_app/server_jetty.clj +++ b/src/electric_starter_app/server_jetty.clj @@ -6,7 +6,7 @@ [clojure.string :as str] [clojure.tools.logging :as log] [contrib.assert :refer [check]] - [hyperfiddle.electric-ring-adapter-de :as electric-ring] + [hyperfiddle.electric-ring-adapter3 :as electric-ring] [ring.adapter.jetty :as ring] [ring.middleware.content-type :refer [wrap-content-type]] [ring.middleware.cookies :as cookies] diff --git a/vendors/electric b/vendors/electric index 2f99c96..7b28afb 160000 --- a/vendors/electric +++ b/vendors/electric @@ -1 +1 @@ -Subproject commit 2f99c9637e4b3b9fa2f51156e516e8fa5740ffe7 +Subproject commit 7b28afb3887ac7d96edf4f4b7603305093a20ad2