Merge pull request #195 from scicloj/kindly-render-1

Kindly render 1
scicloj · Dec 20, 2024 · 42a18bc · 42a18bc
2 parents c41d836 + eddefbf
commit 42a18bc
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,11 @@
 # Change Log
 All notable changes to this project will be documented in this file. This change log follows the conventions of [keepachangelog.com](http://keepachangelog.com/).
 
+## [2-beta26] - 2024-12-20
+- brought the experimental use of `kindly-render` back
+
 ## [2-beta25] - 2024-12-02
-- disabled the experimental use of kindly-render
+- disabled the experimental use of `kindly-render`
 - avoiding the unnecessary use of git clone for ggplotly deps
 
 ## [2-beta24] - 2024-11-30

diff --git a/build.clj b/build.clj
@@ -15,7 +15,7 @@
             [deps-deploy.deps-deploy :as dd]))
 
 (def lib 'org.scicloj/clay)
-(def version "2-beta25")
+(def version "2-beta26")
 
 (def snapshot (str version "-SNAPSHOT"))
 (def class-dir "target/classes")

diff --git a/deps.edn b/deps.edn
@@ -14,9 +14,7 @@
         org.clojure/tools.reader {:mvn/version "1.3.7"}
         com.nextjournal/beholder {:mvn/version "1.0.2"}
         babashka/fs {:mvn/version "0.5.22"}
-        ;; org.scicloj/kindly-render {:git/sha "fb37e8a5946db602d7051e6f1d52c88498789366"
-        ;;                            :git/url "https://github.com/scicloj/kindly-render.git"}
-        }
+        org.scicloj/kindly-render {:mvn/version "0.1.1-alpha"}}
  :aliases {:dev {:extra-paths ["notebooks"]
                  :extra-deps {scicloj/tablecloth {:mvn/version "7.029.2"}
                               org.scicloj/tableplot {:mvn/version "1-alpha14.1"}

diff --git a/src/scicloj/clay/v2/make.clj b/src/scicloj/clay/v2/make.clj
@@ -20,7 +20,7 @@
             [scicloj.clay.v2.files :as files]
             [clojure.pprint :as pp]
             [scicloj.kindly.v4.kind :as kind]
-            #_[scicloj.kindly-render.notes.to-html-page :as to-html-page]))
+            [scicloj.kindly-render.notes.to-html-page :as to-html-page]))
 
 (defn spec->source-type [{:keys [source-path]}]
   (some-> source-path
@@ -313,14 +313,13 @@
     (try
       (files/init-target! full-target-path)
       (if use-kindly-render
-        nil
-        #_(let [notebook {:notes (-> full-source-path
-                                     slurp
-                                     read/->safe-notes)}]
-            (-> spec
-                (assoc :page (to-html-page/render-notebook notebook))
-                server/update-page!)
-            [:wrote-with-kindly-render full-target-path])
+        (let [notebook {:notes (-> full-source-path
+                                   slurp
+                                   read/->safe-notes)}]
+          (-> spec
+              (assoc :page (to-html-page/render-notebook notebook))
+              server/update-page!)
+          [:wrote-with-kindly-render full-target-path])
         (let [{:keys [items test-forms]} (notebook/items-and-test-forms
                                           spec)
               spec-with-items      (-> spec