Unify feature dependencies with workspace dependencies

Cargo.toml

@@ -31,14 +31,17 @@ resolver = "2"
 
 [workspace.dependencies]
 # Local dependencies
-dyn-any = { path = "libraries/dyn-any", features = ["derive", "glam", "reqwest"] }
-graphene-core = { path = "node-graph/gcore" }
-graph-craft = { path = "node-graph/graph-craft", features = ["serde"] }
-wgpu-executor = { path = "node-graph/wgpu-executor" }
-bezier-rs = { path = "libraries/bezier-rs", features = ["dyn-any"] }
-path-bool = { path = "libraries/path-bool", default-features = false }
+bezier-rs = { path = "libraries/bezier-rs", features = ["dyn-any", "serde"] }
+dyn-any = { path = "libraries/dyn-any", features = ["derive", "glam", "reqwest", "log-bad-types", "rc"] }
 math-parser = { path = "libraries/math-parser" }
+path-bool = { path = "libraries/path-bool" }
+graphene-core = { path = "node-graph/gcore", default-features = false }
+graph-craft = { path = "node-graph/graph-craft", features = ["serde"] }
+graphene-std = { path = "node-graph/gstd" }
+interpreted-executor = { path = "node-graph/interpreted-executor" }
 node-macro = { path = "node-graph/node-macro" }
+wgpu-executor = { path = "node-graph/wgpu-executor" }
+graphite-proc-macros = { path = "proc-macros" }
 
 # Workspace dependencies
 rustc-hash = "2.0"
@@ -56,30 +59,51 @@ convert_case = "0.7"
 derivative = "2.2"
 thiserror = "2"
 anyhow = "1.0"
-proc-macro2 = "1"
+proc-macro2 = { version = "1", features = [ "span-locations" ] }
 quote = "1.0"
 axum = "0.8"
 chrono = "0.4"
 ron = "0.8"
 fastnoise-lite = "1.1"
-spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu.git" }
-wgpu = "23"
+wgpu = { version = "23", features = [
+	# We don't have wgpu on multiple threads (yet) https://github.com/gfx-rs/wgpu/blob/trunk/CHANGELOG.md#wgpu-types-now-send-sync-on-wasm
+	"fragile-send-sync-non-atomic-wasm",
+	"spirv",
+	"strict_asserts",
+] }
 once_cell = "1.13" # Remove when `core::cell::LazyCell` (<https://doc.rust-lang.org/core/cell/struct.LazyCell.html>) is stabilized in Rust 1.80 and we bump our MSRV
 wasm-bindgen = "=0.2.100" # NOTICE: ensure this stays in sync with the `wasm-bindgen-cli` version in `website/content/volunteer/guide/project-setup/_index.md`. We pin this version because wasm-bindgen upgrades may break various things.
 wasm-bindgen-futures = "0.4"
 js-sys = "=0.3.77"
-web-sys = "=0.3.77"
+web-sys = { version = "=0.3.77", features = [
+	"Document",
+	"DomRect",
+	"Element",
+	"HtmlCanvasElement",
+	"CanvasRenderingContext2d",
+	"CanvasPattern",
+	"OffscreenCanvas",
+	"OffscreenCanvasRenderingContext2d",
+	"TextMetrics",
+	"Window",
+	"IdleRequestOptions",
+	"ImageData",
+	"Navigator",
+	"Gpu",
+	"HtmlImageElement",
+	"ImageBitmapRenderingContext",
+] }
 winit = "0.29"
 url = "2.5"
-tokio = { version = "1.29", features = ["fs", "io-std"] }
+tokio = { version = "1.29", features = ["fs", "macros", "io-std", "rt"] }
 vello = { git = "https://github.com/linebender/vello.git", rev = "3275ec8" } # TODO switch back to stable when a release is made
 resvg = "0.44"
 usvg = "0.44"
-rand = { version = "0.9", default-features = false }
+rand = { version = "0.9", default-features = false, features = ["std_rng"] }
 rand_chacha = "0.9"
