refactor: remove the mobile argument (#748)

* refactor: remove the mobile argument

when using the `--rc` flag, we'll always generate a cross platform app (supporting both desktop and mobile)

* fix vanilla template

Author: lucasfernog

.changes/remove-mobile-arg.md

@@ -0,0 +1,6 @@
+---
+"create-tauri-app": minor
+"create-tauri-app-js": minor
+---
+
+Removed the `--mobile` and `--no-mobile` arguments. When using `--rc` we will always generate a template that supports both desktop and mobile using Tauri v2.

src/args.rs

@@ -16,8 +16,6 @@ pub struct Args {
     pub skip: bool,
     pub force: bool,
     pub rc: bool,
-    pub mobile: Option<bool>,
-    pub no_mobile: Option<bool>,
 }
 
 impl Default for Args {
@@ -29,8 +27,6 @@ impl Default for Args {
             skip: false,
             force: false,
             rc: false,
-            mobile: Some(false), // default for this value must be Some(false), as we use it as fallback when -y is used
-            no_mobile: None,
         }
     }
 }
@@ -57,8 +53,6 @@ pub fn parse(argv: Vec<OsString>, bin_name: Option<String>) -> anyhow::Result<Ar
   {GREEN}-y{RESET}, {GREEN}--yes{RESET}                     Skip prompts and use defaults where applicable
   {GREEN}-f{RESET}, {GREEN}--force{RESET}                   Force create the directory even if it is not empty.
                     {GREEN}--rc{RESET}                      Bootstraps a project using tauri@2.0-rc.
-                    {GREEN}--mobile{RESET}                  Bootstraps a mobile project too. Only availabe with `--rc` option.
-                    {GREEN}--no-mobile{RESET}               Skip bootstraping a mobile project. Only availabe with `--rc` option.
   {GREEN}-h{RESET}, {GREEN}--help{RESET}                    Prints help information
   {GREEN}-v{RESET}, {GREEN}--version{RESET}                 Prints version information
 "#,
@@ -107,16 +101,6 @@ pub fn parse(argv: Vec<OsString>, bin_name: Option<String>) -> anyhow::Result<Ar
         skip: pargs.contains(["-y", "--yes"]),
         force: pargs.contains(["-f", "--force"]),
         rc,
-        mobile: if pargs.contains("--mobile") {
-            Some(true)
-        } else {
-            None
-        },
-        no_mobile: if pargs.contains("--no-mobile") {
-            Some(true)
-        } else {
-            None
-        },
         project_name: pargs.opt_free_from_str()?,
     };
 

src/lib.rs

@@ -66,8 +66,6 @@ where
     let defaults = args::Args::default();
     let args::Args {
         skip,
-        mut mobile,
-        no_mobile,
         rc,
         manager,
         project_name,
@@ -76,18 +74,6 @@ where
     } = args;
     let cwd = std::env::current_dir()?;
 
-    // Allow `--mobile` to only be used with `--rc` for now
-    // TODO: remove this limitation once tauri@v2 is stable
-    if (mobile.is_some() || no_mobile.is_some()) && !rc {
-        let flag = if mobile.is_some() {
-            "--mobile"
-        } else {
-            "--no-mobile"
-        };
-        eprintln!("{BOLD}{RED}error{RESET}: `{GREEN}{}{RESET}` option is only available if `{GREEN}--rc{RESET}` option is also used", flag);
-        exit(1);
-    }
-
     // Project name used for the project directory name and productName in tauri.conf.json
     // and if valid, it will also be used in Cargo.toml, Package.json ...etc
     let project_name = match project_name {
@@ -281,28 +267,6 @@ where
         }
     };
 
-    // if --no-mobile is specified, ignore --mobile and force it to fale
-    if no_mobile.is_some() {
-        mobile = Some(false);
-    };
-
-    // Prompt for wether to bootstrap a mobile-friendly tauri project
-    // This should only be prompted if `--rc` is used on the command line and `--mobile` wasn't.
-    // TODO: remove this limitation once tauri@v2 is stable
-    let mobile = match mobile {
-        Some(mobile) => mobile,
-        None => {
-            if skip || !rc {
-                defaults.mobile.context("default mobile not set")?
-            } else {
-                Confirm::with_theme(&ColorfulTheme::default())
-                    .with_prompt("Would you like to setup the project for mobile as well?")
-                    .default(false)
-                    .interact()?
-            }
-        }
-    };
-
     // If the package manager and the template are specified on the command line
     // then almost all prompts are skipped so we need to make sure that the combination
     // is valid, otherwise, we error and exit
@@ -339,14 +303,7 @@ where
     }
 
     // Render the template
-    template.render(
-        &target_dir,
-        pkg_manager,
-        &project_name,
-        &package_name,
-        rc,
-        mobile,
-    )?;
+    template.render(&target_dir, pkg_manager, &project_name, &package_name, rc)?;
 
     // Print post-render instructions
     println!();
