Merge master

Author: urisinger

.devcontainer/devcontainer.json

@@ -6,15 +6,14 @@
 		},
 		"ghcr.io/devcontainers/features/node:1": {}
 	},
-	"onCreateCommand": "cargo install wasm-pack cargo-watch cargo-about",
+	"onCreateCommand": "cargo install cargo-watch wasm-pack cargo-about && cargo install -f wasm-bindgen-cli@0.2.100",
 	"customizations": {
 		"vscode": {
 			// NOTE: Keep this in sync with `.vscode/extensions.json`
 			"extensions": [
 				// Rust
 				"rust-lang.rust-analyzer",
 				"tamasfe.even-better-toml",
-				"serayuzgur.crates",
 				// Web
 				"dbaeumer.vscode-eslint",
 				"svelte.svelte-vscode",

.envrc

@@ -0,0 +1 @@
+use flake .nix

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

@@ -89,7 +89,7 @@ jobs:
 
       - name: 🧪 Run Rust tests
         run: |
-          mold -run cargo test --all-features
+          mold -run cargo test --all-features --workspace
 
   # miri:
   #   runs-on: self-hosted
@@ -108,17 +108,6 @@ jobs:
       - name: 📥 Clone and checkout repository
         uses: actions/checkout@v3
 
-      - name: 🔒 Check crate security advisories for root workspace
-        uses: EmbarkStudios/cargo-deny-action@v2
-        with:
-          command: check advisories
-
-      - name: 🔒 Check crate security advisories for /libraries/rawkit
-        uses: EmbarkStudios/cargo-deny-action@v2
-        with:
-          command: check advisories
-          manifest-path: libraries/rawkit/Cargo.toml
-
       - name: 📜 Check crate license compatibility for root workspace
         uses: EmbarkStudios/cargo-deny-action@v2
         with:

.github/workflows/cargo-deny.yml

@@ -0,0 +1,25 @@
+name: "Audit Security Advisories"
+
+on:
+  # Run once each day
+  schedule:
+    - cron: "0 0 * * *"
+
+jobs:
+  cargo-deny:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: 📥 Clone and checkout repository
+        uses: actions/checkout@v3
+
+      - name: 🔒 Check crate security advisories for root workspace
+        uses: EmbarkStudios/cargo-deny-action@v2
+        with:
+          command: check advisories
+
+      - name: 🔒 Check crate security advisories for /libraries/rawkit
+        uses: EmbarkStudios/cargo-deny-action@v2
+        with:
+          command: check advisories
+          manifest-path: libraries/rawkit/Cargo.toml

.github/workflows/comment-clippy-warnings.yaml

@@ -9,7 +9,9 @@ jobs:
   clippy:
     name: Run Clippy
     runs-on: ubuntu-latest
-    if: ${{ !github.event.pull_request.draft }}
+    # TODO(Keavon): Find a workaround (passing the output text to a separate action with permission to read the secrets?) that allows this to work on fork PRs
+    if: false
+    # if: ${{ !github.event.pull_request.draft && !github.event.pull_request.head.repo.fork }}
     permissions:
       contents: read
       pull-requests: write

.github/workflows/comment-profiling-changes.yaml

@@ -9,8 +9,6 @@ env:
 
 jobs:
   profile:
-    # TODO(TrueDoctor): Fix and reenable this action
-    if: false
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -48,7 +46,7 @@ jobs:
 
       - name: Run baseline benchmarks
         run: |
-          cargo bench --bench compile_demo_art --features=iai -- --save-baseline=master
+          cargo bench --bench compile_demo_art_iai -- --save-baseline=master
 
       - name: Checkout PR branch
         run: |
@@ -57,7 +55,7 @@ jobs:
       - name: Run PR benchmarks
         id: benchmark
         run: |
-          BENCH_OUTPUT=$(cargo bench --bench compile_demo_art --features=iai -- --baseline=master --output-format=json  | jq -sc | sed 's/\\"//g')
+          BENCH_OUTPUT=$(cargo bench --bench compile_demo_art_iai -- --baseline=master --output-format=json  | jq -sc | sed 's/\\"//g')
           echo "BENCHMARK_OUTPUT<<EOF" >> $GITHUB_OUTPUT
           echo "$BENCH_OUTPUT" >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT

.github/workflows/website.yml

@@ -13,7 +13,7 @@ on:
       - website/**
 env:
   CARGO_TERM_COLOR: always
-  INDEX_HTML_HEAD_INCLUSION: <script defer data-domain="graphite.rs" data-api="/visit/event" src="/visit/script.js"></script>
+  INDEX_HTML_HEAD_INCLUSION: <script defer data-domain="graphite.rs" data-api="/visit/event" src="/visit/script.hash.js"></script>
 
 jobs:
   build:
@@ -30,17 +30,20 @@ jobs:
       - name: 🕸 Install Zola
         uses: taiki-e/install-action@v2
         with:
-          tool: zola@0.19.1
+          tool: zola@0.20.0
 
       - name: ✂ Replace template in <head> of index.html
         run: |
           # Remove the INDEX_HTML_HEAD_INCLUSION environment variable for build links (not master deploys)
           git rev-parse --abbrev-ref HEAD | grep master > /dev/null || export INDEX_HTML_HEAD_INCLUSION=""
 
       - name: 🌐 Build Graphite website with Zola
+        env:
+          MODE: prod
         run: |
           cd website
-          zola build
+          npm run install-fonts
+          zola --config config.toml build --minify
 
       - name: 🔍 Check if `website/other` directory changed
         uses: dorny/paths-filter@v3

.gitignore

@@ -4,3 +4,4 @@ target/
 perf.data*
 profile.json
 flamegraph.svg
+

.nix/flake.lock

@@ -0,0 +1,115 @@
+# This is a helper file for people using NixOS as their operating system.
+# If you don't know what this file does, you can safely ignore it.
+# This file defines both the development environment for the project.
+#
+# Development Environment:
+# - Provides all necessary tools for Rust/WASM development
+# - Includes Tauri dependencies for desktop app development
+# - Sets up profiling and debugging tools
+# - Configures mold as the default linker for faster builds
+#
+#
+# Usage:
+# - Development shell: `nix develop`
+# - Run in dev shell with direnv: add `use flake` to .envrc
+{
+  description = "Development environment and build configuration";
+
+  inputs = {
+    # This url should be changed to match your system packages if you work on tauri because you need to use the same graphics library versions as the ones used by your system
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs = { nixpkgs, nixpkgs-unstable, rust-overlay, flake-utils, ... }:
+    flake-utils.lib.eachDefaultSystem (system:
+      let
+        overlays = [ (import rust-overlay) ];
+        pkgs = import nixpkgs {
+          inherit system overlays;
+        };
+        pkgs-unstable = import nixpkgs-unstable {
+          inherit system overlays;
+        };
+        
+        rustc-wasm = pkgs.rust-bin.stable.latest.default.override {
+          targets = [ "wasm32-unknown-unknown" ];
+          extensions = [ "rust-src" "rust-analyzer" "clippy" "cargo" ];
+        };
+
+        # Shared build inputs - system libraries that need to be in LD_LIBRARY_PATH
+        buildInputs = with pkgs; [
+          # System libraries
+          openssl
+          vulkan-loader
+          mesa
+          libraw
+
+
+          # Tauri dependencies: keep in sync with https://v2.tauri.app/start/prerequisites/
+          at-spi2-atk
+          atkmm
+          cairo
+          gdk-pixbuf
+          glib
+          gtk3
+          harfbuzz
+          librsvg
+          libsoup_3
+          pango
+          webkitgtk_4_1
+          openssl
+        ];
+
+        # Development tools that don't need to be in LD_LIBRARY_PATH
+        buildTools =  [
+          rustc-wasm
+          pkgs.nodejs
+          pkgs.nodePackages.npm
+          pkgs.binaryen
+          pkgs.wasm-bindgen-cli
+          pkgs-unstable.wasm-pack
+          pkgs.pkg-config
+          pkgs.git
+          pkgs.gobject-introspection
+          pkgs-unstable.cargo-tauri
+          pkgs-unstable.cargo-about
+
+          # Linker
+          pkgs.mold
+        ];
+        # Development tools that don't need to be in LD_LIBRARY_PATH
+        devTools = with pkgs; [
+          cargo-watch
+          cargo-nextest
+          cargo-expand
+          
+          # Profiling tools
+          gnuplot
+          samply
+          cargo-flamegraph
+
+        ];
+      in
+      {
+        # Development shell configuration
+        devShells.default = pkgs.mkShell {
+          packages = buildInputs ++ buildTools ++ devTools;
+
+          LD_LIBRARY_PATH = pkgs.lib.makeLibraryPath buildInputs;
+          GIO_MODULE_DIR="${pkgs.glib-networking}/lib/gio/modules/";
+          XDG_DATA_DIRS="${pkgs.gsettings-desktop-schemas}/share/gsettings-schemas/${pkgs.gsettings-desktop-schemas.name}:${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}:$XDG_DATA_DIRS";
+          
+
+          shellHook = ''
+            alias cargo='mold --run cargo'
+          '';
+        };
+      }
+    );
+}