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

Update wasm-bindgen to 0.2.86 #2161

Merged
merged 8 commits into from
May 19, 2023
Merged

Update wasm-bindgen to 0.2.86 #2161

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7b59541
Update wasm-bindgen to 0.2.86
emilk May 17, 2023
f49eba6
Prepare for new docker image
emilk May 17, 2023
f45076e
Better error messages in build.rs
emilk May 19, 2023
54e02f0
Change the way we mark safe.directory
jleibs May 19, 2023
cefada3
Revert "Change the way we mark safe.directory"
jleibs May 19, 2023
27c41da
Merge branch 'main' into emilk/update-wasm-bindgen
jleibs May 19, 2023
e727bc9
Revert "Better error messages in build.rs"
emilk May 19, 2023
058351b
Switch the Dockerfile to use setup_web.sh
jleibs May 19, 2023
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/reusable_build_and_test_wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ jobs:
- name: Install wasm32 and wasm-bindgen-cli for building the web-viewer Wasm on windows
if: inputs.platform == 'windows'
shell: bash
run: rustup target add wasm32-unknown-unknown && cargo install wasm-bindgen-cli --version 0.2.84
run: rustup target add wasm32-unknown-unknown && cargo install wasm-bindgen-cli --version 0.2.86

# The last step of setup_web.sh, for Windows.
# Since 'winget' is not available within the GitHub runner, we download the package directly:
Expand Down
150 changes: 34 additions & 116 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.

14 changes: 7 additions & 7 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,13 +127,13 @@ debug = true
# ALWAYS document what PR the commit hash is part of, or when it was merged into the upstream trunk.

# TODO(andreas/emilk): Update to a stable egui version
# wgpu 0.16 support, device configuration dependent on adapter, and some additions to help egui_tiles, egui::Modifiers::contains, better error reporting for web
ecolor = { git = "https://github.com/emilk/egui", rev = "ea71b7f" }
eframe = { git = "https://github.com/emilk/egui", rev = "ea71b7f" }
egui = { git = "https://github.com/emilk/egui", rev = "ea71b7f" }
egui-wgpu = { git = "https://github.com/emilk/egui", rev = "ea71b7f" }
egui_extras = { git = "https://github.com/emilk/egui", rev = "ea71b7f" }
emath = { git = "https://github.com/emilk/egui", rev = "ea71b7f" }
# wgpu 0.16 support, device configuration dependent on adapter, some additions to help egui_tiles, egui::Modifiers::contains, better error reporting for web, wasm-bindgen update
ecolor = { git = "https://github.com/emilk/egui", rev = "856afc8" }
eframe = { git = "https://github.com/emilk/egui", rev = "856afc8" }
egui = { git = "https://github.com/emilk/egui", rev = "856afc8" }
egui-wgpu = { git = "https://github.com/emilk/egui", rev = "856afc8" }
egui_extras = { git = "https://github.com/emilk/egui", rev = "856afc8" }
emath = { git = "https://github.com/emilk/egui", rev = "856afc8" }

# TODO(andreas): Either work around this issue in wgpu-egui (never discard command buffers) or wait for wgpu patch release.
# Fix for command buffer dropping crash https://github.com/gfx-rs/wgpu/pull/3726
Expand Down
2 changes: 1 addition & 1 deletion crates/re_log/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ env_logger = "0.10"
# web dependencies:
[target.'cfg(target_arch = "wasm32")'.dependencies]
js-sys = "0.3"
wasm-bindgen = "=0.2.84"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Using "=… here and below was a mistake. We have a Cargo.lock file for that. We don't want force any potential users of our crates to use a specific wasm-bindgen version. However, we do want to force them to use at least 0.2.86 since it contains the critical fix for 2GiB RAM usage

wasm-bindgen = "0.2.86"
2 changes: 1 addition & 1 deletion crates/re_memory/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,4 +37,4 @@ sysinfo = { version = "0.28.3", default-features = false }

# web dependencies:
[target.'cfg(target_arch = "wasm32")'.dependencies]
wasm-bindgen = "=0.2.84"
wasm-bindgen = "0.2.86"
5 changes: 1 addition & 4 deletions scripts/setup_web.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,7 @@ set -x
rustup target add wasm32-unknown-unknown

# For generating JS bindings:
# cargo install wasm-bindgen-cli --version 0.2.84
# We use our own patched version containing this critical fix: https://github.com/rustwasm/wasm-bindgen/pull/3310
# See https://github.com/rerun-io/wasm-bindgen/commits/0.2.84-patch
cargo install wasm-bindgen-cli --git https://github.com/rerun-io/wasm-bindgen.git --rev 13283975ddf48c2d90758095e235b28d381c5762
cargo install wasm-bindgen-cli --version 0.2.86

# For local tests with `start_server.sh`:
# cargo install basic-http-server
Expand Down