diff --git a/.changes/tauri-alpha.09.md b/.changes/tauri-alpha.09.md new file mode 100644 index 0000000000..ce5fc6a79b --- /dev/null +++ b/.changes/tauri-alpha.09.md @@ -0,0 +1,7 @@ +--- +"create-tauri-app": "minor" +"create-tauri-app-js": "minor" +--- + +Update `--alpha` templates for `tauri@2.0.0-alpha.9` + diff --git a/.changes/templates-form.md b/.changes/templates-form.md new file mode 100644 index 0000000000..9c6b21f5b4 --- /dev/null +++ b/.changes/templates-form.md @@ -0,0 +1,7 @@ +--- +"create-tauri-app": "patch" +"create-tauri-app-js": "patch" +--- + +Update `vue`, `vue-ts`, `vanilla`, `vanilla-ts`, `solid`, `solid-ts`, `svelte`, and `svelte-ts` to use `
` + diff --git a/.github/workflows/publish-napi.yml b/.github/workflows/publish-napi.yml index 61091c168d..60b9d8feb8 100644 --- a/.github/workflows/publish-napi.yml +++ b/.github/workflows/publish-napi.yml @@ -193,6 +193,9 @@ jobs: run: | echo "//registry.npmjs.org/:_authToken=$NPM_TOKEN" >> ~/.npmrc npm publish + jq '.name = "create-tauri" | .bin = { "create-tauri": .bin["create-tauri-app"] } | del(.scripts.prepublishOnly)' package.json > package.tmp + mv -f package.tmp package.json + npm publish env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} NPM_TOKEN: ${{ secrets.ORG_NPM_TOKEN }} diff --git a/packages/cli/fragments/_base_/src-tauri/%(alpha)%Cargo.toml b/packages/cli/fragments/_base_/src-tauri/%(alpha)%Cargo.toml index b2310e3f89..be485cd279 100644 --- a/packages/cli/fragments/_base_/src-tauri/%(alpha)%Cargo.toml +++ b/packages/cli/fragments/_base_/src-tauri/%(alpha)%Cargo.toml @@ -13,7 +13,9 @@ edition = "2021" tauri-build = { version = "2.0.0-alpha", features = [] } [dependencies] -tauri = { version = "2.0.0-alpha", features = ["shell-open"] } +tauri = { version = "2.0.0-alpha", features = [] } +tauri-plugin-window = "2.0.0-alpha" +tauri-plugin-shell = "2.0.0-alpha" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/packages/cli/fragments/_base_/src-tauri/%(alpha-mobile)%tauri.conf.json b/packages/cli/fragments/_base_/src-tauri/%(alpha-mobile)%tauri.conf.json new file mode 100644 index 0000000000..6a6fa58824 --- /dev/null +++ b/packages/cli/fragments/_base_/src-tauri/%(alpha-mobile)%tauri.conf.json @@ -0,0 +1,44 @@ +{ + "build": { + "beforeDevCommand": "~fragment_before_dev_command~", + "beforeBuildCommand": "~fragment_before_build_command~", + "devPath": "~fragment_dev_path~", + "distDir": "~fragment_dist_dir~", + "withGlobalTauri": "~fragment_with_global_tauri~" + }, + "package": { + "productName": "~package_name~", + "version": "0.0.0" + }, + "tauri": { + "bundle": { + "active": true, + "targets": "all", + "identifier": "com.tauri.dev", + "icon": [ + "icons/32x32.png", + "icons/128x128.png", + "icons/128x128@2x.png", + "icons/icon.icns", + "icons/icon.ico" + ] + }, + "security": { + "csp": null + }, + "windows": [ + { + "fullscreen": false, + "resizable": true, + "title": "~package_name~", + "width": 800, + "height": 600 + } + ] + }, + "plugins": { + "shell": { + "open": true + } + } +} diff --git a/packages/cli/fragments/_base_/src-tauri/%(mobile)%Cargo.toml b/packages/cli/fragments/_base_/src-tauri/%(mobile)%Cargo.toml index 1ced33f938..2ee2e797b0 100644 --- a/packages/cli/fragments/_base_/src-tauri/%(mobile)%Cargo.toml +++ b/packages/cli/fragments/_base_/src-tauri/%(mobile)%Cargo.toml @@ -17,7 +17,9 @@ crate-type = ["staticlib", "cdylib", "rlib"] tauri-build = { version = "2.0.0-alpha", features = [] } [dependencies] -tauri = { version = "2.0.0-alpha", features = ["shell-open"] } +tauri = { version = "2.0.0-alpha", features = [] } +tauri-plugin-window = "2.0.0-alpha" +tauri-plugin-shell = "2.0.0-alpha" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" diff --git a/packages/cli/fragments/_base_/src-tauri/tauri.conf.json b/packages/cli/fragments/_base_/src-tauri/%(stable)%tauri.conf.json similarity index 95% rename from packages/cli/fragments/_base_/src-tauri/tauri.conf.json rename to packages/cli/fragments/_base_/src-tauri/%(stable)%tauri.conf.json index 5a0a7c14de..16dd22111c 100644 --- a/packages/cli/fragments/_base_/src-tauri/tauri.conf.json +++ b/packages/cli/fragments/_base_/src-tauri/%(stable)%tauri.conf.json @@ -33,9 +33,6 @@ "security": { "csp": null }, - "updater": { - "active": false - }, "windows": [ { "fullscreen": false, diff --git a/packages/cli/fragments/_base_/src-tauri/src/%(alpha)%main.rs b/packages/cli/fragments/_base_/src-tauri/src/%(alpha)%main.rs new file mode 100644 index 0000000000..9e51f99548 --- /dev/null +++ b/packages/cli/fragments/_base_/src-tauri/src/%(alpha)%main.rs @@ -0,0 +1,17 @@ +// 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() + .plugin(tauri_plugin_window::init()) + .plugin(tauri_plugin_shell::init()) + .invoke_handler(tauri::generate_handler![greet]) + .run(tauri::generate_context!()) + .expect("error while running tauri application"); +} diff --git a/packages/cli/fragments/_base_/src-tauri/src/%(mobile)%lib.rs b/packages/cli/fragments/_base_/src-tauri/src/%(mobile)%lib.rs index e6f25bb251..5f48bdb2ca 100644 --- a/packages/cli/fragments/_base_/src-tauri/src/%(mobile)%lib.rs +++ b/packages/cli/fragments/_base_/src-tauri/src/%(mobile)%lib.rs @@ -7,6 +7,8 @@ fn greet(name: &str) -> String { #[cfg_attr(mobile, tauri::mobile_entry_point)] pub fn run() { tauri::Builder::default() + .plugin(tauri_plugin_window::init()) + .plugin(tauri_plugin_shell::init()) .invoke_handler(tauri::generate_handler![greet]) .run(tauri::generate_context!()) .expect("error while running tauri application"); diff --git a/packages/cli/fragments/_base_/src-tauri/src/%(stable-alpha)%main.rs b/packages/cli/fragments/_base_/src-tauri/src/%(stable)%main.rs similarity index 100% rename from packages/cli/fragments/_base_/src-tauri/src/%(stable-alpha)%main.rs rename to packages/cli/fragments/_base_/src-tauri/src/%(stable)%main.rs diff --git a/packages/cli/fragments/fragment-angular/%(alpha-mobile)%package.json b/packages/cli/fragments/fragment-angular/%(alpha-mobile)%package.json index c36260eb79..126efcf204 100644 --- a/packages/cli/fragments/fragment-angular/%(alpha-mobile)%package.json +++ b/packages/cli/fragments/fragment-angular/%(alpha-mobile)%package.json @@ -20,7 +20,9 @@ "rxjs": "~7.8.0", "tslib": "^2.3.0", "zone.js": "~0.12.0", - "@tauri-apps/api": "^2.0.0-alpha.3" + "@tauri-apps/api": "^2.0.0-alpha.4", + "@tauri-apps/plugin-window": "^2.0.0-alpha.0", + "@tauri-apps/plugin-shell": "^2.0.0-alpha.0" }, "devDependencies": { "@angular-devkit/build-angular": "^15.2.0", @@ -34,6 +36,6 @@ "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "~2.0.0", "typescript": "^4.9.5", - "@tauri-apps/cli": "^2.0.0-alpha.7" + "@tauri-apps/cli": "^2.0.0-alpha.9" } } diff --git a/packages/cli/fragments/fragment-angular/%(stable)%package.json b/packages/cli/fragments/fragment-angular/%(stable)%package.json index c1ef979346..ab877dd6d2 100644 --- a/packages/cli/fragments/fragment-angular/%(stable)%package.json +++ b/packages/cli/fragments/fragment-angular/%(stable)%package.json @@ -34,6 +34,6 @@ "karma-jasmine": "~5.1.0", "karma-jasmine-html-reporter": "~2.0.0", "typescript": "^4.9.5", - "@tauri-apps/cli": "^1.3.0" + "@tauri-apps/cli": "^1.3.1" } } diff --git a/packages/cli/fragments/fragment-angular/src/app/app.component.html b/packages/cli/fragments/fragment-angular/src/app/app.component.html index b334beaa1f..760339ea20 100644 --- a/packages/cli/fragments/fragment-angular/src/app/app.component.html +++ b/packages/cli/fragments/fragment-angular/src/app/app.component.html @@ -9,11 +9,10 @@

