Skip to content

Commit

Permalink
Cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
zampino committed Oct 8, 2024
1 parent bc88ec4 commit 79b159b
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 35 deletions.
10 changes: 3 additions & 7 deletions bb.edn
Original file line number Diff line number Diff line change
Expand Up @@ -45,18 +45,14 @@
:task (clojure (str "-X:dev:nextjournal/clerk :git/sha '\"" (or (first *command-line-args*) "SHASHASHA") "\"' :browse? false"))}

dev
{:doc "Boots and watches both shadow browser test and sci builds"
{:doc "Boots and watches shadow browser test"
:depends [yarn-install]
:task (clojure "-M:dev:test:nextjournal/clerk:sci watch browser-test")}
:task (clojure "-M:dev:test:nextjournal/clerk:shadow watch browser-test")}

cljs:compile:tests
{:doc "compiles tests as node executable"
:depends [yarn-install]
:task (clojure "-M:cljs-test compile test")}

test:cljs:browser
{:doc "runs cljs tests in the browsr"
:task (clojure "-M:cljs-test watch browser-test")}
:task (clojure "-M:dev:test:shadow compile test")}

test:cljs
{:doc "runs cljs tests via node"
Expand Down
17 changes: 3 additions & 14 deletions deps.edn
Original file line number Diff line number Diff line change
Expand Up @@ -41,20 +41,9 @@
:extra-deps {nubank/matcher-combinators {:mvn/version "3.8.3"}}
:exec-fn test-runner/run}

:cljs-test
{:extra-paths ["test"]
:main-opts ["-m" "shadow.cljs.devtools.cli"]
:extra-deps {thheller/shadow-cljs {:mvn/version "2.18.0"}
nubank/matcher-combinators {:mvn/version "3.8.3"}}}

:sci
{:extra-paths ["sci"]
:main-opts ["-m" "shadow.cljs.devtools.cli"]
#_#_:jvm-opts ["-Dclerk.resource_manifest={\"/js/viewer.js\" \"http://localhost:8021/viewer.js\"}"]
:extra-deps {thheller/shadow-cljs {:mvn/version "2.18.0"}
#_#_io.github.nextjournal/clerk.render {:git/url "https://github.com/nextjournal/clerk"
:git/sha "80b3e0832d08b75e13e3b862bd46660cb1c66d5c"
:deps/root "render"}}}
:shadow
{:main-opts ["-m" "shadow.cljs.devtools.cli"]
:extra-deps {thheller/shadow-cljs {:mvn/version "2.18.0"}}}

:build
{:ns-default build
Expand Down
2 changes: 1 addition & 1 deletion dev/nextjournal/markdown/graaljs.clj
Original file line number Diff line number Diff line change
Expand Up @@ -89,4 +89,4 @@
")

;; launch shadow cljs repl
(shadow.cljs.devtools.api/repl :sci))
(shadow.cljs.devtools.api/repl :browser-test))
2 changes: 0 additions & 2 deletions sci/deps.cljs

This file was deleted.

13 changes: 2 additions & 11 deletions shadow-cljs.edn
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{:source-paths ["src" "test"]
:dev-http {8021 "out/sci" 8022 "out/test"}
:dev-http {8022 "out/test"}
:nrepl {:cider false}
:builds
{:test
Expand All @@ -14,13 +14,4 @@
{:target :browser-test
:test-dir "out/test"
:closure-defines {shadow.debug true}
:js-options {:output-feature-set :es8}}

:sci
{:target :esm
:runtime :browser
:output-dir "out/sci"
:output-to "out/sci/viewer.js"
:release {:output-dir "public/build/js"}
:js-options {:output-feature-set :es8}
:modules {:viewer {:entries [nextjournal.clerk.sci-ext]}}}}}
:js-options {:output-feature-set :es8}}}}

0 comments on commit 79b159b

Please sign in to comment.