feat: tauri v2 RC (#746)

Author: lucasfernog

.changes/rc.md

@@ -0,0 +1,6 @@
+---
+"create-tauri-app": minor
+"create-tauri-app-js": minor
+---
+
+Updated the templates to Tauri v2 RC.

.github/workflows/templates-test.yml

@@ -99,24 +99,24 @@ jobs:
       - uses: dtolnay/rust-toolchain@stable
 
       - run: cargo install tauri-cli
-        if: (matrix.settings.manager == 'cargo' || matrix.settings.manager == 'dotnet') && matrix.settings.beta != true
+        if: (matrix.settings.manager == 'cargo' || matrix.settings.manager == 'dotnet') && matrix.settings.rc != true
 
-      - run: cargo install tauri-cli --version '^2.0.0-beta'
-        if: (matrix.settings.manager == 'cargo' || matrix.settings.manager == 'dotnet') && matrix.settings.beta == true
+      - run: cargo install tauri-cli --version '^2.0.0-rc'
+        if: (matrix.settings.manager == 'cargo' || matrix.settings.manager == 'dotnet') && matrix.settings.rc == true
 
       - run: |
           rustup target add wasm32-unknown-unknown
           cargo install --locked trunk
         if: matrix.settings.install_trunk
 
       - name: install system dependencies
-        if: matrix.settings.beta != true
+        if: matrix.settings.rc != true
         run: |
           sudo apt-get update
           sudo apt-get install -y libgtk-3-dev webkit2gtk-4.0 libayatana-appindicator3-dev librsvg2-dev patchelf
 
-      - name: install system dependencies (beta)
-        if: matrix.settings.beta == true
+      - name: install system dependencies (rc)
+        if: matrix.settings.rc == true
         run: |
           sudo apt-get update
           sudo apt-get install -y libgtk-3-dev webkit2gtk-4.1 libayatana-appindicator3-dev librsvg2-dev patchelf

.scripts/generate-templates-matrix.js

@@ -78,16 +78,16 @@ matrixConfig
         const jobInfo = {
           template: t,
           install_trunk: ["yew", "sycamore", "leptos"].includes(t),
-          beta: false,
+          rc: false,
           no_bundle_flag: "-b none",
           ...managerInfo,
         };
         outMatrix.push(jobInfo);
         outMatrix.push({
           ...jobInfo,
-          beta: true,
+          rc: true,
           no_bundle_flag: "--no-bundle",
-          flags: "--beta",
+          flags: "--rc",
         });
       }
     }

src/args.rs

@@ -15,7 +15,7 @@ pub struct Args {
     pub template: Option<Template>,
     pub skip: bool,
     pub force: bool,
-    pub beta: bool,
+    pub rc: bool,
     pub mobile: Option<bool>,
     pub no_mobile: Option<bool>,
 }
@@ -28,7 +28,7 @@ impl Default for Args {
             template: Some(Template::Vanilla),
             skip: false,
             force: false,
-            beta: 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,
         }
@@ -56,9 +56,9 @@ pub fn parse(argv: Vec<OsString>, bin_name: Option<String>) -> anyhow::Result<Ar
   {GREEN}-t{RESET}, {GREEN}--template <TEMPLATE>{RESET}     Specify the UI template to use [{templates}]
   {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}--beta{RESET}                    Bootstraps a project using tauri@2.0-beta
-                    {GREEN}--mobile{RESET}                  Bootstraps a mobile project too. Only availabe with `--beta` option.
-                    {GREEN}--no-mobile{RESET}               Skip bootstraping a mobile project. Only availabe with `--beta` option.
+                    {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
 "#,
@@ -87,21 +87,26 @@ pub fn parse(argv: Vec<OsString>, bin_name: Option<String>) -> anyhow::Result<Ar
     }
 
     // pargs.contains() consume the flag so we have to bind the bool to a variable.
