From f7881aa1f0b6b51725498b9723eed64f29488dc5 Mon Sep 17 00:00:00 2001
From: Evan Almloff <evanalmloff@gmail.com>
Date: Fri, 29 Dec 2023 09:46:58 -0600
Subject: [PATCH] fix some merge conflicts

---
 packages/cli/src/cli/build.rs            | 10 +++++-----
 packages/cli/src/server/fullstack/mod.rs |  8 ++++----
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/packages/cli/src/cli/build.rs b/packages/cli/src/cli/build.rs
index 00e3deb43..5958d2f03 100644
--- a/packages/cli/src/cli/build.rs
+++ b/packages/cli/src/cli/build.rs
@@ -26,15 +26,15 @@ impl Build {
         crate_config.with_verbose(self.build.verbose);
 
         if self.build.example.is_some() {
-            crate_config.as_example(self.build.example.unwrap());
+            crate_config.as_example(self.build.example.clone().unwrap());
         }
 
         if self.build.profile.is_some() {
-            crate_config.set_profile(self.build.profile.unwrap());
+            crate_config.set_profile(self.build.profile.clone().unwrap());
         }
 
         if self.build.features.is_some() {
-            crate_config.set_features(self.build.features.unwrap());
+            crate_config.set_features(self.build.features.clone().unwrap());
         }
 
         let platform = self
@@ -57,6 +57,7 @@ impl Build {
                 let _config = WebAssetConfigDropGuard::new();
                 {
                     let mut web_config = crate_config.clone();
+                    let _gaurd = FullstackWebEnvGuard::new(&self.build);
                     let web_feature = self.build.client_feature;
                     let features = &mut web_config.features;
                     match features {
@@ -65,7 +66,6 @@ impl Build {
                         }
                         None => web_config.features = Some(vec![web_feature]),
                     };
-                    let _gaurd = FullstackWebEnvGuard::new(self.build.debug);
                     crate::builder::build(&crate_config, false, self.build.skip_assets)?;
                 }
                 {
@@ -78,7 +78,7 @@ impl Build {
                         }
                         None => desktop_config.features = Some(vec![desktop_feature]),
                     };
-                    let _gaurd = FullstackServerEnvGuard::new(self.build.debug);
+                    let _gaurd = FullstackServerEnvGuard::new(self.build.debug, self.build.release);
                     crate::builder::build_desktop(&desktop_config, false, self.build.skip_assets)?;
                 }
             }
diff --git a/packages/cli/src/server/fullstack/mod.rs b/packages/cli/src/server/fullstack/mod.rs
index abe4fe82d..f41d0e263 100644
--- a/packages/cli/src/server/fullstack/mod.rs
+++ b/packages/cli/src/server/fullstack/mod.rs
@@ -66,7 +66,7 @@ impl Platform for FullstackPlatform {
                 }
                 None => desktop_config.features = Some(vec![desktop_feature]),
             };
-            let _gaurd = FullstackServerEnvGuard::new(&self.serve);
+            let _gaurd = FullstackServerEnvGuard::new(self.serve.debug, self.serve.release);
             self.desktop.rebuild(&desktop_config)
         };
         thread_handle
@@ -136,11 +136,11 @@ pub(crate) struct FullstackServerEnvGuard {
 }
 
 impl FullstackServerEnvGuard {
-    pub fn new(debug_mode: bool, release_mode: bool) -> Self {
+    pub fn new(debug: bool, release: bool) -> Self {
         Self {
-            old_rustflags: (!debug_mode).then(|| {
+            old_rustflags: (!debug).then(|| {
                 let old_rustflags = std::env::var("RUSTFLAGS").unwrap_or_default();
-                let debug_assertions = if serve.release {
+                let debug_assertions = if release {
                     ""
                 } else {
                     " -C debug-assertions"