Welcome to Tauri + Angular!

Click on the logos to learn more about the frameworks

-
- - - - -
+ +
+ + +

{{ greetingMessage }}

diff --git a/packages/cli/fragments/fragment-react-ts/%(alpha)%package.json b/packages/cli/fragments/fragment-react-ts/%(alpha)%package.json index e71bd67ffe..6e8405d71a 100644 --- a/packages/cli/fragments/fragment-react-ts/%(alpha)%package.json +++ b/packages/cli/fragments/fragment-react-ts/%(alpha)%package.json @@ -12,7 +12,9 @@ "dependencies": { "react": "^18.2.0", "react-dom": "^18.2.0", - "@tauri-apps/api": "^2.0.0-alpha.3" + "@tauri-apps/api": "^2.0.0-alpha.4", + "@tauri-apps/plugin-window": "^2.0.0-alpha.0", + "@tauri-apps/plugin-shell": "^2.0.0-alpha.0" }, "devDependencies": { "@types/node": "^18.7.10", @@ -21,6 +23,6 @@ "@vitejs/plugin-react": "^3.0.0", "typescript": "^4.9.5", "vite": "^4.2.1", - "@tauri-apps/cli": "^2.0.0-alpha.7" + "@tauri-apps/cli": "^2.0.0-alpha.9" } } diff --git a/packages/cli/fragments/fragment-react-ts/%(mobile)%package.json b/packages/cli/fragments/fragment-react-ts/%(mobile)%package.json index 6044b681f0..03d82298d9 100644 --- a/packages/cli/fragments/fragment-react-ts/%(mobile)%package.json +++ b/packages/cli/fragments/fragment-react-ts/%(mobile)%package.json @@ -12,7 +12,9 @@ "dependencies": { "react": "^18.2.0", "react-dom": "^18.2.0", - "@tauri-apps/api": "^2.0.0-alpha.3" + "@tauri-apps/api": "^2.0.0-alpha.4", + "@tauri-apps/plugin-window": "^2.0.0-alpha.0", + "@tauri-apps/plugin-shell": "^2.0.0-alpha.0" }, "devDependencies": { "@types/node": "^18.7.10", @@ -21,7 +23,7 @@ "@vitejs/plugin-react": "^3.0.0", "typescript": "^4.9.5", "vite": "^4.2.1", - "@tauri-apps/cli": "^2.0.0-alpha.8", + "@tauri-apps/cli": "^2.0.0-alpha.9", "internal-ip": "^7.0.0" } } diff --git a/packages/cli/fragments/fragment-react-ts/%(stable)%package.json b/packages/cli/fragments/fragment-react-ts/%(stable)%package.json index 329a06531b..00b1eea897 100644 --- a/packages/cli/fragments/fragment-react-ts/%(stable)%package.json +++ b/packages/cli/fragments/fragment-react-ts/%(stable)%package.json @@ -21,6 +21,6 @@ "@vitejs/plugin-react": "^3.0.0", "typescript": "^4.9.5", "vite": "^4.2.1", - "@tauri-apps/cli": "^1.3.0" + "@tauri-apps/cli": "^1.3.1" } } diff --git a/packages/cli/fragments/fragment-react-ts/src/App.tsx b/packages/cli/fragments/fragment-react-ts/src/App.tsx index 9ebfdd07fc..a449915062 100644 --- a/packages/cli/fragments/fragment-react-ts/src/App.tsx +++ b/packages/cli/fragments/fragment-react-ts/src/App.tsx @@ -30,21 +30,21 @@ function App() {

Click on the Tauri, Vite, and React logos to learn more.

-
-
{ - e.preventDefault(); - greet(); - }} - > - setName(e.currentTarget.value)} - placeholder="Enter a name..." - /> - -
-
+
{ + e.preventDefault(); + greet(); + }} + > + setName(e.currentTarget.value)} + placeholder="Enter a name..." + /> + +
+

