Fix serving of service worker by reusing serve-file

Otherwise content-type isn't set correct and it won't work
nextjournal · Sep 11, 2023 · d64677d · d64677d
1 parent 49aeb6b
commit d64677d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 9 deletions.
diff --git a/resources/js/service_worker.js → resources/public/clerk_service_worker.js b/resources/js/service_worker.js → resources/public/clerk_service_worker.js
diff --git a/src/nextjournal/clerk/view.clj b/src/nextjournal/clerk/view.clj
@@ -59,7 +59,7 @@
       [:script {:type "text/javascript"}
        "if ('serviceWorker' in navigator) {
           navigator.serviceWorker
-            .register('/service_worker.js')
+            .register('/clerk_service_worker.js')
             .then(function() { console.log('Service Worker: Registered') })
             .catch(function(error) { console.log('Service Worker: Error', error) })
         }"])

diff --git a/src/nextjournal/clerk/webserver.clj b/src/nextjournal/clerk/webserver.clj
@@ -105,13 +105,6 @@
 
 #_(serve-file "public" {:uri "/js/viewer.js"})
 
-(defn serve-resource [resource-name]
-  (if-some [r (io/resource resource-name)]
-    {:status 200 :body (slurp r)}
-    {:status 404}))
-
-#_(serve-resource "stylesheets/viewer.css")
-#_(serve-resource "service_worker.js")
 
 (defn sync-atom-changed [key atom old-state new-state]
   (eval '(nextjournal.clerk/recompute!)))
@@ -260,7 +253,7 @@
       (case (get (re-matches #"/([^/]*).*" uri) 1)
         "_blob" (serve-blob @!doc (extract-blob-opts req))
         ("build" "js" "css") (serve-file uri (str "public" uri))
-        "service_worker.js" (serve-resource "js/service_worker.js")
+        "clerk_service_worker.js" (serve-file uri (fs/path (io/resource "public/clerk_service_worker.js")))
         ("_fs") (serve-file uri (str/replace uri "/_fs/" ""))
         "_ws" {:status 200 :body "upgrading..."}
         "favicon.ico" {:status 404}