Merge branch 'whiteboards' of https://github.com/logseq/logseq into whiteboards

resources/electron.html

@@ -55,5 +55,6 @@ const portal = new MagicPortal(worker);
 <script defer src="./js/code-editor.js"></script>
 <script defer src="./js/age-encryption.js"></script>
 <script defer src="./js/excalidraw.js"></script>
+<script defer src="./js/tldraw.js"></script>
 </body>
 </html>

resources/index.html

@@ -54,5 +54,6 @@ const portal = new MagicPortal(worker);
 <script defer src="./js/code-editor.js"></script>
 <script defer src="./js/age-encryption.js"></script>
 <script defer src="./js/excalidraw.js"></script>
+<script defer src="./js/tldraw.js"></script>
 </body>
 </html>

shadow-cljs.edn

@@ -5,7 +5,7 @@
  ;; "." for /static
  :dev-http {3001 ["static" "."]
             3002 ["public/workspaces" "."]}
- 
+
  :js-options {:js-package-dirs ["node_modules" "tldraw/apps"]}
 
  :builds
@@ -41,7 +41,7 @@
         ;; NOTE: electron, browser/mobile-app use different asset-paths.
         ;;   For browser/mobile-app devs, assets are located in /static/js(via HTTP root).
         ;;   For electron devs, assets are located in ./js(via relative path).
-        ; :dev      {:asset-path "./js"}
+        ;; :dev      {:asset-path "./js"}
         :devtools {:before-load frontend.core/stop  ;; before live-reloading any code call this function
                    :after-load  frontend.core/start ;; after live-reloading finishes call this function
                    :watch-path  "/static"

src/main/frontend/fs/capacitor_fs.cljs

@@ -137,7 +137,7 @@
         (and
          (not= stat :not-found)   ; file on the disk was deleted
          (not contents-matched?)
-         (not (contains? #{"excalidraw" "edn" "css"} ext))
+         (not (contains? #{"excalidraw" "tldr" "edn" "css"} ext))
          (not (string/includes? path "/.recycle/"))
          (zero? pending-writes))
         (p/let [disk-content (encrypt/decrypt disk-content)]

src/main/frontend/fs/nfs.cljs

@@ -173,7 +173,7 @@
                          (not (string/blank? db-content))
                          (not (:skip-compare? opts))
                          (not contents-matched?)
-                         (not (contains? #{"excalidraw" "edn" "css"} ext))
+                         (not (contains? #{"excalidraw" "tldr" "edn" "css"} ext))
                          (not (string/includes? path "/.recycle/"))
                          (zero? pending-writes))
                       (p/let [local-content (encrypt/decrypt local-content)]

src/main/frontend/fs/node.cljs

@@ -59,7 +59,7 @@
         (and
          (not= stat :not-found)         ; file on the disk was deleted
          (not contents-matched?)
-         (not (contains? #{"excalidraw" "edn" "css"} ext))
+         (not (contains? #{"excalidraw" "tldr" "edn" "css"} ext))
          (not (string/includes? path "/.recycle/"))
          (zero? pending-writes))
         (p/let [disk-content (encrypt/decrypt disk-content)]