{greetMsg}

); diff --git a/packages/cli/fragments/fragment-react/%(alpha)%package.json b/packages/cli/fragments/fragment-react/%(alpha)%package.json index 3e77fe1d3c..1c1a34c6d5 100644 --- a/packages/cli/fragments/fragment-react/%(alpha)%package.json +++ b/packages/cli/fragments/fragment-react/%(alpha)%package.json @@ -12,13 +12,15 @@ "dependencies": { "react": "^18.2.0", "react-dom": "^18.2.0", - "@tauri-apps/api": "^2.0.0-alpha.3" + "@tauri-apps/api": "^2.0.0-alpha.4", + "@tauri-apps/plugin-window": "^2.0.0-alpha.0", + "@tauri-apps/plugin-shell": "^2.0.0-alpha.0" }, "devDependencies": { "@types/react": "^18.0.15", "@types/react-dom": "^18.0.6", "@vitejs/plugin-react": "^3.0.0", "vite": "^4.2.1", - "@tauri-apps/cli": "^2.0.0-alpha.7" + "@tauri-apps/cli": "^2.0.0-alpha.9" } } diff --git a/packages/cli/fragments/fragment-react/%(mobile)%package.json b/packages/cli/fragments/fragment-react/%(mobile)%package.json index fe59e3ea36..67954d6012 100644 --- a/packages/cli/fragments/fragment-react/%(mobile)%package.json +++ b/packages/cli/fragments/fragment-react/%(mobile)%package.json @@ -12,14 +12,16 @@ "dependencies": { "react": "^18.2.0", "react-dom": "^18.2.0", - "@tauri-apps/api": "^2.0.0-alpha.3" + "@tauri-apps/api": "^2.0.0-alpha.4", + "@tauri-apps/plugin-window": "^2.0.0-alpha.0", + "@tauri-apps/plugin-shell": "^2.0.0-alpha.0" }, "devDependencies": { "@types/react": "^18.0.15", "@types/react-dom": "^18.0.6", "@vitejs/plugin-react": "^3.0.0", "vite": "^4.2.1", - "@tauri-apps/cli": "^2.0.0-alpha.8", + "@tauri-apps/cli": "^2.0.0-alpha.9", "internal-ip": "^7.0.0" } } diff --git a/packages/cli/fragments/fragment-react/%(stable)%package.json b/packages/cli/fragments/fragment-react/%(stable)%package.json index 658977b72a..b3fd0f8522 100644 --- a/packages/cli/fragments/fragment-react/%(stable)%package.json +++ b/packages/cli/fragments/fragment-react/%(stable)%package.json @@ -19,6 +19,6 @@ "@types/react-dom": "^18.0.6", "@vitejs/plugin-react": "^3.0.0", "vite": "^4.2.1", - "@tauri-apps/cli": "^1.3.0" + "@tauri-apps/cli": "^1.3.1" } } diff --git a/packages/cli/fragments/fragment-react/src/App.jsx b/packages/cli/fragments/fragment-react/src/App.jsx index d57ee53d1a..a449915062 100644 --- a/packages/cli/fragments/fragment-react/src/App.jsx +++ b/packages/cli/fragments/fragment-react/src/App.jsx @@ -30,21 +30,20 @@ function App() {

Click on the Tauri, Vite, and React logos to learn more.

-
-
{ - e.preventDefault(); - greet(); - }} - > - setName(e.currentTarget.value)} - placeholder="Enter a name..." - /> - -
-
+
{ + e.preventDefault(); + greet(); + }} + > + setName(e.currentTarget.value)} + placeholder="Enter a name..." + /> + +

