Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix wasm compilation, bump wasm-bindgen #2221

Merged
merged 3 commits into from
Apr 16, 2024
Merged

Fix wasm compilation, bump wasm-bindgen #2221

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5ac886b
Fix wasm compilation, bump wasm-bindgen
Thoralf-M Apr 15, 2024
f14f7ce
Merge branch 'develop' into fix-wasm-compilation
Thoralf-M Apr 15, 2024
8842c75
Update dependencies
Thoralf-M Apr 15, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/bindings-wasm-publish.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
- name: Install wasm-bindgen-cli
uses: jetli/[email protected]
with:
version: "0.2.91"
version: "0.2.92"

- name: Set up Node.js
uses: actions/setup-node@v3
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/bindings-wasm.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ jobs:
- name: Install wasm-bindgen-cli
uses: jetli/[email protected]
with:
version: "0.2.91"
version: "0.2.92"

- name: Set Up Node.js ${{ matrix.node }} and Yarn Cache
uses: actions/setup-node@v3
Expand Down
28 changes: 14 additions & 14 deletions Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion bindings/wasm/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ js-sys = { version = "0.3.68", default-features = false, features = [] }
log = { version = "0.4.20", default-features = false }
serde_json = { version = "1.0.113", default-features = false }
tokio = { version = "1.36.0", default-features = false, features = ["sync"] }
wasm-bindgen = { version = "0.2.91", default-features = false, features = [
wasm-bindgen = { version = "0.2.92", default-features = false, features = [
"spans",
"std",
"serde-serialize",
Expand Down
3 changes: 2 additions & 1 deletion sdk/src/client/core.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,12 +62,13 @@ pub struct ClientInner {
pub(crate) request_pool: RequestPool,
}

#[cfg(not(target_family = "wasm"))]
#[derive(Default)]
pub(crate) struct SyncHandle(pub(crate) Option<tokio::task::JoinHandle<()>>);

#[cfg(not(target_family = "wasm"))]
impl Drop for SyncHandle {
fn drop(&mut self) {
#[cfg(not(target_family = "wasm"))]
if let Some(sync_handle) = self.0.take() {
sync_handle.abort();
}
Expand Down
Loading