Merge master into async-refactor

Author: timon-schelling

.branding

@@ -1,2 +1,2 @@
-https://github.com/Keavon/graphite-branded-assets/archive/6687dc6d3d8552948458d00d35e2bee3a40ab66b.tar.gz
-7663b4a35f377a5d3363430a725a1d5f634fbdc56adca5e43167786b8fe1b253
+https://github.com/Keavon/graphite-branded-assets/archive/ca7dd793caba8999ec33fde99bb721a69c3d221f.tar.gz
+77e8a6b68d67a8d5fcfd6268a6b7938ac9322d877378c6563e933a57df6da821

.github/workflows/website.yml

@@ -7,9 +7,15 @@ on:
       - master
     paths:
       - website/**
+      - frontend/eslint.config.js
+      - frontend/eslint-require-data-selectors.js
+      - frontend/package-lock.json
   pull_request:
     paths:
       - website/**
+      - frontend/eslint.config.js
+      - frontend/eslint-require-data-selectors.js
+      - frontend/package-lock.json
 env:
   CARGO_TERM_COLOR: always
   INDEX_HTML_HEAD_INCLUSION: <script defer data-domain="graphite.art" data-api="/visit/event" src="/visit/script.hash.js"></script>
@@ -30,6 +36,10 @@ jobs:
         uses: actions/setup-node@v6
         with:
           node-version-file: .nvmrc
+          cache: npm
+          cache-dependency-path: |
+            frontend/package-lock.json
+            website/package-lock.json
 
       - name: 🕸 Install Zola
         uses: taiki-e/install-action@v2
@@ -55,9 +65,12 @@ jobs:
           cargo run -p crate-hierarchy-viz -- website/generated
           cargo run -p editor-message-tree -- website/generated
 
-      - name: 🔧 Install website npm dependencies
+      - name: 🔧 Install website and frontend npm dependencies
         run: |
-          cd website
+          # The website is linted by the frontend's ESLint config and the tools it installs
+          cd frontend
+          npm ci
+          cd ../website
           npm ci
 
       - name: 📃 Generate node catalog documentation

.nix/default.nix

@@ -61,7 +61,9 @@ in
       graphite-bundle = (lib.call ./pkgs/graphite-bundle.nix) { };
       graphite-bundle-dev = (lib.call ./pkgs/graphite-bundle.nix) { graphite = graphite-dev; };
       graphite-flatpak-manifest = (lib.call ./pkgs/graphite-flatpak-manifest.nix) { };
-      graphite-flatpak-manifest-dev = (lib.call ./pkgs/graphite-flatpak-manifest.nix) { graphite-bundle = graphite-bundle-dev; };
+      graphite-flatpak-manifest-dev = (lib.call ./pkgs/graphite-flatpak-manifest.nix) {
+        graphite-bundle = graphite-bundle-dev;
+      };
       graphite-cef = lib.call ./pkgs/graphite-cef.nix;
 
       # TODO: graphene-cli = lib.call ./pkgs/graphene-cli.nix;
@@ -70,8 +72,26 @@ in
 
   devShells = withArgs (
     { lib, ... }:
+    let
+      shell = lib.makeOverridable (lib.call ./dev.nix);
+    in
     {
-      default = lib.call ./dev.nix;
+      default = shell {
+        desktop = true;
+      };
+      full = shell {
+        desktop = true;
+        x11 = true;
+        playwright = true;
+      };
+      minimal = shell { };
+      x11 = shell {
+        desktop = true;
+        x11 = true;
+      };
+      playwright = shell {
+        playwright = true;
+      };
     }
   );
 

.nix/deps/rust-gpu.nix

@@ -31,13 +31,12 @@ let
     }).buildRustPackage
       (finalAttrs: {
         pname = "rustc_codegen_spirv";
-        version = "0.10.0-alpha.1";
-        src = pkgs.fetchgit {
-          url = "https://github.com/Rust-GPU/rust-gpu";
-          rev = "389dfe784b5992b3443b8969fdae2f82c932c552";
-          sha256 = "sha256-S3pOL7Mz4Z4vNS03qMks1XcztVfRLKcntPhih+S/7Yg=";
+        version = "0.10.0";
+        src = pkgs.fetchCrate {
+          inherit (finalAttrs) pname version;
+          sha256 = "sha256-QluNI2TdJI0j2CBOeAbB9DfOv+8LqzWk7siZyT1WWLU=";
         };
-        cargoHash = "sha256-9dGb+RDYpJKaIhkMPkZAx1M1VGE3gMfCD2T84i1VtV8=";
+        cargoHash = "sha256-vvviUccnip+j60Ml1vqLNJ49KyEF40VLUoV1TMALHMs=";
         cargoBuildFlags = [
           "-p"
           "rustc_codegen_spirv"

.nix/dev.nix

@@ -3,62 +3,90 @@
   deps,
   self,
   system,
+  lib,
   ...
 }:
 
-let
-  libs = [
-    pkgs.wayland
-    pkgs.vulkan-loader
-    pkgs.libGL
-    pkgs.openssl
-    pkgs.libraw
-
-    # X11 Support
-    pkgs.libxkbcommon
-    pkgs.libXcursor
-    pkgs.libxcb
-    pkgs.libX11
-  ];
-in
-pkgs.mkShell (
-  {
-    packages = libs ++ [
-      pkgs.pkg-config
+{
+  desktop ? false,
+  x11 ? false,
+  playwright ? false,
+}:
 
-      pkgs.lld
-      pkgs.nodejs
-      pkgs.binaryen
-      pkgs.wasm-bindgen-cli_0_2_121
-      pkgs.cargo-about
+let
+  features = [
+    {
+      packages = [
+        pkgs.pkg-config
 
-      pkgs.rustc
-      pkgs.cargo
-      pkgs.rust-analyzer
-      pkgs.clippy
-      pkgs.rustfmt
+        pkgs.lld
+        pkgs.nodejs
+        pkgs.binaryen
+        pkgs.wasm-bindgen-cli_0_2_121
+        pkgs.cargo-about
 
-      pkgs.git
+        pkgs.rustc
+        pkgs.cargo
+        pkgs.rust-analyzer
+        pkgs.clippy
+        pkgs.rustfmt
 
-      pkgs.cargo-nextest
-      pkgs.cargo-expand
+        pkgs.git
 
-      # Linker
-      pkgs.mold
+        pkgs.cargo-nextest
+        pkgs.cargo-expand
 
-      # Profiling tools
-      pkgs.gnuplot
-      pkgs.samply
-      pkgs.cargo-flamegraph
+        # Linker
+        pkgs.mold
 
-      # Plotting tools
-      pkgs.graphviz
-    ];
+        # Profiling tools
+        pkgs.gnuplot
+        pkgs.samply
+        pkgs.cargo-flamegraph
 
-    CEF_PATH = self.packages.${system}.graphite-cef;
-    LD_LIBRARY_PATH = "${pkgs.lib.makeLibraryPath libs}:${self.packages.${system}.graphite-cef}";
-    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";
+        # Plotting tools
+        pkgs.graphviz
+      ];
+    }
+    deps.rustGPU
+    (lib.optionalAttrs desktop (
+      {
+        libs = [
+          pkgs.wayland
+          pkgs.vulkan-loader
+          pkgs.libGL
+          pkgs.libxkbcommon
+          self.packages.${system}.graphite-cef
+        ];
+        env = {
+          CEF_PATH = "${self.packages.${system}.graphite-cef}/lib";
+          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";
+        };
+      }
+    ))
+    (lib.optionalAttrs x11 {
+      libs = [
+        pkgs.libXcursor
+        pkgs.libxcb
+        pkgs.libX11
+      ];
+    })
+    (lib.optionalAttrs playwright (
+      assert pkgs.playwright-driver.version == (lib.importJSON ../tools/web-editor-driver/playwright/package-lock.json).packages."node_modules/playwright-core".version;
+      {
+        env = {
+          PLAYWRIGHT_BROWSERS_PATH = pkgs.playwright-driver.browsers-chromium;
+          PLAYWRIGHT_SKIP_VALIDATE_HOST_REQUIREMENTS = "true";
+        };
+      }
+    ))
+  ];
 
-  }
-  // deps.rustGPU.env
-)
+  libs = lib.concatMap (feature: feature.libs or [ ]) features;
+in
+pkgs.mkShell {
+  packages = libs ++ lib.concatMap (feature: feature.packages or [ ]) features;
+  env = lib.mergeAttrsList (map (feature: feature.env or { }) features) // {
+    LD_LIBRARY_PATH = lib.makeLibraryPath libs;
+  };
+}

.nix/pkgs/graphite-cef.nix

@@ -30,19 +30,20 @@ pkgs.cef-binary.overrideAttrs {
   postInstall = ''
     rm -r $out/* $out/.* || true
     strip ./Release/*.so*
-    mv ./Release/* $out/
+    mkdir $out/lib
+    mv ./Release/* $out/lib/
     find "./Resources/locales" -maxdepth 1 -type f ! -name 'en-US.pak' -delete
-    mv ./Resources/* $out/
-    mv ./include $out/
+    mv ./Resources/* $out/lib/
+    mv ./include $out/lib/
 
-    cat ./CREDITS.html | ${pkgs.xz}/bin/xz -9 -e -c > $out/CREDITS.html.xz
+    cat ./CREDITS.html | ${pkgs.xz}/bin/xz -9 -e -c > $out/lib/CREDITS.html.xz
 
     echo '${
       builtins.toJSON {
         type = "minimal";
         name = builtins.baseNameOf url;
         sha1 = "";
       }
-    }' > $out/archive.json
+    }' > $out/lib/archive.json
   '';
 }

.nix/pkgs/graphite.nix

@@ -20,6 +20,7 @@ let
     pkgs.libGL
     pkgs.openssl
     pkgs.libraw
+    self.packages.${system}.graphite-cef
     # X11 Support
     pkgs.libxkbcommon
     pkgs.libXcursor
@@ -50,7 +51,7 @@ let
         pkgs.pkg-config
         pkgs.lld
       ];
-      env.CEF_PATH = self.packages.${system}.graphite-cef;
+      env.CEF_PATH = "${self.packages.${system}.graphite-cef}/lib";
       buildPhase =
         let
           profile = if dev then "dev" else "release";
@@ -99,7 +100,7 @@ deps.crane.lib.buildPackage (
       RASTER_NODES_SHADER_PATH = self.packages.${system}.graphite-raster-nodes-shaders;
       GRAPHITE_GIT_COMMIT_HASH = self.rev or "unknown";
       GRAPHITE_GIT_COMMIT_DATE = self.lastModified or "unknown";
-      CEF_PATH = self.packages.${system}.graphite-cef;
+      CEF_PATH = "${self.packages.${system}.graphite-cef}/lib";
     };
 
     postPatch = ''
@@ -148,7 +149,7 @@ deps.crane.lib.buildPackage (
       remove-references-to -t "${common.cargoVendorDir}" $out/bin/graphite
 
       patchelf \
-        --set-rpath "${pkgs.lib.makeLibraryPath libs}:${self.packages.${system}.graphite-cef}" \
+        --set-rpath "${pkgs.lib.makeLibraryPath libs}" \
         --add-needed libGL.so \
         --add-needed libEGL.so \
         $out/bin/graphite