feat: update version to v0.12.4

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/actions/install-node-dependencies/action.yml

@@ -0,0 +1,37 @@
+name: Install NodeJS Dependencies
+description: This is a composite GitHub Action that sets up pnpm, node and installs the project's dependencies.
+
+inputs:
+  node-version:
+    description: 'Explicit node version. Otherwise fallback reading `.nvmrc`. Use in conjunction with matrix'
+    required: false
+  registry-url:
+    description: 'https://github.com/actions/setup-node?tab=readme-ov-file#usage'
+    required: false
+    default: ''
+
+runs:
+  using: composite
+  steps:
+    - name: Install pnpm
+      uses: pnpm/action-setup@v4
+
+    - name: Setup Node.js (via input)
+      if: ${{ inputs.node-version }}
+      uses: actions/setup-node@v4
+      with:
+        node-version: ${{ inputs.node-version }}
+        registry-url: ${{ inputs.registry-url }}
+        cache: 'pnpm'
+
+    - name: Setup Node.js (via .nvmrc)
+      if: ${{ !inputs.node-version }}
+      uses: actions/setup-node@v4
+      with:
+        node-version-file: '.nvmrc'
+        registry-url: ${{ inputs.registry-url }}
+        cache: 'pnpm'
+
+    - name: Install Dependencies
+      shell: bash
+      run: pnpm install --frozen-lockfile

.github/workflows/ci-documentation.yml

@@ -13,31 +13,22 @@ on:
 jobs:
   build:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+    name: Check build
     timeout-minutes: 15
     runs-on: ubuntu-latest
 
     steps:
-      - name: Check out code
+      - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
 
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
+      - name: Install NodeJS Dependencies
+        uses: ./.github/actions/install-node-dependencies
 
       - name: Setup rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
 
       - name: Install tuono
-        run: cargo install tuono@0.10.4
-
-      - name: Install pnpm
-        run: npm i -g pnpm
-
-      - name: Install dependencies
-        run: pnpm install
+        run: cargo install tuono@0.12.3
 
       - name: Build project
         working-directory: ./apps/documentation
@@ -45,20 +36,16 @@ jobs:
 
   fmt-lint-and-types:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+    name: Check format and lint
     runs-on: ubuntu-latest
     timeout-minutes: 15
 
     steps:
-      - name: Check out code
+      - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
 
-      - name: Install pnpm
-        run: npm i -g pnpm
-
-      - name: Install dependencies
-        run: pnpm install
+      - name: Install NodeJS Dependencies
+        uses: ./.github/actions/install-node-dependencies
 
       - name: Check formatting
         run: pnpm docs:format:check

.github/workflows/deploy-documentation.yml

@@ -15,27 +15,17 @@ jobs:
       AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
       AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
     steps:
-      - name: Check out code
+      - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
 
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
+      - name: Install NodeJS Dependencies
+        uses: ./.github/actions/install-node-dependencies
 
       - name: Setup rust
         uses: actions-rust-lang/setup-rust-toolchain@v1
 
       - name: Install tuono
-        run: cargo install tuono@0.10.4
-
-      - name: Install pnpm
-        run: npm i -g pnpm
-
-      - name: Install dependencies
-        run: pnpm install
+        run: cargo install tuono@0.12.3
 
       - name: Build project
         working-directory: ./apps/documentation

.github/workflows/release.yml

@@ -7,42 +7,35 @@ jobs:
   publish-on-npm-dry-run:
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Install Node.js
-        uses: actions/setup-node@v4
+      - name: Install NodeJS Dependencies
+        uses: ./.github/actions/install-node-dependencies
         with:
-          node-version: 20
           registry-url: 'https://registry.npmjs.org'
 
-      - uses: pnpm/action-setup@v3
-        name: Install pnpm
-        with:
-          version: 8
-          run_install: false
-
-      - name: Install dependencies
-        run: pnpm install 
-
       - name: Build
         run: pnpm build
 
       - name: Publish
