tweedegolf · marlonbaeten · Nov 11, 2024 · Oct 8, 2024 · Oct 8, 2024 · Oct 10, 2024
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -7,6 +7,7 @@ on:
 
 env:
   CARGO_TERM_COLOR: always
+  ASSET_DIR: ../static
 
 jobs:
   format:

diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace]
-members = ["memory-serve", "memory-serve-macros", "examples/test"]
+members = ["memory-serve", "examples/test"]
 resolver = "2"
 
 [workspace.package]

diff --git a/README.md b/README.md
@@ -34,7 +34,7 @@ memory-serve is designed to work with [axum](https://github.com/tokio-rs/axum)
 ## Usage
 
 Provide a relative path to the directory containing your static assets
-to the [`load_assets!`] macro. This macro creates a data structure intended to
+using the `ASSET_PATH` environment variable. This macro creates a data structure intended to
 be consumed by [`MemoryServe::new`]. Calling [`MemoryServe::into_router()`] on
 the resulting instance produces a axum
-Provide a relative path to the directory containing your static assets
-to the [`load_assets!`] macro. This macro creates a data structure intended to
-using the `ASSET_PATH` environment variable. This macro creates a data structure intended to
-be consumed by [`MemoryServe::new`]. Calling [`MemoryServe::into_router()`] on
-the resulting instance produces a axum
+Provide a relative path to the directory containing your static assets
+using the `ASSET_PATH` environment variable. This path will be used in a build script and any changes to files in that path or the variable itself will trigger a rerun and will load fresh assets. The output of the build script is consumed by [`MemoryServe::new`]. Calling [`MemoryServe::into_router()`] on
+the resulting instance produces a axum
-Provide a relative path to the directory containing your static assets
-to the [`load_assets!`] macro. This macro creates a data structure intended to
-using the `ASSET_PATH` environment variable. This macro creates a data structure intended to
-be consumed by [`MemoryServe::new`]. Calling [`MemoryServe::into_router()`] on
-the resulting instance produces a axum
+Provide a relative path to the directory containing your static assets
+using the `ASSET_PATH` environment variable. This path will be used in a build script and any changes to files in that path or the variable itself will trigger a rerun and will load fresh assets. The output of the build script is consumed by [`MemoryServe::new`]. Calling [`MemoryServe::into_router()`] on
+the resulting instance produces a axum
 [`Router`](https://docs.rs/axum/latest/axum/routing/struct.Router.html) that
@@ -45,12 +45,12 @@ calling [`Router::into_make_service()`](https://docs.rs/axum/latest/axum/routing
 
 ```rust,no_run
 use axum::{response::Html, routing::get, Router};
-use memory_serve::{load_assets, MemoryServe};
+use memory_serve::MemoryServe;
 use std::net::SocketAddr;
 
 #[tokio::main]
 async fn main() {
-    let memory_router = MemoryServe::new(load_assets!("static"))
+    let memory_router = MemoryServe::new()
         .index_file(Some("/index.html"))
         .into_router();
 

diff --git a/examples/test/src/main.rs b/examples/test/src/main.rs
@@ -1,13 +1,15 @@
 use axum::{response::Html, routing::get, Router};
-use memory_serve::{load_assets, MemoryServe};
+use memory_serve::MemoryServe;
 use std::net::SocketAddr;
-use tracing::info;
+use tracing::{info, Level};
 
 #[tokio::main]
 async fn main() {
-    tracing_subscriber::fmt().init();
+    tracing_subscriber::fmt()
+        .with_max_level(Level::TRACE)
+        .init();
 
-    let memory_router = MemoryServe::new(load_assets!("../../static"))
+    let memory_router = MemoryServe::new()
         .index_file(Some("/index.html"))
         .into_router();
 

diff --git a/memory-serve-macros/Cargo.toml b/memory-serve-macros/Cargo.toml
diff --git a/memory-serve-macros/README.md b/memory-serve-macros/README.md
diff --git a/memory-serve-macros/src/asset.rs b/memory-serve-macros/src/asset.rs
diff --git a/memory-serve-macros/src/lib.rs b/memory-serve-macros/src/lib.rs
diff --git a/memory-serve-macros/src/utils.rs b/memory-serve-macros/src/utils.rs
diff --git a/memory-serve/Cargo.toml b/memory-serve/Cargo.toml
@@ -8,14 +8,19 @@ publish.workspace = true
 description.workspace = true
 
 [dependencies]
-brotli = "6.0"
+brotli = "7.0"
 flate2 = "1.0"
 axum = { version = "0.7", default-features = false }
-memory-serve-macros = { version = "0.6", path = "../memory-serve-macros" }
 tracing = "0.1"
 sha256 = "1.4"
 
+[build-dependencies]
+sha256 = "1.4"
+brotli = "7.0"
+mime_guess = "2.0"
+walkdir = "2"
+
 [dev-dependencies]
 tokio = { version = "1", features = ["full"] }
-tower = "0.4"
+tower = { version = "0.5", features = ["util"] }
 axum = { version = "0.7" }