Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump the dioxus-cli to 0.4.1 #1424

Merged
merged 4 commits into from
Sep 4, 2023
Merged

Bump the dioxus-cli to 0.4.1 #1424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e63c09
bump the dioxus-cli version
ealmloff Sep 3, 2023
dd2bad1
bump DIOXUS_CLI_VERSION constant
ealmloff Sep 4, 2023
fb45e08
Merge branch 'master' into bump-cli
ealmloff Sep 4, 2023
f3210ee
Merge branch 'master' into bump-cli
ealmloff Sep 4, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions packages/cli/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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"
Expand Down Expand Up @@ -77,7 +77,7 @@ cargo-generate = "0.18"
toml_edit = "0.19.11"

# bundling
tauri-bundler = { version = "1.3.0", features = ["native-tls-vendored"] }
tauri-bundler = { version = "=1.3.0", features = ["native-tls-vendored"] }
tauri-utils = "=1.4.*"

dioxus-autofmt = { workspace = true }
Expand Down
3 changes: 2 additions & 1 deletion packages/cli/src/builder.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ pub struct BuildResult {
pub elapsed_time: u128,
}

pub fn build(config: &CrateConfig) -> Result<BuildResult> {
#[allow(unused)]
pub fn build(config: &CrateConfig, quiet: bool) -> Result<BuildResult> {
// [1] Build the project with cargo, generating a wasm32-unknown-unknown target (is there a more specific, better target to leverage?)
// [2] Generate the appropriate build folders
// [3] Wasm-bindgen the .wasm fiile, and move it into the {builddir}/modules/xxxx/xxxx_bg.wasm
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/cli/build.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ impl Build {

match platform {
Platform::Web => {
crate::builder::build(&crate_config)?;
crate::builder::build(&crate_config, true)?;
}
Platform::Desktop => {
crate::builder::build_desktop(&crate_config, false)?;
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down
6 changes: 3 additions & 3 deletions packages/cli/src/server/web/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ pub async fn serve_default(
config: CrateConfig,
start_browser: bool,
) -> Result<()> {
let first_build_result = crate::builder::build(&config)?;
let first_build_result = crate::builder::build(&config, true)?;

log::info!("🚀 Starting development server...");

Expand Down Expand Up @@ -134,7 +134,7 @@ pub async fn serve_hot_reload(
config: CrateConfig,
start_browser: bool,
) -> Result<()> {
let first_build_result = crate::builder::build(&config)?;
let first_build_result = crate::builder::build(&config, true)?;

log::info!("🚀 Starting development server...");

Expand Down Expand Up @@ -474,7 +474,7 @@ async fn ws_handler(
}

fn build(config: &CrateConfig, reload_tx: &Sender<()>) -> Result<BuildResult> {
let result = builder::build(config)?;
let result = builder::build(config, true)?;
// change the websocket reload state to true;
// the page will auto-reload.
if config
Expand Down