Skip to content

Commit 15fcaac

Browse files
Upgrade WGPU and Linebender dependencies (#4154)
1 parent c4a9780 commit 15fcaac

22 files changed

Lines changed: 409 additions & 394 deletions

File tree

.cargo/config.toml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
[build]
2+
# Keep `--cfg=web_sys_unstable_apis` here so the wasm wrapper crates build with the same web-sys API signatures (e.g. `put_image_data`/`get_image_data` taking `i32` rather than `f64`) on both native test builds and the wasm target. Cargo applies `[build]` rustflags only when no target-specific rustflags table matches, so the wasm-specific list below must continue to include this cfg.
3+
rustflags = ["--cfg=web_sys_unstable_apis"]
4+
15
[target.wasm32-unknown-unknown]
26
rustflags = [
37
# Currently disabled because of https://github.com/GraphiteEditor/Graphite/issues/1262

.devcontainer/devcontainer.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
},
77
"ghcr.io/devcontainers/features/node:1": {}
88
},
9-
"onCreateCommand": "cargo install cargo-watch wasm-pack cargo-about && cargo install -f wasm-bindgen-cli@0.2.100",
9+
"onCreateCommand": "cargo install cargo-watch wasm-pack cargo-about && cargo install -f wasm-bindgen-cli@0.2.121",
1010
"customizations": {
1111
"vscode": {
1212
// NOTE: Keep this in sync with `.vscode/extensions.json`

.github/workflows/build.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ jobs:
283283
pull-requests: write
284284

285285
env:
286-
WASM_BINDGEN_CLI_VERSION: "0.2.100"
286+
WASM_BINDGEN_CLI_VERSION: "0.2.121"
287287

288288
steps:
289289
- name: 📥 Clone repository
@@ -474,7 +474,7 @@ jobs:
474474
pull-requests: write
475475

476476
env:
477-
WASM_BINDGEN_CLI_VERSION: "0.2.100"
477+
WASM_BINDGEN_CLI_VERSION: "0.2.121"
478478

479479
steps:
480480
- name: 📥 Clone repository

.github/workflows/check.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,8 @@ jobs:
5757

5858
- name: 🧪 Run Rust tests
5959
env:
60-
RUSTFLAGS: -Dwarnings
60+
# `--cfg=web_sys_unstable_apis` mirrors the `[build]` section of `.cargo/config.toml`
61+
RUSTFLAGS: "-Dwarnings --cfg=web_sys_unstable_apis"
6162
run: mold -run cargo test --all-features
6263

6364
# Rust format check on GitHub runner

.nix/dev.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ pkgs.mkShell (
2929
pkgs.lld
3030
pkgs.nodejs
3131
pkgs.binaryen
32-
pkgs.wasm-bindgen-cli_0_2_100
32+
pkgs.wasm-bindgen-cli_0_2_121
3333
pkgs.wasm-pack
3434
pkgs.cargo-about
3535

.nix/pkgs/graphite-cef.nix

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{ pkgs, ... }:
22

33
let
4-
version = "147.0.10+gd58e84d+chromium-147.0.7727.118";
4+
version = "147.0.14+g76d2442+chromium-147.0.7727.138";
55
hashes = {
6-
aarch64-linux = "sha256-kaRijMDacPcoeCcS31zmRSNOvgozx+uq2M34mD28bu4=";
7-
x86_64-linux = "sha256-CHzPofBDhCniDZEpOxXK4I7p57SYjMAY1HVo3Vna0e8=";
6+
aarch64-linux = "sha256-Gy2Xs1NHwmIr+buzoqDso1QJVkKlA/UMXytHjNGqpNk=";
7+
x86_64-linux = "sha256-os7wAFJ+mVK65HCikvEjhMeQUj2ty7y+6Ad0OlOcbeA=";
88
};
99

1010
selectSystem =

0 commit comments

Comments
 (0)