Delete v2 code and dependents, fix jvm test suite

hyperfiddle · Sep 3, 2024 · f2f786f · f2f786f
1 parent b51adf9
commit f2f786f
Show file tree

Hide file tree

Showing 78 changed files with 28 additions and 12,562 deletions.
diff --git a/ci/run_tests_jvm.sh b/ci/run_tests_jvm.sh
@@ -4,13 +4,8 @@ echo "Running JVM tests"
 clojure -X:test \
     :dirs "[\"src\" \"test\"]"  \
     :patterns                                \
-    "[\"hyperfiddle.electric.impl.*\"        \
-      \"hyperfiddle.incseq.*-test\"          \
-      \"hyperfiddle.electric-test\"          \
-      \"hyperfiddle.electric-de-test\"       \
-      \"hyperfiddle.zero\"                   \
-      \"hyperfiddle.missionary-test\"        \
-      \"contrib.missionary-contrib-test\"    \
-      \"contrib.ednish\"                     \
-      \"contrib.sexpr-router\"               \
+    "[\"hyperfiddle.*-test\"                 \
+      \"hyperfiddle.electric.impl.*\"        \
+      \"contrib.((?!datomic).)*\"            \
      ]"
+
diff --git a/deps.edn b/deps.edn
@@ -21,7 +21,10 @@
                                  datascript/datascript                {:mvn/version "1.4.1"}
                                  ch.qos.logback/logback-classic       {:mvn/version "1.4.14"}
                                  io.github.cognitect-labs/test-runner {:git/url "https://github.com/cognitect-labs/test-runner.git" :sha "cc75980b43011773162b485f46f939dc5fba91e4"}
-                                 org.clojure/test.check               {:mvn/version "1.1.1"}}}
+                                 org.clojure/test.check               {:mvn/version "1.1.1"}
+                                 com.datomic/local                    {:mvn/version "1.0.285"} ; for hyperfiddle.transaction-test
+                                 com.datomic/client-cloud             {:mvn/version "1.0.130"} ; for hyperfiddle.transaction-test
+                                 }}
            :build {:extra-paths ["src-build"]
                    :ns-default  build
                    :extra-deps  {io.github.clojure/tools.build {:mvn/version "0.9.6"}

diff --git a/shadow-cljs.edn b/shadow-cljs.edn
@@ -1,26 +1,22 @@
 {:builds {:test         {:target           :node-test
                          :output-to        "out/node-tests.js"
-                         :ns-regexp        "^(hyperfiddle.electric-(?!dom|fulcro|css|svg)|contrib.(ednish|sexpr-router|missionary-contrib-test|stacktrace)|hyperfiddle.incseq).*$"
+                         :ns-regexp        "^(hyperfiddle.electric-(?!dom|fulcro|css|svg)|contrib.(ednish|sexpr-router|stacktrace)|hyperfiddle.incseq).*$"
                          :build-options    {:cache-level :off}
-                         :modules          {:main {:entries [hyperfiddle.zero
-                                                             hyperfiddle.electric
-                                                             hyperfiddle.electric-test
+                         :modules          {:main {:entries [#_hyperfiddle.electric
+                                                             #_hyperfiddle.electric-test
                                                              hyperfiddle.electric-de-test
                                                              #_hyperfiddle.missionary-test
-                                                             contrib.missionary-contrib-test
                                                              contrib.ednish
                                                              contrib.sexpr-router]}}
                          :compiler-options {:warnings {:redef-in-file false}}}
           :browser-test {:target           :karma
                          :output-to        "out/karma-tests.js"
-                         :ns-regexp        "^(hyperfiddle.electric-(?!fulcro)|contrib.(ednish|sexpr-router|missionary-contrib-test|stacktrace)|hyperfiddle.incseq).*$"
+                         :ns-regexp        "^(hyperfiddle.electric-(?!fulcro)|contrib.(ednish|sexpr-router|stacktrace)|hyperfiddle.incseq).*$"
                          :build-options    {:cache-level :off}
                          :build-hooks [(hyperfiddle.browser-test-setup/blow-up-tests-on-warnings)]
-                         :modules          {:main {:entries [hyperfiddle.zero
-                                                             hyperfiddle.electric
-                                                             hyperfiddle.electric-test
+                         :modules          {:main {:entries [#_hyperfiddle.electric
+                                                             #_hyperfiddle.electric-test
                                                              #_hyperfiddle.missionary-test
-                                                             contrib.missionary-contrib-test
                                                              contrib.ednish
                                                              contrib.sexpr-router]}}
                          :compiler-options {:warnings-as-errors {:warning-types #{:infer-warning}}}}}}
diff --git a/src/contrib/electric_contrib.cljc b/src/contrib/electric_contrib.cljc
diff --git a/src/contrib/electric_goog_history.cljc → src/contrib/electric_goog_history.edn b/src/contrib/electric_goog_history.cljc → src/contrib/electric_goog_history.edn
@@ -1,3 +1,4 @@
+;; FIXME revisit under v3
 (ns contrib.electric-goog-history
   #?(:cljs
      (:import goog.history.Html5History

diff --git a/src/contrib/element_syntax.cljc b/src/contrib/element_syntax.cljc
diff --git a/src/contrib/gridsheet.cljc b/src/contrib/gridsheet.cljc
diff --git a/src/contrib/test_match.clj b/src/contrib/test_match.clj
@@ -1,6 +1,5 @@
 (ns contrib.test-match
-  (:require [contrib.debug :as dbg]
-            [hyperfiddle.rcf :as rcf :refer [tests]]
+  (:require [hyperfiddle.rcf :as rcf :refer [tests]]
             [fipp.ednize]))
 
 (set! *warn-on-reflection* true)
@@ -85,7 +84,6 @@
                   ;; TODO turn into pattern compiler so we don't need `eval`
                   (let [[_ ap subpat] pat, subv (eval (list ap v)), ret (test-match subv subpat)]
                     (if (= subv ret) v ret))
-                  ;; if (contrib.debug/dbgv (instance? (class pat) v))
                   (if (coll? v)
                     (cond
                       (map? v)