From 06803ef3c5c88367f4efdba444cef0cd39841b92 Mon Sep 17 00:00:00 2001
From: Xe Iaso <me@xeiaso.net>
Date: Tue, 28 Mar 2023 18:03:58 -0400
Subject: bump axum-extra from 0.5.0 to 0.6.0

Replaces #615

Signed-off-by: Xe Iaso <me@xeiaso.net>
---
 Cargo.lock  | 50 +++-----------------------------------------------
 Cargo.toml  |  1 -
 src/main.rs |  7 +++----
 3 files changed, 6 insertions(+), 52 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 062971d..b1c20b8 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -201,25 +201,6 @@ dependencies = [
  "tower-service",
 ]
 
-[[package]]
-name = "axum-extra"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "51227033e4d3acad15c879092ac8a228532707b5db5ff2628f638334f63e1b7a"
-dependencies = [
- "axum",
- "bytes",
- "futures-util",
- "http",
- "mime",
- "pin-project-lite",
- "tokio",
- "tower",
- "tower-http 0.3.5",
- "tower-layer",
- "tower-service",
-]
-
 [[package]]
 name = "axum-macros"
 version = "0.3.7"
@@ -1939,7 +1920,7 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "83abebdb324c30f176d449513f0134bafbf976d5279c6554742599e3996d1629"
 dependencies = [
- "rand 0.7.3",
+ "rand 0.8.5",
  "serde",
  "serde_derive",
  "serde_json",
@@ -3012,30 +2993,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "tower-http"
-version = "0.3.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f873044bf02dd1e8239e9c1293ea39dad76dc594ec16185d0a1bf31d8dc8d858"
-dependencies = [
- "bitflags",
- "bytes",
- "futures-core",
- "futures-util",
- "http",
- "http-body",
- "http-range-header",
- "httpdate",
- "mime",
- "mime_guess",
- "percent-encoding",
- "pin-project-lite",
- "tokio",
- "tokio-util",
- "tower-layer",
- "tower-service",
-]
-
 [[package]]
 name = "tower-http"
 version = "0.4.0"
@@ -3584,7 +3541,6 @@ name = "xesite"
 version = "3.0.0"
 dependencies = [
  "axum",
- "axum-extra",
  "axum-macros",
  "chrono",
  "color-eyre",
@@ -3610,7 +3566,7 @@ dependencies = [
  "pfacts",
  "pretty_env_logger",
  "prometheus",
- "rand 0.7.3",
+ "rand 0.8.5",
  "regex",
  "reqwest",
  "ructe",
@@ -3625,7 +3581,7 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "tower",
- "tower-http 0.4.0",
+ "tower-http",
  "tracing",
  "tracing-futures",
  "tracing-subscriber",
diff --git a/Cargo.toml b/Cargo.toml
index a1d2539..af71ece 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -12,7 +12,6 @@ license = "zlib"
 [dependencies]
 axum = { version = "0.6", features = ["headers"] }
 axum-macros = "0.3"
-axum-extra = { version = "0.5", features = ["spa"] }
 color-eyre = "0.6"
 chrono = "0.4"
 derive_more = "0.99"
diff --git a/src/main.rs b/src/main.rs
index 0186e5f..d24086c 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -9,7 +9,6 @@ use axum::{
     routing::{get, get_service},
     Router,
 };
-use axum_extra::routing::SpaRouter;
 use color_eyre::eyre::Result;
 use hyper::StatusCode;
 use prometheus::{Encoder, TextEncoder};
@@ -21,7 +20,7 @@ use std::{
 };
 use tokio::net::UnixListener;
 use tower_http::{
-    cors::CorsLayer, services::ServeFile, set_header::SetResponseHeaderLayer, trace::TraceLayer,
+    cors::CorsLayer, services::{ServeFile, ServeDir}, set_header::SetResponseHeaderLayer, trace::TraceLayer,
 };
 
 pub mod app;
@@ -101,7 +100,7 @@ async fn main() -> Result<()> {
         ))
         .layer(CorsLayer::permissive());
 
-    let files = SpaRouter::new("/static", "static");
+    let files = ServeDir::new("static");
 
     let app = Router::new()
         // meta
@@ -172,7 +171,7 @@ async fn main() -> Result<()> {
         // junk google wants
         .route("/sitemap.xml", get(handlers::feeds::sitemap))
         // static files
-        .merge(files)
+        .nest_service("/static", files)
         .fallback(handlers::not_found)
         .layer(middleware);
 
-- 
cgit v1.2.3