diff --git a/nbb.edn b/nbb.edn index 2cfff8c..e738d86 100644 --- a/nbb.edn +++ b/nbb.edn @@ -1,17 +1,17 @@ {:deps {logseq/graph-parser {:git/url "https://github.com/logseq/logseq" - :git/sha "d43fb23ef01363937a383cc5984191287187811c" + :git/sha "8eec034c612bb549000d06b94bf814f72b53c424" :deps/root "deps/graph-parser"} #_{:local/root "../logseq/deps/graph-parser"} logseq/publishing {:git/url "https://github.com/logseq/logseq" - :git/sha "d43fb23ef01363937a383cc5984191287187811c" + :git/sha "8eec034c612bb549000d06b94bf814f72b53c424" :deps/root "deps/publishing"} #_{:local/root "../logseq/deps/publishing"} ;; TODO: Remove workaround for error: 'Unable to compare versions for logseq/db' logseq/db {:git/url "https://github.com/logseq/logseq" - :git/sha "d43fb23ef01363937a383cc5984191287187811c" + :git/sha "8eec034c612bb549000d06b94bf814f72b53c424" :deps/root "deps/db"} #_{:local/root "../logseq/deps/db"}}} diff --git a/package.json b/package.json index 3e52300..c00e86b 100644 --- a/package.json +++ b/package.json @@ -17,9 +17,9 @@ }, "homepage": "https://github.com/logseq/publish-spa#readme", "dependencies": { - "@logseq/nbb-logseq": "^1.2.173", + "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v1", + "better-sqlite3": "8.0.1", "fs-extra": "^9.1.0", - "mldoc": "^1.5.1", - "better-sqlite3": "8.0.1" + "mldoc": "^1.5.1" } } diff --git a/src/logseq/publish_spa.cljs b/src/logseq/publish_spa.cljs index ca12d44..dd47bed 100644 --- a/src/logseq/publish_spa.cljs +++ b/src/logseq/publish_spa.cljs @@ -75,8 +75,7 @@ (defn- publish-db-graph [static-dir graph-dir output-path options] (let [db-name (node-path/basename graph-dir) - _ (sqlite-db/open-db! (node-path/dirname graph-dir) db-name) - conn (sqlite-cli/read-graph db-name) + conn (sqlite-db/open-db! (node-path/dirname graph-dir) db-name) repo-config (-> (d/q '[:find ?content :where [?b :file/path "logseq/config.edn"] [?b :file/content ?content]] @conn) diff --git a/yarn.lock b/yarn.lock index b68c505..f0ed201 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9,6 +9,12 @@ dependencies: import-meta-resolve "^2.1.0" +"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v1": + version "1.2.173-feat-db-v1" + resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/e4910dfb12043404c97962d8faab3a946ab89f81" + dependencies: + import-meta-resolve "^2.1.0" + ansi-regex@^2.0.0: version "2.1.1" resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"