swaits/dioxus
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

make collect-assets not optional in dioxus fullstack

Browse Source
This commit is contained in:
Evan Almloff committed 2024-01-09 13:58:28 -06:00
1 parent 48e413a4f3
commit 663296ae45
4 files changed
+3241 -4
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

examples/mobile_demo/Cargo.lock
Generated
+3240
View File
File diff suppressed because it is too large. Load diff
packages/cli/Cargo.toml
-1
View File
@@ -76,7 +76,6 @@ toml_edit = "0.19.11"
tauri-bundler = { version = "=1.4.*", features = ["native-tls-vendored"] } tauri-bundler = { version = "=1.4.*", features = ["native-tls-vendored"] }
tauri-utils = "=1.5.*" tauri-utils = "=1.5.*"
# todo: don't make this optional
manganis-cli-support = { workspace = true, features = ["webp", "html"] } manganis-cli-support = { workspace = true, features = ["webp", "html"] }
dioxus-autofmt = { workspace = true } dioxus-autofmt = { workspace = true }
packages/cli/src/cli/bundle.rs
-1
View File
@@ -136,7 +136,6 @@ impl Bundle {
} }
// Add all assets from collect assets to the bundle // Add all assets from collect assets to the bundle
#[cfg(feature = "collect-assets")]
{ {
let config = manganis_cli_support::Config::current(); let config = manganis_cli_support::Config::current();
let location = config.assets_serve_location().to_string(); let location = config.assets_serve_location().to_string();
packages/fullstack/Cargo.toml
+1 -2
View File
@@ -69,7 +69,7 @@ web-sys = { version = "0.3.61", features = ["Window", "Document", "Element", "Ht
[target.'cfg(any(target_os = "windows",target_os = "macos",target_os = "linux",target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))'.dependencies] [target.'cfg(any(target_os = "windows",target_os = "macos",target_os = "linux",target_os = "dragonfly", target_os = "freebsd", target_os = "netbsd", target_os = "openbsd"))'.dependencies]
# This is only for debug mode, and it appears mobile does not support some packages this uses # This is only for debug mode, and it appears mobile does not support some packages this uses
manganis-cli-support = { workspace = true, features = ["webp", "html"], optional = true } manganis-cli-support = { workspace = true, features = ["webp", "html"] }
[features] [features]
default = ["hot-reload"] default = ["hot-reload"]
@@ -83,4 +83,3 @@ salvo = ["dep:salvo", "ssr", "http-body-util"]
ssr = ["server_fn/ssr", "dioxus_server_macro/ssr", "tokio", "tokio-util", "tokio-stream", "dioxus-ssr", "tower", "hyper", "http", "dioxus-router?/ssr", "tower-layer", "anymap", "tracing-futures", "pin-project", "thiserror"] ssr = ["server_fn/ssr", "dioxus_server_macro/ssr", "tokio", "tokio-util", "tokio-stream", "dioxus-ssr", "tower", "hyper", "http", "dioxus-router?/ssr", "tower-layer", "anymap", "tracing-futures", "pin-project", "thiserror"]
default-tls = ["server_fn/default-tls"] default-tls = ["server_fn/default-tls"]
rustls = ["server_fn/rustls"] rustls = ["server_fn/rustls"]
collect-assets = ["manganis-cli-support"]