-glam = { version = "0.29", default-features = false, features = ["serde"] }
+glam = { version = "0.29", default-features = false, features = ["serde", "scalar-math", "debug-glam-assert"] }
 base64 = "0.22"
-image = { version = "0.25", default-features = false, features = ["png"] }
+image = { version = "0.25", default-features = false, features = ["png", "jpeg", "bmp"] }
 rustybuzz = "0.20"
 pretty_assertions = "1.4.1"
 fern = { version = "0.7", features = ["colored"] }
@@ -94,11 +118,22 @@ specta = { version = "2.0.0-rc.22", features = [
 syn = { version = "2.0", default-features = false, features = [
 	"full",
 	"derive",
+	"parsing",
+	"printing",
+	"visit-mut",
+	"visit",
+	"clone-impls",
+	"extra-traits",
+	"proc-macro",
 ] }
 kurbo = { version = "0.11.0", features = ["serde"] }
 petgraph = { version = "0.7.1", default-features = false, features = [
 	"graphmap",
 ] }
+half = { version = "2.4.1", default-features = false, features = ["bytemuck"] }
+tinyvec = { version = "1" }
+criterion = { version = "0.5", features = ["html_reports"] }
+iai-callgrind = { version = "0.12.3" }
 
 [profile.dev]
 opt-level = 1

editor/Cargo.toml

@@ -25,12 +25,12 @@ ron = ["dep:ron"]
 
 [dependencies]
 # Local dependencies
-graphite-proc-macros = { path = "../proc-macros" }
-graph-craft = { path = "../node-graph/graph-craft" }
-interpreted-executor = { path = "../node-graph/interpreted-executor", features = [
+graphite-proc-macros = { workspace = true }
+graph-craft = { workspace = true }
+interpreted-executor = { workspace = true, features = [
 	"serde",
 ] }
-graphene-std = { path = "../node-graph/gstd", features = ["serde"] }
+graphene-std = { workspace = true, features = ["serde"] }
 
 # Workspace dependencies
 js-sys = { workspace = true }
@@ -41,31 +41,20 @@ serde = { workspace = true }
 serde_json = { workspace = true }
 bezier-rs = { workspace = true }
 futures = { workspace = true }
-glam = { workspace = true, features = ["serde", "debug-glam-assert"] }
+glam = { workspace = true }
 derivative = { workspace = true }
 specta = { workspace = true }
-image = { workspace = true, features = ["bmp", "png"] }
 dyn-any = { workspace = true }
 num_enum = { workspace = true }
 usvg = { workspace = true }
 once_cell = { workspace = true }
-web-sys = { workspace = true, features = [
-	"Document",
-	"DomRect",
-	"Element",
-	"HtmlCanvasElement",
-	"CanvasRenderingContext2d",
-	"CanvasPattern",
-	"OffscreenCanvas",
-	"OffscreenCanvasRenderingContext2d",
-	"TextMetrics",
-] }
+web-sys = { workspace = true }
 
 # Required dependencies
 spin = "0.9.8"
 
 # Optional local dependencies
-wgpu-executor = { path = "../node-graph/wgpu-executor", optional = true }
+wgpu-executor = { workspace = true, optional = true }
 
 # Optional workspace dependencies
 wasm-bindgen = { workspace = true, optional = true }
@@ -76,7 +65,7 @@ ron = { workspace = true, optional = true }
 # Workspace dependencies
 env_logger = { workspace = true }
 futures = { workspace = true }
-tokio = { workspace = true, features = ["rt", "macros"] }
+tokio = { workspace = true }
 
 [lints.rust]
 # TODO: figure out why we check these features when they do not exist

frontend/src-tauri/Cargo.toml

@@ -29,7 +29,7 @@ graphite-editor = { path = "../../editor", features = [
 # Workspace dependencies
 axum = { workspace = true }
 chrono = { workspace = true }
-tokio = { workspace = true, features = ["macros", "rt"] }
+tokio = { workspace = true }
 ron = { workspace = true }
 log = { workspace = true }
 fern = { workspace = true }

frontend/wasm/Cargo.toml

@@ -29,24 +29,16 @@ editor = { path = "../../editor", package = "graphite-editor", features = [
 # Workspace dependencies
 graph-craft = { workspace = true }
 log = { workspace = true }
-graphene-core = { workspace = true }
-serde = { workspace = true, features = ["derive"] }
+graphene-core = { workspace = true, features = ["wasm"] }
+serde = { workspace = true }
 wasm-bindgen = { workspace = true }
 serde-wasm-bindgen = { workspace = true }
 js-sys = { workspace = true }
 wasm-bindgen-futures = { workspace = true }
 glam = { workspace = true }
 math-parser = { workspace = true }
-wgpu = { workspace = true, features = [
-	"fragile-send-sync-non-atomic-wasm",
-] } # We don't have wgpu on multiple threads (yet) https://github.com/gfx-rs/wgpu/blob/trunk/CHANGELOG.md#wgpu-types-now-send-sync-on-wasm
-web-sys = { workspace = true, features = [
-	"Window",
-	"CanvasRenderingContext2d",
-	"Document",
-	"HtmlCanvasElement",
-	"IdleRequestOptions",
-] }
+wgpu = { workspace = true }
+web-sys = { workspace = true }
 
 [package.metadata.wasm-pack.profile.dev]
 wasm-opt = false

libraries/bezier-rs/Cargo.toml

@@ -15,7 +15,7 @@ documentation = "https://graphite.rs/libraries/bezier-rs/"
 
 [dependencies]
 # Required dependencies
-glam = { workspace = true, features = ["serde"] }
+glam = { workspace = true }
 
 # Optional local dependencies
 dyn-any = { version = "0.3.0", path = "../dyn-any", optional = true }

libraries/dyn-any/derive/Cargo.toml

@@ -17,13 +17,7 @@ proc-macro = true
 # Workspace dependencies
 proc-macro2 = { workspace = true }
 quote = { workspace = true }
-syn = { workspace = true, default-features = false, features = [
-	"derive",
-	"parsing",
-	"proc-macro",
-	"printing",
-	"clone-impls",
-] }
+syn = { workspace = true }
 
 [dev-dependencies]
 # Local dependencies

libraries/math-parser/Cargo.toml

@@ -15,7 +15,7 @@ lazy_static = "1.5"
 num-complex = "0.4"
 
 [dev-dependencies]
-criterion = "0.5"
+criterion = { workspace = true }
 
 [[bench]]
 name = "bench"

libraries/path-bool/Cargo.toml

@@ -35,7 +35,7 @@ resvg = "0.44"
 image = "0.25"
 
 # Required dependencies
-criterion = { version = "0.5", features = ["html_reports"] }
+criterion = { workspace = true }
 
 # Benchmarks
 [[bench]]

node-graph/gcore/Cargo.toml

@@ -24,50 +24,42 @@ serde = [
 ]
 
 [dependencies]
+# Local dependencies
+math-parser = { workspace = true }
+
 # Workspace dependencies
-bytemuck = { workspace = true, features = ["derive"] }
+bytemuck = { workspace = true }
 node-macro = { workspace = true }
 num-derive = { workspace = true }
-num-traits = { workspace = true, default-features = false, features = ["i128"] }
+num-traits = { workspace = true }
 usvg = { workspace = true }
-rand = { workspace = true, default-features = false, features = ["std_rng"] }
-glam = { workspace = true, default-features = false, features = [
-	"scalar-math",
-] }
+rand = { workspace = true }
+glam = { workspace = true }
 serde_json = { workspace = true }
-petgraph = { workspace = true, default-features = false, features = [
-	"graphmap",
-] }
+petgraph = { workspace = true }
 rustc-hash = { workspace = true }
-math-parser = { path = "../../libraries/math-parser" }
 dyn-any = { workspace = true }
 ctor = { workspace = true }
 rand_chacha = { workspace = true }
 bezier-rs = { workspace = true }
 specta = { workspace = true }
 rustybuzz = { workspace = true }
-image = { workspace = true, default-features = false, features = [
-	"png",
-] }
-
-# Required dependencies
-half = { version = "2.4.1", default-features = false, features = ["bytemuck"] }
-tinyvec = { version = "1" }
+image = { workspace = true }
+half = { workspace = true }
+tinyvec = { workspace = true }
 kurbo = { workspace = true }
 log = { workspace = true }
 
 # Optional workspace dependencies
-serde = { workspace = true, optional = true, features = ["derive"] }
+serde = { workspace = true, optional = true }
 base64 = { workspace = true, optional = true }
 vello = { workspace = true, optional = true }
 wgpu = { workspace = true, optional = true }
-web-sys = { workspace = true, optional = true, features = [
-	"HtmlCanvasElement",
-] }
+web-sys = { workspace = true, optional = true }
 
 [dev-dependencies]
 # Workspace dependencies
-tokio = { workspace = true, features = ["rt", "macros"] }
+tokio = { workspace = true }
 serde_json = { workspace = true }
 
 [lints.rust]

node-graph/graph-craft/Cargo.toml

@@ -8,38 +8,37 @@ license = "MIT OR Apache-2.0"
 default = ["dealloc_nodes"]
 serde = ["dep:serde", "graphene-core/serde", "glam/serde", "bezier-rs/serde"]
 dealloc_nodes = ["graphene-core/dealloc_nodes"]
-wgpu = []
+wgpu = ["wgpu-executor"]
 tokio = ["dep:tokio"]
 wayland = []
 loading = ["serde_json", "serde"]
 
 [dependencies]
 # Local dependencies
-dyn-any = { path = "../../libraries/dyn-any", features = [
-	"log-bad-types",
-	"rc",
-	"glam",
-] }
+dyn-any = { workspace = true }
+graphene-core = { workspace = true }
 
 # Workspace dependencies
-graphene-core = { workspace = true }
 log = { workspace = true }
 glam = { workspace = true }
 bezier-rs = { workspace = true }
 specta = { workspace = true }
 rustc-hash = { workspace = true }
 url = { workspace = true }
 reqwest = { workspace = true }
-wgpu-executor = { workspace = true }
 
 # Optional workspace dependencies
+wgpu-executor = { workspace = true, optional = true }
 serde = { workspace = true, optional = true }
 tokio = { workspace = true, optional = true }
 serde_json = { workspace = true, optional = true }
 
 # Workspace dependencies
 [target.'cfg(target_arch = "wasm32")'.dependencies]
-web-sys = { workspace = true }
+web-sys = { workspace = true, features = [
+	"Navigator",
+	"Gpu",
+] }
 js-sys = { workspace = true }
 wasm-bindgen = { workspace = true }
 
@@ -50,10 +49,8 @@ winit = { workspace = true }
 # Workspace dependencies
 graph-craft = { workspace = true, features = ["loading"] }
 pretty_assertions = { workspace = true }
-
-# Required dependencies
-criterion = { version = "0.5", features = ["html_reports"] }
-iai-callgrind = { version = "0.12.3" }
+criterion = { workspace = true }
+iai-callgrind = { workspace = true }
 
 # Benchmarks
 [[bench]]

node-graph/graph-craft/src/document.rs

@@ -676,10 +676,12 @@ fn migrate_layer_to_merge<'de, D: serde::Deserializer<'de>>(deserializer: D) ->
 	Ok(s)
 }
 // TODO: Eventually remove this document upgrade code
+#[cfg(feature = "serde")]
 fn default_import_metadata() -> (NodeId, IVec2) {
 	(NodeId::new(), IVec2::new(-25, -4))
 }
 // TODO: Eventually remove this document upgrade code
+#[cfg(feature = "serde")]
 fn default_export_metadata() -> (NodeId, IVec2) {
 	(NodeId::new(), IVec2::new(8, -4))
 }