Merge branch 'master' into improve-save-document

Author: timon-schelling

.github/workflows/website.yml

@@ -63,14 +63,14 @@ jobs:
           mkdir artifacts
           mv hierarchical_message_system_tree.txt artifacts/hierarchical_message_system_tree.txt
 
-      - name: 🚚 Move `artifacts` contents to `website/other/editor-structure`
+      - name: 🚚 Move `artifacts` contents to the project root
         run: |
-          mv artifacts/* website/other/editor-structure
+          mv artifacts/* .
 
       - name: 🔧 Build auto-generated code docs artifacts into HTML
         run: |
-          cd website/other/editor-structure
-          node generate.js hierarchical_message_system_tree.txt replacement.html
+          cd website
+          npm run generate-editor-structure
 
       - name: 🌐 Build Graphite website with Zola
         env:
@@ -80,38 +80,6 @@ jobs:
           npm run install-fonts
           zola --config config.toml build --minify
 
-      - name: 💿 Restore cache of `website/other/dist` directory, if available and `website/other` didn't change
-        if: steps.changes.outputs.website-other != 'true'
-        id: cache-website-other-dist
-        uses: actions/cache/restore@v3
-        with:
-          path: website/other/dist
-          key: website-other-dist-${{ runner.os }}
-
-      - name: 🟢 Set up Node only if we are going to build in the next step
-        if: steps.cache-website-other-dist.outputs.cache-hit != 'true'
-        uses: actions/setup-node@v4
-        with:
-          node-version: "latest"
-
-      - name: 📁 Build `website/other` directory only if changed or not cached
-        if: steps.cache-website-other-dist.outputs.cache-hit != 'true'
-        id: build-website-other
-        run: |
-          sh website/other/build.sh
-
-      - name: 💾 Save cache of `website/other/dist` directory if it was built above
-        if: steps.cache-website-other-dist.outputs.cache-hit != 'true'
-        uses: actions/cache/save@v3
-        with:
-          path: website/other/dist
-          key: ${{ steps.cache-website-other-dist.outputs.cache-primary-key }}
-
-      - name: 🚚 Move `website/other/dist` contents to `website/public`
-        run: |
-          mkdir -p website/public
-          mv website/other/dist/* website/public
-
       - name: 📤 Publish to Cloudflare Pages
         id: cloudflare
         uses: cloudflare/pages-action@1

.gitignore

@@ -8,3 +8,4 @@ flamegraph.svg
 .idea/
 .direnv
 hierarchical_message_system_tree.txt
+hierarchical_message_system_tree.html

.vscode/settings.json

@@ -35,7 +35,7 @@
 	"rust-analyzer.cargo.allTargets": false,
 	// ESLint config
 	"eslint.format.enable": true,
-	"eslint.workingDirectories": ["./frontend", "./website/other/bezier-rs-demos", "./website"],
+	"eslint.workingDirectories": ["./frontend", "./website"],
 	"eslint.validate": ["javascript", "typescript", "svelte"],
 	// Svelte config
 	"svelte.plugin.svelte.compilerWarnings": {

Cargo.lock

@@ -20,9 +20,7 @@ members = [
 	"node-graph/preprocessor",
 	"libraries/dyn-any",
 	"libraries/path-bool",
-	"libraries/bezier-rs",
 	"libraries/math-parser",
-	"website/other/bezier-rs-demos/wasm",
 ]
 default-members = [
 	"editor",
@@ -44,9 +42,14 @@ resolver = "2"
 
 [workspace.dependencies]
 # Local dependencies
-bezier-rs = { path = "libraries/bezier-rs", features = ["dyn-any", "serde"] }
-dyn-any = { path = "libraries/dyn-any", features = ["derive", "glam", "reqwest", "log-bad-types", "rc"] }
-preprocessor = { path = "node-graph/preprocessor"}
+dyn-any = { path = "libraries/dyn-any", features = [
+	"derive",
+	"glam",
+	"reqwest",
+	"log-bad-types",
+	"rc",
+] }
+preprocessor = { path = "node-graph/preprocessor" }
 math-parser = { path = "libraries/math-parser" }
 path-bool = { path = "libraries/path-bool" }
 graphene-application-io = { path = "node-graph/gapplication-io" }
@@ -80,9 +83,8 @@ convert_case = "0.7"
 derivative = "2.2"
 thiserror = "2"
 anyhow = "1.0"
-proc-macro2 = { version = "1", features = [ "span-locations" ] }
+proc-macro2 = { version = "1", features = ["span-locations"] }
 quote = "1.0"
-axum = "0.8"
 chrono = "0.4"
 ron = "0.8"
 fastnoise-lite = "1.1"
@@ -122,9 +124,17 @@ resvg = "0.44"
 usvg = "0.44"
 rand = { version = "0.9", default-features = false, features = ["std_rng"] }
 rand_chacha = "0.9"
-glam = { version = "0.29", default-features = false, features = ["serde", "scalar-math", "debug-glam-assert"] }
+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", "jpeg", "bmp"] }
+image = { version = "0.25", default-features = false, features = [
+	"png",
+	"jpeg",
+	"bmp",
+] }
 parley = "0.5.0"
 skrifa = "0.32.0"
 pretty_assertions = "1.4.1"

Cargo.toml

@@ -12,18 +12,18 @@ license = "Apache-2.0"
 
 [features]
 default = ["wasm"]
-wasm = ["wasm-bindgen", "graphene-std/wasm", "wasm-bindgen-futures"]
+wasm = ["wasm-bindgen", "graphene-std/wasm"]
 gpu = ["interpreted-executor/gpu", "wgpu-executor"]
 resvg = ["graphene-std/resvg"]
 vello = ["graphene-std/vello", "resvg"]
-ron = ["dep:ron"]
+ron = []
 
 [dependencies]
 # Local dependencies
 graphite-proc-macros = { workspace = true }
 graph-craft = { workspace = true }
 interpreted-executor = { workspace = true }
-graphene-std = { workspace = true }
+graphene-std = { workspace = true } # NOTE: `graphene-core` should not be added here because `graphene-std` re-exports its contents
 preprocessor = { workspace = true }
 
 # Workspace dependencies
@@ -33,7 +33,6 @@ bitflags = { workspace = true }
 thiserror = { workspace = true }
 serde = { workspace = true }
 serde_json = { workspace = true }
-bezier-rs = { workspace = true }
 kurbo = { workspace = true }
 futures = { workspace = true }
 glam = { workspace = true }
@@ -44,9 +43,7 @@ num_enum = { workspace = true }
 usvg = { workspace = true }
 once_cell = { workspace = true }
 web-sys = { workspace = true }
-bytemuck = { workspace = true }
 vello = { workspace = true }
-tracing = { workspace = true }
 base64 = { workspace = true }
 
 # Required dependencies
@@ -57,8 +54,6 @@ wgpu-executor = { workspace = true, optional = true }
 
 # Optional workspace dependencies
 wasm-bindgen = { workspace = true, optional = true }
-wasm-bindgen-futures = { workspace = true, optional = true }
-ron = { workspace = true, optional = true }
 
 [dev-dependencies]
 # Workspace dependencies