Skip to content

Commit

Permalink
Cleanup deps and legacy dev setup
Browse files Browse the repository at this point in the history
  • Loading branch information
@ggeoffrey
ggeoffrey committed Aug 27, 2024
1 parent c262b16 commit b51adf9
Show file tree
Hide file tree
Showing 6 changed files with 28 additions and 89 deletions.
2 changes: 1 addition & 1 deletion ci/run_tests_browser.sh
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/sh -x

echo "Running Browser tests"
clojure -M:dev:test:browser-test:shadow-cljs compile :browser-test --force-spawn && \
clojure -M:test:shadow-cljs compile :browser-test --force-spawn && \
./node_modules/.bin/karma start --single-run $@ # --browsers Chrome
2 changes: 1 addition & 1 deletion ci/run_tests_jvm.sh
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

echo "Running JVM tests"
clojure -X:test \
:dirs "[\"src\" \"src-docs\" \"test\"]" \
:dirs "[\"src\" \"test\"]" \
:patterns \
"[\"hyperfiddle.electric.impl.*\" \
\"hyperfiddle.incseq.*-test\" \
Expand Down
90 changes: 24 additions & 66 deletions deps.edn
View file
Original file line number Diff line number Diff line change
@@ -1,70 +1,28 @@
{:paths ["src"]
:deps {com.cognitect/transit-clj {:mvn/version "1.0.333"}
com.cognitect/transit-cljs {:mvn/version "0.8.280"}
com.hyperfiddle/rcf {:mvn/version "20220926-202227"}
missionary/missionary {:mvn/version "b.35"}
dom-top/dom-top {:mvn/version "1.0.9"}
fipp/fipp {:mvn/version "0.6.26"}
org.clojure/clojure {:mvn/version "1.12.0-alpha11"}
org.clojure/clojurescript {:mvn/version "1.11.121"}
org.clojure/tools.analyzer.jvm {:mvn/version "1.2.3"} ;; used by Electric
org.clojure/tools.logging {:mvn/version "1.2.4"}
borkdude/edamame {:mvn/version "1.4.25"}
net.cgrand/xforms {:mvn/version "0.19.6"}
org.clojure/test.check {:mvn/version "1.1.1"}
:deps {com.cognitect/transit-clj {:mvn/version "1.0.333"}
com.cognitect/transit-cljs {:mvn/version "0.8.280"}
com.hyperfiddle/rcf {:mvn/version "20220926-202227"}
missionary/missionary {:mvn/version "b.35"}
dom-top/dom-top {:mvn/version "1.0.9"}
fipp/fipp {:mvn/version "0.6.26"}
org.clojure/clojure {:mvn/version "1.12.0-alpha11"}
org.clojure/clojurescript {:mvn/version "1.11.121"}
org.clojure/tools.logging {:mvn/version "1.2.4"}
borkdude/edamame {:mvn/version "1.4.25"}
}

:aliases {:dev {:extra-paths ["src-dev" "src-docs" "test" "scratch" "resources-demo"] ; for clj command
:extra-deps {binaryage/devtools {:mvn/version "1.0.7"} ; for chrome devtools pretty printing
thheller/shadow-cljs {:mvn/version "2.26.2"}
;; reagent/reagent {:mvn/version "1.1.1"} ; for reagent interop demo
ch.qos.logback/logback-classic {:mvn/version "1.4.14"} ; logging implementation
lambdaisland/deep-diff2 {:mvn/version "2.10.211"}
info.sunng/ring-jetty9-adapter {:mvn/version "0.14.3"
;; "0.14.3" (Jetty 9) is Java 8 compatible;
;; "0.17.7" (Jetty 10) is NOT Java 8 compatible
:exclusions [org.slf4j/slf4j-api
info.sunng/ring-jetty9-adapter-http3]} ; no need
;; ring-basic-authentication/ring-basic-authentication {:mvn/version "1.2.0"}
com.datomic/peer {:mvn/version "1.0.7075" :exclusions [org.slf4j/slf4j-nop]} ; for demos TODO can this be removed?
datascript/datascript {:mvn/version "1.4.1"} ; for demos TODO can this be updated/removed?
}
:jvm-opts ["-XX:-OmitStackTraceInFastThrow" ;; RCF
]}
:test {:extra-paths [#_"src-dev" "test"]
:jvm-opts ["-Dhyperfiddle.rcf.generate-tests=true"
"-XX:-OmitStackTraceInFastThrow" ;; https://archive.md/NNt9r
]
:extra-deps {org.clojure/core.async {:mvn/version "1.6.681"} ; for interop helpers only
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"}}
:exec-fn cognitect.test-runner.api/test}

:browser-test {:jvm-opts ["-Dhyperfiddle.electric.web-config-peers=client,cljs,server,cljs"]}

:build {:extra-paths ["src-build"]
:ns-default build
:extra-deps {io.github.clojure/tools.build {:mvn/version "0.9.6"}
slipset/deps-deploy {:mvn/version "0.2.2"}}}
:shadow-cljs {:extra-deps {thheller/shadow-cljs {:mvn/version "2.26.2"}}
:aliases { :shadow-cljs {:extra-deps {thheller/shadow-cljs {:mvn/version "2.26.2"}}
:main-opts ["-m" "shadow.cljs.devtools.cli"]}
:prod {:extra-paths ["src-prod" "src-docs" "resources-demo"]
:extra-deps {ch.qos.logback/logback-classic {:mvn/version "1.4.14"} ; logging implementation
info.sunng/ring-jetty9-adapter {:mvn/version "0.14.3"
;; "0.14.3" (Jetty 9) is Java 8 compatible;
;; "0.17.7" (Jetty 10) is NOT Java 8 compatible
:exclusions [org.slf4j/slf4j-api
info.sunng/ring-jetty9-adapter-http3]} ; no need
ring-basic-authentication/ring-basic-authentication {:mvn/version "1.2.0"}
datascript/datascript {:mvn/version "1.4.1"} ; for demos TODO can this be updated/removed?
com.datomic/peer {:mvn/version "1.0.7075" :exclusions [org.slf4j/slf4j-nop]} ; for demos TODO can this be removed?
}}

:profile {:extra-deps {criterium/criterium {:mvn/version "0.4.6"}
com.clojure-goes-fast/clj-java-decompiler {:mvn/version "0.3.4"}
com.clojure-goes-fast/clj-async-profiler {:mvn/version "1.1.1"}}
:jvm-opts ["-Djdk.attach.allowAttachSelf"
"-XX:+UnlockDiagnosticVMOptions"
"-XX:+DebugNonSafepoints"]}}}

:test {:extra-paths ["test"]
:exec-fn cognitect.test-runner.api/test
:jvm-opts ["-Dhyperfiddle.rcf.generate-tests=true" "-XX:-OmitStackTraceInFastThrow"] ;; https://archive.md/NNt9r
:extra-deps {org.clojure/core.async {:mvn/version "1.6.681"} ; for interop helpers only
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"}}}
:build {:extra-paths ["src-build"]
:ns-default build
:extra-deps {io.github.clojure/tools.build {:mvn/version "0.9.6"}
slipset/deps-deploy {:mvn/version "0.2.2"}}}}}
21 changes: 2 additions & 19 deletions shadow-cljs.edn
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,4 @@
{:builds {:dev {:target :browser
:devtools {:watch-dir "resources-demo/public" ; live reload CSS
:hud #{:errors :progress}
:ignore-warnings true ; warnings don't prevent hot-reload
:loader-mode :default ; faster reload
}
:output-dir "resources-demo/public/js"
:asset-path "/js"
:modules {:main {:entries [user]
:init-fn user/start!}}
:build-hooks [(shadow.cljs.build-report/hook {:output-to "target/build_report.html"})
(user/rcf-shadow-hook)]}
:test {:target :node-test
{: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).*$"
:build-options {:cache-level :off}
Expand All @@ -35,9 +23,4 @@
contrib.missionary-contrib-test
contrib.ednish
contrib.sexpr-router]}}
:compiler-options {:warnings-as-errors {:warning-types #{:infer-warning}}}}
:prod {:target :browser
:output-dir "resources-demo/public/js"
:asset-path "/js"
:module-hash-names true
:modules {:main {:entries [prod] :init-fn prod/start!}}}}}
:compiler-options {:warnings-as-errors {:warning-types #{:infer-warning}}}}}}
1 change: 0 additions & 1 deletion src-dev/user.clj
View file

This file was deleted.

1 change: 0 additions & 1 deletion src-dev/user.cljs
View file

This file was deleted.

0 comments on commit b51adf9

Please sign in to comment.