Skip to content

Restore standard Clay and contributor tooling #421

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jamiepratt wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Restore standard Clay and contributor tooling #421

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
53407a4
Restore the standard Clay preview workflow
jamiepratt Jul 16, 2026
50cee8b
Move vocabulary test aliases out of Civitas
jamiepratt Jul 16, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions clay.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
{:base-target-path "temp"
:base-source-path "src"
:watch-dirs ["src"]
:format [:quarto :html]
:run-quarto true
:browse false
:quarto-target-path "site"
:quarto ^:replace {}
:subdirs-to-sync ["src"]
Expand Down
11 changes: 2 additions & 9 deletions deps.edn
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@
:aliases
{;; Build the site with `clojure -M:clay -A:markdown`
;; Run Clay in watch mode with `clojure -M:clay`
:clay {:main-opts ["-m" "civitas.clay-main"]
:clay {:main-opts ["-m" "scicloj.clay.v2.main"]
:jvm-opts ["-Dclojure.main.report=stderr"
"--add-opens=java.base/java.nio=ALL-UNNAMED"]}
;; When debugging libraries
Expand All @@ -100,11 +100,4 @@
org.scicloj/kindly-advice {:local/root "../kindly-advice"}
org.scicloj/kindly-render {:local/root "../kindly-render"}}}
:neil {:project {:name io.github.timothypratley/clojurecivitas}}
:dev {:jvm-opts ["--add-opens=java.base/java.nio=ALL-UNNAMED"]}
:test-clj {:extra-paths ["test"]
:main-opts ["-m" "language-learning.vocabulary-estimation.test-runner"]}
:test-cljs {:extra-paths ["test"]
:extra-deps {org.clojure/clojurescript {:mvn/version "1.12.42"}}
:main-opts ["-m" "cljs.main"
"-re" "node"
"-m" "language-learning.vocabulary-estimation.cljs-test-runner"]}}}
:dev {:jvm-opts ["--add-opens=java.base/java.nio=ALL-UNNAMED"]}}}
55 changes: 0 additions & 55 deletions src/civitas/clay_main.clj
View file
Open in desktop

This file was deleted.

22 changes: 1 addition & 21 deletions src/civitas/db.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
(:require [clojure.edn :as edn]
[clojure.pprint :as pprint]
[clojure.walk :as walk]
[scicloj.kindly.v4.api :as kindly]
[tablecloth.api :as tc]
[clj-yaml.core :as yaml]))

Expand Down Expand Up @@ -41,29 +40,10 @@
(->> (index-by :id))
(update-vals #(dissoc % :id))))

(defn- ns-clay-config [ns-form]
(let [[_ sym ?doc ?attr] ns-form]
(kindly/deep-merge
(some-> ns-form meta :clay)
(some-> sym meta :clay)
(:clay (cond
(map? ?doc) ?doc
(map? ?attr) ?attr)))))

(defn- restore-replaced-quarto-config [config]
(let [quarto (:quarto config)
ns-quarto (some-> config :ns-form ns-clay-config :quarto)]
(if (and ns-quarto (-> quarto meta :replace))
(assoc config :quarto
(kindly/deep-merge ns-quarto (with-meta quarto nil)))
config)))

(defn expand-authors
"Hook for Clay to update ns metadata configuration"
[config]
(-> config
restore-replaced-quarto-config
(update :quarto #(walk/prewalk-replace (author-replacements) %))))
(update config :quarto #(walk/prewalk-replace (author-replacements) %)))

;; TODO: what if the front matter doesn't match existing?

Expand Down