feat: create-tauri-app@3

.changes/cta-3.0-removed-templates.md

@@ -0,0 +1,6 @@
+---
+"create-tauri-app": "major"
+"create-tauri-app-js": "major"
+---
+
+**Breaking Change** Removed `next`, `next-ts`, `preact`, `preact-ts`, `angular`, `clojurescript`, `svelte-kit`, `svelte-kit-ts` templates.

.changes/leptos.md

@@ -0,0 +1,7 @@
+---
+"create-tauri-app": "patch"
+"create-tauri-app-js": "patch"
+---
+
+Add `leptos` rust template.
+

.github/CONTRIBUTING.md

@@ -58,10 +58,12 @@ cargo run -- <cli arguments>
 
 ### Templates
 
-A template is a just combination of two fragments, [`fragment-base`](../packages/cli/fragments/base) (which is shared between all templates) and another fragment that is specific to the template.
+A template is a just combination of two fragments, [`_base_`](../packages/cli/fragments/_base_) (which is shared between all templates) and another fragment that is specific to the template.
 
 #### Adding a new template
 
+> You should open a new issue first to discuss the addition of a certain template.
+
 - Add a directory in `<repo-root>/packages/cli/fragments` and name `fragment-template` where `template` is the name of the template and add all the files you need there as they should appear after the template is created.
 - A template also must have a `_cta_manifest_` file which contains info about the template:
   ```ini
@@ -80,7 +82,7 @@ A template is a just combination of two fragments, [`fragment-base`](../packages
   # the second part is the path that the file will be copied to under the final template directory
   tauri.svg = public/tauri.svg
   ```
-- In `<repo-root>/packages/cli/src/template.rs`, add an entry in the `Template` enum, modify `post_init_info` if needed and modify `FromStr` and `Display` implementation
+- In `<repo-root>/packages/cli/src/template.rs`, add an entry in the `Template` enum, modify `post_init_info`, `flavors` and `from_flavor` if needed and modify `FromStr` and `Display` implementation
 - In `<repo-root>/packages/cli/src/package_manager.rs` add your new template to the appropraite package manager in the `templates` method
 - Modify `<repo-root>/.scripts/generate-templates-matrix.js` and append the template name inside the template list for the appropriate package manager so the CI would run tests for it.
 - If the template requires system dependencies, add a post init note in `<repo-root>/packages/cli/src/template.rs` in `post_init_info` method.

.github/workflows/audit.yml

@@ -33,6 +33,7 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - uses: dtolnay/rust-toolchain@stable
+      - run: cargo install cargo-audit
       - run: cargo audit
 
   audit-js:
@@ -50,4 +51,4 @@ jobs:
           cache: 'pnpm'
           cache-dependency-path: '**/pnpm-lock.yaml'
       - run: pnpm install
-      - run: pnpm audit
+      - run: pnpm audit

.github/workflows/cli-test.yml

@@ -32,7 +32,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        toolchain: [1.57, stable]
+        toolchain: [1.58, stable]
 
     steps:
       - uses: actions/checkout@v2

.github/workflows/templates-test.yml

@@ -40,25 +40,35 @@ jobs:
           path: create-tauri-app.tar
           if-no-files-found: error
 
+  generate-matrix:
+    runs-on: ubuntu-latest
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+
+    steps:
+      - uses: actions/checkout@v2
+
       - name: Get changed files
         id: changed-files
-        uses: tj-actions/changed-files@v29.0.1
+        uses: tj-actions/changed-files@v35
+        with:
+          separator: ","
 
       - name: set matrix
         id: set-matrix
         shell: bash
         run: |
-          OUT="$(node .scripts/generate-templates-matrix.js ${{ steps.changed-files.outputs.all_changed_files }})"
-          echo "::set-output name=matrix::$OUT"
+          OUT="$(node .scripts/generate-templates-matrix.js '${{ steps.changed-files.outputs.all_changed_files }}')"
+          echo "matrix=$OUT" >> $GITHUB_OUTPUT
 
   test:
-    needs: build-cli
+    needs: [build-cli, generate-matrix]
     runs-on: ubuntu-latest
-    if: ${{ needs.build-cli.outputs.matrix != '[]' && needs.build-cli.outputs.matrix != '' }}
+    if: ${{ needs.generate-matrix.outputs.matrix != '[]' && needs.generate-matrix.outputs.matrix != '' }}
     strategy:
       fail-fast: false
       matrix:
-        settings: ${{ fromJson(needs.build-cli.outputs.matrix) }}
+        settings: ${{ fromJson(needs.generate-matrix.outputs.matrix) }}
 
     name: ${{ matrix.settings.manager }} - ${{ matrix.settings.template }}
     steps:
@@ -81,7 +91,7 @@ jobs:
       - run: |
           rustup target add wasm32-unknown-unknown
           cargo install --locked trunk
