fix: nbb-logseq bundling and quirky datascript requires (#12032)

* fix: nbb-logseq bundling and quirky datascript requires

* fix: bump nbb-logseq for node version incompatibility

deps/common/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "devDependencies": {
-    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v24"
+    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v26"
   },
   "scripts": {
     "test": "yarn nbb-logseq -cp test -m nextjournal.test-runner"

deps/common/yarn.lock

@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v24":
-  version "1.2.173-feat-db-v24"
-  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/3d5b78b0382c7253bf9874c1f38586dd338434f4"
+"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v26":
+  version "1.2.173-feat-db-v25"
+  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/b26d290944234b20762ff109e5328b87ea240692"
   dependencies:
     import-meta-resolve "^4.1.0"
 

deps/db/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "devDependencies": {
-    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v24"
+    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v26"
   },
   "dependencies": {
     "better-sqlite3": "11.10.0"

deps/db/src/logseq/db/common/sqlite_cli.cljs

@@ -6,8 +6,6 @@
             ["path" :as node-path]
             [cljs-bean.core :as bean]
             [clojure.string :as string]
-            ;; FIXME: datascript.core has to come before datascript.storage or else nbb fails
-            [datascript.core]
             [datascript.storage :refer [IStorage]]
             [logseq.db.common.sqlite :as common-sqlite]
             [logseq.db.file-based.schema :as file-schema]

deps/db/yarn.lock

@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v24":
-  version "1.2.173-feat-db-v24"
-  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/3d5b78b0382c7253bf9874c1f38586dd338434f4"
+"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v26":
+  version "1.2.173-feat-db-v25"
+  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/b26d290944234b20762ff109e5328b87ea240692"
   dependencies:
     import-meta-resolve "^4.1.0"
 

deps/graph-parser/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "devDependencies": {
-    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v24",
+    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v26",
     "better-sqlite3": "11.10.0"
   },
   "dependencies": {

deps/graph-parser/yarn.lock

@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v24":
-  version "1.2.173-feat-db-v24"
-  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/3d5b78b0382c7253bf9874c1f38586dd338434f4"
+"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v26":
+  version "1.2.173-feat-db-v25"
+  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/b26d290944234b20762ff109e5328b87ea240692"
   dependencies:
     import-meta-resolve "^4.1.0"
 

deps/outliner/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "devDependencies": {
-    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v24"
+    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v26"
   },
   "dependencies": {
     "better-sqlite3": "11.10.0",

deps/outliner/yarn.lock

@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v24":
-  version "1.2.173-feat-db-v24"
-  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/3d5b78b0382c7253bf9874c1f38586dd338434f4"
+"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v26":
+  version "1.2.173-feat-db-v25"
+  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/b26d290944234b20762ff109e5328b87ea240692"
   dependencies:
     import-meta-resolve "^4.1.0"
 

deps/publishing/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "devDependencies": {
-    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v24",
+    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v26",
     "mldoc": "^1.5.9"
   },
   "dependencies": {

deps/publishing/yarn.lock

@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v24":
-  version "1.2.173-feat-db-v24"
-  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/3d5b78b0382c7253bf9874c1f38586dd338434f4"
+"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v26":
+  version "1.2.173-feat-db-v25"
+  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/b26d290944234b20762ff109e5328b87ea240692"
   dependencies:
     import-meta-resolve "^4.1.0"
 

scripts/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "devDependencies": {
-    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v24"
+    "@logseq/nbb-logseq": "logseq/nbb-logseq#feat-db-v26"
   },
   "dependencies": {
     "better-sqlite3": "11.10.0",

scripts/yarn.lock

@@ -2,9 +2,9 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v24":
-  version "1.2.173-feat-db-v24"
-  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/3d5b78b0382c7253bf9874c1f38586dd338434f4"
+"@logseq/nbb-logseq@logseq/nbb-logseq#feat-db-v26":
+  version "1.2.173-feat-db-v25"
+  resolved "https://codeload.github.com/logseq/nbb-logseq/tar.gz/b26d290944234b20762ff109e5328b87ea240692"
   dependencies:
     import-meta-resolve "^4.1.0"