{greetMsg}

diff --git a/packages/cli/fragments/fragment-solid-ts/%(alpha)%package.json b/packages/cli/fragments/fragment-solid-ts/%(alpha)%package.json index f529b9c75d..0f9ae37ddd 100644 --- a/packages/cli/fragments/fragment-solid-ts/%(alpha)%package.json +++ b/packages/cli/fragments/fragment-solid-ts/%(alpha)%package.json @@ -13,13 +13,15 @@ "license": "MIT", "dependencies": { "solid-js": "^1.7.0", - "@tauri-apps/api": "^2.0.0-alpha.3" + "@tauri-apps/api": "^2.0.0-alpha.4", + "@tauri-apps/plugin-window": "^2.0.0-alpha.0", + "@tauri-apps/plugin-shell": "^2.0.0-alpha.0" }, "devDependencies": { "@types/node": "^18.7.10", "typescript": "^4.9.5", "vite": "^4.2.1", "vite-plugin-solid": "^2.5.0", - "@tauri-apps/cli": "^2.0.0-alpha.7" + "@tauri-apps/cli": "^2.0.0-alpha.9" } } diff --git a/packages/cli/fragments/fragment-solid-ts/%(mobile)%package.json b/packages/cli/fragments/fragment-solid-ts/%(mobile)%package.json index 22fc254d20..152167210a 100644 --- a/packages/cli/fragments/fragment-solid-ts/%(mobile)%package.json +++ b/packages/cli/fragments/fragment-solid-ts/%(mobile)%package.json @@ -13,14 +13,16 @@ "license": "MIT", "dependencies": { "solid-js": "^1.7.0", - "@tauri-apps/api": "^2.0.0-alpha.3" + "@tauri-apps/api": "^2.0.0-alpha.4", + "@tauri-apps/plugin-window": "^2.0.0-alpha.0", + "@tauri-apps/plugin-shell": "^2.0.0-alpha.0" }, "devDependencies": { "@types/node": "^18.7.10", "typescript": "^4.9.5", "vite": "^4.2.1", "vite-plugin-solid": "^2.5.0", - "@tauri-apps/cli": "^2.0.0-alpha.8", + "@tauri-apps/cli": "^2.0.0-alpha.9", "internal-ip": "^7.0.0" } } diff --git a/packages/cli/fragments/fragment-solid-ts/%(stable)%package.json b/packages/cli/fragments/fragment-solid-ts/%(stable)%package.json index 7725ff68f4..159b91210f 100644 --- a/packages/cli/fragments/fragment-solid-ts/%(stable)%package.json +++ b/packages/cli/fragments/fragment-solid-ts/%(stable)%package.json @@ -19,6 +19,6 @@ "typescript": "^4.9.5", "vite": "^4.2.1", "vite-plugin-solid": "^2.5.0", - "@tauri-apps/cli": "^1.3.0" + "@tauri-apps/cli": "^1.3.1" } } diff --git a/packages/cli/fragments/fragment-solid-ts/src/App.tsx b/packages/cli/fragments/fragment-solid-ts/src/App.tsx index ccbb50724d..0443046e2e 100644 --- a/packages/cli/fragments/fragment-solid-ts/src/App.tsx +++ b/packages/cli/fragments/fragment-solid-ts/src/App.tsx @@ -30,18 +30,20 @@ function App() {

Click on the Tauri, Vite, and Solid logos to learn more.

-
-
- setName(e.currentTarget.value)} - placeholder="Enter a name..." - /> - -
-
+
{ + e.preventDefault(); + greet(); + }} + > + setName(e.currentTarget.value)} + placeholder="Enter a name..." + /> + +

{greetMsg()}

