fix: seperate tauri.conf templates for v1 and v2. Fix compatibilies file. Fix --alpha flag not working. (#593)

* fix: seperate tauri.conf templates for v1 and v2. Fix compatibilies file.

* fix --alpha flag

Author: FabianLars

.changes/fix-beta-templates.md

@@ -0,0 +1,6 @@
+---
+create-tauri-app: patch
+create-tauri-app-js: patch
+---
+
+Fix tauri v2 beta templates.

src/args.rs

@@ -82,18 +82,23 @@ pub fn parse(argv: Vec<OsString>, bin_name: Option<String>) -> anyhow::Result<Ar
         println!("{}", env!("CARGO_PKG_VERSION"));
         std::process::exit(0);
     }
-    if pargs.contains("--alpha") {
+
+    // pargs.contains() consume the flag so we have to bind the bool to a variable.
+    let alpha = 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."
             );
-    }
+        true
+    } else {
+        pargs.contains("--beta")
+    };
 
     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"]),
-        alpha: pargs.contains("--alpha") || pargs.contains("--beta"),
+        alpha,
         mobile: if pargs.contains("--mobile") {
             Some(true)
         } else {

templates/_base_/src-tauri/%(alpha)%tauri.conf.json.lte

@@ -0,0 +1,42 @@
+{
+  "productName": "{% project_name %}",
+  "version": "0.0.0",
+  "identifier": "com.tauri.dev",
+  "build": {
+    "beforeDevCommand": "{% before_dev_command %}",
+    "beforeBuildCommand": "{% before_build_command %}",
+    "devUrl": "{% dev_path %}",
+    "frontendDist": "{% dist_dir %}"
+  },
+  "app": {
+    "security": {
+      "csp": null
+    },
+    "windows": [
+      {
+        "fullscreen": false,
+        "resizable": true,
+        "title": "{% package_name %}",
+        "width": 800,
+        "height": 600
+      }
+    ]{% if with_global_tauri %},
+    "withGlobalTauri": true{% endif %}
+  },
+  "bundle": {
+    "active": true,
+    "targets": "all",
+    "icon": [
+      "icons/32x32.png",
+      "icons/128x128.png",
+      "icons/128x128@2x.png",
+      "icons/icon.icns",
+      "icons/icon.ico"
+    ]
+  },
+  "plugins": {
+    "shell": {
+      "open": true
+    }
+  }
+}

…tes/_base_/src-tauri/tauri.conf.json.lte …/src-tauri/%(stable)%tauri.conf.json.ltetemplates/_base_/src-tauri/tauri.conf.json.lte renamed to templates/_base_/src-tauri/%(stable)%tauri.conf.json.lte templates/_base_/src-tauri/tauri.conf.json.lte renamed to templates/_base_/src-tauri/%(stable)%tauri.conf.json.lte

@@ -11,14 +11,14 @@
     "version": "0.0.0"
   },
   "tauri": {
-    {% if stable %}"allowlist": {
+    "allowlist": {
       "all": false,
       "shell": {
         "all": false,
         "open": true
       }
     },
-    {% endif %}"bundle": {
+    "bundle": {
       "active": true,
       "targets": "all",
       "identifier": "com.tauri.dev",
@@ -42,10 +42,5 @@
         "height": 600
       }
     ]
-  }{% if alpha %},
-  "plugins": {
-    "shell": {
-      "open": true
-    }
-  }{% endif %}
+  }
 }

…/_base_/src-tauri/capabilities/main.json …auri/capabilities/%(alpha)%main.json.ltetemplates/_base_/src-tauri/capabilities/main.json renamed to templates/_base_/src-tauri/capabilities/%(alpha)%main.json.lte templates/_base_/src-tauri/capabilities/main.json renamed to templates/_base_/src-tauri/capabilities/%(alpha)%main.json.lte

@@ -2,7 +2,9 @@
   "$schema": "./schemas/desktop-schema.json",
   "identifier": "main-capability",
   "description": "Capability for the main window",
-  "windows": ["main"],
+  "windows": [
+    "main"
+  ],
   "permissions": [
     "path:default",
     "event:default",
@@ -11,6 +13,6 @@
     "resources:default",
     "menu:default",
     "tray:default",
-    "shell:open"
+    "shell:allow-open"
   ]
 }