Merge branch 'main' into bump-sci

Author: borkdude

book.clj

@@ -311,7 +311,7 @@ int main() {
 ;; famous painting of a farmer sowing a field from Wiki Commons like
 ;; this:
 
-(clerk/image "https://upload.wikimedia.org/wikipedia/commons/thumb/3/31/The_Sower.jpg/1510px-The_Sower.jpg")
+(clerk/image "https://commons.wikimedia.org/w/thumb.php?f=The_Sower.jpg&w=1510")
 
 ;; We've put some effort into making the default image rendering
 ;; pleasing. The viewer uses the dimensions and aspect ratio of each

notebooks/viewers/table.clj

@@ -81,7 +81,7 @@
   (clerk/table
    {:rows (map (juxt identity dec) (range 1 100))
     :head [(read-image "https://upload.wikimedia.org/wikipedia/commons/1/17/Plus_img_364976.png")
-           (read-image "https://upload.wikimedia.org/wikipedia/commons/thumb/d/df/OCR-A_char_Hyphen-Minus.svg/543px-OCR-A_char_Hyphen-Minus.svg.png")]}))
+           (read-image "https://commons.wikimedia.org/w/thumb.php?f=OCR-A_char_Hyphen-Minus.svg&w=543")]}))
 
 ;; ## Custom Table Viewers
 ;; override single table components

src/nextjournal/clerk/analyzer/impl.clj

@@ -1,7 +1,7 @@
 (ns nextjournal.clerk.analyzer.impl
   "This code is largely borrowed from https://github.com/hyperfiddle/rcf"
   (:require [clojure.string :as str])
-    (:refer-clojure :exclude [macroexpand-1 macroexpand update-vals])
+    (:refer-clojure :exclude [update-vals])
     (:import (clojure.lang IObj)))
 
 (def ^:dynamic *deps* nil)

src/nextjournal/clerk/cherry_env.cljs

@@ -1,5 +1,4 @@
 (ns nextjournal.clerk.cherry-env
-  (:refer-clojure :exclude [time])
   (:require [applied-science.js-interop :as j]
             [cherry.embed :as cherry]
             [cljs.math]

src/nextjournal/clerk/cljs_libs.clj

@@ -1,5 +1,5 @@
 (ns nextjournal.clerk.cljs-libs
-  (:refer-clojure :exclude [remove-ns all-ns])
+  (:refer-clojure :exclude [all-ns])
   (:require
    [clojure.java.io :as io]
    [clojure.string :as str]

test/nextjournal/clerk/webserver_test.clj

@@ -77,13 +77,15 @@
 
 (deftest serve-file-test
   (testing "serving a file resource"
-    (is (= 200 (:status (webserver/serve-file "public/clerk_service_worker.js" "resources/public/clerk_service_worker.js")))
-        (= {"Content-Type" "text/javascript"} (:headers (webserver/serve-file "public/clerk_service_worker.js" "resources/public/clerk_service_worker.js"))))))
+    (is (= 200 (:status (webserver/serve-file "public/clerk_service_worker.js" "resources/public/clerk_service_worker.js"))))
+    (is (#{"application/javascript" "text/javascript"} (get (:headers (webserver/serve-file "public/clerk_service_worker.js" "resources/public/clerk_service_worker.js"))
+                                                            "Content-Type")))))
 
 (deftest serve-resource-test
   (testing "serving a file resource"
-    (is (= 200 (:status (webserver/serve-resource (io/resource "public/clerk_service_worker.js"))))
-        (= {"Content-Type" "text/javascript"} (:headers (webserver/serve-resource (io/resource "public/clerk_service_worker.js"))))))
+    (is (= 200 (:status (webserver/serve-resource (io/resource "public/clerk_service_worker.js")))))
+    (is (#{"application/javascript" "text/javascript"} (get (:headers (webserver/serve-resource (io/resource "public/clerk_service_worker.js")))
+                                                            "Content-Type"))))
 
   (testing "serving a resource from a jar"
     (is (= 200 (:status (webserver/serve-resource (io/resource "weavejester/dependency.cljc")))))))