diff --git a/packages/cli/fragments/fragment-solid/%(alpha)%package.json b/packages/cli/fragments/fragment-solid/%(alpha)%package.json index 061baf6e24..f9ede299a3 100644 --- a/packages/cli/fragments/fragment-solid/%(alpha)%package.json +++ b/packages/cli/fragments/fragment-solid/%(alpha)%package.json @@ -13,11 +13,13 @@ "license": "MIT", "dependencies": { "solid-js": "^1.7.0", - "@tauri-apps/api": "^2.0.0-alpha.3" + "@tauri-apps/api": "^2.0.0-alpha.4", + "@tauri-apps/plugin-window": "^2.0.0-alpha.0", + "@tauri-apps/plugin-shell": "^2.0.0-alpha.0" }, "devDependencies": { "vite": "^4.2.1", "vite-plugin-solid": "^2.5.0", - "@tauri-apps/cli": "^2.0.0-alpha.7" + "@tauri-apps/cli": "^2.0.0-alpha.9" } } diff --git a/packages/cli/fragments/fragment-solid/%(mobile)%package.json b/packages/cli/fragments/fragment-solid/%(mobile)%package.json index 7b71a4ab6b..951aca6516 100644 --- a/packages/cli/fragments/fragment-solid/%(mobile)%package.json +++ b/packages/cli/fragments/fragment-solid/%(mobile)%package.json @@ -13,12 +13,14 @@ "license": "MIT", "dependencies": { "solid-js": "^1.7.0", - "@tauri-apps/api": "^2.0.0-alpha.3" + "@tauri-apps/api": "^2.0.0-alpha.4", + "@tauri-apps/plugin-window": "^2.0.0-alpha.0", + "@tauri-apps/plugin-shell": "^2.0.0-alpha.0" }, "devDependencies": { "vite": "^4.2.1", "vite-plugin-solid": "^2.5.0", - "@tauri-apps/cli": "^2.0.0-alpha.8", + "@tauri-apps/cli": "^2.0.0-alpha.9", "internal-ip": "^7.0.0" } } diff --git a/packages/cli/fragments/fragment-solid/%(stable)%package.json b/packages/cli/fragments/fragment-solid/%(stable)%package.json index bf4d24b7fe..228b827f9b 100644 --- a/packages/cli/fragments/fragment-solid/%(stable)%package.json +++ b/packages/cli/fragments/fragment-solid/%(stable)%package.json @@ -17,6 +17,6 @@ "devDependencies": { "vite": "^4.2.1", "vite-plugin-solid": "^2.5.0", - "@tauri-apps/cli": "^1.3.0" + "@tauri-apps/cli": "^1.3.1" } } diff --git a/packages/cli/fragments/fragment-solid/src/App.jsx b/packages/cli/fragments/fragment-solid/src/App.jsx index 13e6ab3635..0443046e2e 100644 --- a/packages/cli/fragments/fragment-solid/src/App.jsx +++ b/packages/cli/fragments/fragment-solid/src/App.jsx @@ -30,21 +30,20 @@ function App() {

Click on the Tauri, Vite, and Solid logos to learn more.

-
-
{ - e.preventDefault(); - greet(); - }} - > - setName(e.currentTarget.value)} - placeholder="Enter a name..." - /> - -
-
+
{ + e.preventDefault(); + greet(); + }} + > + setName(e.currentTarget.value)} + placeholder="Enter a name..." + /> + +

{greetMsg()}

diff --git a/packages/cli/fragments/fragment-svelte-ts/%(alpha)%package.json b/packages/cli/fragments/fragment-svelte-ts/%(alpha)%package.json index 30b415fcef..40a57b3ef0 100644 --- a/packages/cli/fragments/fragment-svelte-ts/%(alpha)%package.json +++ b/packages/cli/fragments/fragment-svelte-ts/%(alpha)%package.json @@ -11,7 +11,9 @@ "tauri": "tauri" }, "dependencies": { - "@tauri-apps/api": "^2.0.0-alpha.3" + "@tauri-apps/api": "^2.0.0-alpha.4", + "@tauri-apps/plugin-window": "^2.0.0-alpha.0", + "@tauri-apps/plugin-shell": "^2.0.0-alpha.0" }, "devDependencies": { "@types/node": "^18.7.10", @@ -23,7 +25,7 @@ "tslib": "^2.4.1", "typescript": "^4.9.5", "vite": "^4.2.1", - "@tauri-apps/cli": "^2.0.0-alpha.8", + "@tauri-apps/cli": "^2.0.0-alpha.9", "internal-ip": "^7.0.0" } } diff --git a/packages/cli/fragments/fragment-svelte-ts/%(mobile)%package.json b/packages/cli/fragments/fragment-svelte-ts/%(mobile)%package.json index 30b415fcef..40a57b3ef0 100644 --- a/packages/cli/fragments/fragment-svelte-ts/%(mobile)%package.json +++ b/packages/cli/fragments/fragment-svelte-ts/%(mobile)%package.json @@ -11,7 +11,9 @@ "tauri": "tauri" }, "dependencies": { - "@tauri-apps/api": "^2.0.0-alpha.3" + "@tauri-apps/api": "^2.0.0-alpha.4", + "@tauri-apps/plugin-window": "^2.0.0-alpha.0", + "@tauri-apps/plugin-shell": "^2.0.0-alpha.0" }, "devDependencies": { "@types/node": "^18.7.10", @@ -23,7 +25,7 @@ "tslib": "^2.4.1", "typescript": "^4.9.5", "vite": "^4.2.1", - "@tauri-apps/cli": "^2.0.0-alpha.8", + "@tauri-apps/cli": "^2.0.0-alpha.9", "internal-ip": "^7.0.0" } } diff --git a/packages/cli/fragments/fragment-svelte-ts/%(stable)%package.json b/packages/cli/fragments/fragment-svelte-ts/%(stable)%package.json index 1caefddf21..c9ffc924e4 100644 --- a/packages/cli/fragments/fragment-svelte-ts/%(stable)%package.json +++ b/packages/cli/fragments/fragment-svelte-ts/%(stable)%package.json @@ -23,6 +23,6 @@ "tslib": "^2.4.1", "typescript": "^4.9.5", "vite": "^4.2.1", - "@tauri-apps/cli": "^1.3.0" + "@tauri-apps/cli": "^1.3.1" } } diff --git a/packages/cli/fragments/fragment-svelte-ts/src/lib/Greet.svelte b/packages/cli/fragments/fragment-svelte-ts/src/lib/Greet.svelte index 05c46ef33d..1916d1a037 100644 --- a/packages/cli/fragments/fragment-svelte-ts/src/lib/Greet.svelte +++ b/packages/cli/fragments/fragment-svelte-ts/src/lib/Greet.svelte @@ -11,11 +11,9 @@
-
+
- -
+ +

{greetMsg}

