Skip to content

Commit 4d9f138

Browse files
Release v34 w/ latest upstream nbb
Using latest nbb requires java 21+. Also found workaround for sci conflict issue with deps.edn to avoid relying on forked nbb
1 parent cfe10d5 commit 4d9f138

37 files changed

+5987
-6128
lines changed

.gitignore

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
/.cpcache
2+
/.claude
13
.shadow-cljs
24
node_modules
35
shadow-cljs.edn

.java-version

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
21.0.10

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ $ nbb-logseq -e '(+ 1 2 3)'
3636

3737
## Database Version
3838

39-
To use `nbb-logseq` with [the database version](https://github.com/logseq/logseq#-database-version), specify the version as `logseq/nbb-logseq#feat-db-v33`. This version is only available through github and has not been released to npm. An npm version will be released when the database version has a desktop release.
39+
To use `nbb-logseq` with [the database version](https://github.com/logseq/logseq#-database-version), specify the version as `logseq/nbb-logseq#feat-db-v34`. This version is only available through github and has not been released to npm. An npm version will be released when the database version has a desktop release.
4040

4141
Unlike file graphs, DB graphs can be written by scripts. This is powerful and opens up more use cases for scripting. To write your own script, you'll need a package.json and nbb.edn. Use [this example package.json](https://github.com/logseq/publish-spa/blob/feat/db/package.json) and [this example nbb.edn](https://github.com/logseq/publish-spa/blob/feat/db/nbb.edn). Some example database graph scripts:
4242

@@ -95,7 +95,7 @@ Community CLIs with a `nbb.edn`:
9595
single page app
9696

9797
To install or build a CLI locally, install
98-
[babashka](https://github.com/babashka/babashka#installation) and
98+
[babashka](https://github.com/babashka/babashka#installation), Java 21+ and
9999
[clojure](https://clojure.org/guides/install_clojure).
100100

101101
### Install a CLI

bb.edn

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,17 +2,15 @@
22
:deps
33
{nbb.build/nbb.build
44
{:git/url "https://github.com/babashka/nbb"
5-
:git/sha "62e749cdbd6706ccdbaeaf6017e4bfed5fc54704"
5+
:git/sha "70fb827cd77d12da435efaf093fb763bc3090965"
66
:deps/root "build"}
77
#_{:local/root "../nbb/build"}
8+
;; When bumping nbb, also bump sci version in deps.edn
89
nbb/nbb
9-
;; Use fork temporarily until sci build error is fixed upstream
10-
{:git/url "https://github.com/logseq/nbb"
11-
:git/sha "2486d72cbddb70d4c4047be9c063122fd78f6835"
10+
{:git/url "https://github.com/babashka/nbb"
11+
:git/sha "70fb827cd77d12da435efaf093fb763bc3090965"
1212
:exclusions [org.babashka/sci]}
1313
#_{:local/root "../nbb"}
14-
;; org.babashka/sci
15-
;; {:mvn/version "0.10.46"}
1614
datascript/deps
1715
{:git/url "https://github.com/logseq/nbb-features"
1816
:git/sha "49a77b405cb43e6bba8270aee736db939c8dd634"
@@ -24,7 +22,7 @@
2422
:deps/root "features/datascript-transit"}
2523
#_{:local/root "../nbb-features/features/datascript-transit"}
2624
cljs-time/deps {:local/root "features/cljs-time"}
27-
;; nbb comes with cljs-bean but not cljs-bean.transit
25+
;; nbb comes with cljs-bean but not cljs-bean.transit
2826
cljs-bean-transit/deps {:local/root "features/cljs-bean-transit"}
2927
rewrite-clj/deps {:local/root "features/rewrite-clj"}
3028
ordered/deps {:local/root "features/ordered"}

deps.edn

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{:deps
2+
;; Fixes sci transitive conflict by setting dependency at top-level.
3+
;; Conflict is between bb.edn's nbb depending on git based sci
4+
;; and nbb's sci.configs dep depending on maven based sci.
5+
;; This override is needed here because nbb.build calls clojure shell command
6+
{org.babashka/sci
7+
{:git/url "https://github.com/babashka/sci"
8+
:git/sha "9bc5ee7371ddd24a6715066e47573f80addc98e7"}}}

lib/nbb_api.js

Lines changed: 20 additions & 20 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/nbb_bundler.js

Lines changed: 14 additions & 14 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)