-    let beta = if pargs.contains("--alpha") {
+    let rc = if pargs.contains("--alpha") {
         eprintln!(
-                "{BOLD}{YELLOW}warning{RESET}: The `{GREEN}--alpha{RESET}` option is now an alias for `{GREEN}--beta{RESET}` and may be removed in the future."
+                "{BOLD}{YELLOW}warning{RESET}: The `{GREEN}--alpha{RESET}` option is now an alias for `{GREEN}--rc{RESET}` and may be removed in the future."
+            );
+        true
+    } else if pargs.contains("--beta") {
+        eprintln!(
+                "{BOLD}{YELLOW}warning{RESET}: The `{GREEN}--beta{RESET}` option is now an alias for `{GREEN}--rc{RESET}` and may be removed in the future."
             );
         true
     } else {
-        pargs.contains("--beta")
+        pargs.contains("--rc")
     };
 
     let args = Args {
         manager: pargs.opt_value_from_str(["-m", "--manager"])?,
         template: pargs.opt_value_from_str(["-t", "--template"])?,
         skip: pargs.contains(["-y", "--yes"]),
         force: pargs.contains(["-f", "--force"]),
-        beta,
+        rc,
         mobile: if pargs.contains("--mobile") {
             Some(true)
         } else {

src/deps.rs

@@ -37,11 +37,11 @@ fn is_trunk_installed() -> bool {
         .unwrap_or(false)
 }
 
-fn is_appropriate_tauri_cli_installed(beta: bool) -> bool {
+fn is_appropriate_tauri_cli_installed(rc: bool) -> bool {
     let check = |o: Output| match o.status.success() {
         true => String::from_utf8_lossy(&o.stdout)
             .split_once(' ')
-            .map(|(_, v)| v.starts_with(if beta { '2' } else { '1' }))
+            .map(|(_, v)| v.starts_with(if rc { '2' } else { '1' }))
             .unwrap_or(false),
         s => s,
     };
@@ -111,9 +111,9 @@ fn is_webview2_installed() -> bool {
     target_os = "openbsd",
     target_os = "netbsd"
 ))]
-fn is_webkit2gtk_installed(beta: bool) -> bool {
+fn is_webkit2gtk_installed(rc: bool) -> bool {
     Command::new("pkg-config")
-        .arg(if beta {
+        .arg(if rc {
             "webkit2gtk-4.1"
         } else {
             "webkit2gtk-4.0"
@@ -163,7 +163,7 @@ struct Dep<'a> {
 }
 
 /// Print missing deps in a table and returns whether there was any missing deps.
-pub fn print_missing_deps(pkg_manager: PackageManager, template: Template, beta: bool) -> bool {
+pub fn print_missing_deps(pkg_manager: PackageManager, template: Template, rc: bool) -> bool {
     let rustc_installed = is_rustc_installed();
     let cargo_installed = is_cargo_installed();
 
@@ -175,7 +175,7 @@ pub fn print_missing_deps(pkg_manager: PackageManager, template: Template, beta:
         target_os = "netbsd"
     ))]
     let (webkit2gtk_installed, rsvg2_installed) =
-        (is_webkit2gtk_installed(beta), is_rsvg2_installed());
+        (is_webkit2gtk_installed(rc), is_rsvg2_installed());
 
     let deps: &[Dep<'_>] = &[
         Dep {
@@ -198,12 +198,12 @@ pub fn print_missing_deps(pkg_manager: PackageManager, template: Template, beta:
         },
         Dep {
             name: "Tauri CLI",
-            instruction: if beta {
-                format!("Run `{BLUE}{BOLD}cargo install tauri-cli --version '^2.0.0-beta'{RESET}`")
+            instruction: if rc {
+                format!("Run `{BLUE}{BOLD}cargo install tauri-cli --version '^2.0.0-rc'{RESET}`")
             } else {
                 format!("Run `{BLUE}{BOLD}cargo install tauri-cli{RESET}`")
             },
-            exists: &|| is_appropriate_tauri_cli_installed(beta),
+            exists: &|| is_appropriate_tauri_cli_installed(rc),
             skip: pkg_manager.is_node() || !template.needs_tauri_cli(),
         },
         Dep {
@@ -240,8 +240,8 @@ pub fn print_missing_deps(pkg_manager: PackageManager, template: Template, beta:
         ))]
         Dep {
             name: "webkit2gtk & rsvg2",
-            instruction: format!("Visit {BLUE}{BOLD}{}{RESET}", if beta {
-                "https://beta.tauri.app/guides/prerequisites/#linux"
+            instruction: format!("Visit {BLUE}{BOLD}{}{RESET}", if rc {
+                "https://v2.tauri.app/guides/prerequisites/#linux"
             } else {
                 "https://tauri.app/v1/guides/getting-started/prerequisites#setting-up-linux"
             }),
@@ -257,8 +257,8 @@ pub fn print_missing_deps(pkg_manager: PackageManager, template: Template, beta:
         ))]
         Dep {
             name: "webkit2gtk",
-            instruction: format!("Visit {BLUE}{BOLD}{}{RESET}", if beta {
-                "https://beta.tauri.app/guides/prerequisites/#linux"
+            instruction: format!("Visit {BLUE}{BOLD}{}{RESET}", if rc {
+                "https://v2.tauri.app/guides/prerequisites/#linux"
             } else {
                 "https://tauri.app/v1/guides/getting-started/prerequisites#setting-up-linux"
             }),
@@ -274,8 +274,8 @@ pub fn print_missing_deps(pkg_manager: PackageManager, template: Template, beta:
         ))]
         Dep {
             name: "rsvg2",
-            instruction: format!("Visit {BLUE}{BOLD}{}{RESET}", if beta {
-                "https://beta.tauri.app/guides/prerequisites/#linux"
+            instruction: format!("Visit {BLUE}{BOLD}{}{RESET}", if rc {
+                "https://v2.tauri.app/guides/prerequisites/#linux"
             } else {
                 "https://tauri.app/v1/guides/getting-started/prerequisites#setting-up-linux"
             }),

src/lib.rs

@@ -68,23 +68,23 @@ where
         skip,
         mut mobile,
         no_mobile,
-        beta,
+        rc,
         manager,
         project_name,
         template,
         force,
     } = args;
     let cwd = std::env::current_dir()?;
 
-    // Allow `--mobile` to only be used with `--beta` for now
+    // 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()) && !beta {
+    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}--beta{RESET}` option is also used", flag);
+        eprintln!("{BOLD}{RED}error{RESET}: `{GREEN}{}{RESET}` option is only available if `{GREEN}--rc{RESET}` option is also used", flag);
         exit(1);
     }
 
@@ -287,12 +287,12 @@ where
     };
 
     // Prompt for wether to bootstrap a mobile-friendly tauri project
-    // This should only be prompted if `--beta` is used on the command line and `--mobile` wasn't.
+    // 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 || !beta {
+            if skip || !rc {
                 defaults.mobile.context("default mobile not set")?
             } else {
                 Confirm::with_theme(&ColorfulTheme::default())
@@ -344,14 +344,14 @@ where
         pkg_manager,
         &project_name,
         &package_name,
-        beta,
+        rc,
         mobile,
     )?;
 
     // Print post-render instructions
     println!();
     print!("Template created!");
-    let has_missing = print_missing_deps(pkg_manager, template, beta);
+    let has_missing = print_missing_deps(pkg_manager, template, rc);
     if has_missing {
         println!("Make sure you have installed the prerequisites for your OS: {BLUE}{BOLD}https://tauri.app/v1/guides/getting-started/prerequisites{RESET}, then run:");
     } else {

src/template.rs

@@ -256,7 +256,7 @@ impl<'a> Template {
         pkg_manager: PackageManager,
         project_name: &str,
         package_name: &str,
-        beta: bool,
+        rc: bool,
         mobile: bool,
     ) -> anyhow::Result<()> {
         let manifest_bytes =
@@ -270,9 +270,9 @@ impl<'a> Template {
         let lib_name = format!("{}_lib", package_name.replace('-', "_"));
         let project_name_pascal_case = Self::transform_to_pascal_case(project_name.to_string());
 
-        let beta_str = beta.to_string();
+        let rc_str = rc.to_string();
         let manifest_template_data: HashMap<&str, &str> = [
-            ("beta", beta_str.as_str()),
+            ("rc", rc_str.as_str()),
             ("pkg_manager_run_command", pkg_manager.run_cmd()),
             ("lib_name", &lib_name),
             ("package_name", package_name),
@@ -297,8 +297,8 @@ impl<'a> Template {
         )?;
 
         let template_data: HashMap<&str, String> = [
-            ("stable", (!beta).to_string()),
-            ("beta", beta_str.clone()),
+            ("stable", (!rc).to_string()),
+            ("rc", rc_str.clone()),
             ("mobile", mobile.to_string()),
             ("project_name", project_name.to_string()),
             (
@@ -376,8 +376,8 @@ 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, beta and mobile.
-                // example: "%(pnpm-npm-yarn-stable-beta)%package.json"
+                // flags are supported package managers, stable, rc and mobile.
+                // example: "%(pnpm-npm-yarn-stable-rc)%package.json"
                 name if name.starts_with("%(") && name[1..].contains(")%") => {
                     let mut s = name.strip_prefix("%(").unwrap().split(")%");
                     let (mut flags, name) = (
@@ -386,16 +386,16 @@ impl<'a> Template {
                     );
 
                     let for_stable = flags.contains(&"stable");
-                    let for_beta = flags.contains(&"beta");
+                    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", "beta", "mobile"].contains(e));
+                    flags.retain(|e| !["stable", "rc", "mobile"].contains(e));
 
-                    if ((for_stable && !beta)
-                        || (for_beta && beta && !mobile)
-                        || (for_mobile && beta && mobile)
-                        || (!for_stable && !for_beta && !for_mobile))
+                    if ((for_stable && !rc)
+                        || (for_rc && rc && !mobile)
+                        || (for_mobile && rc && mobile)
+                        || (!for_stable && !for_rc && !for_mobile))
                         && (flags.contains(&pkg_manager.to_string().as_str()) || flags.is_empty())
                     {
                         name

src/utils/lte.rs

@@ -508,19 +508,19 @@ mod tests {
         <html>
         <h1>Hello<h2>{% if alpha %}
         <em>{% alpha_str %}</em>{% else %}
-        <em>{% if beta %}beta{%else%}stable{%endif%}</em>{% endif %}
+        <em>{% if rc %}rc{%else%}stable{%endif%}</em>{% endif %}
         </html>"#;
         let data: HashMap<&str, &str> = [
             ("alpha", "false"),
-            ("beta", "true"),
+            ("rc", "true"),
             ("alpha_str", "holla alpha"),
         ]
         .into();
         let rendered = render(template, &data).expect("it should render");
         let expected = r#"
         <html>
         <h1>Hello<h2>
-        <em>beta</em>
+        <em>rc</em>
         </html>"#;
         assert_eq!(rendered, expected)
     }

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

@@ -16,11 +16,11 @@ tauri-build = { version = "1", features = [] }
 
 [dependencies]
 tauri = { version = "1", features = ["shell-open"] }{% else %}[build-dependencies]
-tauri-build = { version = "2.0.0-beta", features = [] }
+tauri-build = { version = "2.0.0-rc", features = [] }
 
 [dependencies]
-tauri = { version = "2.0.0-beta", features = [] }
-tauri-plugin-shell = "2.0.0-beta"{% endif %}
+tauri = { version = "2.0.0-rc", features = [] }
+tauri-plugin-shell = "2.0.0-rc"{% endif %}
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 {% if stable %}