Skip to content

Commit 7a16adb

Browse files
KeavonKeavon
committed
Merge branch 'master' into shapes-refactor
2 parents bcf62c6 + e520c21 commit 7a16adb

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

72 files changed

+582
-736
lines changed

‎frontend/wasm/.cargo/config.toml renamed to ‎.cargo/config.toml

File renamed without changes.

‎Cargo.lock

Lines changed: 0 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml

Lines changed: 49 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,17 @@ resolver = "2"
3131

3232
[workspace.dependencies]
3333
# Local dependencies
34-
dyn-any = { path = "libraries/dyn-any", features = ["derive", "glam", "reqwest"] }
35-
graphene-core = { path = "node-graph/gcore" }
36-
graph-craft = { path = "node-graph/graph-craft", features = ["serde"] }
37-
wgpu-executor = { path = "node-graph/wgpu-executor" }
38-
bezier-rs = { path = "libraries/bezier-rs", features = ["dyn-any"] }
39-
path-bool = { path = "libraries/path-bool", default-features = false }
34+
bezier-rs = { path = "libraries/bezier-rs", features = ["dyn-any", "serde"] }
35+
dyn-any = { path = "libraries/dyn-any", features = ["derive", "glam", "reqwest", "log-bad-types", "rc"] }
4036
math-parser = { path = "libraries/math-parser" }
37+
path-bool = { path = "libraries/path-bool" }
38+
graphene-core = { path = "node-graph/gcore" }
39+
graph-craft = { path = "node-graph/graph-craft" }
40+
graphene-std = { path = "node-graph/gstd" }
41+
interpreted-executor = { path = "node-graph/interpreted-executor" }
4142
node-macro = { path = "node-graph/node-macro" }
43+
wgpu-executor = { path = "node-graph/wgpu-executor" }
44+
graphite-proc-macros = { path = "proc-macros" }
4245