-        run: pnpm publish -r --no-git-checks --dry-run 
+        run: pnpm publish -r --no-git-checks --dry-run
         env:
           NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}
 
   publish-on-crates-dry-run:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions-rs/toolchain@v1
-      with:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - uses: actions-rs/toolchain@v1
+        with:
           toolchain: stable
           override: true
-    - uses: katyo/publish-crates@v2
-      with:
+
+      - uses: katyo/publish-crates@v2
+        with:
           path: './crates/tuono'
           dry-run: true
           registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}
@@ -52,27 +45,17 @@ jobs:
     needs: [publish-on-crates-dry-run, publish-on-npm-dry-run]
     runs-on: ubuntu-latest
     steps:
-      - name: Checkout
+      - name: Checkout code
         uses: actions/checkout@v4
 
-      - name: Install Node.js
-        uses: actions/setup-node@v4
+      - name: Install NodeJS Dependencies
+        uses: ./.github/actions/install-node-dependencies
         with:
-          node-version: 20
           registry-url: 'https://registry.npmjs.org'
 
-      - uses: pnpm/action-setup@v3
-        name: Install pnpm
-        with:
-          version: 8
-          run_install: false
-
       - name: Clone root README.md on tuono package
         run: cp README.md packages/tuono/README.md
 
-      - name: Install dependencies
-        run: pnpm install 
-
       - name: Build
         run: pnpm build
 
@@ -85,13 +68,16 @@ jobs:
     needs: [publish-on-crates-dry-run, publish-on-npm-dry-run]
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v4
-    - uses: actions-rs/toolchain@v1
-      with:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - uses: actions-rs/toolchain@v1
+        with:
           toolchain: stable
           override: true
-    - uses: katyo/publish-crates@v2
-      with:
+
+      - uses: katyo/publish-crates@v2
+        with:
           path: './crates/tuono'
           registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }}
           check-repo: true

.github/workflows/rust.yml

@@ -10,16 +10,19 @@ on:
       - '.github/**'
       - 'crates/**'
 
-env: 
+env:
   CARGO_TERM_COLOR: always
 
 jobs:
   lint_and_fmt:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+    name: Check format and lint rust crates
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
+
       - run: cargo fmt --all -- --check
       - run: cargo clippy -- -D warnings
 
@@ -34,7 +37,9 @@ jobs:
           - beta
           - nightly
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
+
       - run: rustup update ${{ matrix.toolchain }} && rustup default ${{ matrix.toolchain }}
       - run: cargo build --verbose
       - run: cargo test --verbose

.github/workflows/spell-checking.yml

@@ -7,7 +7,9 @@ jobs:
     name: runner / LanguageTools
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - name: Checkout code
+        uses: actions/checkout@v4
+
       - uses: reviewdog/action-languagetool@v1
         with:
           github_token: ${{ secrets.REVIEWDOG_TOKEN }}

.github/workflows/typescript.yml

@@ -13,25 +13,16 @@ on:
 jobs:
   build-and-test:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+    name: Check build and test
     timeout-minutes: 15
     runs-on: ubuntu-latest
 
     steps:
-      - name: Check out code
+      - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
 
-      - name: Setup Node.js environment
-        uses: actions/setup-node@v4
-        with:
-          node-version: 20
-
-      - name: Install pnpm
-        run: npm i -g pnpm
-
-      - name: Install dependencies
-        run: pnpm install
+      - name: Install NodeJS Dependencies
+        uses: ./.github/actions/install-node-dependencies
 
       - name: Build project
         run: pnpm build
@@ -41,20 +32,16 @@ jobs:
 
   fmt-lint-and-types:
     if: github.event_name != 'pull_request' || github.event.pull_request.head.repo.full_name != github.event.pull_request.base.repo.full_name
+    name: Check format and lint
     runs-on: ubuntu-latest
     timeout-minutes: 15
 
     steps:
-      - name: Check out code
+      - name: Checkout code
         uses: actions/checkout@v4
-        with:
-          fetch-depth: 2
 
-      - name: Install pnpm
-        run: npm i -g pnpm
-
-      - name: Install dependencies
-        run: pnpm install
+      - name: Install NodeJS Dependencies
+        uses: ./.github/actions/install-node-dependencies
 
       - name: Check formatting
         run: pnpm format:check