\ No newline at end of file diff --git a/packages/cli/fragments/fragment-svelte/%(alpha)%package.json b/packages/cli/fragments/fragment-svelte/%(alpha)%package.json index 8c340ab730..3773fefae2 100644 --- a/packages/cli/fragments/fragment-svelte/%(alpha)%package.json +++ b/packages/cli/fragments/fragment-svelte/%(alpha)%package.json @@ -10,13 +10,15 @@ "tauri": "tauri" }, "dependencies": { - "@tauri-apps/api": "^2.0.0-alpha.3" + "@tauri-apps/api": "^2.0.0-alpha.4", + "@tauri-apps/plugin-window": "^2.0.0-alpha.0", + "@tauri-apps/plugin-shell": "^2.0.0-alpha.0" }, "devDependencies": { "@sveltejs/vite-plugin-svelte": "^2.0.0", "svelte": "^3.54.0", "vite": "^4.2.1", - "@tauri-apps/cli": "^2.0.0-alpha.8", + "@tauri-apps/cli": "^2.0.0-alpha.9", "internal-ip": "^7.0.0" } } diff --git a/packages/cli/fragments/fragment-svelte/%(mobile)%package.json b/packages/cli/fragments/fragment-svelte/%(mobile)%package.json index 8c340ab730..3773fefae2 100644 --- a/packages/cli/fragments/fragment-svelte/%(mobile)%package.json +++ b/packages/cli/fragments/fragment-svelte/%(mobile)%package.json @@ -10,13 +10,15 @@ "tauri": "tauri" }, "dependencies": { - "@tauri-apps/api": "^2.0.0-alpha.3" + "@tauri-apps/api": "^2.0.0-alpha.4", + "@tauri-apps/plugin-window": "^2.0.0-alpha.0", + "@tauri-apps/plugin-shell": "^2.0.0-alpha.0" }, "devDependencies": { "@sveltejs/vite-plugin-svelte": "^2.0.0", "svelte": "^3.54.0", "vite": "^4.2.1", - "@tauri-apps/cli": "^2.0.0-alpha.8", + "@tauri-apps/cli": "^2.0.0-alpha.9", "internal-ip": "^7.0.0" } } diff --git a/packages/cli/fragments/fragment-svelte/%(stable)%package.json b/packages/cli/fragments/fragment-svelte/%(stable)%package.json index 278f6982ee..fcd5cf4191 100644 --- a/packages/cli/fragments/fragment-svelte/%(stable)%package.json +++ b/packages/cli/fragments/fragment-svelte/%(stable)%package.json @@ -16,6 +16,6 @@ "@sveltejs/vite-plugin-svelte": "^2.0.0", "svelte": "^3.54.0", "vite": "^4.2.1", - "@tauri-apps/cli": "^1.3.0" + "@tauri-apps/cli": "^1.3.1" } } diff --git a/packages/cli/fragments/fragment-svelte/src/lib/Greet.svelte b/packages/cli/fragments/fragment-svelte/src/lib/Greet.svelte index d8a1bd7d64..c73b74ad43 100644 --- a/packages/cli/fragments/fragment-svelte/src/lib/Greet.svelte +++ b/packages/cli/fragments/fragment-svelte/src/lib/Greet.svelte @@ -11,12 +11,10 @@
-
+
- -
+ +

{greetMsg}

diff --git a/packages/cli/fragments/fragment-vanilla-ts/%(alpha)%package.json b/packages/cli/fragments/fragment-vanilla-ts/%(alpha)%package.json index d8a334d579..a9cd92822d 100644 --- a/packages/cli/fragments/fragment-vanilla-ts/%(alpha)%package.json +++ b/packages/cli/fragments/fragment-vanilla-ts/%(alpha)%package.json @@ -10,10 +10,12 @@ "tauri": "tauri" }, "dependencies": { - "@tauri-apps/api": "^2.0.0-alpha.3" + "@tauri-apps/api": "^2.0.0-alpha.4", + "@tauri-apps/plugin-window": "^2.0.0-alpha.0", + "@tauri-apps/plugin-shell": "^2.0.0-alpha.0" }, "devDependencies": { - "@tauri-apps/cli": "^2.0.0-alpha.8", + "@tauri-apps/cli": "^2.0.0-alpha.9", "internal-ip": "^7.0.0", "vite": "^4.2.1", "typescript": "^4.8.2" diff --git a/packages/cli/fragments/fragment-vanilla-ts/%(mobile)%package.json b/packages/cli/fragments/fragment-vanilla-ts/%(mobile)%package.json index d8a334d579..a9cd92822d 100644 --- a/packages/cli/fragments/fragment-vanilla-ts/%(mobile)%package.json +++ b/packages/cli/fragments/fragment-vanilla-ts/%(mobile)%package.json @@ -10,10 +10,12 @@ "tauri": "tauri" }, "dependencies": { - "@tauri-apps/api": "^2.0.0-alpha.3" + "@tauri-apps/api": "^2.0.0-alpha.4", + "@tauri-apps/plugin-window": "^2.0.0-alpha.0", + "@tauri-apps/plugin-shell": "^2.0.0-alpha.0" }, "devDependencies": { - "@tauri-apps/cli": "^2.0.0-alpha.8", + "@tauri-apps/cli": "^2.0.0-alpha.9", "internal-ip": "^7.0.0", "vite": "^4.2.1", "typescript": "^4.8.2" diff --git a/packages/cli/fragments/fragment-vanilla-ts/%(stable)%package.json b/packages/cli/fragments/fragment-vanilla-ts/%(stable)%package.json index 8f5c2bfc1d..a21392910c 100644 --- a/packages/cli/fragments/fragment-vanilla-ts/%(stable)%package.json +++ b/packages/cli/fragments/fragment-vanilla-ts/%(stable)%package.json @@ -13,7 +13,7 @@ "@tauri-apps/api": "^1.3.0" }, "devDependencies": { - "@tauri-apps/cli": "^1.3.0", + "@tauri-apps/cli": "^1.3.1", "vite": "^4.2.1", "typescript": "^4.8.2" } diff --git a/packages/cli/fragments/fragment-vanilla-ts/index.html b/packages/cli/fragments/fragment-vanilla-ts/index.html index 45044692f7..59db61664b 100644 --- a/packages/cli/fragments/fragment-vanilla-ts/index.html +++ b/packages/cli/fragments/fragment-vanilla-ts/index.html @@ -43,12 +43,10 @@

