diff --git a/Cargo.lock b/Cargo.lock index bf7afb2dc..090795e05 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -64,7 +64,7 @@ version = "0.7.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5a824f2aa7e75a0c98c5a504fceb80649e9c35265d44525b5f94de4771a395cd" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "once_cell", "version_check", ] @@ -77,7 +77,7 @@ checksum = "77c3a9648d43b9cd48db467b3f87fdd6e146bcc88ab0180006cef2179fe11d01" dependencies = [ "cfg-if", "const-random", - "getrandom 0.2.11", + "getrandom 0.2.12", "once_cell", "version_check", "zerocopy", @@ -381,7 +381,7 @@ version = "1.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "17ae5ebefcc48e7452b4987947920dac9450be1110cadf34d1b8c116bdbaf97c" dependencies = [ - "async-lock 3.2.0", + "async-lock 3.3.0", "async-task", "concurrent-queue", "fastrand 2.0.1", @@ -427,7 +427,7 @@ version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6afaa937395a620e33dc6a742c593c01aced20aa376ffb0f628121198578ccc7" dependencies = [ - "async-lock 3.2.0", + "async-lock 3.3.0", "cfg-if", "concurrent-queue", "futures-io", @@ -451,9 +451,9 @@ dependencies = [ [[package]] name = "async-lock" -version = "3.2.0" +version = "3.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7125e42787d53db9dd54261812ef17e937c95a51e4d291373b670342fa44310c" +checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b" dependencies = [ "event-listener 4.0.3", "event-listener-strategy", @@ -1085,7 +1085,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118" dependencies = [ "async-channel 2.1.1", - "async-lock 3.2.0", + "async-lock 3.3.0", "async-task", "fastrand 2.0.1", "futures-io", @@ -1659,15 +1659,15 @@ dependencies = [ [[package]] name = "console" -version = "0.15.7" +version = "0.15.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8" +checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb" dependencies = [ "encode_unicode", "lazy_static", "libc", "unicode-width", - "windows-sys 0.45.0", + "windows-sys 0.52.0", ] [[package]] @@ -1701,7 +1701,7 @@ version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "once_cell", "tiny-keccak", ] @@ -2592,7 +2592,6 @@ dependencies = [ "futures-util", "global-hotkey", "infer 0.11.0", - "manganis-cli-support", "minify-js", "muda", "objc", @@ -2672,7 +2671,6 @@ dependencies = [ "http 0.2.11", "http-body-util", "hyper 0.14.28", - "manganis-cli-support", "once_cell", "pin-project", "salvo", @@ -4024,9 +4022,9 @@ dependencies = [ [[package]] name = "getrandom" -version = "0.2.11" +version = "0.2.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fe9006bed769170c11f845cf00c7c1e9092aeb3f268e007c3e760ac68008070f" +checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", "js-sys", @@ -4723,9 +4721,9 @@ dependencies = [ [[package]] name = "h2" -version = "0.3.22" +version = "0.3.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4d6250322ef6e60f93f9a2162799302cd6f68f79f6e5d85c8c16f14d1d958178" +checksum = "b553656127a00601c8ae5590fcfdc118e4083a7924b6cf4ffc1ea4b99dc429d7" dependencies = [ "bytes", "fnv", @@ -5076,7 +5074,7 @@ dependencies = [ "futures-channel", "futures-core", "futures-util", - "h2 0.3.22", + "h2 0.3.23", "http 0.2.11", "http-body 0.4.6", "httparse", @@ -5880,9 +5878,9 @@ dependencies = [ [[package]] name = "libz-sys" -version = "1.1.13" +version = "1.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5f526fdd09d99e19742883e43de41e1aa9e36db0c7ab7f935165d611c5cccc66" +checksum = "295c17e837573c8c821dbaeb3cceb3d745ad082f7572191409e69cbc1b3fd050" dependencies = [ "cc", "libc", @@ -6136,7 +6134,7 @@ dependencies = [ [[package]] name = "manganis" version = "0.1.0" -source = "git+https://github.com/DioxusLabs/collect-assets?rev=94ea6f7#94ea6f728b3d135b5160f2c119c6e797049e4b2c" +source = "git+https://github.com/DioxusLabs/collect-assets?rev=e0093a4#e0093a47f0fa3bb50c49cd21aee5aa674faa24ad" dependencies = [ "manganis-macro", ] @@ -6144,7 +6142,7 @@ dependencies = [ [[package]] name = "manganis-cli-support" version = "0.1.0" -source = "git+https://github.com/DioxusLabs/collect-assets?rev=94ea6f7#94ea6f728b3d135b5160f2c119c6e797049e4b2c" +source = "git+https://github.com/DioxusLabs/collect-assets?rev=e0093a4#e0093a47f0fa3bb50c49cd21aee5aa674faa24ad" dependencies = [ "anyhow", "cargo-lock 9.0.0", @@ -6170,7 +6168,7 @@ dependencies = [ [[package]] name = "manganis-common" version = "0.1.0" -source = "git+https://github.com/DioxusLabs/collect-assets?rev=94ea6f7#94ea6f728b3d135b5160f2c119c6e797049e4b2c" +source = "git+https://github.com/DioxusLabs/collect-assets?rev=e0093a4#e0093a47f0fa3bb50c49cd21aee5aa674faa24ad" dependencies = [ "anyhow", "base64 0.21.6", @@ -6185,7 +6183,7 @@ dependencies = [ [[package]] name = "manganis-macro" version = "0.0.1" -source = "git+https://github.com/DioxusLabs/collect-assets?rev=94ea6f7#94ea6f728b3d135b5160f2c119c6e797049e4b2c" +source = "git+https://github.com/DioxusLabs/collect-assets?rev=e0093a4#e0093a47f0fa3bb50c49cd21aee5aa674faa24ad" dependencies = [ "base64 0.21.6", "manganis-cli-support", @@ -6822,7 +6820,7 @@ checksum = "c38841cdd844847e3e7c8d29cef9dcfed8877f8f56f9071f77843ecf3baf937f" dependencies = [ "base64 0.13.1", "chrono", - "getrandom 0.2.11", + "getrandom 0.2.12", "http 0.2.11", "rand 0.8.5", "reqwest", @@ -8014,7 +8012,7 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", ] [[package]] @@ -8102,9 +8100,9 @@ dependencies = [ [[package]] name = "rav1e" -version = "0.7.0" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5eb0e0ea87a360ae76a935bd99cd5940006d8e13811e3d1a6994a93823eab5b1" +checksum = "cd87ce80a7665b1cce111f8a16c1f3929f6547ce91ade6addf4ec86a8dda5ce9" dependencies = [ "arbitrary 1.3.2", "arg_enum_proc_macro", @@ -8130,7 +8128,6 @@ dependencies = [ "profiling", "rand 0.8.5", "rand_chacha 0.3.1", - "rustc_version", "simd_helpers", "system-deps", "thiserror", @@ -8148,7 +8145,7 @@ dependencies = [ "loop9", "quick-error 2.0.1", "rav1e 0.6.6", - "rav1e 0.7.0", + "rav1e 0.7.1", "rayon", "rgb", ] @@ -8200,7 +8197,7 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "libredox", "thiserror", ] @@ -8305,7 +8302,7 @@ dependencies = [ "encoding_rs", "futures-core", "futures-util", - "h2 0.3.22", + "h2 0.3.23", "http 0.2.11", "http-body 0.4.6", "hyper 0.14.28", @@ -8441,7 +8438,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "688c63d65483050968b2a8937f7995f443e27041a0f7700aa59b0822aedebb74" dependencies = [ "cc", - "getrandom 0.2.11", + "getrandom 0.2.12", "libc", "spin 0.9.8", "untrusted 0.9.0", @@ -10327,9 +10324,9 @@ dependencies = [ [[package]] name = "termcolor" -version = "1.4.0" +version = "1.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff1bc3d3f05aff0403e8ac0d92ced918ec05b666a43f83297ccef5bea8a3d449" +checksum = "06794f8f6c5c898b3275aebefa6b8a1cb24cd2c6c79397ab15774837a0bc5755" dependencies = [ "winapi-util", ] @@ -11165,7 +11162,7 @@ version = "1.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e395fcf16a7a3d8127ec99782007af141946b4795001f876d54fb0d55978560" dependencies = [ - "getrandom 0.2.11", + "getrandom 0.2.12", "serde", "sha1_smol", ] @@ -11191,9 +11188,9 @@ checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" [[package]] name = "value-bag" -version = "1.5.0" +version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dd65ff0de3304a013e6dfeb7324e1cd389a8a000e582e3c9c9fae82ced778e26" +checksum = "7cdbaf5e132e593e9fc1de6a15bbec912395b11fb9719e061cf64f804524c503" [[package]] name = "vcpkg" @@ -11992,9 +11989,9 @@ checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" [[package]] name = "winnow" -version = "0.5.33" +version = "0.5.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7520bbdec7211caa7c4e682eb1fbe07abe20cee6756b6e00f537c82c11816aa" +checksum = "b7cf47b659b318dccbd69cc4797a39ae128f533dce7902a1096044d1967b9c16" dependencies = [ "memchr", ] diff --git a/Cargo.toml b/Cargo.toml index b231106b1..a3de51715 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -98,12 +98,11 @@ thiserror = "1.0.40" prettyplease = { package = "prettier-please", version = "0.2", features = [ "verbatim", ] } -manganis-cli-support = { git = "https://github.com/DioxusLabs/collect-assets", rev = "94ea6f7", features = [ +manganis-cli-support = { git = "https://github.com/DioxusLabs/collect-assets", rev = "e0093a4", features = [ "webp", "html", ] } -manganis = { git = "https://github.com/DioxusLabs/collect-assets", rev = "94ea6f7" } - +manganis = { git = "https://github.com/DioxusLabs/collect-assets", rev = "e0093a4" } # This is a "virtual package" # It is not meant to be published, but is used so "cargo run --example XYZ" works properly diff --git a/packages/cli/src/assets.rs b/packages/cli/src/assets.rs index 081c1c85c..9248b47d5 100644 --- a/packages/cli/src/assets.rs +++ b/packages/cli/src/assets.rs @@ -12,17 +12,14 @@ pub fn asset_manifest(crate_config: &CrateConfig) -> AssetManifest { } /// Create a head file that contains all of the imports for assets that the user project uses -pub fn create_assets_head(config: &CrateConfig) -> Result<()> { - let manifest = asset_manifest(config); +pub fn create_assets_head(config: &CrateConfig, manifest: &AssetManifest) -> Result<()> { let mut file = File::create(config.out_dir.join("__assets_head.html"))?; file.write_all(manifest.head().as_bytes())?; Ok(()) } /// Process any assets collected from the binary -pub(crate) fn process_assets(config: &CrateConfig) -> anyhow::Result<()> { - let manifest = asset_manifest(config); - +pub(crate) fn process_assets(config: &CrateConfig, manifest: &AssetManifest) -> anyhow::Result<()> { let static_asset_output_dir = PathBuf::from( config .dioxus_config diff --git a/packages/cli/src/builder.rs b/packages/cli/src/builder.rs index bed60ff5a..92d9ab093 100644 --- a/packages/cli/src/builder.rs +++ b/packages/cli/src/builder.rs @@ -9,7 +9,7 @@ use dioxus_cli_config::CrateConfig; use dioxus_cli_config::ExecutableType; use indicatif::{ProgressBar, ProgressStyle}; use lazy_static::lazy_static; -use serde::Serialize; +use manganis_cli_support::{AssetManifest, ManganisSupportGuard}; use std::{ fs::{copy, create_dir_all, File}, io::Read, @@ -23,10 +23,11 @@ lazy_static! { static ref PROGRESS_BARS: indicatif::MultiProgress = indicatif::MultiProgress::new(); } -#[derive(Serialize, Debug, Clone)] +#[derive(Debug, Clone)] pub struct BuildResult { pub warnings: Vec, pub elapsed_time: u128, + pub assets: Option, } pub fn build(config: &CrateConfig, _: bool, skip_assets: bool) -> Result { @@ -47,7 +48,8 @@ pub fn build(config: &CrateConfig, _: bool, skip_assets: bool) -> Result Result anyhow::Result> { Ok(warning_messages) } -pub fn gen_page(config: &CrateConfig, serve: bool, skip_assets: bool) -> String { +pub fn gen_page(config: &CrateConfig, manifest: Option<&AssetManifest>, serve: bool) -> String { let _gaurd = WebAssetConfigDropGuard::new(); let crate_root = crate_root().unwrap(); @@ -515,8 +528,7 @@ pub fn gen_page(config: &CrateConfig, serve: bool, skip_assets: bool) -> String { style_str.push_str("\n"); } - if !skip_assets { - let manifest = asset_manifest(config); + if let Some(manifest) = manifest { style_str.push_str(&manifest.head()); } diff --git a/packages/cli/src/cli/build.rs b/packages/cli/src/cli/build.rs index fb0bdfb24..ad15a8cf5 100644 --- a/packages/cli/src/cli/build.rs +++ b/packages/cli/src/cli/build.rs @@ -52,12 +52,10 @@ impl Build { // #[cfg(feature = "plugin")] // let _ = PluginManager::on_build_start(&crate_config, &platform); - match platform { - Platform::Web => { - crate::builder::build(&crate_config, false, self.build.skip_assets)?; - } + let build_result = match platform { + Platform::Web => crate::builder::build(&crate_config, false, self.build.skip_assets)?, Platform::Desktop => { - crate::builder::build_desktop(&crate_config, false, self.build.skip_assets)?; + crate::builder::build_desktop(&crate_config, false, self.build.skip_assets)? } Platform::Fullstack => { // Fullstack mode must be built with web configs on the desktop (server) binary as well as the web binary @@ -87,12 +85,12 @@ impl Build { }; let _gaurd = FullstackServerEnvGuard::new(self.build.force_debug, self.build.release); - crate::builder::build_desktop(&desktop_config, false, self.build.skip_assets)?; + crate::builder::build_desktop(&desktop_config, false, self.build.skip_assets)? } } - } + }; - let temp = gen_page(&crate_config, false, self.build.skip_assets); + let temp = gen_page(&crate_config, build_result.assets.as_ref(), false); let mut file = std::fs::File::create( crate_config diff --git a/packages/cli/src/cli/serve.rs b/packages/cli/src/cli/serve.rs index 4b0f3f457..b4362729f 100644 --- a/packages/cli/src/cli/serve.rs +++ b/packages/cli/src/cli/serve.rs @@ -1,4 +1,5 @@ use dioxus_cli_config::Platform; +use manganis_cli_support::AssetManifest; use super::*; use std::{fs::create_dir_all, io::Write, path::PathBuf}; @@ -47,9 +48,6 @@ impl Serve { match platform { Platform::Web => { - // generate dev-index page - Serve::regen_dev_page(&crate_config, self.serve.skip_assets)?; - // start the develop server server::web::startup( self.serve.port, @@ -69,8 +67,11 @@ impl Serve { Ok(()) } - pub fn regen_dev_page(crate_config: &CrateConfig, skip_assets: bool) -> Result<()> { - let serve_html = gen_page(crate_config, true, skip_assets); + pub fn regen_dev_page( + crate_config: &CrateConfig, + manifest: Option<&AssetManifest>, + ) -> anyhow::Result<()> { + let serve_html = gen_page(crate_config, manifest, true); let dist_path = crate_config .crate_dir diff --git a/packages/cli/src/main.rs b/packages/cli/src/main.rs index 54211a254..a603f7929 100644 --- a/packages/cli/src/main.rs +++ b/packages/cli/src/main.rs @@ -49,7 +49,7 @@ async fn main() -> anyhow::Result<()> { let _dioxus_config = DioxusConfig::load(Some(bin.clone())) .map_err(|e| anyhow!("Failed to load Dioxus config because: {e}"))? .unwrap_or_else(|| { - log::warn!("You appear to be creating a Dioxus project from scratch; we will use the default config"); + log::info!("You appear to be creating a Dioxus project from scratch; we will use the default config"); DioxusConfig::default() }); diff --git a/packages/cli/src/server/web/mod.rs b/packages/cli/src/server/web/mod.rs index 47661e3dd..39366ee0c 100644 --- a/packages/cli/src/server/web/mod.rs +++ b/packages/cli/src/server/web/mod.rs @@ -111,6 +111,9 @@ pub async fn serve( ) -> Result<()> { let first_build_result = crate::builder::build(&config, false, skip_assets)?; + // generate dev-index page + Serve::regen_dev_page(&config, first_build_result.assets.as_ref())?; + log::info!("🚀 Starting development server..."); // WS Reload Watching @@ -448,7 +451,7 @@ fn build(config: &CrateConfig, reload_tx: &Sender<()>, skip_assets: bool) -> Res // change the websocket reload state to true; // the page will auto-reload. if config.dioxus_config.web.watcher.reload_html { - let _ = Serve::regen_dev_page(config, skip_assets); + let _ = Serve::regen_dev_page(config, result.assets.as_ref()); } let _ = reload_tx.send(()); Ok(result) diff --git a/packages/desktop/Cargo.toml b/packages/desktop/Cargo.toml index d18b6efa4..b888d0cfb 100644 --- a/packages/desktop/Cargo.toml +++ b/packages/desktop/Cargo.toml @@ -52,8 +52,6 @@ crossbeam-channel = "0.5.8" tao = { version = "0.24.0", features = ["rwh_05"] } [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 -manganis-cli-support = { workspace = true, optional = true, features = ["webp", "html"] } rfd = "0.12" global-hotkey = "0.4.1" muda = "0.11.3" @@ -73,7 +71,6 @@ fullscreen = ["wry/fullscreen"] transparent = ["wry/transparent"] devtools = ["wry/devtools"] hot-reload = ["dioxus-hot-reload"] -collect-assets = ["manganis-cli-support"] gnu = [] [package.metadata.docs.rs] diff --git a/packages/desktop/src/app.rs b/packages/desktop/src/app.rs index b43c0e3b4..6e1c75c24 100644 --- a/packages/desktop/src/app.rs +++ b/packages/desktop/src/app.rs @@ -81,11 +81,6 @@ impl App

{ }), }; - // Copy over any assets we find - // todo - re-enable this when we have a faster way of copying assets - #[cfg(feature = "collect-assets")] - crate::collect_assets::copy_assets(); - // Set the event converter dioxus_html::set_event_converter(Box::new(crate::events::SerializedHtmlEventConverter)); diff --git a/packages/desktop/src/collect_assets.rs b/packages/desktop/src/collect_assets.rs deleted file mode 100644 index aa9050a75..000000000 --- a/packages/desktop/src/collect_assets.rs +++ /dev/null @@ -1,60 +0,0 @@ -pub fn copy_assets() { - #[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" - ) - ))] - { - // The CLI will copy assets to the current working directory - if std::env::var_os("DIOXUS_ACTIVE").is_some() { - return; - } - use manganis_cli_support::AssetManifest; - use manganis_cli_support::AssetManifestExt; - use manganis_cli_support::Config; - use std::path::PathBuf; - let config = Config::current(); - let asset_location = config.assets_serve_location(); - let asset_location = PathBuf::from(asset_location); - let _ = std::fs::remove_dir_all(&asset_location); - - println!("Finding assets... (Note: if you run a dioxus desktop application with the CLI. This process will be significantly faster.)"); - let manifest = AssetManifest::load(); - let has_assets = manifest - .packages() - .iter() - .any(|package| !package.assets().is_empty()); - - if has_assets { - println!("Copying and optimizing assets..."); - manifest.copy_static_assets_to(&asset_location).unwrap(); - println!("Copied assets to {}", asset_location.display()); - } else { - println!("No assets found"); - } - } - #[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!( - "Skipping assets in release mode. You compile assets with the dioxus-cli in release mode" - ); - } -} diff --git a/packages/desktop/src/lib.rs b/packages/desktop/src/lib.rs index 9cd94d128..2b673f729 100644 --- a/packages/desktop/src/lib.rs +++ b/packages/desktop/src/lib.rs @@ -22,9 +22,6 @@ mod shortcut; mod waker; mod webview; -#[cfg(feature = "collect-assets")] -mod collect_assets; - // mobile shortcut is only supported on mobile platforms #[cfg(any(target_os = "ios", target_os = "android"))] mod mobile_shortcut; diff --git a/packages/desktop/src/protocol.rs b/packages/desktop/src/protocol.rs index 06304cdd2..82570b1bc 100644 --- a/packages/desktop/src/protocol.rs +++ b/packages/desktop/src/protocol.rs @@ -167,7 +167,7 @@ fn module_loader(root_id: &str, headless: bool) -> String { ) } -/// Get the assset directory, following tauri/cargo-bundles directory discovery approach +/// Get the asset directory, following tauri/cargo-bundles directory discovery approach /// /// Defaults to the current directory if no asset directory is found, which is useful for development when the app /// isn't bundled. diff --git a/packages/fullstack/Cargo.toml b/packages/fullstack/Cargo.toml index cce29ed65..84072b705 100644 --- a/packages/fullstack/Cargo.toml +++ b/packages/fullstack/Cargo.toml @@ -67,9 +67,6 @@ dioxus-hot-reload = { workspace = true } [target.'cfg(target_arch = "wasm32")'.dependencies] web-sys = { version = "0.3.61", features = ["Window", "Document", "Element", "HtmlDocument", "Storage", "console"] } -[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 -manganis-cli-support = { workspace = true, features = ["webp", "html"] } [features] default = ["hot-reload"] diff --git a/packages/fullstack/dist/index.html b/packages/fullstack/dist/index.html new file mode 100644 index 000000000..f7830275d --- /dev/null +++ b/packages/fullstack/dist/index.html @@ -0,0 +1,47 @@ + + + + dioxus | ⛺ + + + + + + +

+ + + + \ No newline at end of file diff --git a/packages/fullstack/src/adapters/axum_adapter.rs b/packages/fullstack/src/adapters/axum_adapter.rs index a14c51c0a..09e6e1aa1 100644 --- a/packages/fullstack/src/adapters/axum_adapter.rs +++ b/packages/fullstack/src/adapters/axum_adapter.rs @@ -276,9 +276,6 @@ where fn serve_static_assets(mut self, assets_path: impl Into) -> Self { use tower_http::services::{ServeDir, ServeFile}; - // Copy over any assets we find - crate::collect_assets::copy_assets(); - let assets_path = assets_path.into(); // Serve all files in dist folder except index.html diff --git a/packages/fullstack/src/adapters/salvo_adapter.rs b/packages/fullstack/src/adapters/salvo_adapter.rs index 84894bbda..674722665 100644 --- a/packages/fullstack/src/adapters/salvo_adapter.rs +++ b/packages/fullstack/src/adapters/salvo_adapter.rs @@ -241,9 +241,6 @@ impl DioxusRouterExt for Router { } fn serve_static_assets(mut self, assets_path: impl Into) -> Self { - // Copy over any assets we find - crate::collect_assets::copy_assets(); - let assets_path = assets_path.into(); // Serve all files in dist folder except index.html diff --git a/packages/fullstack/src/adapters/warp_adapter.rs b/packages/fullstack/src/adapters/warp_adapter.rs index 682063084..316d70e56 100644 --- a/packages/fullstack/src/adapters/warp_adapter.rs +++ b/packages/fullstack/src/adapters/warp_adapter.rs @@ -187,9 +187,6 @@ pub fn serve_dioxus_application