fix: always set host to 0.0.0.0 for angular when --rc (#768)

closes #765

Author: amrbashir

.changes/angluar-template-rc.md

@@ -0,0 +1,6 @@
+---
+"create-tauri-app": patch
+"create-tauri-app-js": patch
+---
+
+Fix  `--rc` angluar template invalid configuration

src/manifest.rs

@@ -13,11 +13,10 @@ pub struct Manifest<'a> {
 }
 
 impl<'a> Manifest<'a> {
-    pub fn parse(s: &'a str, mobile: bool) -> Result<Self, anyhow::Error> {
+    pub fn parse(s: &'a str) -> Result<Self, anyhow::Error> {
         let mut manifest = Self::default();
 
         let mut in_files_section = false;
-        let mut in_mobile_section = false;
 
         for (i, line) in s.split('\n').enumerate() {
             let line_number = i + 1;
@@ -31,13 +30,6 @@ impl<'a> Manifest<'a> {
 
             if line == "[files]" {
                 in_files_section = true;
-                in_mobile_section = false;
-                continue;
-            }
-
-            if line == "[mobile]" {
-                in_mobile_section = true;
-                in_files_section = false;
                 continue;
             }
 
@@ -64,16 +56,12 @@ impl<'a> Manifest<'a> {
                     bail!("parsing manifest: value is empty in line {line_number}");
                 }
 
-                #[allow(clippy::nonminimal_bool)]
-                let replace =
-                    !in_files_section && (!in_mobile_section || (in_mobile_section && mobile));
-
                 match k {
-                    "beforeDevCommand" if replace => manifest.before_dev_command = Some(v),
-                    "beforeBuildCommand" if replace => manifest.before_build_command = Some(v),
-                    "devPath" if replace => manifest.dev_path = Some(v),
-                    "distDir" if replace => manifest.dist_dir = Some(v),
-                    "withGlobalTauri" if replace => manifest.with_global_tauri = Some(v.parse()?),
+                    "beforeDevCommand" => manifest.before_dev_command = Some(v),
+                    "beforeBuildCommand" => manifest.before_build_command = Some(v),
+                    "devPath" => manifest.dev_path = Some(v),
+                    "distDir" => manifest.dist_dir = Some(v),
+                    "withGlobalTauri" => manifest.with_global_tauri = Some(v.parse()?),
                     _ if in_files_section => {
                         manifest.files.insert(k, v);
                     }
@@ -100,15 +88,12 @@ mod test {
             beforeBuildCommand = {% pkg_manager_run_command %} build # this comment should be stripped
             devPath = http://localhost:1420
 
-            [mobile]
-            beforeBuildCommand = {% pkg_manager_run_command %} build mobile
-
             [files]
             tauri.svg = src/assets/tauri.svg
             styles.css = src/styles.css
         "#;
 
-        assert_eq!(Manifest::parse(manifest_file, false).unwrap(), {
+        assert_eq!(Manifest::parse(manifest_file).unwrap(), {
             let mut files = HashMap::new();
             files.insert("tauri.svg", "src/assets/tauri.svg");
             files.insert("styles.css", "src/styles.css");
@@ -122,21 +107,6 @@ mod test {
                 files,
             }
         });
-
-        assert_eq!(Manifest::parse(manifest_file, true).unwrap(), {
-            let mut files = HashMap::new();
-            files.insert("tauri.svg", "src/assets/tauri.svg");
-            files.insert("styles.css", "src/styles.css");
-
-            Manifest {
-                before_dev_command: Some("npm start -- --port 1420"),
-                before_build_command: Some("{% pkg_manager_run_command %} build mobile"),
-                dev_path: Some("http://localhost:1420"),
-                dist_dir: None,
-                with_global_tauri: None,
-                files,
-            }
-        });
     }
 
     #[test]
@@ -151,15 +121,12 @@ mod test {
             beforeBuildCommand =
             devPath = http://localhost:1420
 
-            [mobile]
-            beforeBuildCommand = {% pkg_manager_run_command %} build mobile
-
             [files]
             tauri.svg = src/assets/tauri.svg
             styles.css = src/styles.css
         "#;
 
-        Manifest::parse(manifest_file, false).unwrap();
+        Manifest::parse(manifest_file).unwrap();
     }
 
     #[test]
@@ -179,7 +146,7 @@ mod test {
         styles.css = src/styles.css
     "#;
 
-        assert_eq!(Manifest::parse(manifest_file, false).unwrap(), {
+        assert_eq!(Manifest::parse(manifest_file).unwrap(), {
             let mut files = HashMap::new();
             files.insert("tauri.svg", "src/assets/tauri.svg");
             files.insert("styles.css", "src/styles.css");

src/template.rs

@@ -261,7 +261,7 @@ impl<'a> Template {
                 .data
                 .to_vec();
         let manifest_str = String::from_utf8(manifest_bytes)?;
-        let manifest = Manifest::parse(&manifest_str, rc)?;
+        let manifest = Manifest::parse(&manifest_str)?;
 
         let lib_name = format!("{}_lib", package_name.replace('-', "_"));
         let project_name_pascal_case = utils::to_pascal_case(project_name);

templates/template-angular/.manifest

@@ -7,9 +7,6 @@ beforeBuildCommand = {% pkg_manager_run_command %} build
 devPath = http://localhost:1420
 distDir = ../dist/{% package_name %}/browser
 
-[mobile]
-beforeDevCommand = {% pkg_manager_run_command %} start {% double_dash_with_space %}--host $HOST --public-host $HOST
-
 [files]
 tauri.svg = src/assets/tauri.svg
 styles.css = src/app/app.component.css

templates/template-angular/angular.json.lte

@@ -20,7 +20,7 @@
             "browser": "src/main.ts",
             "polyfills": ["zone.js"],
             "tsConfig": "tsconfig.app.json",
-            "assets": ["src/assets"],
+            "assets": ["src/assets"]
           },
           "configurations": {
             "production": {
@@ -49,7 +49,8 @@
         "serve": {
           "builder": "@angular-devkit/build-angular:dev-server",
           "options": {
-            "port": 1420
+            "port": 1420{% if rc %},
+            "host": "0.0.0.0"{% endif %}
           },
           "configurations": {
             "production": {