update version to v0.2.5

README.md

@@ -74,7 +74,9 @@ Now to execute it just run `cargo run --release`.
 - rust
 - cargo
 - node
-- pnpm (other package managers support will be added soon)
+- npm/pnpm/yarn*
+
+> yarn [pnp](https://yarnpkg.com/features/pnp) is not supported yet
 
 ## Folder structure
 

crates/tuono/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "tuono"
-version = "0.2.1"
+version = "0.2.5"
 edition = "2021"
 authors = ["V. Ageno <valerioageno@yahoo.it>"]
 description = "The react/rust fullstack framework"
-homepage = "https://github.com/Valerioageno/tuono"
+repository = "https://github.com/Valerioageno/tuono"
 readme = "../../README.md"
 license-file = "../../LICENSE.md"
-categories = ["web-programming", "reactjs", "typescript", "framework", "fullstack"]
+categories = ["web-programming"]
 include = [
 		"src/*.rs",
 		"Cargo.toml"

crates/tuono/src/scaffold_project.rs

@@ -165,7 +165,7 @@ fn outro(folder_name: String) {
     }
 
     println!("\nInstall the dependencies:");
-    println!("pnpm install");
+    println!("npm install");
 
     println!("\nRun the local environment:");
     println!("tuono dev");

crates/tuono/src/source_builder.rs

@@ -73,10 +73,7 @@ async fn main() {
 
     let app = Router::new()
         // ROUTE_BUILDER
-        .fallback_service(
+        .fallback_service(ServeDir::new("/*public_dir*/").fallback(get(catch_all)))
-            ServeDir::new("public"))
-        .fallback_service(ServeDir::new("out/client")
-            .fallback(get(catch_all)))
         .with_state(fetch);
 
     let listener = tokio::net::TcpListener::bind("0.0.0.0:3000").await.unwrap();
@@ -112,6 +109,8 @@ async fn catch_all(Path(params): Path<HashMap<String, String>>, request: Request
 
 const ROOT_FOLDER: &str = "src/routes";
 const DEV_FOLDER: &str = ".tuono";
+const DEV_PUBLIC_DIR: &str = "public";
+const PROD_PUBLIC_DIR: &str = "out/client";
 
 #[derive(Debug, PartialEq, Eq)]
 struct Route {
@@ -255,6 +254,12 @@ pub fn bundle_axum_source(mode: Mode) -> io::Result<()> {
 }
 
 fn generate_axum_source(source_builder: &SourceBuilder, mode: Mode) -> String {
+    let public_dir = if mode == Mode::Prod {
+        PROD_PUBLIC_DIR
+    } else {
+        DEV_PUBLIC_DIR
+    };
+
     AXUM_ENTRY_POINT
         .replace(
             "// ROUTE_BUILDER\n",
@@ -264,6 +269,7 @@ fn generate_axum_source(source_builder: &SourceBuilder, mode: Mode) -> String {
             "// MODULE_IMPORTS\n",
             &create_modules_declaration(&source_builder.route_map),
         )
+        .replace("/*public_dir*/", public_dir)
         .replace("/*MODE*/", mode.as_str())
 }
 
@@ -404,4 +410,20 @@ mod tests {
         assert_eq!(dev, "Mode::Dev");
         assert_eq!(prod, "Mode::Prod");
     }
+
+    #[test]
+    fn should_replace_the_correct_public_folder_dev() {
+        let source_builder = SourceBuilder::new();
+        let source = generate_axum_source(&source_builder, Mode::Dev);
+
+        assert!(source.contains(r#"ServeDir::new("public")"#))
+    }
+
+    #[test]
+    fn should_replace_the_correct_public_folder_prod() {
+        let source_builder = SourceBuilder::new();
+        let source = generate_axum_source(&source_builder, Mode::Prod);
+
+        assert!(source.contains(r#"ServeDir::new("out/client")"#))
+    }
 }

crates/tuono_lib/Cargo.toml

@@ -1,13 +1,13 @@
 [package]
 name = "tuono_lib"
-version = "0.2.1"
+version = "0.2.5"
 edition = "2021"
 authors = ["V. Ageno <valerioageno@yahoo.it>"]
 description = "The react/rust fullstack framework"
-homepage = "https://github.com/Valerioageno/tuono"
+repository = "https://github.com/Valerioageno/tuono"
 readme = "../../README.md"
 license-file = "../../LICENSE.md"
-categories = ["web-programming", "reactjs", "typescript", "framework", "fullstack"]
+categories = ["web-programming"]
 include = [
 		"src/*.rs",
 		"Cargo.toml"
@@ -18,13 +18,13 @@ name = "tuono_lib"
 path = "src/lib.rs"
 
 [dependencies]
-ssr_rs = "0.5.4"
+ssr_rs = "0.5.5"
 axum = "0.7.5"
 serde = { version = "1.0.202", features = ["derive"] }
 erased-serde = "0.4.5"
 serde_json = "1.0"
 
-tuono_lib_macros = {path = "../tuono_lib_macros", version = "0.2.1"}
+tuono_lib_macros = {path = "../tuono_lib_macros", version = "0.2.5"}
 once_cell = "1.19.0"
 lazy_static = "1.5.0"
 regex = "1.10.5"

crates/tuono_lib_macros/Cargo.toml

@@ -1,12 +1,12 @@
 [package]
 name = "tuono_lib_macros"
-version = "0.2.1"
+version = "0.2.5"
 edition = "2021"
 description = "The react/rust fullstack framework"
-homepage = "https://github.com/Valerioageno/tuono"
+repository = "https://github.com/Valerioageno/tuono"
 readme = "../../README.md"
 license-file = "../../LICENSE.md"
-categories = ["web-programming", "reactjs", "typescript", "framework", "fullstack"]
+categories = ["web-programming"]
 include = [
 		"src/*.rs",
 		"Cargo.toml"

docs/tutorial.md

@@ -53,7 +53,7 @@ $ tuono new tuono-tutorial
 Get into the project folder and install the dependencies with:
 
 ```bash
-$ pnpm install
+$ npm install
 ```
 
 Open it with your favourite code editor.
@@ -283,7 +283,7 @@ Create alongside the `PokemonLink.tsx` component the CSS module `PokemonLink.mod
 }
 ```
 
-> 💡 SASS is supported out of the box. Just install the processor in the devDependencies `pnpm i -D sass` and run again `tuono dev`
+> 💡 SASS is supported out of the box. Just install the processor in the devDependencies `npm i -D sass` and run again `tuono dev`
 
 Then import the styles into the `PokemonLink` component as following:
 

packages/lazy-fn-vite-plugin/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tuono-lazy-fn-vite-plugin",
-  "version": "0.2.1",
+  "version": "0.2.5",
   "description": "Plugin for the tuono's lazy fn. Tuono is the react/rust fullstack framework",
   "scripts": {
     "dev": "vite build --watch",

packages/tuono/package.json

@@ -1,6 +1,6 @@
 {
   "name": "tuono",
-  "version": "0.2.1",
+  "version": "0.2.5",
   "description": "The react/rust fullstack framework",
   "scripts": {
     "dev": "vite build --watch",