From 9bfe9682b5a83ca9dd521a7bed61071c14ded163 Mon Sep 17 00:00:00 2001
From: Evan Almloff <evanalmloff@gmail.com>
Date: Fri, 18 Aug 2023 10:27:38 -0500
Subject: [PATCH] integrate with the bundle command

---
 packages/cli/src/builder.rs    |  4 ++--
 packages/cli/src/cli/bundle.rs | 13 +++++++++++++
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/cli/src/builder.rs b/packages/cli/src/builder.rs
index bed075ad6..9e445ed7a 100644
--- a/packages/cli/src/builder.rs
+++ b/packages/cli/src/builder.rs
@@ -252,8 +252,6 @@ pub fn build(config: &CrateConfig, quiet: bool) -> Result<BuildResult> {
 pub fn build_desktop(config: &CrateConfig, _is_serve: bool) -> Result<BuildResult> {
     log::info!("🚅 Running build [Desktop] command...");
 
-    let _gaurd = AssetConfigDropGaurd::new();
-
     let t_start = std::time::Instant::now();
     let ignore_files = build_assets(config)?;
 
@@ -353,6 +351,8 @@ pub fn build_desktop(config: &CrateConfig, _is_serve: bool) -> Result<BuildResul
         }
     }
 
+    // Collect assets
+    process_assets(config)?;
     // Create the __assets_head.html file for bundling
     create_assets_head(&config)?;
 
diff --git a/packages/cli/src/cli/bundle.rs b/packages/cli/src/cli/bundle.rs
index 0d4fb23da..42c5e6ab6 100644
--- a/packages/cli/src/cli/bundle.rs
+++ b/packages/cli/src/cli/bundle.rs
@@ -128,6 +128,19 @@ impl Bundle {
             }
         }
 
+        // Add all assets from collect assets to the bundle
+        {
+            let config = assets_cli_support::Config::current();
+            let location = config.assets_serve_location().to_string();
+            let location = format!("./{}", location);
+            println!("Adding assets from {} to bundle", location);
+            if let Some(resources) = &mut bundle_settings.resources {
+                resources.push(location);
+            } else {
+                bundle_settings.resources = Some(vec![location]);
+            }
+        }
+
         let mut settings = SettingsBuilder::new()
             .project_out_directory(crate_config.out_dir)
             .package_settings(PackageSettings {