|
|
@@ -8,7 +8,7 @@ use crate::{
|
|
|
};
|
|
|
use anyhow::Context;
|
|
|
use cargo_metadata::{diagnostic::Diagnostic, Message};
|
|
|
-use dioxus_cli_config::{crate_root, CrateConfig, ExecutableType};
|
|
|
+use dioxus_cli_config::{crate_root, CrateConfig, ExecutableType, WasmOptLevel};
|
|
|
use indicatif::{ProgressBar, ProgressStyle};
|
|
|
use lazy_static::lazy_static;
|
|
|
use manganis_cli_support::{AssetManifest, ManganisSupportGuard};
|
|
|
@@ -174,15 +174,18 @@ pub fn build_web(
|
|
|
// [3] Bindgen the final binary for use easy linking
|
|
|
let mut bindgen_builder = Bindgen::new();
|
|
|
|
|
|
+ let keep_debug = dioxus_config.web.wasm_opt.debug || (!config.release);
|
|
|
+
|
|
|
bindgen_builder
|
|
|
.input_path(&input_path)
|
|
|
.web(true)
|
|
|
.unwrap()
|
|
|
- .debug(true)
|
|
|
- .demangle(true)
|
|
|
- .keep_debug(true)
|
|
|
- .remove_name_section(false)
|
|
|
- .remove_producers_section(false)
|
|
|
+ .debug(keep_debug)
|
|
|
+ .demangle(keep_debug)
|
|
|
+ .keep_debug(keep_debug)
|
|
|
+ .reference_types(true)
|
|
|
+ .remove_name_section(!keep_debug)
|
|
|
+ .remove_producers_section(!keep_debug)
|
|
|
.out_name(&dioxus_config.application.name)
|
|
|
.generate(&bindgen_outdir)
|
|
|
.unwrap();
|
|
|
@@ -197,43 +200,33 @@ pub fn build_web(
|
|
|
run_wasm_bindgen();
|
|
|
}
|
|
|
|
|
|
- // check binaryen:wasm-opt tool
|
|
|
- tracing::info!("Running optimization with wasm-opt...");
|
|
|
- let dioxus_tools = dioxus_config.application.tools.clone();
|
|
|
- if dioxus_tools.contains_key("binaryen") {
|
|
|
- let info = dioxus_tools.get("binaryen").unwrap();
|
|
|
- let binaryen = crate::tools::Tool::Binaryen;
|
|
|
-
|
|
|
- if binaryen.is_installed() {
|
|
|
- if let Some(sub) = info.as_table() {
|
|
|
- if sub.contains_key("wasm_opt")
|
|
|
- && sub.get("wasm_opt").unwrap().as_bool().unwrap_or(false)
|
|
|
- {
|
|
|
- tracing::info!("Optimizing WASM size with wasm-opt...");
|
|
|
- let target_file = out_dir
|
|
|
- .join("assets")
|
|
|
- .join("dioxus")
|
|
|
- .join(format!("{}_bg.wasm", dioxus_config.application.name));
|
|
|
- if target_file.is_file() {
|
|
|
- let mut args = vec![
|
|
|
- target_file.to_str().unwrap(),
|
|
|
- "-o",
|
|
|
- target_file.to_str().unwrap(),
|
|
|
- ];
|
|
|
- if config.release {
|
|
|
- args.push("-Oz");
|
|
|
- }
|
|
|
- binaryen.call("wasm-opt", args)?;
|
|
|
- }
|
|
|
- }
|
|
|
- }
|
|
|
- } else {
|
|
|
- tracing::warn!(
|
|
|
- "Binaryen tool not found, you can use `dx tool add binaryen` to install it."
|
|
|
- );
|
|
|
- }
|
|
|
- } else {
|
|
|
- tracing::info!("Skipping optimization with wasm-opt, binaryen tool not found.");
|
|
|
+ // Run wasm-opt if this is a release build
|
|
|
+ if config.release {
|
|
|
+ tracing::info!("Running optimization with wasm-opt...");
|
|
|
+ let mut options = match dioxus_config.web.wasm_opt.level {
|
|
|
+ WasmOptLevel::Z => wasm_opt::OptimizationOptions::new_optimize_for_size_aggressively(),
|
|
|
+ WasmOptLevel::S => wasm_opt::OptimizationOptions::new_optimize_for_size(),
|
|
|
+ WasmOptLevel::Zero => wasm_opt::OptimizationOptions::new_opt_level_0(),
|
|
|
+ WasmOptLevel::One => wasm_opt::OptimizationOptions::new_opt_level_1(),
|
|
|
+ WasmOptLevel::Two => wasm_opt::OptimizationOptions::new_opt_level_2(),
|
|
|
+ WasmOptLevel::Three => wasm_opt::OptimizationOptions::new_opt_level_3(),
|
|
|
+ WasmOptLevel::Four => wasm_opt::OptimizationOptions::new_opt_level_4(),
|
|
|
+ };
|
|
|
+ let wasm_file = bindgen_outdir.join(format!("{}_bg.wasm", dioxus_config.application.name));
|
|
|
+ let old_size = wasm_file.metadata()?.len();
|
|
|
+ options
|
|
|
+ // WASM bindgen relies on reference types
|
|
|
+ .enable_feature(wasm_opt::Feature::ReferenceTypes)
|
|
|
+ .debug_info(dioxus_config.web.wasm_opt.debug)
|
|
|
+ .run(&wasm_file, &wasm_file)
|
|
|
+ .map_err(|err| Error::Other(anyhow::anyhow!(err)))?;
|
|
|
+ let new_size = wasm_file.metadata()?.len();
|
|
|
+ tracing::info!(
|
|
|
+ "wasm-opt reduced WASM size from {} to {} ({:2}%)",
|
|
|
+ old_size,
|
|
|
+ new_size,
|
|
|
+ (new_size as f64 - old_size as f64) / old_size as f64 * 100.0
|
|
|
+ );
|
|
|
}
|
|
|
|
|
|
// If pre-compressing is enabled, we can pre_compress the wasm-bindgen output
|
|
|
@@ -242,6 +235,7 @@ pub fn build_web(
|
|
|
}
|
|
|
|
|
|
// [5][OPTIONAL] If tailwind is enabled and installed we run it to generate the CSS
|
|
|
+ let dioxus_tools = dioxus_config.application.tools.clone();
|
|
|
if dioxus_tools.contains_key("tailwindcss") {
|
|
|
let info = dioxus_tools.get("tailwindcss").unwrap();
|
|
|
let tailwind = crate::tools::Tool::Tailwind;
|
Evan Almloff