From 1250334a4e662cd8f4af111219371fda52381c40 Mon Sep 17 00:00:00 2001 From: Geoffrey Gaillard Date: Tue, 21 Nov 2023 12:11:47 +0100 Subject: [PATCH] Dev - add electric as a submodule --- .gitmodules | 3 +++ README.md | 1 + deps.edn | 4 +++- vendors/electric | 1 + 4 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .gitmodules create mode 160000 vendors/electric diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..aef4d82 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "electric"] + path = vendors/electric + url = git@github.com:hyperfiddle/electric.git diff --git a/README.md b/README.md index 585e0b7..e787d0a 100644 --- a/README.md +++ b/README.md @@ -4,6 +4,7 @@ Live app: https://electric.hyperfiddle.net/ ``` +$ git submodule update --init $ yarn # demos only - react interop, codemirror $ clj -A:dev -X user/main diff --git a/deps.edn b/deps.edn index 955f9ab..1b39663 100644 --- a/deps.edn +++ b/deps.edn @@ -1,7 +1,7 @@ {:paths ["src" "resources"] :deps {com.datomic/dev-local {:mvn/version "1.0.243"} com.google.guava/guava {:mvn/version "31.1-jre"} ; fix conflict - datomic cloud & shadow - com.hyperfiddle/electric {:mvn/version "v2-alpha-469-gb6d9865c"} + com.hyperfiddle/electric {:mvn/version "v2-alpha-428-g22937f75"} com.hyperfiddle/rcf {:mvn/version "20220926-202227"} datascript/datascript {:mvn/version "1.5.2"} com.datomic/peer {:mvn/version "1.0.6735"} @@ -23,6 +23,8 @@ {binaryage/devtools {:mvn/version "1.0.6"} com.clojure-goes-fast/clj-async-profiler {:mvn/version "1.1.1"} thheller/shadow-cljs {:mvn/version "2.22.10"}} + :override-deps + {com.hyperfiddle/electric {:local/root "vendors/electric"}} :jvm-opts ["-Xss2m" ; https://github.com/hyperfiddle/photon/issues/11 "-XX:-OmitStackTraceInFastThrow" ;; RCF diff --git a/vendors/electric b/vendors/electric new file mode 160000 index 0000000..574a8f7 --- /dev/null +++ b/vendors/electric @@ -0,0 +1 @@ +Subproject commit 574a8f73df9ce57ce3c7e194b332f061cbfd7c13