Welcome to Tauri!

Click on the Tauri logo to learn more about the framework

-
-
- - -
-
+
+ + +

diff --git a/packages/cli/fragments/fragment-vanilla-ts/src/main.ts b/packages/cli/fragments/fragment-vanilla-ts/src/main.ts index 638e793cb9..9f75eb8f18 100644 --- a/packages/cli/fragments/fragment-vanilla-ts/src/main.ts +++ b/packages/cli/fragments/fragment-vanilla-ts/src/main.ts @@ -15,7 +15,8 @@ async function greet() { window.addEventListener("DOMContentLoaded", () => { greetInputEl = document.querySelector("#greet-input"); greetMsgEl = document.querySelector("#greet-msg"); - document - .querySelector("#greet-button") - ?.addEventListener("click", () => greet()); + document.querySelector("#greet-form")?.addEventListener("submit", (e) => { + e.preventDefault(); + greet(); + }); }); diff --git a/packages/cli/fragments/fragment-vanilla/%(pnpm-yarn-npm-alpha-mobile)%package.json b/packages/cli/fragments/fragment-vanilla/%(pnpm-yarn-npm-alpha-mobile)%package.json index 8800d182b0..8349f578e9 100644 --- a/packages/cli/fragments/fragment-vanilla/%(pnpm-yarn-npm-alpha-mobile)%package.json +++ b/packages/cli/fragments/fragment-vanilla/%(pnpm-yarn-npm-alpha-mobile)%package.json @@ -7,6 +7,6 @@ "tauri": "tauri" }, "devDependencies": { - "@tauri-apps/cli": "^2.0.0-alpha.7" + "@tauri-apps/cli": "^2.0.0-alpha.9" } } diff --git a/packages/cli/fragments/fragment-vanilla/%(pnpm-yarn-npm-stable)%package.json b/packages/cli/fragments/fragment-vanilla/%(pnpm-yarn-npm-stable)%package.json index dba8dda908..527e35d01a 100644 --- a/packages/cli/fragments/fragment-vanilla/%(pnpm-yarn-npm-stable)%package.json +++ b/packages/cli/fragments/fragment-vanilla/%(pnpm-yarn-npm-stable)%package.json @@ -7,6 +7,6 @@ "tauri": "tauri" }, "devDependencies": { - "@tauri-apps/cli": "^1.3.0" + "@tauri-apps/cli": "^1.3.1" } } diff --git a/packages/cli/fragments/fragment-vanilla/src/index.html b/packages/cli/fragments/fragment-vanilla/src/index.html index 178a13c5db..ce17a3cd56 100644 --- a/packages/cli/fragments/fragment-vanilla/src/index.html +++ b/packages/cli/fragments/fragment-vanilla/src/index.html @@ -35,12 +35,10 @@

Welcome to Tauri!

Click on the Tauri logo to learn more about the framework

-
-
- - -
-
+
+ + +

