diff --git a/Cargo.toml b/Cargo.toml index c4e2a073f..69a854fd9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -9,7 +9,7 @@ license = "Apache-2.0" [package] name = "loco-rs" -version = "0.11.0" +version = "0.11.1" description = "The one-person framework for Rust" homepage = "https://loco.rs/" documentation = "https://docs.rs/loco-rs" diff --git a/src/cli.rs b/src/cli.rs index 550d17b64..f178d65e4 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -667,7 +667,7 @@ pub async fn main() -> crate::Result<()> { run_scheduler::(&app_context, config.as_ref(), name, tag, list).await?; } Commands::Generate { component } => { - gen::generate( + loco_gen::generate( component.into_gen_component(&config)?, &AppInfo { app_name: H::app_name().to_string(), diff --git a/starters/lightweight-service/Cargo.lock b/starters/lightweight-service/Cargo.lock index 7e2d1bfa7..52a190a24 100644 --- a/starters/lightweight-service/Cargo.lock +++ b/starters/lightweight-service/Cargo.lock @@ -431,38 +431,6 @@ version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" -[[package]] -name = "camino" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", - "thiserror", -] - [[package]] name = "cc" version = "1.1.6" @@ -489,6 +457,7 @@ dependencies = [ "iana-time-zone", "js-sys", "num-traits", + "serde", "wasm-bindgen", "windows-targets 0.52.6", ] @@ -1417,8 +1386,25 @@ dependencies = [ ] [[package]] -name = "loco-rs" +name = "loco-gen" version = "0.11.0" +dependencies = [ + "chrono", + "clap", + "dialoguer", + "duct", + "lazy_static", + "regex", + "rrgen", + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "loco-rs" +version = "0.11.1" dependencies = [ "argon2", "async-trait", @@ -1428,12 +1414,10 @@ dependencies = [ "backtrace_printer", "byte-unit", "bytes", - "cargo_metadata", "cfg-if", "chrono", "clap", "colored", - "dialoguer", "duct", "duct_sh", "english-to-cron", @@ -1445,11 +1429,12 @@ dependencies = [ "ipnetwork", "lazy_static", "lettre", + "loco-gen", "mime", "object_store", "rand", "regex", - "rrgen", + "semver", "serde", "serde_json", "serde_variant", @@ -2206,9 +2191,6 @@ name = "semver" version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" -dependencies = [ - "serde", -] [[package]] name = "serde" diff --git a/starters/lightweight-service/Cargo.toml b/starters/lightweight-service/Cargo.toml index e5ee0e1c7..3c1092c61 100644 --- a/starters/lightweight-service/Cargo.toml +++ b/starters/lightweight-service/Cargo.toml @@ -11,7 +11,7 @@ default-run = "loco_starter_template-cli" [dependencies] -loco-rs = { version = "0.11.0", default-features = false, features = ["cli"] } +loco-rs = { version = "0.11.1", default-features = false, features = ["cli"] } serde = "1" serde_json = "1" tokio = { version = "1.33.0", default-features = false, features = [ @@ -35,7 +35,7 @@ required-features = [] [dev-dependencies] serial_test = "3.1.1" rstest = "0.21.0" -loco-rs = { version = "0.11.0", default-features = false, features = [ +loco-rs = { version = "0.11.1", default-features = false, features = [ "testing", "cli", ] } diff --git a/starters/rest-api/Cargo.lock b/starters/rest-api/Cargo.lock index 6007062f0..ea3dfb416 100644 --- a/starters/rest-api/Cargo.lock +++ b/starters/rest-api/Cargo.lock @@ -763,38 +763,6 @@ version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" -[[package]] -name = "camino" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", - "thiserror", -] - [[package]] name = "cc" version = "1.1.6" @@ -2161,8 +2129,25 @@ dependencies = [ ] [[package]] -name = "loco-rs" +name = "loco-gen" version = "0.11.0" +dependencies = [ + "chrono", + "clap", + "dialoguer", + "duct", + "lazy_static", + "regex", + "rrgen", + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "loco-rs" +version = "0.11.1" dependencies = [ "argon2", "async-trait", @@ -2173,12 +2158,10 @@ dependencies = [ "bb8", "byte-unit", "bytes", - "cargo_metadata", "cfg-if", "chrono", "clap", "colored", - "dialoguer", "duct", "duct_sh", "english-to-cron", @@ -2191,15 +2174,16 @@ dependencies = [ "jsonwebtoken", "lazy_static", "lettre", + "loco-gen", "mime", "moka", "object_store", "rand", "regex", - "rrgen", "rusty-sidekiq", "sea-orm", "sea-orm-migration", + "semver", "serde", "serde_json", "serde_variant", @@ -3576,9 +3560,6 @@ name = "semver" version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" -dependencies = [ - "serde", -] [[package]] name = "serde" diff --git a/starters/rest-api/Cargo.toml b/starters/rest-api/Cargo.toml index a3ec29c8a..0d7d7737b 100644 --- a/starters/rest-api/Cargo.toml +++ b/starters/rest-api/Cargo.toml @@ -11,7 +11,7 @@ default-run = "loco_starter_template-cli" [dependencies] -loco-rs = { version = "0.11.0" } +loco-rs = { version = "0.11.1" } migration = { path = "migration" } serde = { version = "1", features = ["derive"] } @@ -46,5 +46,5 @@ required-features = [] [dev-dependencies] serial_test = "3.1.1" rstest = "0.21.0" -loco-rs = { version = "0.11.0", features = ["testing"] } +loco-rs = { version = "0.11.1", features = ["testing"] } insta = { version = "1.34.0", features = ["redactions", "yaml", "filters"] } diff --git a/starters/rest-api/migration/Cargo.toml b/starters/rest-api/migration/Cargo.toml index 839562279..d614afb42 100644 --- a/starters/rest-api/migration/Cargo.toml +++ b/starters/rest-api/migration/Cargo.toml @@ -10,7 +10,7 @@ path = "src/lib.rs" [dependencies] async-std = { version = "1", features = ["attributes", "tokio1"] } -loco-rs = { version = "0.11.0" } +loco-rs = { version = "0.11.1" } [dependencies.sea-orm-migration] version = "1.1.0" diff --git a/starters/saas/Cargo.lock b/starters/saas/Cargo.lock index 8cee134f7..54ced07df 100644 --- a/starters/saas/Cargo.lock +++ b/starters/saas/Cargo.lock @@ -769,38 +769,6 @@ version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" -[[package]] -name = "camino" -version = "1.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo-platform" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24b1f0365a6c6bb4020cd05806fd0d33c44d38046b8bd7f0e40814b9763cabfc" -dependencies = [ - "serde", -] - -[[package]] -name = "cargo_metadata" -version = "0.18.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d886547e41f740c616ae73108f6eb70afe6d940c7bc697cb30f13daec073037" -dependencies = [ - "camino", - "cargo-platform", - "semver", - "serde", - "serde_json", - "thiserror", -] - [[package]] name = "cc" version = "1.1.6" @@ -2296,8 +2264,25 @@ dependencies = [ ] [[package]] -name = "loco-rs" +name = "loco-gen" version = "0.11.0" +dependencies = [ + "chrono", + "clap", + "dialoguer", + "duct", + "lazy_static", + "regex", + "rrgen", + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] +name = "loco-rs" +version = "0.11.1" dependencies = [ "argon2", "async-trait", @@ -2308,12 +2293,10 @@ dependencies = [ "bb8", "byte-unit", "bytes", - "cargo_metadata", "cfg-if", "chrono", "clap", "colored", - "dialoguer", "duct", "duct_sh", "english-to-cron", @@ -2326,15 +2309,16 @@ dependencies = [ "jsonwebtoken", "lazy_static", "lettre", + "loco-gen", "mime", "moka", "object_store", "rand", "regex", - "rrgen", "rusty-sidekiq", "sea-orm", "sea-orm-migration", + "semver", "serde", "serde_json", "serde_variant", @@ -3740,9 +3724,6 @@ name = "semver" version = "1.0.23" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b" -dependencies = [ - "serde", -] [[package]] name = "serde" diff --git a/starters/saas/Cargo.toml b/starters/saas/Cargo.toml index 8f63be914..8778191ab 100644 --- a/starters/saas/Cargo.toml +++ b/starters/saas/Cargo.toml @@ -11,7 +11,7 @@ default-run = "loco_starter_template-cli" [dependencies] -loco-rs = { version = "0.11.0" } +loco-rs = { version = "0.11.1" } migration = { path = "migration" } serde = { version = "1", features = ["derive"] } @@ -51,5 +51,5 @@ required-features = [] [dev-dependencies] serial_test = "3.1.1" rstest = "0.21.0" -loco-rs = { version = "0.11.0", features = ["testing"] } +loco-rs = { version = "0.11.1", features = ["testing"] } insta = { version = "1.34.0", features = ["redactions", "yaml", "filters"] } diff --git a/starters/saas/migration/Cargo.toml b/starters/saas/migration/Cargo.toml index 839562279..d614afb42 100644 --- a/starters/saas/migration/Cargo.toml +++ b/starters/saas/migration/Cargo.toml @@ -10,7 +10,7 @@ path = "src/lib.rs" [dependencies] async-std = { version = "1", features = ["attributes", "tokio1"] } -loco-rs = { version = "0.11.0" } +loco-rs = { version = "0.11.1" } [dependencies.sea-orm-migration] version = "1.1.0"