Skip to content

Commit

Permalink
Upgrade to renamed electric3
Browse files Browse the repository at this point in the history
  • Loading branch information
ggeoffrey committed Aug 28, 2024
1 parent cb89bdc commit b2e829d
Show file tree
Hide file tree
Showing 8 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion deps.edn
Original file line number Diff line number Diff line change
@@ -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"}
Expand Down
2 changes: 1 addition & 1 deletion shadow-cljs.edn
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion src-build/build.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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)))
Expand Down
4 changes: 2 additions & 2 deletions src-dev/dev.cljc
Original file line number Diff line number Diff line change
@@ -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])
Expand Down
4 changes: 2 additions & 2 deletions src-prod/prod.cljc
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion src/electric_starter_app/main.cljc
Original file line number Diff line number Diff line change
@@ -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]
Expand Down
2 changes: 1 addition & 1 deletion src/electric_starter_app/server_jetty.clj
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion vendors/electric
Submodule electric updated 118 files

0 comments on commit b2e829d

Please sign in to comment.