浏览代码

Fix nbb.edn paths with latest nbb-logseq

Also upgrade nbb-logseq in other deps
Gabriel Horner 2 年之前
父节点
当前提交
7dc9c41899

+ 1 - 1
deps/db/package.json

@@ -3,6 +3,6 @@
   "version": "1.0.0",
   "private": true,
   "devDependencies": {
-    "@logseq/nbb-logseq": "^1.1.158"
+    "@logseq/nbb-logseq": "^1.2.173"
   }
 }

+ 4 - 4
deps/db/yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@^1.1.158":
-  version "1.1.158"
-  resolved "https://registry.yarnpkg.com/@logseq/nbb-logseq/-/nbb-logseq-1.1.158.tgz#ebff10bdb0998b43e52e69ad487be04236b84569"
-  integrity sha512-NT3w5BmYBUeyOPNDc3SRNUrC4EXiY75KXiTdDS24kYaRX4UR63UZiAcCrG2GLB3jS48N2xv23dWJusHFer/+sQ==
+"@logseq/nbb-logseq@^1.2.173":
+  version "1.2.173"
+  resolved "https://registry.yarnpkg.com/@logseq/nbb-logseq/-/nbb-logseq-1.2.173.tgz#27a52c350f06ac9c337d73687738f6ea8b2fc3f3"
+  integrity sha512-ABKPtVnSOiS4Zpk9+UTaGcs5H6EUmRADr9FJ0aEAVpa0WfAyvUbX/NgkQGMe1kKRv3EbIuLwaxfy+txr31OtAg==
   dependencies:
     import-meta-resolve "^2.1.0"
 

+ 1 - 1
deps/graph-parser/package.json

@@ -3,7 +3,7 @@
   "version": "1.0.0",
   "private": true,
   "devDependencies": {
-    "@logseq/nbb-logseq": "^1.1.158"
+    "@logseq/nbb-logseq": "^1.2.173"
   },
   "dependencies": {
     "mldoc": "^1.5.1"

+ 4 - 4
deps/graph-parser/yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@^1.1.158":
-  version "1.1.158"
-  resolved "https://registry.yarnpkg.com/@logseq/nbb-logseq/-/nbb-logseq-1.1.158.tgz#ebff10bdb0998b43e52e69ad487be04236b84569"
-  integrity sha512-NT3w5BmYBUeyOPNDc3SRNUrC4EXiY75KXiTdDS24kYaRX4UR63UZiAcCrG2GLB3jS48N2xv23dWJusHFer/+sQ==
+"@logseq/nbb-logseq@^1.2.173":
+  version "1.2.173"
+  resolved "https://registry.yarnpkg.com/@logseq/nbb-logseq/-/nbb-logseq-1.2.173.tgz#27a52c350f06ac9c337d73687738f6ea8b2fc3f3"
+  integrity sha512-ABKPtVnSOiS4Zpk9+UTaGcs5H6EUmRADr9FJ0aEAVpa0WfAyvUbX/NgkQGMe1kKRv3EbIuLwaxfy+txr31OtAg==
   dependencies:
     import-meta-resolve "^2.1.0"
 

+ 2 - 4
deps/publishing/nbb.edn

@@ -1,8 +1,6 @@
 {:paths ["src"]
  :deps
- {;; logseq/db should just be "../db". Fine on CI but locally it requires three
-  ;; levels more. Disabled until bug is sorted out
-  ; logseq/db
-  ;{:local/root "../../../../db"}
+ {logseq/db
+  {:local/root "../db"}
   io.github.nextjournal/nbb-test-runner
   {:git/sha "60ed57aa04bca8d604f5ba6b28848bd887109347"}}}

+ 2 - 2
deps/publishing/package.json

@@ -3,13 +3,13 @@
   "version": "1.0.0",
   "private": true,
   "devDependencies": {
-    "@logseq/nbb-logseq": "^1.2.168",
+    "@logseq/nbb-logseq": "^1.2.173",
     "mldoc": "^1.5.1"
   },
   "dependencies": {
     "fs-extra": "9.1.0"
   },
   "scripts": {
-    "test": "yarn nbb-logseq -cp test:../db/src:../graph-parser/src -m nextjournal.test-runner"
+    "test": "yarn nbb-logseq -cp test:../graph-parser/src -m nextjournal.test-runner"
   }
 }

+ 4 - 4
deps/publishing/yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@^1.2.168":
-  version "1.2.168"
-  resolved "https://registry.yarnpkg.com/@logseq/nbb-logseq/-/nbb-logseq-1.2.168.tgz#e4120c4a7eb6c80737473292c1e20919b4453c91"
-  integrity sha512-lgZuAhck/74+9mT4vr6jVLkPcyRA/RO8ApBizq3d1L6LsPlPjdRp4nIaC2I1/p/AaIIB5vP89pMpqZfVsIHHQg==
+"@logseq/nbb-logseq@^1.2.173":
+  version "1.2.173"
+  resolved "https://registry.yarnpkg.com/@logseq/nbb-logseq/-/nbb-logseq-1.2.173.tgz#27a52c350f06ac9c337d73687738f6ea8b2fc3f3"
+  integrity sha512-ABKPtVnSOiS4Zpk9+UTaGcs5H6EUmRADr9FJ0aEAVpa0WfAyvUbX/NgkQGMe1kKRv3EbIuLwaxfy+txr31OtAg==
   dependencies:
     import-meta-resolve "^2.1.0"
 

+ 2 - 3
scripts/nbb.edn

@@ -1,7 +1,6 @@
 {:paths ["src"]
  :deps
  {logseq/graph-parser
-  ;; Nbb bug. Should just be "../graph-parser"
-  {:local/root "../../../../deps/graph-parser"}
+  {:local/root "../deps/graph-parser"}
   logseq/publishing
-  {:local/root "../../../../deps/publishing"}}}
+  {:local/root "../deps/publishing"}}}

+ 3 - 3
scripts/package.json

@@ -3,10 +3,10 @@
   "version": "1.0.0",
   "private": true,
   "devDependencies": {
-    "@logseq/nbb-logseq": "^1.2.168"
+    "@logseq/nbb-logseq": "^1.2.173"
   },
   "dependencies": {
-    "mldoc": "^1.5.1",
-    "fs-extra": "9.1.0"
+    "fs-extra": "9.1.0",
+    "mldoc": "^1.5.1"
   }
 }

+ 4 - 4
scripts/yarn.lock

@@ -2,10 +2,10 @@
 # yarn lockfile v1
 
 
-"@logseq/nbb-logseq@^1.2.168":
-  version "1.2.168"
-  resolved "https://registry.yarnpkg.com/@logseq/nbb-logseq/-/nbb-logseq-1.2.168.tgz#e4120c4a7eb6c80737473292c1e20919b4453c91"
-  integrity sha512-lgZuAhck/74+9mT4vr6jVLkPcyRA/RO8ApBizq3d1L6LsPlPjdRp4nIaC2I1/p/AaIIB5vP89pMpqZfVsIHHQg==
+"@logseq/nbb-logseq@^1.2.173":
+  version "1.2.173"
+  resolved "https://registry.yarnpkg.com/@logseq/nbb-logseq/-/nbb-logseq-1.2.173.tgz#27a52c350f06ac9c337d73687738f6ea8b2fc3f3"
+  integrity sha512-ABKPtVnSOiS4Zpk9+UTaGcs5H6EUmRADr9FJ0aEAVpa0WfAyvUbX/NgkQGMe1kKRv3EbIuLwaxfy+txr31OtAg==
   dependencies:
     import-meta-resolve "^2.1.0"