disable asset patching in cargo run for mobile
This commit is contained in:
1 parent
1c58352456
commit
1a36409922
4 files changed
+74
-8
No files matched your search
@@ -38,9 +38,9 @@ futures-util = { workspace = true }
|
|||||||
urlencoding = "2.1.2"
|
urlencoding = "2.1.2"
|
||||||
async-trait = "0.1.68"
|
async-trait = "0.1.68"
|
||||||
|
|
||||||
assets-cli-support = { git = "https://github.com/DioxusLabs/collect-assets", features = ["webp", "html"] }
|
|
||||||
|
|
||||||
[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
|
||||||
|
assets-cli-support = { git = "https://github.com/DioxusLabs/collect-assets", features = ["webp", "html"] }
|
||||||
rfd = "0.11.3"
|
rfd = "0.11.3"
|
||||||
|
|
||||||
[target.'cfg(target_os = "ios")'.dependencies]
|
[target.'cfg(target_os = "ios")'.dependencies]
|
||||||
|
|||||||
@@ -1,5 +1,16 @@
|
|||||||
pub fn copy_assets() {
|
pub fn copy_assets() {
|
||||||
#[cfg(debug_assertions)]
|
#[cfg(all(
|
||||||
|
debug_assertions,
|
||||||
|
any(
|
||||||
|
target_os = "windows",
|
||||||
|
target_os = "macos",
|
||||||
|
target_os = "linux",
|
||||||
|
target_os = "dragonfly",
|
||||||
|
target_os = "freebsd",
|
||||||
|
target_os = "netbsd",
|
||||||
|
target_os = "openbsd"
|
||||||
|
)
|
||||||
|
))]
|
||||||
{
|
{
|
||||||
use assets_cli_support::AssetManifest;
|
use assets_cli_support::AssetManifest;
|
||||||
use assets_cli_support::AssetManifestExt;
|
use assets_cli_support::AssetManifestExt;
|
||||||
@@ -22,7 +33,18 @@ pub fn copy_assets() {
|
|||||||
println!("Copied assets to {}", asset_location.display());
|
println!("Copied assets to {}", asset_location.display());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#[cfg(not(debug_assertions))]
|
#[cfg(not(all(
|
||||||
|
debug_assertions,
|
||||||
|
any(
|
||||||
|
target_os = "windows",
|
||||||
|
target_os = "macos",
|
||||||
|
target_os = "linux",
|
||||||
|
target_os = "dragonfly",
|
||||||
|
target_os = "freebsd",
|
||||||
|
target_os = "netbsd",
|
||||||
|
target_os = "openbsd"
|
||||||
|
)
|
||||||
|
)))]
|
||||||
{
|
{
|
||||||
println!(
|
println!(
|
||||||
"Skipping assets in release mode. You compile assets with the dioxus-cli in release mode"
|
"Skipping assets in release mode. You compile assets with the dioxus-cli in release mode"
|
||||||
|
|||||||
@@ -74,13 +74,35 @@ pub(super) fn desktop_handler(
|
|||||||
|
|
||||||
#[allow(unused_mut)]
|
#[allow(unused_mut)]
|
||||||
let mut head = custom_head.unwrap_or_default();
|
let mut head = custom_head.unwrap_or_default();
|
||||||
#[cfg(debug_assertions)]
|
#[cfg(all(
|
||||||
|
debug_assertions,
|
||||||
|
any(
|
||||||
|
target_os = "windows",
|
||||||
|
target_os = "macos",
|
||||||
|
target_os = "linux",
|
||||||
|
target_os = "dragonfly",
|
||||||
|
target_os = "freebsd",
|
||||||
|
target_os = "netbsd",
|
||||||
|
target_os = "openbsd"
|
||||||
|
)
|
||||||
|
))]
|
||||||
{
|
{
|
||||||
use assets_cli_support::AssetManifestExt;
|
use assets_cli_support::AssetManifestExt;
|
||||||
let manifest = assets_cli_support::AssetManifest::load();
|
let manifest = assets_cli_support::AssetManifest::load();
|
||||||
head += &manifest.head();
|
head += &manifest.head();
|
||||||
}
|
}
|
||||||
#[cfg(not(debug_assertions))]
|
#[cfg(not(all(
|
||||||
|
debug_assertions,
|
||||||
|
any(
|
||||||
|
target_os = "windows",
|
||||||
|
target_os = "macos",
|
||||||
|
target_os = "linux",
|
||||||
|
target_os = "dragonfly",
|
||||||
|
target_os = "freebsd",
|
||||||
|
target_os = "netbsd",
|
||||||
|
target_os = "openbsd"
|
||||||
|
)
|
||||||
|
)))]
|
||||||
{
|
{
|
||||||
if let Some(assets_head) = assets_head {
|
if let Some(assets_head) = assets_head {
|
||||||
head += &assets_head;
|
head += &assets_head;
|
||||||
|
|||||||
@@ -19,11 +19,33 @@ pub fn build(
|
|||||||
let index_file = cfg.custom_index.clone();
|
let index_file = cfg.custom_index.clone();
|
||||||
let root_name = cfg.root_name.clone();
|
let root_name = cfg.root_name.clone();
|
||||||
let assets_head = {
|
let assets_head = {
|
||||||
#[cfg(debug_assertions)]
|
#[cfg(all(
|
||||||
|
debug_assertions,
|
||||||
|
any(
|
||||||
|
target_os = "windows",
|
||||||
|
target_os = "macos",
|
||||||
|
target_os = "linux",
|
||||||
|
target_os = "dragonfly",
|
||||||
|
target_os = "freebsd",
|
||||||
|
target_os = "netbsd",
|
||||||
|
target_os = "openbsd"
|
||||||
|
)
|
||||||
|
))]
|
||||||
{
|
{
|
||||||
None
|
None
|
||||||
}
|
}
|
||||||
#[cfg(not(debug_assertions))]
|
#[cfg(not(all(
|
||||||
|
debug_assertions,
|
||||||
|
any(
|
||||||
|
target_os = "windows",
|
||||||
|
target_os = "macos",
|
||||||
|
target_os = "linux",
|
||||||
|
target_os = "dragonfly",
|
||||||
|
target_os = "freebsd",
|
||||||
|
target_os = "netbsd",
|
||||||
|
target_os = "openbsd"
|
||||||
|
)
|
||||||
|
)))]
|
||||||
{
|
{
|
||||||
let head = crate::protocol::get_asset_root_or_default();
|
let head = crate::protocol::get_asset_root_or_default();
|
||||||
let head = head.join("dist/__assets_head.html");
|
let head = head.join("dist/__assets_head.html");
|
||||||
|
|||||||
Reference in new issue
Block a user