更新 wasm32 的依赖

jinleili · Feb 14, 2025 · 56c5a44 · 56c5a44
1 parent 2b9b116
commit 56c5a44
Show file tree

Hide file tree

Showing 26 changed files with 349 additions and 681 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -29,7 +29,7 @@ env_logger = "0.11"
 flume = "0.11"
 instant = "0.1.13"
 log = "0.4"
-pollster = "0.3"
+pollster = "0.4"
 parking_lot = "0.12"
 rayon = "1.8"
 tobj = "3.2"
@@ -42,11 +42,10 @@ console_error_panic_hook = "0.1.7"
 console_log = "1.0"
 fern = "0.7"
 reqwest = { version = "0.11" }
-web-sys = "0.3.77"
+web-sys = { version = "0.3.77", default-features = false }
 wasm-bindgen = "0.2.100"
-js-sys = "0.3.77"
+js-sys = { version = "0.3.77", default-features = false }
 wasm-bindgen-futures = "0.4.50"
-web-time = "1"
 
 # build-dependencies
 anyhow = "1.0"

diff --git a/code/beginner/tutorial1-window/Cargo.toml b/code/beginner/tutorial1-window/Cargo.toml
@@ -30,5 +30,4 @@ fern.workspace = true
 js-sys.workspace = true
 wasm-bindgen.workspace = true
 wasm-bindgen-futures.workspace = true
-web-time.workspace = true
 web-sys = { workspace = true, features = ["Document", "Window", "Element"] }
diff --git a/code/beginner/tutorial2-surface/Cargo.toml b/code/beginner/tutorial2-surface/Cargo.toml
@@ -26,7 +26,6 @@ fern.workspace = true
 js-sys.workspace = true
 wasm-bindgen.workspace = true
 wasm-bindgen-futures.workspace = true
-web-time.workspace = true
 web-sys = { workspace = true, features = ["Document", "Window", "Element"] }
 
 [[bin]]

diff --git a/code/beginner/tutorial3-pipeline/Cargo.toml b/code/beginner/tutorial3-pipeline/Cargo.toml
@@ -17,16 +17,6 @@ wgpu = { workspace = true }
 app-surface = { workspace = true }
 utils.workspace = true
 
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-console_error_panic_hook.workspace = true
-console_log.workspace = true
-fern.workspace = true
-js-sys.workspace = true
-wasm-bindgen.workspace = true
-wasm-bindgen-futures.workspace = true
-web-time.workspace = true
-web-sys = { workspace = true, features = ["Document", "Window", "Element"] }
-
 [[bin]]
 name = "tutorial3-challenge"
 path = "src/challenge.rs"
diff --git a/code/beginner/tutorial4-buffer/Cargo.toml b/code/beginner/tutorial4-buffer/Cargo.toml
@@ -19,17 +19,6 @@ utils.workspace = true
 # NEW!
 bytemuck = { workspace = true, features = ["derive"] }
 
-
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-console_error_panic_hook.workspace = true
-console_log.workspace = true
-fern.workspace = true
-js-sys.workspace = true
-wasm-bindgen.workspace = true
-wasm-bindgen-futures.workspace = true
-web-time.workspace = true
-web-sys = { workspace = true, features = ["Document", "Window", "Element"] }
-
 [build-dependencies]
 anyhow.workspace = true
 fs_extra.workspace = true

diff --git a/code/beginner/tutorial5-textures/Cargo.toml b/code/beginner/tutorial5-textures/Cargo.toml
@@ -23,16 +23,6 @@ utils.workspace = true
 workspace = true
 features = ["png", "jpeg"]
 
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-console_error_panic_hook.workspace = true
-console_log.workspace = true
-fern.workspace = true
-js-sys.workspace = true
-wasm-bindgen.workspace = true
-wasm-bindgen-futures.workspace = true
-web-time.workspace = true
-web-sys = { workspace = true, features = ["Document", "Window", "Element"] }
-
 [build-dependencies]
 anyhow.workspace = true
 fs_extra.workspace = true

diff --git a/code/beginner/tutorial6-uniforms/Cargo.toml b/code/beginner/tutorial6-uniforms/Cargo.toml
@@ -22,16 +22,6 @@ utils.workspace = true
 workspace = true
 features = ["png", "jpeg"]
 
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-console_error_panic_hook.workspace = true
-console_log.workspace = true
-fern.workspace = true
-js-sys.workspace = true
-wasm-bindgen.workspace = true
-wasm-bindgen-futures.workspace = true
-web-time.workspace = true
-web-sys = { workspace = true, features = ["Document", "Window", "Element"] }
-
 [build-dependencies]
 anyhow.workspace = true
 fs_extra.workspace = true

