Merge pull request #5 from jamiepratt/codex/revert-personal-clay-config

Restore the standard Clay preview workflow

Author: jamiepratt

clay.edn

@@ -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"]

deps.edn

@@ -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

src/civitas/clay_main.clj

@@ -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]))
 
@@ -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?