merge upstream

packages/fullstack/Cargo.toml

@@ -70,6 +70,10 @@ 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 = { git = "https://github.com/DioxusLabs/collect-assets", features = ["webp", "html"] }
+
 [features]
 default = ["hot-reload", "default-tls"]
 router = ["dioxus-router"]

packages/fullstack/examples/axum-auth/.gitignore

@@ -1,3 +1,4 @@
 dist
 target
-static
+static
+.dioxus

packages/fullstack/examples/axum-desktop/.gitignore

@@ -1,2 +1,4 @@
 dist
-target
+target
+static
+.dioxus

packages/fullstack/examples/axum-hello-world/.gitignore

@@ -1,3 +1,4 @@
 dist
 target
-static
+static
+.dioxus

packages/fullstack/examples/axum-router/.gitignore

@@ -1,3 +1,4 @@
 dist
 target
-static
+static
+.dioxus

packages/fullstack/examples/salvo-hello-world/.gitignore

@@ -1,3 +1,4 @@
 dist
 target
-static
+static
+.dioxus

packages/fullstack/examples/static-hydrated/.gitignore

@@ -1,3 +1,4 @@
 docs
 target
-static
+static
+.dioxus

packages/fullstack/examples/warp-hello-world/.gitignore

@@ -1,3 +1,4 @@
 dist
 target
-static
+static
+.dioxus

packages/fullstack/src/adapters/axum_adapter.rs

@@ -276,6 +276,9 @@ where
     fn serve_static_assets(mut self, assets_path: impl Into<std::path::PathBuf>) -> 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

packages/fullstack/src/adapters/salvo_adapter.rs

@@ -241,6 +241,9 @@ impl DioxusRouterExt for Router {
     }
 
     fn serve_static_assets(mut self, assets_path: impl Into<std::path::PathBuf>) -> 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

packages/fullstack/src/adapters/warp_adapter.rs

@@ -187,6 +187,9 @@ pub fn serve_dioxus_application<P: Clone + serde::Serialize + Send + Sync + 'sta
     // Serve the dist folder and the index.html file
     let serve_dir = warp::fs::dir(cfg.assets_path);
 
+    // Copy over any assets we find
+    crate::collect_assets::copy_assets();
+
     connect_hot_reload()
         // First register the server functions
         .or(register_server_fns(server_fn_route))

packages/fullstack/src/collect_assets.rs

@@ -0,0 +1,61 @@
+#[cfg(any(feature = "axum", feature = "warp", feature = "salvo"))]
+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"
+        );
+    }
+}

packages/fullstack/src/lib.rs

@@ -14,6 +14,7 @@ pub mod router;
 mod adapters;
 #[cfg(feature = "ssr")]
 pub use adapters::*;
+mod collect_assets;
 mod hooks;
 #[cfg(all(debug_assertions, feature = "hot-reload", feature = "ssr"))]
 mod hot_reload;