.gitignore

@@ -1,12 +1,12 @@
+## Node related ignores
+
 node_modules/
 dist/
 .turbo/
 
 */**/routeTree.gen.ts
 
-pnpm-lock.yaml
-
-examples/playground/
+examples/*/pnpm-lock.yaml
 
 ## Rust related ignores
 

apps/documentation/Cargo.toml

@@ -8,7 +8,7 @@ name = "tuono"
 path = ".tuono/main.rs"
 
 [dependencies]
-tuono_lib = "0.12.0"
+tuono_lib = "0.12.3"
 glob = "0.3.1"
 time = { version = "0.3", features = ["macros"] }
 serde = { version = "1.0.202", features = ["derive"] }

apps/documentation/package.json

@@ -18,7 +18,7 @@
     "clsx": "^2.1.1",
     "react": "18.3.1",
     "react-dom": "18.3.1",
-    "tuono": "npm:tuono@0.12.0"
+    "tuono": "npm:tuono@0.12.3"
   },
   "devDependencies": {
     "@types/mdx": "^2.0.13",

crates/tuono/Cargo.toml

@@ -1,9 +1,10 @@
 [package]
 name = "tuono"
-version = "0.12.1"
+version = "0.12.4"
 edition = "2021"
 authors = ["V. Ageno <valerioageno@yahoo.it>"]
-description = "The react/rust fullstack framework"
+description = "Superfast React fullstack framework"
+homepage = "https://tuono.dev"
 keywords = [ "react", "typescript", "fullstack", "web", "ssr"]
 repository = "https://github.com/Valerioageno/tuono"
 readme = "../../README.md"

crates/tuono/src/app.rs

@@ -119,6 +119,8 @@ mod tests {
             "/home/user/Documents/tuono/src/routes/index.rs",
             "/home/user/Documents/tuono/src/routes/posts/index.rs",
             "/home/user/Documents/tuono/src/routes/posts/[post].rs",
+            "/home/user/Documents/tuono/src/routes/posts/handle-this.rs",
+            "/home/user/Documents/tuono/src/routes/posts/handle-this/[post].rs",
             "/home/user/Documents/tuono/src/routes/posts/UPPERCASE.rs",
             "/home/user/Documents/tuono/src/routes/sitemap.xml.rs",
         ];
@@ -132,6 +134,11 @@ mod tests {
             ("/about", "about"),
             ("/posts/index", "posts_index"),
             ("/posts/[post]", "posts_dyn_post"),
+            ("/posts/handle-this", "posts_handle_hyphen_this"),
+            (
+                "/posts/handle-this/[post]",
+                "posts_handle_hyphen_this_dyn_post",
+            ),
             ("/posts/UPPERCASE", "posts_uppercase"),
             ("/sitemap.xml", "sitemap_dot_xml"),
         ];

crates/tuono/src/route.rs

@@ -32,6 +32,7 @@ impl AxumInfo {
             .to_string()
             .replace('/', "_")
             .replace('.', "_dot_")
+            .replace('-', "_hyphen_")
             .to_lowercase();
 
         if axum_route.is_empty() {
@@ -47,6 +48,7 @@ impl AxumInfo {
                     .as_str()
                     .to_string()
                     .replace('/', "_")
+                    .replace('-', "_hyphen_")
                     .replace('[', "dyn_")
                     .replace(']', ""),
                 axum_route: axum_route.replace('[', ":").replace(']', ""),

crates/tuono_lib/Cargo.toml

@@ -1,9 +1,10 @@
 [package]
 name = "tuono_lib"
-version = "0.12.1"
+version = "0.12.4"
 edition = "2021"
 authors = ["V. Ageno <valerioageno@yahoo.it>"]
-description = "The react/rust fullstack framework"
+description = "Superfast React fullstack framework"
+homepage = "https://tuono.dev"
 keywords = [ "react", "typescript", "fullstack", "web", "ssr"]
 repository = "https://github.com/Valerioageno/tuono"
 readme = "../../README.md"
@@ -14,9 +15,6 @@ include = [
 		"Cargo.toml"
 ]
 
-[lib]
-name = "tuono_lib"
-path = "src/lib.rs"
 
 [dependencies]
 ssr_rs = "0.7.0"
@@ -33,7 +31,7 @@ either = "1.13.0"
 tower-http = {version = "0.6.0", features = ["fs"]}
 colored = "2.1.0"
 
-tuono_lib_macros = {path = "../tuono_lib_macros", version = "0.12.1"}
+tuono_lib_macros = {path = "../tuono_lib_macros", version = "0.12.4"}
 # Match the same version used by axum
 tokio-tungstenite = "0.24.0"
 futures-util = { version = "0.3", default-features = false, features = ["sink", "std"] }

crates/tuono_lib/src/lib.rs

@@ -1,11 +1,11 @@
 mod catch_all;
+mod logger;
 mod manifest;
 mod mode;
 mod payload;
 mod request;
 mod response;
 mod server;
-mod services;
 mod ssr;
 mod vite_reverse_proxy;
 mod vite_websocket_proxy;

crates/tuono_lib/src/server.rs

@@ -1,13 +1,12 @@
 use crate::manifest::load_manifest;
 use crate::mode::{Mode, GLOBAL_MODE};
-use crate::services::logger::LoggerLayer;
 use axum::routing::{get, Router};
 use colored::Colorize;
 use ssr_rs::Ssr;
 use tower_http::services::ServeDir;
 
 use crate::{
-    catch_all::catch_all, vite_reverse_proxy::vite_reverse_proxy,
+    catch_all::catch_all, logger::LoggerLayer, vite_reverse_proxy::vite_reverse_proxy,
     vite_websocket_proxy::vite_websocket_proxy,
 };
 

crates/tuono_lib/src/services.rs

@@ -1 +0,0 @@
-pub mod logger;

crates/tuono_lib_macros/Cargo.toml

@@ -1,8 +1,9 @@
 [package]
 name = "tuono_lib_macros"
-version = "0.12.1"
+version = "0.12.4"
 edition = "2021"
-description = "The react/rust fullstack framework"
+description = "Superfast React fullstack framework"
+homepage = "https://tuono.dev"
 keywords = [ "react", "typescript", "fullstack", "web", "ssr"]
 repository = "https://github.com/Valerioageno/tuono"
 readme = "../../README.md"

packages/fs-router-vite-plugin/package.json

@@ -1,7 +1,8 @@
 {
   "name": "tuono-fs-router-vite-plugin",
-  "version": "0.12.1",
+  "version": "0.12.4",
   "description": "Plugin for the tuono's file system router. Tuono is the react/rust fullstack framework",
+  "homepage": "https://tuono.dev",
   "scripts": {
     "dev": "vite build --watch",
     "build": "vite build",

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

@@ -1,7 +1,8 @@
 {
   "name": "tuono-lazy-fn-vite-plugin",
-  "version": "0.12.1",
+  "version": "0.12.4",
   "description": "Plugin for the tuono's lazy fn. Tuono is the react/rust fullstack framework",
+  "homepage": "https://tuono.dev",
   "scripts": {
     "dev": "vite build --watch",
     "build": "vite build",

packages/router/package.json

@@ -1,7 +1,8 @@
 {
   "name": "tuono-router",
-  "version": "0.12.1",
+  "version": "0.12.4",
   "description": "React routing component for the framework tuono. Tuono is the react/rust fullstack framework",
+  "homepage": "https://tuono.dev",
   "scripts": {
     "dev": "vite build --watch",
     "build": "vite build",

packages/tuono/package.json

@@ -1,7 +1,8 @@
 {
   "name": "tuono",
-  "version": "0.12.1",
-  "description": "The react/rust fullstack framework",
+  "version": "0.12.4",
+  "description": "Superfast React fullstack framework",
+  "homepage": "https://tuono.dev",
   "scripts": {
     "dev": "vite build --watch",
     "build": "vite build",