Merge branch 'master' into intigrate-collect-assets

This commit is contained in:
Evan Almloff committed 2023-09-05 13:45:37 -05:00
commit ffb5de91d1
5 files changed
+17 -8

No files matched your search

+3 -3
View File
@@ -1,6 +1,6 @@
[package]
name = "dioxus-cli"
version = { workspace = true }
version = "0.4.1"
authors = ["Jonathan Kelley"]
edition = "2021"
description = "CLI tool for developing, testing, and publishing Dioxus apps"
@@ -77,8 +77,8 @@ cargo-generate = "0.18"
toml_edit = "0.19.11"
# bundling
tauri-bundler = { version = "1.2", features = ["native-tls-vendored"] }
tauri-utils = "1.3"
tauri-bundler = { version = "=1.3.0", features = ["native-tls-vendored"] }
tauri-utils = "=1.4.*"
manganis-cli-support= { git = "https://github.com/DioxusLabs/collect-assets", features = ["webp", "html"] }
+1 -1
View File
@@ -1,4 +1,4 @@
pub const DIOXUS_CLI_VERSION: &str = "0.1.5";
pub const DIOXUS_CLI_VERSION: &str = "0.4.1";
pub mod builder;
pub mod server;