Removed cljs runtime test dependency, moved clj tests to deps.edn, merged :dev and :test profiles

Author: tonsky

deps.edn

@@ -21,16 +21,10 @@
    {org.clojure/clojure {:mvn/version "1.11.1"}}}
 
   :dev
-  {:extra-paths ["dev"]
+  {:extra-paths ["dev" "test"]
    :jvm-opts    ["-ea" "-Ddatascript.debug" "-Dclojure.main.report=stderr"]
    :extra-deps
-   {io.github.tonsky/duti {:git/sha "fc833a87a8687b67e66281e216eeee1ad6048168"}}}
-            
-  :test
-  {:extra-paths ["test"]
-   :jvm-opts    ["-ea" "-Ddatascript.debug" "-Dclojure.main.report=stderr"]
-   :extra-deps
-   {org.clojure/clojurescript  {:mvn/version "1.10.520"}
+   {io.github.tonsky/duti      {:git/sha "fc833a87a8687b67e66281e216eeee1ad6048168"}
     metosin/jsonista           {:mvn/version "0.3.3"}
     cheshire/cheshire          {:mvn/version "5.10.0"}
     com.cognitect/transit-clj  {:mvn/version "1.0.324"}

dev/user.clj

@@ -11,7 +11,7 @@
   duti/-main)
 
 (defn test-all []
-  (duti/test #"datascript\.test\..*"))
+  (duti/test #"datascript\.test\.(?!cljs).*"))
 
 (defn -test-main [_]
-  (duti/test-exit #"datascript\.test\..*"))
+  (duti/test-exit #"datascript\.test\.(?!cljs).*"))

script/bench_clj.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 cd "`dirname $0`/.."
 
-clj -A:bench -M -m datascript.bench.datascript $@
+clojure -A:bench -M -m datascript.bench.datascript $@

script/bench_datomic.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 cd "`dirname $0`/.."
 
-clj -A:bench:datomic -M -m datascript.bench.datomic $@
+clojure -A:bench:datomic -M -m datascript.bench.datomic $@

script/nrepl.sh

@@ -2,4 +2,4 @@
 set -o errexit -o nounset -o pipefail
 cd "`dirname $0`/.."
 
-clj -A:1.11.1:dev:test:bench -M -m user
+clojure -A:1.11.1:dev:bench -M -m user

script/repl.sh

@@ -2,4 +2,4 @@
 set -o errexit -o nounset -o pipefail
 cd "`dirname $0`/.."
 
-lein with-profile test run -m datascript.test/test-clj
+clojure -X:dev user/-test-main