From 820e8e8bef28b816d6a9b21f48e322b3d8a6b068 Mon Sep 17 00:00:00 2001
From: MickLesk <47820557+MickLesk@users.noreply.github.com>
Date: Mon, 7 Sep 2026 13:17:44 +0200
Subject: [PATCH] flatnotes: follow upstream move to uv and Python 3.13

---
 ct/flatnotes.sh              | 13 ++++++-------
 install/flatnotes-install.sh | 11 ++++-------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/ct/flatnotes.sh b/ct/flatnotes.sh
index 348953afa..e81574266 100644
--- a/ct/flatnotes.sh
+++ b/ct/flatnotes.sh
@@ -38,19 +38,18 @@ function update_script() {
 
     create_backup /opt/flatnotes/.env /opt/flatnotes/data
 
+    PYTHON_VERSION="3.13" setup_uv
+    NODE_VERSION="24" setup_nodejs
+
     CLEAN_INSTALL=1 fetch_and_deploy_gh_release "flatnotes" "dullage/flatnotes" "tarball"
 
     restore_backup
 
     msg_info "Updating Flatnotes"
-    cd /opt/flatnotes/client
-    $STD npm install
-    $STD npm run build
     cd /opt/flatnotes
-    rm -f uv.lock
-    sed -i 's/^name = ""$/name = "flatnotes"/' pyproject.toml
-    $STD /usr/local/bin/uvx migrate-to-uv
-    $STD /usr/local/bin/uv sync
+    $STD uv sync --locked --no-dev
+    $STD npm ci
+    $STD npm run build
     msg_ok "Updated Flatnotes"
 
     msg_info "Starting Service"
diff --git a/install/flatnotes-install.sh b/install/flatnotes-install.sh
index 38d5c40bf..338a84cc9 100644
--- a/install/flatnotes-install.sh
+++ b/install/flatnotes-install.sh
@@ -14,17 +14,14 @@ network_check
 update_os
 
 fetch_and_deploy_gh_release "flatnotes" "dullage/flatnotes" "tarball"
-USE_UVX="YES" setup_uv
-NODE_VERSION="22" setup_nodejs
+PYTHON_VERSION="3.13" setup_uv
+NODE_VERSION="24" setup_nodejs
 
 msg_info "Setting up Flatnotes"
 cd /opt/flatnotes
-sed -i 's/^name = ""$/name = "flatnotes"/' pyproject.toml
-$STD /usr/local/bin/uvx migrate-to-uv
-$STD /usr/local/bin/uv sync
+$STD uv sync --locked --no-dev
 mkdir -p /opt/flatnotes/data
-cd /opt/flatnotes/client
-$STD npm install
+$STD npm ci
 $STD npm run build
 
 cat <<EOF >/opt/flatnotes/.env