Merge remote-tracking branch 'upstream/master'

Author: timon-schelling

.branding

@@ -1,2 +1,2 @@
-https://github.com/Keavon/graphite-branded-assets/archive/8cd7cf811d36228a2eb7ce741adc3c745632a6e7.tar.gz
-17a7cd32dda4afd893c65e1fb6757f1ecf760702217f647d1c680db8d92643ef
+https://github.com/Keavon/graphite-branded-assets/archive/f44aa2f362ae4fed8d634878b817a1d3948a7dcb.tar.gz
+dffe2b483e491979ef57c320d61446ada5400ef73ff26582976631d9c36efefc

.github/workflows/build-dev-and-ci.yml

@@ -5,6 +5,7 @@ on:
     branches:
       - master
   pull_request: {}
+  merge_group: {}
 env:
   CARGO_TERM_COLOR: always
   INDEX_HTML_HEAD_REPLACEMENT: <script defer data-domain="dev.graphite.art" data-api="https://graphite.art/visit/event" src="https://graphite.art/visit/script.hash.js"></script>
@@ -113,9 +114,11 @@ jobs:
       - name: 📃 Generate code documentation info for website
         if: github.ref == 'refs/heads/master'
         run: |
-          cargo test --package graphite-editor --lib -- messages::message::test::generate_message_tree
+          cd tools/editor-message-tree
+          cargo run
+          cd ../..
           mkdir -p artifacts-generated
-          mv hierarchical_message_system_tree.txt artifacts-generated/hierarchical_message_system_tree.txt
+          mv website/generated/hierarchical_message_system_tree.txt artifacts-generated/hierarchical_message_system_tree.txt
 
       - name: 💿 Obtain cache of auto-generated code docs artifacts, to check if they've changed
         if: github.ref == 'refs/heads/master'

.github/workflows/website.yml

@@ -67,19 +67,27 @@ jobs:
           rustup update stable
           echo "🦀 Latest updated version of Rust:"
           rustc --version
-          cargo test --package graphite-editor --lib -- messages::message::test::generate_message_tree
+          cd tools/editor-message-tree
+          cargo run
+          cd ../..
           mkdir artifacts
-          mv hierarchical_message_system_tree.txt artifacts/hierarchical_message_system_tree.txt
+          mv website/generated/hierarchical_message_system_tree.txt artifacts/hierarchical_message_system_tree.txt
 
-      - name: 🚚 Move `artifacts` contents to the project root
+      - name: 🚚 Move `artifacts` contents to website/generated
         run: |
-          mv artifacts/* .
+          mkdir -p website/generated
+          mv artifacts/* website/generated/
 
       - name: 🔧 Build auto-generated code docs artifacts into HTML
         run: |
           cd website
           npm run generate-editor-structure
 
+      - name: 📃 Generate node catalog documentation
+        run: |
+          cd tools/node-docs
+          cargo run
+
       - name: 🌐 Build Graphite website with Zola
         env:
           MODE: prod

.gitignore

@@ -11,6 +11,7 @@ flamegraph.svg
 .idea/
 .direnv
 .DS_Store
+
 hierarchical_message_system_tree.txt
 hierarchical_message_system_tree.html
 

.vscode/settings.json

@@ -26,6 +26,10 @@
 		// Configured in `.prettierrc`
 		"editor.defaultFormatter": "esbenp.prettier-vscode"
 	},
+	// Website: don't format Zola/Tera-templated HTML on save
+	"[html]": {
+		"editor.formatOnSave": false
+	},
 	// Handlebars: don't save on format
 	// (`about.hbs` is used by Cargo About to encode license information)
 	"[handlebars]": {

Cargo.lock

@@ -39,7 +39,9 @@ members = [
 	"node-graph/node-macro",
 	"node-graph/preprocessor",
 	"proc-macros",
-	"tools/crate-hierarchy-viz"
+	"tools/crate-hierarchy-viz",
+	"tools/editor-message-tree",
+	"tools/node-docs",
 ]
 default-members = [
 	"editor",
@@ -137,6 +139,7 @@ log = "0.4"
 bitflags = { version = "2.4", features = ["serde"] }
 ctor = "0.2"
 convert_case = "0.8"
+indoc = "2.0.5"
 derivative = "2.2"
 thiserror = "2"
 anyhow = "1.0"
@@ -151,7 +154,7 @@ wgpu = { version = "27.0", features = [
 	"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
+once_cell = "1.13" # Remove and replace with `core::cell::LazyCell` (<https://doc.rust-lang.org/core/cell/struct.LazyCell.html>)
 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"
@@ -176,11 +179,17 @@ web-sys = { version = "=0.3.77", features = [
 winit = { git = "https://github.com/rust-windowing/winit.git" }
 keyboard-types = "0.8"
 url = "2.5"
-tokio = { version = "1.29", features = ["fs", "macros", "io-std", "rt"] }
+tokio = { version = "1.29", features = ["fs", "macros", "io-std", "rt", "rt-multi-thread"] }
+# Linebender ecosystem (BEGIN)
+kurbo = { version = "0.12", features = ["serde"] }
 vello = { git = "https://github.com/linebender/vello" }
 vello_encoding = { git = "https://github.com/linebender/vello" }
 resvg = "0.45"
 usvg = "0.45"
+parley = "0.6"
+skrifa = "0.36"
+polycool = "0.4"
+# Linebender ecosystem (END)
 rand = { version = "0.9", default-features = false, features = ["std_rng"] }
 rand_chacha = "0.9"
 glam = { version = "0.29", default-features = false, features = [
@@ -194,8 +203,6 @@ image = { version = "0.25", default-features = false, features = [
 	"jpeg",
 	"bmp",
 ] }
-parley = "0.6"
-skrifa = "0.36"
 pretty_assertions = "1.4"
 fern = { version = "0.7", features = ["colored"] }
 num_enum = { version = "0.7", default-features = false }
@@ -217,7 +224,6 @@ syn = { version = "2.0", default-features = false, features = [
 	"extra-traits",
 	"proc-macro",
 ] }
-kurbo = { version = "0.12", features = ["serde"] }
 lyon_geom = "1.0"
 petgraph = { version = "0.7", default-features = false, features = ["graphmap"] }
 half = { version = "2.4", default-features = false, features = ["bytemuck"] }
@@ -234,7 +240,6 @@ tracing-subscriber = { version = "0.3", features = ["env-filter"] }
 tracing = "0.1"
 rfd = "0.15"
 open = "5.3"
-polycool = "0.4"
 spin = "0.10"
 clap = "4.5"
 spirv-std = { git = "https://github.com/Firestar99/rust-gpu-new", rev = "c12f216121820580731440ee79ebc7403d6ea04f", features = ["bytemuck"] }

Cargo.toml

@@ -31,6 +31,7 @@ winit = { workspace = true, features = [
 ] }
 thiserror = { workspace = true }
 futures = { workspace = true }
+tokio = { workspace = true }
 cef = { workspace = true }
 cef-dll-sys = { workspace = true }
 tracing-subscriber = { workspace = true }