diff --git a/code/beginner/tutorial7-instancing/Cargo.toml b/code/beginner/tutorial7-instancing/Cargo.toml
@@ -22,16 +22,6 @@ utils.workspace = true
 workspace = true
 features = ["png", "jpeg"]
 
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-console_error_panic_hook.workspace = true
-console_log.workspace = true
-fern.workspace = true
-js-sys.workspace = true
-wasm-bindgen.workspace = true
-wasm-bindgen-futures.workspace = true
-web-time.workspace = true
-web-sys = { workspace = true, features = ["Document", "Window", "Element"] }
-
 [build-dependencies]
 anyhow.workspace = true
 fs_extra.workspace = true

diff --git a/code/beginner/tutorial8-depth/Cargo.toml b/code/beginner/tutorial8-depth/Cargo.toml
@@ -25,16 +25,6 @@ utils.workspace = true
 workspace = true
 features = ["png", "jpeg"]
 
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-console_error_panic_hook.workspace = true
-console_log.workspace = true
-fern.workspace = true
-js-sys.workspace = true
-wasm-bindgen.workspace = true
-wasm-bindgen-futures.workspace = true
-web-time.workspace = true
-web-sys = { workspace = true, features = ["Document", "Window", "Element"] }
-
 [build-dependencies]
 anyhow.workspace = true
 fs_extra.workspace = true

diff --git a/code/beginner/tutorial9-models/Cargo.toml b/code/beginner/tutorial9-models/Cargo.toml
@@ -24,15 +24,13 @@ workspace = true
 features = ["png", "jpeg"]
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-console_error_panic_hook.workspace = true
-console_log.workspace = true
-fern.workspace = true
-js-sys.workspace = true
 reqwest.workspace = true
-wasm-bindgen.workspace = true
-wasm-bindgen-futures.workspace = true
-web-time.workspace = true
-web-sys = { workspace = true, features = ["Document", "Window", "Element"] }
+web-sys = { workspace = true, features = [
+    "Document",
+    "Window",
+    "Element",
+    "Location",
+] }
 
 [build-dependencies]
 anyhow.workspace = true

diff --git a/code/integration-and-debugging/wgpu_in_web/Cargo.toml b/code/integration-and-debugging/wgpu_in_web/Cargo.toml
@@ -36,7 +36,6 @@ wgpu.workspace = true
 winit.workspace = true
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-console_error_panic_hook.workspace = true
 console_log.workspace = true
 js-sys.workspace = true
 wasm-bindgen.workspace = true

diff --git a/code/intermediate/compute-pipeline/Cargo.toml b/code/intermediate/compute-pipeline/Cargo.toml
@@ -17,14 +17,4 @@ log.workspace = true
 winit.workspace = true
 wgpu.workspace = true
 png = "0.17"
-utils.workspace = true
-
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-console_error_panic_hook.workspace = true
-console_log.workspace = true
-fern.workspace = true
-js-sys.workspace = true
-wasm-bindgen.workspace = true
-wasm-bindgen-futures.workspace = true
-web-time.workspace = true
-web-sys = { workspace = true, features = ["Document", "Window", "Element"] }
+utils.workspace = true
diff --git a/code/intermediate/hdr/Cargo.toml b/code/intermediate/hdr/Cargo.toml
@@ -18,23 +18,20 @@ anyhow = "1.0"
 tobj = { version = "3.2", features = ["async"] }
 instant = "0.1"
 # image 0.25.5 版本中, read_image_transform 被改成了私有方法, 所以使用 0.24 版本
-image = { version = "=0.24.6", features = ["png", "jpeg", "hdr"] }
+image = { version = "=0.24.6", default-features = false, features = [
+    "png",
+    "jpeg",
+    "hdr",
+] }
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-console_error_panic_hook.workspace = true
-console_log.workspace = true
-fern.workspace = true
-js-sys.workspace = true
-wasm-bindgen.workspace = true
-wasm-bindgen-futures.workspace = true
-web-time.workspace = true
+reqwest = { workspace = true }
 web-sys = { workspace = true, features = [
     "Document",
     "Window",
     "Element",
     "Location",
 ] }