diff --git a/packages/cli/fragments/fragment-vanilla/src/main.js b/packages/cli/fragments/fragment-vanilla/src/main.js index 287279a9f4..95a17024e7 100644 --- a/packages/cli/fragments/fragment-vanilla/src/main.js +++ b/packages/cli/fragments/fragment-vanilla/src/main.js @@ -11,7 +11,8 @@ async function greet() { window.addEventListener("DOMContentLoaded", () => { greetInputEl = document.querySelector("#greet-input"); greetMsgEl = document.querySelector("#greet-msg"); - document - .querySelector("#greet-button") - .addEventListener("click", () => greet()); + document.querySelector("#greet-form").addEventListener("submit", (e) => { + e.preventDefault(); + greet(); + }); }); diff --git a/packages/cli/fragments/fragment-vue-ts/%(alpha)%package.json b/packages/cli/fragments/fragment-vue-ts/%(alpha)%package.json index 68d99df4a2..ddb2a943b8 100644 --- a/packages/cli/fragments/fragment-vue-ts/%(alpha)%package.json +++ b/packages/cli/fragments/fragment-vue-ts/%(alpha)%package.json @@ -11,7 +11,9 @@ }, "dependencies": { "vue": "^3.2.45", - "@tauri-apps/api": "^2.0.0-alpha.3" + "@tauri-apps/api": "^2.0.0-alpha.4", + "@tauri-apps/plugin-window": "^2.0.0-alpha.0", + "@tauri-apps/plugin-shell": "^2.0.0-alpha.0" }, "devDependencies": { "@types/node": "^18.7.10", @@ -19,7 +21,7 @@ "typescript": "^4.9.5", "vite": "^4.2.1", "vue-tsc": "^1.0.11", - "@tauri-apps/cli": "^2.0.0-alpha.8", + "@tauri-apps/cli": "^2.0.0-alpha.9", "internal-ip": "^7.0.0" } } diff --git a/packages/cli/fragments/fragment-vue-ts/%(mobile)%package.json b/packages/cli/fragments/fragment-vue-ts/%(mobile)%package.json index 68d99df4a2..ddb2a943b8 100644 --- a/packages/cli/fragments/fragment-vue-ts/%(mobile)%package.json +++ b/packages/cli/fragments/fragment-vue-ts/%(mobile)%package.json @@ -11,7 +11,9 @@ }, "dependencies": { "vue": "^3.2.45", - "@tauri-apps/api": "^2.0.0-alpha.3" + "@tauri-apps/api": "^2.0.0-alpha.4", + "@tauri-apps/plugin-window": "^2.0.0-alpha.0", + "@tauri-apps/plugin-shell": "^2.0.0-alpha.0" }, "devDependencies": { "@types/node": "^18.7.10", @@ -19,7 +21,7 @@ "typescript": "^4.9.5", "vite": "^4.2.1", "vue-tsc": "^1.0.11", - "@tauri-apps/cli": "^2.0.0-alpha.8", + "@tauri-apps/cli": "^2.0.0-alpha.9", "internal-ip": "^7.0.0" } } diff --git a/packages/cli/fragments/fragment-vue-ts/%(stable)%package.json b/packages/cli/fragments/fragment-vue-ts/%(stable)%package.json index e5e7049f53..ef7224e490 100644 --- a/packages/cli/fragments/fragment-vue-ts/%(stable)%package.json +++ b/packages/cli/fragments/fragment-vue-ts/%(stable)%package.json @@ -19,6 +19,6 @@ "typescript": "^4.9.5", "vite": "^4.2.1", "vue-tsc": "^1.0.11", - "@tauri-apps/cli": "^1.3.0" + "@tauri-apps/cli": "^1.3.1" } } diff --git a/packages/cli/fragments/fragment-vue-ts/src/components/Greet.vue b/packages/cli/fragments/fragment-vue-ts/src/components/Greet.vue index 289373be32..5bee0076b2 100644 --- a/packages/cli/fragments/fragment-vue-ts/src/components/Greet.vue +++ b/packages/cli/fragments/fragment-vue-ts/src/components/Greet.vue @@ -12,10 +12,10 @@ async function greet() { diff --git a/packages/cli/fragments/fragment-vue/%(alpha)%package.json b/packages/cli/fragments/fragment-vue/%(alpha)%package.json index 5e6dba8e79..f9e48d92a2 100644 --- a/packages/cli/fragments/fragment-vue/%(alpha)%package.json +++ b/packages/cli/fragments/fragment-vue/%(alpha)%package.json @@ -11,12 +11,14 @@ }, "dependencies": { "vue": "^3.2.45", - "@tauri-apps/api": "^2.0.0-alpha.3" + "@tauri-apps/api": "^2.0.0-alpha.4", + "@tauri-apps/plugin-window": "^2.0.0-alpha.0", + "@tauri-apps/plugin-shell": "^2.0.0-alpha.0" }, "devDependencies": { "@vitejs/plugin-vue": "^4.0.0", "vite": "^4.2.1", - "@tauri-apps/cli": "^2.0.0-alpha.8", + "@tauri-apps/cli": "^2.0.0-alpha.9", "internal-ip": "^7.0.0" } } diff --git a/packages/cli/fragments/fragment-vue/%(mobile)%package.json b/packages/cli/fragments/fragment-vue/%(mobile)%package.json index 5e6dba8e79..f9e48d92a2 100644 --- a/packages/cli/fragments/fragment-vue/%(mobile)%package.json +++ b/packages/cli/fragments/fragment-vue/%(mobile)%package.json @@ -11,12 +11,14 @@ }, "dependencies": { "vue": "^3.2.45", - "@tauri-apps/api": "^2.0.0-alpha.3" + "@tauri-apps/api": "^2.0.0-alpha.4", + "@tauri-apps/plugin-window": "^2.0.0-alpha.0", + "@tauri-apps/plugin-shell": "^2.0.0-alpha.0" }, "devDependencies": { "@vitejs/plugin-vue": "^4.0.0", "vite": "^4.2.1", - "@tauri-apps/cli": "^2.0.0-alpha.8", + "@tauri-apps/cli": "^2.0.0-alpha.9", "internal-ip": "^7.0.0" } } diff --git a/packages/cli/fragments/fragment-vue/%(stable)%package.json b/packages/cli/fragments/fragment-vue/%(stable)%package.json index 792096ab34..5f7ba90aa2 100644 --- a/packages/cli/fragments/fragment-vue/%(stable)%package.json +++ b/packages/cli/fragments/fragment-vue/%(stable)%package.json @@ -16,6 +16,6 @@ "devDependencies": { "@vitejs/plugin-vue": "^4.0.0", "vite": "^4.2.1", - "@tauri-apps/cli": "^1.3.0" + "@tauri-apps/cli": "^1.3.1" } } diff --git a/packages/cli/fragments/fragment-vue/src/components/Greet.vue b/packages/cli/fragments/fragment-vue/src/components/Greet.vue index 6721b11fe3..11d2077428 100644 --- a/packages/cli/fragments/fragment-vue/src/components/Greet.vue +++ b/packages/cli/fragments/fragment-vue/src/components/Greet.vue @@ -12,10 +12,10 @@ async function greet() {