-        if: matrix.settings.template == 'yew'
+        if: matrix.settings.install_trunk
 
       - name: download cli artifact
         uses: actions/download-artifact@v3

.scripts/generate-templates-matrix.js

@@ -1,7 +1,7 @@
-const changedFiles = process.argv.slice(2);
+const changedFilesStr = process.argv[2];
+const changedFiles = changedFilesStr.split(",");
 
 const nodeJsTemplates = [
-  "angular",
   "svelte",
   "svelte-ts",
   "vue",
@@ -12,13 +12,6 @@ const nodeJsTemplates = [
   "react-ts",
   "vanilla",
   "vanilla-ts",
-  "next",
-  "next-ts",
-  "preact",
-  "preact-ts",
-  "clojurescript",
-  "svelte-kit",
-  "svelte-kit-ts",
 ];
 
 const matrixConfig = [
@@ -44,7 +37,7 @@ const matrixConfig = [
     manager: "cargo",
     install_cmd: "",
     run_cmd: "cargo",
-    templates: ["vanilla", "yew"],
+    templates: ["vanilla", "yew", "leptos"],
   },
 ];
 
@@ -66,6 +59,7 @@ matrixConfig
       ) {
         outMatrix.push({
           template: t,
+          install_trunk: ["yew", "leptos"].includes(t),
           ...managerInfo,
         });
       }

packages/cli/fragments/_base_/src-tauri/%(alpha-mobile)%Cargo.toml

@@ -0,0 +1,27 @@
+[package]
+name = "{{package_name}}"
+version = "0.0.0"
+description = "A Tauri App"
+authors = ["you"]
+license = ""
+repository = ""
+edition = "2021"
+
+[lib]
+name = "{{lib_name}}"
+crate-type = ["staticlib", "cdylib", "rlib"]
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[build-dependencies]
+tauri-build = { version = "2.0.0-alpha.1", features = [] }
+
+[dependencies]
+tauri = { version = "2.0.0-alpha.3", features = ["shell-open"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
+
+[features]
+# this feature is used for production builds or when `devPath` points to the filesystem
+# DO NOT REMOVE!!
+custom-protocol = ["tauri/custom-protocol"]

packages/cli/fragments/base/src-tauri/_Cargo.toml → packages/cli/fragments/_base_/src-tauri/%(stable)%Cargo.toml

@@ -13,14 +13,11 @@ edition = "2021"
 tauri-build = { version = "1.2", features = [] }
 
 [dependencies]
-serde_json = "1.0"
-serde = { version = "1.0", features = ["derive"] }
 tauri = { version = "1.2", features = ["shell-open"] }
+serde = { version = "1.0", features = ["derive"] }
+serde_json = "1.0"
 
 [features]
-# by default Tauri runs in production mode
-# when `tauri dev` runs it is executed with `cargo run --no-default-features` if `devPath` is an URL
-default = ["custom-protocol"]
-# this feature is used used for production builds where `devPath` points to the filesystem
-# DO NOT remove this
+# this feature is used for production builds or when `devPath` points to the filesystem
+# DO NOT REMOVE!!
 custom-protocol = ["tauri/custom-protocol"]

packages/cli/fragments/base/src-tauri/src/main.rs → packages/cli/fragments/_base_/src-tauri/src/%(mobile)%lib.rs

@@ -1,15 +1,11 @@
-#![cfg_attr(
-    all(not(debug_assertions), target_os = "windows"),
-    windows_subsystem = "windows"
-)]
-
 // Learn more about Tauri commands at https://tauri.app/v1/guides/features/command
 #[tauri::command]
 fn greet(name: &str) -> String {
     format!("Hello, {}! You've been greeted from Rust!", name)
 }
 
-fn main() {
+#[cfg_attr(mobile, tauri::mobile_entry_point)]
+pub fn run() {
     tauri::Builder::default()
         .invoke_handler(tauri::generate_handler![greet])
         .run(tauri::generate_context!())

packages/cli/fragments/_base_/src-tauri/src/%(mobile)%main.rs

@@ -0,0 +1,7 @@
+// Prevents additional console window on Windows in release, DO NOT REMOVE!!
+#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
+
+fn main() {
+    #[cfg(desktop)]
+    {{lib_name}}::run();
+}

packages/cli/fragments/_base_/src-tauri/src/%(stable-alpha)%main.rs

@@ -0,0 +1,15 @@
+// Prevents additional console window on Windows in release, DO NOT REMOVE!!
+#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
+
+// Learn more about Tauri commands at https://tauri.app/v1/guides/features/command
+#[tauri::command]
+fn greet(name: &str) -> String {
+    format!("Hello, {}! You've been greeted from Rust!", name)
+}
+
+fn main() {
+    tauri::Builder::default()
+        .invoke_handler(tauri::generate_handler![greet])
+        .run(tauri::generate_context!())
+        .expect("error while running tauri application");
+}