Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
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
40 changes: 38 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ members = [
"packages/asset-resolver",
"packages/depinfo",
"packages/server",
"packages/component-manifest",

# Playwright tests
"packages/playwright-tests/liveview",
Expand Down Expand Up @@ -180,6 +181,7 @@ dioxus-native = { path = "packages/native", version = "0.7.0-rc.0" }
dioxus-native-dom = { path = "packages/native-dom", version = "0.7.0-rc.0" }
dioxus-asset-resolver = { path = "packages/asset-resolver", version = "0.7.0-rc.0" }
dioxus-config-macros = { path = "packages/config-macros", version = "0.7.0-rc.0" }
dioxus-component-manifest = { path = "packages/component-manifest", version = "0.7.0-rc.0" }

generational-box = { path = "packages/generational-box", version = "0.7.0-rc.0" }
lazy-js-bundle = { path = "packages/lazy-js-bundle", version = "0.7.0-rc.0" }
Expand Down
2 changes: 1 addition & 1 deletion examples/bevy/src/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ fn app() -> Element {
use_effect(move || println!("{:?}", color().components));

rsx!(
document::Link { rel: "stylesheet", href: STYLES }
document::Stylesheet { href: STYLES }
div { id:"overlay",
h2 { "Control Panel" },
button {
Expand Down
2 changes: 2 additions & 0 deletions packages/cli/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ wasm-split-cli = { workspace = true }
depinfo = { workspace = true }
subsecond-types = { workspace = true }
dioxus-cli-telemetry = { workspace = true }
dioxus-component-manifest = { workspace = true }

clap = { workspace = true, features = ["derive", "cargo"] }
convert_case = { workspace = true }
Expand Down Expand Up @@ -78,6 +79,7 @@ dunce = { workspace = true }
dirs = { workspace = true }
reqwest = { workspace = true, features = ["rustls-tls", "trust-dns", "json"] }
tower = { workspace = true }
git2 = "0.20.2"

# path lookup
which = { version = "8.0.0" }
Expand Down
10 changes: 3 additions & 7 deletions packages/cli/src/build/builder.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
use crate::{
serve::WebServer, BuildArtifacts, BuildRequest, BuildStage, BuilderUpdate, BundleFormat,
ProgressRx, ProgressTx, Result, RustcArgs, StructuredOutput,
serve::WebServer, verbosity_or_default, BuildArtifacts, BuildRequest, BuildStage,
BuilderUpdate, BundleFormat, ProgressRx, ProgressTx, Result, RustcArgs, StructuredOutput,
};
use anyhow::{bail, Context};
use dioxus_cli_opt::process_file_to;
Expand Down Expand Up @@ -484,11 +484,7 @@ impl AppBuilder {
));
}

if crate::VERBOSITY
.get()
.map(|f| f.verbose)
.unwrap_or_default()
{
if verbosity_or_default().verbose {
envs.push(("RUST_BACKTRACE".into(), "1".to_string()));
}

Expand Down
8 changes: 4 additions & 4 deletions packages/cli/src/build/request.rs
Original file line number Diff line number Diff line change
Expand Up @@ -320,9 +320,9 @@
//! - xbuild: <https://github.com/rust-mobile/xbuild/blob/master/xbuild/src/command/build.rs>

use crate::{
AndroidTools, BuildContext, BundleFormat, DioxusConfig, Error, LinkAction, LinkerFlavor,
Renderer, Result, RustcArgs, TargetAlias, TargetArgs, TraceSrc, WasmBindgen, WasmOptConfig,
Workspace, DX_RUSTC_WRAPPER_ENV_VAR,
verbosity_or_default, AndroidTools, BuildContext, BundleFormat, DioxusConfig, Error,
LinkAction, LinkerFlavor, Renderer, Result, RustcArgs, TargetAlias, TargetArgs, TraceSrc,
WasmBindgen, WasmOptConfig, Workspace, DX_RUSTC_WRAPPER_ENV_VAR,
};
use anyhow::{bail, Context};
use cargo_metadata::diagnostic::Diagnostic;
Expand Down Expand Up @@ -2340,7 +2340,7 @@ impl BuildRequest {
cargo_args.push(self.executable_name().to_string());

// Set offline/locked/frozen
let lock_opts = crate::VERBOSITY.get().cloned().unwrap_or_default();
let lock_opts = verbosity_or_default();
if lock_opts.frozen {
cargo_args.push("--frozen".to_string());
}
Expand Down
Loading
Loading