From 3be491baa7599527a83cf117ae530ceb4dcdfae2 Mon Sep 17 00:00:00 2001 From: Valerio Ageno <51341197+Valerioageno@users.noreply.github.com> Date: Sat, 16 Nov 2024 10:50:02 +0100 Subject: [PATCH] Fix tuono lib release (#103) * fix: removed service * feat: update version to v0.12.3 --- .github/workflows/release.yml | 1 - crates/tuono/Cargo.toml | 2 +- crates/tuono_lib/Cargo.toml | 7 ++----- crates/tuono_lib/src/lib.rs | 2 +- crates/tuono_lib/src/{services => }/logger.rs | 0 crates/tuono_lib/src/server.rs | 3 +-- crates/tuono_lib/src/services.rs | 1 - crates/tuono_lib_macros/Cargo.toml | 2 +- packages/fs-router-vite-plugin/package.json | 2 +- packages/lazy-fn-vite-plugin/package.json | 2 +- packages/router/package.json | 2 +- packages/tuono/package.json | 2 +- 12 files changed, 10 insertions(+), 16 deletions(-) rename crates/tuono_lib/src/{services => }/logger.rs (100%) delete mode 100644 crates/tuono_lib/src/services.rs diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 92b99c65..1a8fc58a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -95,4 +95,3 @@ jobs: path: './crates/tuono' registry-token: ${{ secrets.CARGO_REGISTRY_TOKEN }} check-repo: true - no-verify: true diff --git a/crates/tuono/Cargo.toml b/crates/tuono/Cargo.toml index 92cceaa8..749703bc 100644 --- a/crates/tuono/Cargo.toml +++ b/crates/tuono/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tuono" -version = "0.12.2" +version = "0.12.3" edition = "2021" authors = ["V. Ageno "] description = "The react/rust fullstack framework" diff --git a/crates/tuono_lib/Cargo.toml b/crates/tuono_lib/Cargo.toml index 413bf237..ce99b182 100644 --- a/crates/tuono_lib/Cargo.toml +++ b/crates/tuono_lib/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tuono_lib" -version = "0.12.2" +version = "0.12.3" edition = "2021" authors = ["V. Ageno "] description = "The react/rust fullstack framework" @@ -14,9 +14,6 @@ include = [ "Cargo.toml" ] -[lib] -name = "tuono_lib" -path = "src/lib.rs" [dependencies] ssr_rs = "0.7.0" @@ -33,7 +30,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.2"} +tuono_lib_macros = {path = "../tuono_lib_macros", version = "0.12.3"} # Match the same version used by axum tokio-tungstenite = "0.24.0" futures-util = { version = "0.3", default-features = false, features = ["sink", "std"] } diff --git a/crates/tuono_lib/src/lib.rs b/crates/tuono_lib/src/lib.rs index 6dc388cb..1f8e19f0 100644 --- a/crates/tuono_lib/src/lib.rs +++ b/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; diff --git a/crates/tuono_lib/src/services/logger.rs b/crates/tuono_lib/src/logger.rs similarity index 100% rename from crates/tuono_lib/src/services/logger.rs rename to crates/tuono_lib/src/logger.rs diff --git a/crates/tuono_lib/src/server.rs b/crates/tuono_lib/src/server.rs index 1928c67a..6a4b19aa 100644 --- a/crates/tuono_lib/src/server.rs +++ b/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, }; diff --git a/crates/tuono_lib/src/services.rs b/crates/tuono_lib/src/services.rs deleted file mode 100644 index d9917284..00000000 --- a/crates/tuono_lib/src/services.rs +++ /dev/null @@ -1 +0,0 @@ -pub mod logger; diff --git a/crates/tuono_lib_macros/Cargo.toml b/crates/tuono_lib_macros/Cargo.toml index 81163cfb..565a01e8 100644 --- a/crates/tuono_lib_macros/Cargo.toml +++ b/crates/tuono_lib_macros/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tuono_lib_macros" -version = "0.12.2" +version = "0.12.3" edition = "2021" description = "The react/rust fullstack framework" keywords = [ "react", "typescript", "fullstack", "web", "ssr"] diff --git a/packages/fs-router-vite-plugin/package.json b/packages/fs-router-vite-plugin/package.json index fa10bba1..b4c24c73 100644 --- a/packages/fs-router-vite-plugin/package.json +++ b/packages/fs-router-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "tuono-fs-router-vite-plugin", - "version": "0.12.2", + "version": "0.12.3", "description": "Plugin for the tuono's file system router. Tuono is the react/rust fullstack framework", "scripts": { "dev": "vite build --watch", diff --git a/packages/lazy-fn-vite-plugin/package.json b/packages/lazy-fn-vite-plugin/package.json index 8ac6561c..dad62a3a 100644 --- a/packages/lazy-fn-vite-plugin/package.json +++ b/packages/lazy-fn-vite-plugin/package.json @@ -1,6 +1,6 @@ { "name": "tuono-lazy-fn-vite-plugin", - "version": "0.12.2", + "version": "0.12.3", "description": "Plugin for the tuono's lazy fn. Tuono is the react/rust fullstack framework", "scripts": { "dev": "vite build --watch", diff --git a/packages/router/package.json b/packages/router/package.json index 2c8c5e92..0c764d6f 100644 --- a/packages/router/package.json +++ b/packages/router/package.json @@ -1,6 +1,6 @@ { "name": "tuono-router", - "version": "0.12.2", + "version": "0.12.3", "description": "React routing component for the framework tuono. Tuono is the react/rust fullstack framework", "scripts": { "dev": "vite build --watch", diff --git a/packages/tuono/package.json b/packages/tuono/package.json index f0392268..f0bcc5fb 100644 --- a/packages/tuono/package.json +++ b/packages/tuono/package.json @@ -1,6 +1,6 @@ { "name": "tuono", - "version": "0.12.2", + "version": "0.12.3", "description": "The react/rust fullstack framework", "scripts": { "dev": "vite build --watch",