@@ -370,7 +327,7 @@ where
     if let Some(cmd) = pkg_manager.install_cmd() {
         println!("  {cmd}");
     }
-    if !mobile {
+    if !rc {
         println!("  {} tauri dev", pkg_manager.run_cmd());
     } else {
         println!("  {} tauri android init", pkg_manager.run_cmd());

src/template.rs

@@ -257,15 +257,14 @@ impl<'a> Template {
         project_name: &str,
         package_name: &str,
         rc: bool,
-        mobile: bool,
     ) -> anyhow::Result<()> {
         let manifest_bytes =
             EMBEDDED_TEMPLATES::get(&format!("template-{self}/{CTA_MANIFEST_FILENAME}"))
                 .with_context(|| "Failed to get manifest bytes")?
                 .data
                 .to_vec();
         let manifest_str = String::from_utf8(manifest_bytes)?;
-        let manifest = Manifest::parse(&manifest_str, mobile)?;
+        let manifest = Manifest::parse(&manifest_str, rc)?;
 
         let lib_name = format!("{}_lib", package_name.replace('-', "_"));
         let project_name_pascal_case = Self::transform_to_pascal_case(project_name.to_string());
@@ -299,7 +298,6 @@ impl<'a> Template {
         let template_data: HashMap<&str, String> = [
             ("stable", (!rc).to_string()),
             ("rc", rc_str.clone()),
-            ("mobile", mobile.to_string()),
             ("project_name", project_name.to_string()),
             (
                 "project_name_pascal_case",
@@ -376,7 +374,7 @@ impl<'a> Template {
                 // conditional files:
                 // are files that start with a special syntax
                 //          "%(<list of flags separated by `-`>%)<file_name>"
-                // flags are supported package managers, stable, rc and mobile.
+                // flags are supported package managers, stable and rc.
                 // example: "%(pnpm-npm-yarn-stable-rc)%package.json"
                 name if name.starts_with("%(") && name[1..].contains(")%") => {
                     let mut s = name.strip_prefix("%(").unwrap().split(")%");
@@ -387,15 +385,11 @@ impl<'a> Template {
 
                     let for_stable = flags.contains(&"stable");
                     let for_rc = flags.contains(&"rc");
-                    let for_mobile = flags.contains(&"mobile");
 
                     // remove these flags to only keep package managers flags
-                    flags.retain(|e| !["stable", "rc", "mobile"].contains(e));
+                    flags.retain(|e| !["stable", "rc"].contains(e));
 
-                    if ((for_stable && !rc)
-                        || (for_rc && rc && !mobile)
-                        || (for_mobile && rc && mobile)
-                        || (!for_stable && !for_rc && !for_mobile))
+                    if ((for_stable && !rc) || (for_rc && rc) || (!for_stable && !for_rc))
                         && (flags.contains(&pkg_manager.to_string().as_str()) || flags.is_empty())
                     {
                         name

…c-tauri/%(rc-mobile)%tauri.conf.json.lte …ase_/src-tauri/%(rc)%tauri.conf.json.ltetemplates/_base_/src-tauri/%(rc-mobile)%tauri.conf.json.lte renamed to templates/_base_/src-tauri/%(rc)%tauri.conf.json.lte templates/_base_/src-tauri/%(rc-mobile)%tauri.conf.json.lte renamed to templates/_base_/src-tauri/%(rc)%tauri.conf.json.lte

@@ -7,7 +7,7 @@ edition = "2021"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
-{% if mobile %}[lib]
+{% if rc %}[lib]
 name = "{% lib_name %}"
 crate-type = ["lib", "cdylib", "staticlib"]
 

templates/_base_/src-tauri/Cargo.toml.lte

@@ -1,7 +1,7 @@
 // Prevents additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
-{% if mobile %}fn main() {
+{% if rc %}fn main() {
     {% lib_name %}::run()
 }{% else %}// Learn more about Tauri commands at https://tauri.app/v1/guides/features/command
 #[tauri::command]

…pabilities/%(rc-mobile)%default.json.lte …auri/capabilities/%(rc)%default.json.ltetemplates/_base_/src-tauri/capabilities/%(rc-mobile)%default.json.lte renamed to templates/_base_/src-tauri/capabilities/%(rc)%default.json.lte templates/_base_/src-tauri/capabilities/%(rc-mobile)%default.json.lte renamed to templates/_base_/src-tauri/capabilities/%(rc)%default.json.lte

@@ -5,7 +5,7 @@ target = "./index.html"
 ignore = ["./src-tauri"]
 
 [serve]
-address = "{% if mobile %}0.0.0.0{% else %}127.0.0.1{% endif %}"
+address = "{% if rc %}0.0.0.0{% else %}127.0.0.1{% endif %}"
 port = 1420
-open = false{% if mobile %}
+open = false{% if rc %}
 ws_protocol = "ws"{% endif %}