diff --git a/.carve/ignore b/.carve/ignore index 95227770ceb..b0e3526b1c5 100644 --- a/.carve/ignore +++ b/.carve/ignore @@ -93,4 +93,8 @@ frontend.db.sync/export-as-blocks ;; Initial loaded frontend.ui/_emoji-init-data ;; placeholder var for defonce -frontend.db.rtc.op-mem-layer/_sync-loop \ No newline at end of file +frontend.db.rtc.op-mem-layer/_sync-loop +;; Used by shadow.cljs +frontend.db-worker/init +;; For defonce +frontend.persist-db.browser/_do_not_reload_worker diff --git a/src/main/frontend/core.cljs b/src/main/frontend/core.cljs index 1de2addf945..a176735f743 100644 --- a/src/main/frontend/core.cljs +++ b/src/main/frontend/core.cljs @@ -9,7 +9,6 @@ [frontend.routes :as routes] [frontend.spec] [frontend.log] - [frontend.persist-db.browser :as browser-persist-db] [reitit.frontend :as rf] [reitit.frontend.easy :as rfe] [logseq.api] diff --git a/src/main/frontend/db_worker.cljs b/src/main/frontend/db_worker.cljs index 16b7c3d6a2b..7b10e9e300e 100644 --- a/src/main/frontend/db_worker.cljs +++ b/src/main/frontend/db_worker.cljs @@ -1,4 +1,5 @@ (ns frontend.db-worker + "Worker used for browser DB implementation" (:require ["@logseq/sqlite" :as sqlite-db :default wasm-bindgen-init] ["comlink" :as Comlink] [promesa.core :as p] @@ -6,6 +7,7 @@ (def *inited (atom false)) +#_:clj-kondo/ignore (defclass SQLiteDB (extends js/Object) diff --git a/src/main/frontend/format/mldoc.cljs b/src/main/frontend/format/mldoc.cljs index 99abcd326bf..36d7c8d04ba 100644 --- a/src/main/frontend/format/mldoc.cljs +++ b/src/main/frontend/format/mldoc.cljs @@ -168,17 +168,4 @@ ast) (->> @*result (remove string/blank?) - (distinct)))) - -(defn content-without-tags - "Remove tags from content" - [content tags] - (-> - (reduce - (fn [content tag] - (-> content - (string/replace (str "#" tag) "") - (string/replace (str "#" page-ref/left-brackets tag page-ref/right-brackets) ""))) - content - tags) - (string/trim))) + (distinct)))) \ No newline at end of file diff --git a/src/main/frontend/handler/page.cljs b/src/main/frontend/handler/page.cljs index d3c556068fc..e7ac327eefe 100644 --- a/src/main/frontend/handler/page.cljs +++ b/src/main/frontend/handler/page.cljs @@ -219,7 +219,7 @@ (subs q 1) q)) last-pattern (str "#" (when wrapped? page-ref/left-brackets) last-pattern)] - (when (config/db-based-graph? (state/get-current-repo)) + (when db-based? (let [tag (string/trim chosen) edit-block (state/get-edit-block)] (when (and (not (string/blank? tag)) (:block/uuid edit-block)) diff --git a/src/main/frontend/persist_db/browser.cljs b/src/main/frontend/persist_db/browser.cljs index 1ee52dfa1d8..bb833bc70fa 100644 --- a/src/main/frontend/persist_db/browser.cljs +++ b/src/main/frontend/persist_db/browser.cljs @@ -16,7 +16,7 @@ (defonce *inited (atom false)) -(when-not (or (util/electron?) config/publishing?) +(when-not (or (util/electron?) config/publishing? util/node-test?) (defonce _do_not_reload_worker (let [worker (try (js/Worker. "/static/js/db-worker.js")