Revert "defer loading html2canvas"

This reverts commit 16e0c3713fd2d0c58735fc46c95506d3194133b0.

deps/publishing/src/logseq/publishing/html.cljs

@@ -125,6 +125,7 @@ necessary db filtering"
             [:script {:src "static/js/interact.min.js"}]
             [:script {:src "static/js/highlight.min.js"}]
             [:script {:src "static/js/katex.min.js"}]
+            [:script {:src "static/js/html2canvas.min.js"}]
             [:script {:src "static/js/code-editor.js"}]
             [:script {:src "static/js/custom.js"}]])))))
 

public/index.html

@@ -51,6 +51,7 @@
 <script defer src="/static/js/highlight.min.js"></script>
 <script defer src="/static/js/interact.min.js"></script>
 <script defer src="/static/js/marked.min.js"></script>
+<script defer src="/static/js/html2canvas.min.js"></script>
 <script defer src="/static/js/main.js"></script>
 <script defer src="/static/js/amplify.js"></script>
 <script defer src="/static/js/tabler.min.js"></script>

resources/electron.html

@@ -51,6 +51,7 @@ const portal = new MagicPortal(worker);
 <script defer src="./js/highlight.min.js"></script>
 <script defer src="./js/interact.min.js"></script>
 <script defer src="./js/marked.min.js"></script>
+<script defer src="./js/html2canvas.min.js"></script>
 <script defer src="./js/lsplugin.core.js"></script>
 <script defer src="./js/main.js"></script>
 <script defer src="./js/amplify.js"></script>

resources/index.html

@@ -50,6 +50,7 @@ const portal = new MagicPortal(worker);
 <script defer src="./js/highlight.min.js"></script>
 <script defer src="./js/interact.min.js"></script>
 <script defer src="./js/marked.min.js"></script>
+<script defer src="./js/html2canvas.min.js"></script>
 <script defer src="./js/lsplugin.core.js"></script>
 <script defer src="./js/main.js"></script>
 <script defer src="./js/amplify.js"></script>

src/main/frontend/components/export.cljs

@@ -12,8 +12,7 @@
             [frontend.state :as state]
             [frontend.ui :as ui]
             [frontend.util :as util]
-            [rum.core :as rum]
-            [promesa.core :as p]))
+            [rum.core :as rum]))
 
 (rum/defc export
   []
@@ -111,13 +110,13 @@
                      :scale scale
                      :windowHeight (when (string? block-uuids-or-page-name)
                                      (.-scrollHeight container))}]
-    (p/let [_ (util/js-load$ (str util/JS_ROOT "/html2canvas.min.js"))] (-> (js/html2canvas container options)
-                                       (.then (fn [canvas] (.toBlob canvas (fn [blob]
-                                                                             (when blob
-                                                                               (let [img (js/document.getElementById "export-preview")
-                                                                                     img-url (image/create-object-url blob)]
-                                                                                 (set! (.-src img) img-url)
-                                                                                 (callback blob)))) "image/png")))))))
+    (-> (js/html2canvas container options)
+        (.then (fn [canvas] (.toBlob canvas (fn [blob]
+                                              (when blob
+                                                (let [img (js/document.getElementById "export-preview")
+                                                      img-url (image/create-object-url blob)]
+                                                  (set! (.-src img) img-url)
+                                                  (callback blob)))) "image/png"))))))
 
 (rum/defcs ^:large-vars/cleanup-todo
   export-blocks < rum/static