-reqwest = { workspace = true }
 
 [build-dependencies]
 anyhow.workspace = true

diff --git a/code/intermediate/hilbert-curve/Cargo.toml b/code/intermediate/hilbert-curve/Cargo.toml
@@ -13,14 +13,4 @@ log.workspace = true
 winit.workspace = true
 wgpu.workspace = true
 glam.workspace = true
-utils.workspace = true
-
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-console_error_panic_hook.workspace = true
-console_log.workspace = true
-fern.workspace = true
-js-sys.workspace = true
-wasm-bindgen.workspace = true
-wasm-bindgen-futures.workspace = true
-web-time.workspace = true
-web-sys = { workspace = true, features = ["Document", "Window", "Element"] }
+utils.workspace = true
diff --git a/code/intermediate/tutorial10-lighting/Cargo.toml b/code/intermediate/tutorial10-lighting/Cargo.toml
@@ -24,15 +24,13 @@ workspace = true
 features = ["png", "jpeg"]
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-console_error_panic_hook.workspace = true
-console_log.workspace = true
-fern.workspace = true
-js-sys.workspace = true
 reqwest.workspace = true
-wasm-bindgen.workspace = true
-wasm-bindgen-futures.workspace = true
-web-time.workspace = true
-web-sys = { workspace = true, features = ["Document", "Window", "Element"] }
+web-sys = { workspace = true, features = [
+    "Document",
+    "Window",
+    "Element",
+    "Location",
+] }
 
 [build-dependencies]
 anyhow.workspace = true

diff --git a/code/intermediate/tutorial11-normals/Cargo.toml b/code/intermediate/tutorial11-normals/Cargo.toml
@@ -24,14 +24,7 @@ workspace = true
 features = ["png", "jpeg"]
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-console_error_panic_hook.workspace = true
-console_log.workspace = true
-fern.workspace = true
-js-sys.workspace = true
 reqwest.workspace = true
-wasm-bindgen.workspace = true
-wasm-bindgen-futures.workspace = true
-web-time.workspace = true
 web-sys = { workspace = true, features = [
     "Document",
     "Window",

diff --git a/code/intermediate/tutorial12-camera/Cargo.toml b/code/intermediate/tutorial12-camera/Cargo.toml
@@ -24,14 +24,7 @@ workspace = true
 features = ["png", "jpeg"]
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-console_error_panic_hook.workspace = true
-console_log.workspace = true
-fern.workspace = true
-js-sys.workspace = true
 reqwest.workspace = true
-wasm-bindgen.workspace = true
-wasm-bindgen-futures.workspace = true
-web-time.workspace = true
 web-sys = { workspace = true, features = [
     "Document",
     "Window",

diff --git a/code/intermediate/tutorial13-terrain/Cargo.toml b/code/intermediate/tutorial13-terrain/Cargo.toml
@@ -27,12 +27,10 @@ workspace = true
 features = ["png", "jpeg"]
 
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-console_error_panic_hook.workspace = true
 console_log.workspace = true
 reqwest.workspace = true
 wasm-bindgen.workspace = true
 wasm-bindgen-futures.workspace = true
-web-time.workspace = true
 web-sys = { workspace = true, features = [
     "Document",
     "Window",

diff --git a/code/intermediate/vertex-animation/Cargo.toml b/code/intermediate/vertex-animation/Cargo.toml
@@ -16,14 +16,4 @@ wgpu.workspace = true
 glam.workspace = true
 png = "0.17"
 utils.workspace = true
-rand = "0.8"
-
-[target.'cfg(target_arch = "wasm32")'.dependencies]
-console_error_panic_hook.workspace = true
-console_log.workspace = true
-fern.workspace = true
-js-sys.workspace = true
-web-sys = { workspace = true, features = ["Document", "Window", "Element"] }
-wasm-bindgen.workspace = true
-wasm-bindgen-futures.workspace = true
-web-time.workspace = true
+rand = "0.8"
diff --git a/code/showcase/compute/Cargo.toml b/code/showcase/compute/Cargo.toml
@@ -24,4 +24,7 @@ anyhow.workspace = true
 fs_extra.workspace = true
 glob.workspace = true
 rayon.workspace = true
-naga = { version = "23", features = ["glsl-in", "wgsl-out"] }
+naga = { version = "24", default-features = false, features = [
+    "glsl-in",
+    "wgsl-out",
+] }