Merge branch 'master' into intigrate-collect-assets

This commit is contained in:
ealmloff authored and GitHub committed 2023-10-12 08:46:27 -05:00
commit a7736284c8
31 files changed
+90 -4

No files matched your search

+2
View File
@@ -467,6 +467,7 @@ pub fn gen_page(config: &CrateConfig, serve: bool, skip_assets: bool) -> String
String::from(include_str!("./assets/index.html"))
};
let resources = config.dioxus_config.web.resource.clone();
let mut style_list = resources.style.unwrap_or_default();
@@ -719,6 +720,7 @@ fn build_assets(config: &CrateConfig) -> Result<Vec<PathBuf>> {
Ok(result)
}
/// Process any assets collected from the binary
fn process_assets(config: &CrateConfig) -> anyhow::Result<()> {
let manifest = config.asset_manifest();
+4
View File
@@ -1,3 +1,7 @@
#![doc = include_str!("../README.md")]
#![doc(html_logo_url = "https://avatars.githubusercontent.com/u/79236386")]
#![doc(html_favicon_url = "https://avatars.githubusercontent.com/u/79236386")]
pub const DIOXUS_CLI_VERSION: &str = "0.4.1";
pub mod builder;