From 690b955d5d762ff42683138f0674f441608da7d2 Mon Sep 17 00:00:00 2001
From: cupcakearmy <hi@nicco.io>
Date: Sun, 31 May 2026 22:55:11 +0200
Subject: [PATCH] watchexec & breaking changes in axum 0.8

---
 mise.toml                     |  1 +
 packages/backend/package.json |  2 +-
 packages/backend/src/main.rs  | 10 +++++-----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/mise.toml b/mise.toml
index dc86a82..d92acf3 100644
--- a/mise.toml
+++ b/mise.toml
@@ -1,6 +1,7 @@
 [tools]
 pnpm = "11.5.0"
 rust = "1.95"
+watchexec = "latest"
 # Node loaded below from .nvmrc
 
 [settings]
diff --git a/packages/backend/package.json b/packages/backend/package.json
index c75db96..fad7f3f 100644
--- a/packages/backend/package.json
+++ b/packages/backend/package.json
@@ -2,7 +2,7 @@
   "private": true,
   "name": "@cryptgeon/backend",
   "scripts": {
-    "dev": "cargo watch -x 'run --bin cryptgeon'",
+    "dev": "watchexec -r -e rs cargo run",
     "build": "cargo build --release",
     "test:server": "SIZE_LIMIT=10MiB LISTEN_ADDR=0.0.0.0:3000 cargo run",
     "test:prepare": "cargo build"
diff --git a/packages/backend/src/main.rs b/packages/backend/src/main.rs
index a1627c0..e738eea 100644
--- a/packages/backend/src/main.rs
+++ b/packages/backend/src/main.rs
@@ -1,9 +1,9 @@
 use std::{collections::HashMap, sync::Arc};
 
 use axum::{
+    Router, ServiceExt,
     extract::{DefaultBodyLimit, Request},
     routing::{delete, get, post},
-    Router, ServiceExt,
 };
 use dotenv::dotenv;
 use lock::SharedState;
@@ -41,14 +41,14 @@ async fn main() {
 
     let notes_routes = Router::new()
         .route("/", post(note::create))
-        .route("/:id", delete(note::delete))
-        .route("/:id", get(note::preview));
+        .route("/{id}", delete(note::delete))
+        .route("/{id}", get(note::preview));
     let health_routes = Router::new().route("/live", get(health::report_health));
     let status_routes = Router::new().route("/status", get(status::get_status));
     let api_routes = Router::new()
         .nest("/notes", notes_routes)
-        .nest("/", health_routes)
-        .nest("/", status_routes);
+        .merge(health_routes)
+        .merge(status_routes);
 
     let index = format!("{}{}", config::FRONTEND_PATH.to_string(), "/index.html");
     let serve_dir =