Update dependencies

Cargo.toml

@@ -6,20 +6,20 @@ authors = ["Mike Moolenaar <[email protected]>"]
 repository = "https://github.com/MikeMoolenaar/RATH-stack"
 
 [dependencies]
-axum = { version = "0.7.5", features = ["form", "macros"] }
-tokio = { version = "1.37.0", features = ["macros", "rt-multi-thread"] }
-tower-http = { version = "0.5", features = ["fs","set-header"] }
-serde = { version = "1.0.198", features = ["derive"] }
+axum = { version = "0.7.9", features = ["form", "macros"] }
+tokio = { version = "1.41.1", features = ["macros", "rt-multi-thread"] }
+tower-http = { version = "0.6", features = ["fs","set-header"] }
+serde = { version = "1.0.215", features = ["derive"] }
 chrono = "0.4.38"
 dotenv = "0.15.0"
-tower = "0.4.13"
-tower_governor = "0.3.2"
-tower-sessions = "0.10.2"
-tower-sessions-libsql-store = "0.1.0"
-tower-livereload = "0.9.2"
-minijinja = { version = "1.0.20", features = ["loader", "v_htmlescape", "multi_template"] }
-axum-htmx = "0.5.0"
+tower = "0.5.1"
+tower_governor = "0.4.3"
+tower-sessions = "0.13.0"
+tower-sessions-libsql-store = "0.3.0"
+tower-livereload = "0.9.4"
+minijinja = { version = "2.5.0", features = ["loader", "v_htmlescape", "multi_template"] }
+axum-htmx = "0.6.0"
 argon2 = "0.5.3"
 time = "0.3.36"
-libsql = "0.3.5"
+libsql = "0.6.0"
 html-minifier = "5.0.0"

Dockerfile

@@ -1,4 +1,4 @@
-FROM clux/muslrust:1.76.0-stable-2024-02-28 AS chef
+FROM clux/muslrust:1.82.0-stable AS chef
 USER root
 RUN cargo install cargo-chef
 WORKDIR /app

README.md

@@ -59,6 +59,8 @@ Fly commands
 fly machine start
 fly machine stop
 
+# make sure you have a .env.prod file before deploying!
+
 fly deploy # Deploy using remote runner
 sudo fly deploy --local-only # Deploy using local docker runner
 ```

src/main.rs

@@ -114,7 +114,7 @@ async fn main() {
         governor_limiter.retain_recent();
     });
     let governor_layer = ServiceBuilder::new().layer(GovernorLayer {
-        config: Box::leak(governor_conf),
+        config: governor_conf.into(),
     });
 
     // Setup router

static/init.sh

@@ -12,10 +12,19 @@ fi
 
 # Clear folder if dist folder exists
 if [ -d "dist" ]; then
-  rm -rf dist
+  read -p "Removing static/dist folder, are you sure? (y/n): " -n 1 -r
+  echo
+  if [[ $REPLY =~ ^[Yy]$ ]]; then
+    rm -rf dist
+  else
+    echo "Alrighty then, exiting."
+    exit 1
+  fi
 fi
 mkdir dist
 
-cp -r ./node_modules/htmx.org/dist/htmx.min.js "./dist/htmx-$HTMX_VERSION.min.js"
+cp -r ./node_modules/htmx.org/dist/htmx.js "./dist/htmx-$HTMX_VERSION.js"
 cp -r ./node_modules/htmx.org/dist/ext/response-targets.js "./dist/htmx-response-targets-$HTMX_VERSION.min.js"
 cp -r ./node_modules/idiomorph/dist/idiomorph-ext.min.js "./dist/idiomorph-$IDIOMORPH_VERSION.min.js"
+
+echo "Done, static files copied to dist folder."