Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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/web-demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ jobs:
uses: taiki-e/install-action@v2
with:
# If updating, also update in examples/with_winit/Cargo.toml
tool: wasm-bindgen@0.2.121
tool: wasm-bindgen@0.2.114

- name: build (wasm)
run: cargo build -p with_winit --bin with_winit_bin --release --target wasm32-unknown-unknown
Expand Down
73 changes: 44 additions & 29 deletions Cargo.lock

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

8 changes: 8 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,14 @@ crossbeam-channel = "0.5.15"
ordered-channel = { version = "1.2.0", features = ["crossbeam-channel"] }
fearless_simd = { version = "0.4.0", default-features = false }

# Unlike the other crates, please do not update these before a release
# unless absolutely necessary.
js-sys = "0.3.91"
wasm-bindgen = "0.2.114"
wasm-bindgen-futures = "0.4.64"
wasm-bindgen-test = "0.3.64"
web-sys = "0.3.91"

# The below crates are experimental!
vello_common = { version = "0.0.9", path = "sparse_strips/vello_common", default-features = false }
vello_cpu = { version = "0.0.9", path = "sparse_strips/vello_cpu" }
Expand Down
6 changes: 3 additions & 3 deletions examples/with_winit/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,11 @@ jni = "0.21.1"
[target.'cfg(target_arch = "wasm32")'.dependencies]
console_error_panic_hook = { workspace = true }
console_log = { workspace = true }
wasm-bindgen-futures = "0.4.71"
web-sys = { version = "0.3.98", features = ["HtmlCollection", "Text"] }
wasm-bindgen-futures = { workspace = true }
web-sys = { workspace = true, features = ["HtmlCollection", "Text"] }
web-time = { workspace = true }
# If updating, also update in .github/workflows/web-demo.yml
wasm-bindgen = "=0.2.121"
wasm-bindgen = "=0.2.114"

[target.wasm32-unknown-unknown.dependencies]
# We have a transitive dependency on getrandom and it does not automatically
Expand Down
10 changes: 5 additions & 5 deletions sparse_strips/vello_cpu/examples/wasm_cpu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ workspace = true
bytemuck = { workspace = true, features = [] }
console_error_panic_hook = { workspace = true }
console_log = { workspace = true }
js-sys = "0.3.98"
js-sys = { workspace = true }
log = { workspace = true }
vello_common = { workspace = true, features = ["pico_svg"] }
vello_cpu = { workspace = true }
vello_example_scenes = { workspace = true, features = ["cpu"] }
wasm-bindgen = "0.2.121"
wasm-bindgen-futures = "0.4.71"
web-sys = { version = "0.3.98", features = [
wasm-bindgen = { workspace = true }
wasm-bindgen-futures = { workspace = true }
web-sys = { workspace = true, features = [
"Window",
"Document",
"Element",
Expand All @@ -39,4 +39,4 @@ web-sys = { version = "0.3.98", features = [
wgpu = { workspace = true, features = ["webgl"], default-features = true }

[dev-dependencies]
wasm-bindgen-test = "0.3.71"
wasm-bindgen-test = { workspace = true }
4 changes: 2 additions & 2 deletions sparse_strips/vello_hybrid/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ vello_sparse_shaders = { workspace = true, optional = true }
log = { workspace = true }
hashbrown = { workspace = true }

js-sys = { version = "0.3.98", optional = true }
web-sys = { version = "0.3.98", features = [
js-sys = { workspace = true, optional = true }
web-sys = { workspace = true, features = [
"HtmlCanvasElement",
"WebGl2RenderingContext",
"WebGlContextAttributes",
Expand Down
10 changes: 5 additions & 5 deletions sparse_strips/vello_hybrid/examples/native_webgl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ workspace = true
[dependencies]
console_error_panic_hook = { workspace = true }
console_log = { workspace = true }
js-sys = "0.3.98"
js-sys = { workspace = true }
log = { workspace = true }
vello_common = { workspace = true }
vello_hybrid = { workspace = true, features = ["webgl"] }
vello_example_scenes = { workspace = true }
wasm-bindgen = "0.2.121"
wasm-bindgen-futures = "0.4.71"
web-sys = { version = "0.3.98", features = [
wasm-bindgen = { workspace = true }
wasm-bindgen-futures = { workspace = true }
web-sys = { workspace = true, features = [
"AddEventListenerOptions",
"Window",
"Document",
Expand All @@ -39,4 +39,4 @@ web-sys = { version = "0.3.98", features = [
] }

[dev-dependencies]
wasm-bindgen-test = "0.3.71"
wasm-bindgen-test = { workspace = true }
10 changes: 5 additions & 5 deletions sparse_strips/vello_hybrid/examples/wgpu_webgl/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,14 @@ workspace = true
[dependencies]
console_error_panic_hook = { workspace = true }
console_log = { workspace = true }
js-sys = "0.3.98"
js-sys = { workspace = true }
log = { workspace = true }
vello_common = { workspace = true }
vello_hybrid = { workspace = true }
vello_example_scenes = { workspace = true }
wasm-bindgen = "0.2.121"
wasm-bindgen-futures = "0.4.71"
web-sys = { version = "0.3.98", features = [
wasm-bindgen = { workspace = true }
wasm-bindgen-futures = { workspace = true }
web-sys = { workspace = true, features = [
"Window",
"Document",
"Element",
Expand All @@ -38,4 +38,4 @@ web-sys = { version = "0.3.98", features = [
wgpu = { workspace = true, default-features = true, features = ["webgl"] }

[dev-dependencies]
wasm-bindgen-test = "0.3.71"
wasm-bindgen-test = { workspace = true }
8 changes: 4 additions & 4 deletions sparse_strips/vello_sparse_tests/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ smallvec = { workspace = true }
oxipng = { workspace = true, features = ["freestanding", "parallel"] }

[target.'cfg(target_arch = "wasm32")'.dependencies]
wasm-bindgen-test = "0.3.71"
web-sys = { version = "0.3.98", features = [
wasm-bindgen-test = { workspace = true }
web-sys = { workspace = true, features = [
"HtmlCanvasElement",
"WebGl2RenderingContext",
"Document",
Expand All @@ -54,8 +54,8 @@ web-sys = { version = "0.3.98", features = [
"Url",
"Response",
] }
wasm-bindgen = "0.2.121"
wasm-bindgen-futures = "0.4.71"
wasm-bindgen = { workspace = true }
wasm-bindgen-futures = { workspace = true }
# Required for introspecting the built WASM binary.
wasmparser = "0.235.0"

Expand Down
Loading