chore: cleanup after #806

Author: amrbashir

.changes/tauriver.md

@@ -0,0 +1,6 @@
+---
+"create-tauri-app": "patch"
+"create-tauri-app-js": "patch"
+---
+
+Fix incorrect version printed for installing `tauri-cli` command

.github/workflows/templates-test.yml

@@ -111,13 +111,13 @@ jobs:
           cargo install dioxus-cli --locked
         if: matrix.settings.install_dioxus_cli
 
-      - name: install system dependencies
+      - name: install system dependencies (v1)
         if: matrix.settings.tauriVersion == 1
         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 (rc)
+      - name: install system dependencies
         if: matrix.settings.tauriVersion == 'latest'
         run: |
           sudo apt-get update

CONTRIBUTING.md

@@ -29,8 +29,8 @@ cargo run -- <cli arguments>
   ```ini
   beforeDevCommand = {% pkg_manager_run_command %} dev
   beforeBuildCommand = {% pkg_manager_run_command %} build
-  devPath = http://localhost:1420
-  distDir = ../dist
+  devUrl = http://localhost:1420
+  frontendDist = ../dist
 
   # the next sction is used to determine what files to copy from `templates/_assets_`
   # if you introduce a new file like an icon that is shared between multiple templates,

src/args.rs

@@ -16,8 +16,8 @@ pub enum TauriVersion {
 }
 
 impl TauriVersion {
-    pub fn all() -> &'static [TauriVersion] {
-        &[TauriVersion::V1, TauriVersion::V2]
+    pub fn all() -> [TauriVersion; 2] {
+        [TauriVersion::V1, TauriVersion::V2]
     }
 }
 

src/deps.rs

@@ -210,8 +210,8 @@ pub fn print_missing_deps(
         Dep {
             name: "Tauri CLI",
             instruction: match tauri_version {
-                TauriVersion::V1 => format!("Run `{BLUE}{BOLD}cargo install tauri-cli --version '^2.0.0' --locked{RESET}`"),
-                TauriVersion::V2 => format!("Run `{BLUE}{BOLD}cargo install tauri-cli --version '^1.0.0' --locked{RESET}`"),
+                TauriVersion::V1 => format!("Run `{BLUE}{BOLD}cargo install tauri-cli --version '^1.0.0' --locked{RESET}`"),
+                TauriVersion::V2 => format!("Run `{BLUE}{BOLD}cargo install tauri-cli --version '^2.0.0' --locked{RESET}`"),
             },
             exists: &|| is_appropriate_tauri_cli_installed(tauri_version),
             skip: pkg_manager.is_node() || !template.needs_tauri_cli(),

src/manifest.rs

@@ -6,8 +6,8 @@ use anyhow::{bail, Context};
 pub struct Manifest<'a> {
     pub before_dev_command: Option<&'a str>,
     pub before_build_command: Option<&'a str>,
-    pub dev_path: Option<&'a str>,
-    pub dist_dir: Option<&'a str>,
+    pub dev_url: Option<&'a str>,
+    pub frontend_dist: Option<&'a str>,
     pub with_global_tauri: Option<bool>,
     pub files: HashMap<&'a str, &'a str>,
 }
@@ -59,8 +59,8 @@ impl<'a> Manifest<'a> {
                 match k {
                     "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),
+                    "devUrl" => manifest.dev_url = Some(v),
+                    "frontendDist" => manifest.frontend_dist = Some(v),
                     "withGlobalTauri" => manifest.with_global_tauri = Some(v.parse()?),
                     _ if in_files_section => {
                         manifest.files.insert(k, v);
@@ -86,7 +86,7 @@ mod test {
 
             beforeDevCommand = npm start -- --port 1420
             beforeBuildCommand = {% pkg_manager_run_command %} build # this comment should be stripped
-            devPath = http://localhost:1420
+            devUrl = http://localhost:1420
 
             [files]
             tauri.svg = src/assets/tauri.svg
@@ -101,8 +101,8 @@ mod test {
             Manifest {
                 before_dev_command: Some("npm start -- --port 1420"),
                 before_build_command: Some("{% pkg_manager_run_command %} build"),
-                dev_path: Some("http://localhost:1420"),
-                dist_dir: None,
+                dev_url: Some("http://localhost:1420"),
+                frontend_dist: None,
                 with_global_tauri: None,
                 files,
             }
@@ -119,7 +119,7 @@ mod test {
 
             beforeDevCommand = npm start -- --port 1420
             beforeBuildCommand =
-            devPath = http://localhost:1420
+            devUrl = http://localhost:1420
 
             [files]
             tauri.svg = src/assets/tauri.svg
@@ -138,7 +138,7 @@ mod test {
 
         beforeDevCommand = npm start -- --port 1420
         beforeBuildCommand = {% pkg_manager_run_command %} build # this comment should be stripped
-        devPath = http://localhost:1420
+        devUrl = http://localhost:1420
         beforeBuildCommand = {% pkg_manager_run_command %} build mobile
 
         [files]
@@ -154,8 +154,8 @@ mod test {
             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,
+                dev_url: Some("http://localhost:1420"),
+                frontend_dist: None,
                 with_global_tauri: None,
                 files,
             }

src/template.rs

@@ -278,40 +278,39 @@ impl<'a> Template {
         let lib_name = format!("{}_lib", package_name.replace('-', "_"));
         let project_name_pascal_case = utils::to_pascal_case(project_name);
 
+        let versions = TauriVersion::all()
+            .iter()
+            .map(|&v| {
+                (
+                    format!("v{v}",),
+                    match v == tauri_version {
+                        true => "true",
+                        false => "false",
+                    },
+                )
+            })
+            .collect::<Vec<_>>();
+
+        let styles = String::from_utf8(
+            EMBEDDED_TEMPLATES::get("_assets_/styles.css")
+                .unwrap()
+                .data
+                .to_vec(),
+        )?;
+
         let mut manifest_template_data: HashMap<&str, &str> = [
             ("pkg_manager_run_command", pkg_manager.run_cmd()),
             ("lib_name", &lib_name),
             ("package_name", package_name),
             ("project_name", project_name),
             ("identifier", identifier),
             ("project_name_pascal_case", &project_name_pascal_case),
-            (
-                "double_dash_with_space",
-                if pkg_manager == PackageManager::Npm {
-                    "-- "
-                } else {
-                    ""
-                },
-            ),
         ]
         .into();
 
-        let versions = TauriVersion::all()
-            .iter()
-            .map(|v| format!("v{v}"))
-            .collect::<Vec<_>>();
-        for version in &versions {
-            manifest_template_data.insert(version.as_str(), "false");
+        for (version, enabled) in &versions {
+            manifest_template_data.insert(version, enabled);
         }
-        let tauri_version_key = format!("v{tauri_version}");
-        manifest_template_data.insert(tauri_version_key.as_str(), "true");
-
-        let styles = String::from_utf8(
-            EMBEDDED_TEMPLATES::get("_assets_/styles.css")
-                .unwrap()
-                .data
-                .to_vec(),
-        )?;
 
         let mut template_data: HashMap<&str, String> = [
             ("project_name", project_name.to_string()),
@@ -336,16 +335,16 @@ impl<'a> Template {
                 )?,
             ),
             (
-                "dev_path",
+                "dev_url",
                 lte::render(
-                    manifest.dev_path.unwrap_or_default(),
+                    manifest.dev_url.unwrap_or_default(),
                     &manifest_template_data,
                 )?,
             ),
             (
-                "dist_dir",
+                "frontend_dist",
                 lte::render(
-                    manifest.dist_dir.unwrap_or_default(),
+                    manifest.frontend_dist.unwrap_or_default(),
                     &manifest_template_data,
                 )?,
             ),
@@ -354,33 +353,18 @@ impl<'a> Template {
                 manifest.with_global_tauri.unwrap_or_default().to_string(),
             ),
             ("lib_name", lib_name),
-            (
-                "styles_padded",
-                styles
-                    .lines()
-                    .map(|l| {
-                        if l.is_empty() {
-                            l.to_string()
-                        } else {
-                            format!("  {l}")
-                        }
-                    })
-                    .collect::<Vec<_>>()
-                    .join("\n"),
-            ),
             ("styles", styles),
         ]
         .into();
 
-        let versions = TauriVersion::all()
+        for (version, enabled) in &versions {
+            template_data.insert(version.as_str(), enabled.to_string());
+        }
+
+        let version_flags = TauriVersion::all()
             .iter()
-            .map(|v| format!("v{v}"))
+            .map(|&v| (v, format!("v{v}")))
             .collect::<Vec<_>>();
-        for version in &versions {
-            template_data.insert(version.as_str(), "false".to_string());
-        }
-        let tauri_version_key = format!("v{tauri_version}");
-        template_data.insert(tauri_version_key.as_str(), "true".to_string());
 
         let write_file = |file: &str, template_data| -> anyhow::Result<()> {
             // remove the first component, which is certainly the template directory they were in before getting embeded into the binary
@@ -394,11 +378,6 @@ impl<'a> Template {
             let p = target_dir.join(p);
             let file_name = p.file_name().unwrap().to_string_lossy();
 
-            let version_flags = TauriVersion::all()
-                .iter()
-                .map(|version| (format!("v{version}"), *version))
-                .collect::<Vec<_>>();
-
             let file_name = match &*file_name {
                 "_gitignore" => ".gitignore",
                 // skip manifest
@@ -417,19 +396,18 @@ impl<'a> Template {
 
                     let for_version = version_flags
                         .iter()
-                        .find(|(flag, _version)| flags.contains(&flag.as_str()))
-                        .map(|(_flag, version)| *version);
-
-                    // remove these flags to only keep package managers flags
-                    flags.retain(|e| !["stable", "rc"].contains(e));
-
-                    if let Some(for_version) = for_version {
-                        if for_version == tauri_version {
-                            name
-                        } else {
-                            return Ok(());
-                        }
-                    } else if flags.contains(&pkg_manager.to_string().as_str()) || flags.is_empty()
+                        .find(|(_, flag)| flags.contains(&flag.as_str()))
+                        .map(|(v, _)| *v);
+
+                    // remove version flags to only keep package managers flags
+                    flags.retain(|e| !version_flags.iter().any(|(_, flag)| e == flag));
+
+                    // this file has a version flag and matches active version.
+                    // if doesn't have any version flag, it should be rendered
+                    if for_version.map(|v| v == tauri_version).unwrap_or(true)
+                        // this file has a package manager flag and matches active package manager.
+                        // if doesn't have any package manager flag, it should be rendered
+                        && (flags.contains(&pkg_manager.to_string().as_str()) || flags.is_empty())
                     {
                         name
                     } else {

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

@@ -3,8 +3,8 @@
   "build": {
     {% if before_dev_command %}"beforeDevCommand": "{% before_dev_command %}",
     {% endif %}{% if before_build_command %}"beforeBuildCommand": "{% before_build_command %}",
-    {% endif %}{% if dev_path %}"devPath": "{% dev_path %}",
-    {% endif %}"distDir": "{% dist_dir %}"{% if with_global_tauri %},
+    {% endif %}{% if dev_url %}"devPath": "{% dev_url %}",
+    {% endif %}"distDir": "{% frontend_dist %}"{% if with_global_tauri %},
     "withGlobalTauri": true{% endif %}
   },
   "package": {

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

@@ -5,9 +5,9 @@
   "identifier": "{% identifier %}",
   "build": {
     {% if before_dev_command %}"beforeDevCommand": "{% before_dev_command %}",
-    {% endif %}{% if dev_path %}"devUrl": "{% dev_path %}",
+    {% endif %}{% if dev_url %}"devUrl": "{% dev_url %}",
     {% endif %}{% if before_build_command %}"beforeBuildCommand": "{% before_build_command %}",
-    {% endif %}"frontendDist": "{% dist_dir %}"
+    {% endif %}"frontendDist": "{% frontend_dist %}"
   },
   "app": {
     {% if with_global_tauri %}"withGlobalTauri": true,

templates/template-angular/.manifest

@@ -4,8 +4,8 @@
 
 beforeDevCommand = {% pkg_manager_run_command %} start
 beforeBuildCommand = {% pkg_manager_run_command %} build
-devPath = http://localhost:1420
-distDir = ../dist/{% package_name %}/browser
+devUrl = http://localhost:1420
+frontendDist = ../dist/{% package_name %}/browser
 
 [files]
 tauri.svg = src/assets/tauri.svg