Skip to content

Commit eb90491

Browse files
committed
Switch to upstream uniffi-bindgen-react-native
The upstream repo (jhugman/uniffi-bindgen-react-native) merged uniffi 0.30 support in PR payjoin#343, so we no longer need the fork. - Point dependency at upstream main (pinned to 93bed37) - Add uniffi_core 0.30 with wasm-unstable-single-threaded feature to wasm-manifest-patch.toml, since upstream's runtime crate hasn't enabled it yet and uniffi_core 0.30 requires it for wasm32 builds
1 parent 88909e9 commit eb90491

3 files changed

Lines changed: 12 additions & 4 deletions

File tree

payjoin-ffi/javascript/package-lock.json

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

payjoin-ffi/javascript/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@
2929
"prettier": "^3.6.2",
3030
"tsx": "^4.20.6",
3131
"typescript": "^5.9.3",
32-
"uniffi-bindgen-react-native": "github:spacebear21/uniffi-bindgen-react-native#update-uniffi-0.30-wasm"
32+
"uniffi-bindgen-react-native": "github:jhugman/uniffi-bindgen-react-native#93bed377c6e0b5cd7afd3fb7ee0d7211d5f294c5"
3333
},
3434
"repository": {
3535
"type": "git",

payjoin-ffi/javascript/wasm-manifest-patch.toml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,17 @@
99
# the library and CLI versions causes "unreachable" panics at runtime.
1010
wasm-bindgen = "=0.2.108"
1111

12+
# uniffi_core 0.30 requires this feature for wasm32 builds to remove the
13+
# Send bound on futures, which is not applicable in single-threaded WASM.
14+
[dependencies.uniffi_core]
15+
version = "0.30"
16+
default-features = false
17+
features = ["wasm-unstable-single-threaded"]
18+
1219
[patch.crates-io]
1320
payjoin = { path = "../../../../payjoin" }
1421
payjoin-directory = { path = "../../../../payjoin-directory" }
1522
payjoin-test-utils = { path = "../../../../payjoin-test-utils" }
16-
# This patch is required due to the hardcoded 0.29 dependency in uniffi-bindgen-react-native's Cargo.toml. Once they publish the 0.30 package we shouldn't need this anymore.
23+
# uniffi-runtime-javascript is not yet published with uniffi_core 0.30 support.
24+
# This path patch lets cargo resolve it from the installed npm package.
1725
uniffi-runtime-javascript = { path = "../../node_modules/uniffi-bindgen-react-native/crates/uniffi-runtime-javascript" }

0 commit comments

Comments
 (0)