4346
# Workspace dependencies
4447
rustc-hash = "2.0"
@@ -56,30 +59,51 @@ convert_case = "0.7"
5659
derivative = "2.2"
5760
thiserror = "2"
5861
anyhow = "1.0"
59-
proc-macro2 = "1"
62+
proc-macro2 = { version = "1", features = [ "span-locations" ] }
6063
quote = "1.0"
6164
axum = "0.8"
6265
chrono = "0.4"
6366
ron = "0.8"
6467
fastnoise-lite = "1.1"
65-
spirv-std = { git = "https://github.com/Rust-GPU/rust-gpu.git" }
66-
wgpu = "23"
68+
wgpu = { version = "23", features = [
69+
# 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
70+
"fragile-send-sync-non-atomic-wasm",
71+
"spirv",
72+
"strict_asserts",
73+
] }
6774
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
6875
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.
6976
wasm-bindgen-futures = "0.4"
7077
js-sys = "=0.3.77"
71-
web-sys = "=0.3.77"
78+
web-sys = { version = "=0.3.77", features = [
79+
"Document",
80+
"DomRect",
81+
"Element",
82+
"HtmlCanvasElement",
83+
"CanvasRenderingContext2d",
84+
"CanvasPattern",
85+
"OffscreenCanvas",
86+
"OffscreenCanvasRenderingContext2d",
87+
"TextMetrics",
88+
"Window",
89+
"IdleRequestOptions",
90+
"ImageData",
91+
"Navigator",
92+
"Gpu",
93+
"HtmlImageElement",
94+
"ImageBitmapRenderingContext",
95+
] }
7296
winit = "0.29"
7397
url = "2.5"
74-
tokio = { version = "1.29", features = ["fs", "io-std"] }
98+
tokio = { version = "1.29", features = ["fs", "macros", "io-std", "rt"] }
7599
vello = { git = "https://github.com/linebender/vello.git", rev = "3275ec8" } # TODO switch back to stable when a release is made
76100
resvg = "0.44"
77101
usvg = "0.44"
78-
rand = { version = "0.9", default-features = false }
102+
rand = { version = "0.9", default-features = false, features = ["std_rng"] }
79103
rand_chacha = "0.9"
80-
glam = { version = "0.29", default-features = false, features = ["serde"] }
104+
glam = { version = "0.29", default-features = false, features = ["serde", "scalar-math", "debug-glam-assert"] }
81105
base64 = "0.22"
82-
image = { version = "0.25", default-features = false, features = ["png"] }
106+
image = { version = "0.25", default-features = false, features = ["png", "jpeg", "bmp"] }
83107
rustybuzz = "0.20"
84108
pretty_assertions = "1.4.1"
85109
fern = { version = "0.7", features = ["colored"] }
@@ -94,11 +118,22 @@ specta = { version = "2.0.0-rc.22", features = [
94118
syn = { version = "2.0", default-features = false, features = [
95119
"full",
96120
"derive",
121+
"parsing",
122+
"printing",
123+
"visit-mut",
124+
"visit",
125+
"clone-impls",
126+
"extra-traits",
127+
"proc-macro",
97128
] }
98129
kurbo = { version = "0.11.0", features = ["serde"] }
99130
petgraph = { version = "0.7.1", default-features = false, features = [
100131
"graphmap",
101132
] }
133+
half = { version = "2.4.1", default-features = false, features = ["bytemuck", "serde"] }
134+
tinyvec = { version = "1" }
135+
criterion = { version = "0.5", features = ["html_reports"] }
136+
iai-callgrind = { version = "0.12.3" }
102137

103138
[profile.dev]
104139
opt-level = 1

‎editor/Cargo.toml

Lines changed: 8 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -25,12 +25,10 @@ ron = ["dep:ron"]
2525

2626
[dependencies]
2727
# Local dependencies
28-
graphite-proc-macros = { path = "../proc-macros" }
29-
graph-craft = { path = "../node-graph/graph-craft" }
30-
interpreted-executor = { path = "../node-graph/interpreted-executor", features = [
31-
"serde",
32-
] }
33-
graphene-std = { path = "../node-graph/gstd", features = ["serde"] }
28+
graphite-proc-macros = { workspace = true }
29+
graph-craft = { workspace = true }
30+
interpreted-executor = { workspace = true }
31+
graphene-std = { workspace = true }
3432

3533
# Workspace dependencies
3634
js-sys = { workspace = true }
@@ -41,32 +39,21 @@ serde = { workspace = true }
4139
serde_json = { workspace = true }
4240
bezier-rs = { workspace = true }
4341
futures = { workspace = true }
44-
glam = { workspace = true, features = ["serde", "debug-glam-assert"] }
42+
glam = { workspace = true }
4543
kurbo = { workspace = true }
4644
derivative = { workspace = true }
4745
specta = { workspace = true }
48-
image = { workspace = true, features = ["bmp", "png"] }
4946
dyn-any = { workspace = true }
5047
num_enum = { workspace = true }
5148
usvg = { workspace = true }
5249
once_cell = { workspace = true }
53-
web-sys = { workspace = true, features = [
54-
"Document",
55-
"DomRect",
56-
"Element",
57-
"HtmlCanvasElement",
58-
"CanvasRenderingContext2d",
59-
"CanvasPattern",
60-
"OffscreenCanvas",
61-
"OffscreenCanvasRenderingContext2d",
62-
"TextMetrics",
63-
] }
50+
web-sys = { workspace = true }
6451

6552
# Required dependencies
6653
spin = "0.9.8"
6754

6855
# Optional local dependencies
69-
wgpu-executor = { path = "../node-graph/wgpu-executor", optional = true }
56+
wgpu-executor = { workspace = true, optional = true }
7057

7158
# Optional workspace dependencies
7259
wasm-bindgen = { workspace = true, optional = true }
@@ -77,7 +64,7 @@ ron = { workspace = true, optional = true }
7764
# Workspace dependencies
7865
env_logger = { workspace = true }
7966
futures = { workspace = true }
80-
tokio = { workspace = true, features = ["rt", "macros"] }
67+
tokio = { workspace = true }
8168

8269
[lints.rust]
8370
# TODO: figure out why we check these features when they do not exist

‎frontend/src-tauri/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ graphite-editor = { path = "../../editor", features = [
2929
# Workspace dependencies
3030
axum = { workspace = true }
3131
chrono = { workspace = true }
32-
tokio = { workspace = true, features = ["macros", "rt"] }
32+
tokio = { workspace = true }
3333
ron = { workspace = true }
3434
log = { workspace = true }
3535
fern = { workspace = true }

‎frontend/wasm/Cargo.toml

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -29,24 +29,16 @@ editor = { path = "../../editor", package = "graphite-editor", features = [
2929
# Workspace dependencies
3030
graph-craft = { workspace = true }
3131
log = { workspace = true }
32-
graphene-core = { workspace = true }
33-
serde = { workspace = true, features = ["derive"] }
32+
graphene-core = { workspace = true, features = ["wasm"] }
33+
serde = { workspace = true }
3434
wasm-bindgen = { workspace = true }
3535
serde-wasm-bindgen = { workspace = true }
3636
js-sys = { workspace = true }
3737
wasm-bindgen-futures = { workspace = true }
3838
glam = { workspace = true }
3939
math-parser = { workspace = true }
40-
wgpu = { workspace = true, features = [
41-
"fragile-send-sync-non-atomic-wasm",
42-
] } # 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
43-
web-sys = { workspace = true, features = [
44-
"Window",
45-
"CanvasRenderingContext2d",
46-
"Document",
47-
"HtmlCanvasElement",
48-
"IdleRequestOptions",
49-
] }
40+
wgpu = { workspace = true }
41+
web-sys = { workspace = true }
5042

5143
[package.metadata.wasm-pack.profile.dev]
5244
wasm-opt = false

‎libraries/bezier-rs/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ documentation = "https://graphite.rs/libraries/bezier-rs/"
1515

1616
[dependencies]
1717
# Required dependencies
18-
glam = { workspace = true, features = ["serde"] }
18+
glam = { workspace = true }
1919

2020
# Optional local dependencies
2121
dyn-any = { version = "0.3.0", path = "../dyn-any", optional = true }

‎libraries/dyn-any/derive/Cargo.toml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,7 @@ proc-macro = true
1717
# Workspace dependencies
1818
proc-macro2 = { workspace = true }
1919
quote = { workspace = true }
20-
syn = { workspace = true, default-features = false, features = [
21-
"derive",
22-
"parsing",
23-
"proc-macro",
24-
"printing",
25-
"clone-impls",
26-
] }
20+
syn = { workspace = true }
2721

2822
[dev-dependencies]
2923
# Local dependencies

‎libraries/math-parser/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ lazy_static = "1.5"
1515
num-complex = "0.4"
1616

1717
[dev-dependencies]
18-
criterion = "0.5"
18+
criterion = { workspace = true }
1919

2020
[[bench]]
2121
name = "bench"

‎libraries/path-bool/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ resvg = "0.44"
3535
image = "0.25"
3636

3737
# Required dependencies
38-
criterion = { version = "0.5", features = ["html_reports"] }
38+
criterion = { workspace = true }
3939

4040
# Benchmarks
4141
[[bench]]

0 commit comments

Comments
 (0)