Merge remote-tracking branch 'origin/dev' into chore/deps

tauri-apps · Dec 12, 2024 · f9cbc31 · f9cbc31
2 parents db9680c + 82413b9
commit f9cbc31
Show file tree

Hide file tree

Showing 16 changed files with 22 additions and 15 deletions.
diff --git a/.changes/opener.md b/.changes/opener.md
@@ -0,0 +1,7 @@
+---
+"create-tauri-app": "patch"
+"create-tauri-app-js": "patch"
+---
+
+Use `tauri-plugin-opener` instead of `tauri-plugin-shell` in templates
+
diff --git a/templates/_base_/src-tauri/Cargo.toml.lte b/templates/_base_/src-tauri/Cargo.toml.lte
@@ -23,7 +23,7 @@ tauri-build = { version = "2", features = [] }
 
 [dependencies]
 tauri = { version = "2", features = [] }
-tauri-plugin-shell = "2"{% endif %}
+tauri-plugin-opener = "2"{% endif %}
 serde = { version = "1", features = ["derive"] }
 serde_json = "1"
 {% if v1 %}

diff --git a/templates/_base_/src-tauri/capabilities/%(v2)%default.json.lte b/templates/_base_/src-tauri/capabilities/%(v2)%default.json.lte
@@ -5,6 +5,6 @@
   "windows": ["main"],
   "permissions": [
     "core:default",
-    "shell:allow-open"
+    "opener:default"
   ]
 }
diff --git a/templates/_base_/src-tauri/src/%(v2)%lib.rs.lte b/templates/_base_/src-tauri/src/%(v2)%lib.rs.lte
@@ -7,7 +7,7 @@ fn greet(name: &str) -> String {
 #[cfg_attr(mobile, tauri::mobile_entry_point)]
 pub fn run() {
     tauri::Builder::default()
-        .plugin(tauri_plugin_shell::init())
+        .plugin(tauri_plugin_opener::init())
         .invoke_handler(tauri::generate_handler![greet])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");

diff --git a/templates/template-angular/package.json.lte b/templates/template-angular/package.json.lte
@@ -22,7 +22,7 @@
     "tslib": "^2.3.0",
     "zone.js": "~0.14.2",
     "@tauri-apps/api": "{% if v2 %}^2{% else %}^1{% endif %}"{% if v2 %},
-    "@tauri-apps/plugin-shell": "^2"{% endif %}
+    "@tauri-apps/plugin-opener": "^2"{% endif %}
   },
   "devDependencies": {
     "@angular-devkit/build-angular": "^17.0.0",

diff --git a/templates/template-preact-ts/package.json.lte b/templates/template-preact-ts/package.json.lte
@@ -12,7 +12,7 @@
   "dependencies": {
     "preact": "^10.25.1",
     "@tauri-apps/api": "{% if v2 %}^2{% else %}^1{% endif %}"{% if v2 %},
-    "@tauri-apps/plugin-shell": "^2"{% endif %}
+    "@tauri-apps/plugin-opener": "^2"{% endif %}
   },
   "devDependencies": {
     "@preact/preset-vite": "^2.9.3",

diff --git a/templates/template-preact/package.json.lte b/templates/template-preact/package.json.lte
@@ -12,7 +12,7 @@
   "dependencies": {
     "preact": "^10.25.1",
     "@tauri-apps/api": "{% if v2 %}^2{% else %}^1{% endif %}"{% if v2 %},
-    "@tauri-apps/plugin-shell": "^2"{% endif %}
+    "@tauri-apps/plugin-opener": "^2"{% endif %}
   },
   "devDependencies": {
     "@preact/preset-vite": "^2.9.3",

diff --git a/templates/template-react-ts/package.json.lte b/templates/template-react-ts/package.json.lte
@@ -13,7 +13,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "@tauri-apps/api": "{% if v2 %}^2{% else %}^1{% endif %}"{% if v2 %},
-    "@tauri-apps/plugin-shell": "^2"{% endif %}
+    "@tauri-apps/plugin-opener": "^2"{% endif %}
   },
   "devDependencies": {
     "@types/react": "^18.3.1",

diff --git a/templates/template-react/package.json.lte b/templates/template-react/package.json.lte
@@ -13,7 +13,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "@tauri-apps/api": "{% if v2 %}^2{% else %}^1{% endif %}"{% if v2 %},
-    "@tauri-apps/plugin-shell": "^2"{% endif %}
+    "@tauri-apps/plugin-opener": "^2"{% endif %}
   },
   "devDependencies": {
     "@vitejs/plugin-react": "^4.3.4",

diff --git a/templates/template-solid-ts/package.json.lte b/templates/template-solid-ts/package.json.lte
@@ -14,7 +14,7 @@
   "dependencies": {
     "solid-js": "^1.9.3",
     "@tauri-apps/api": "{% if v2 %}^2{% else %}^1{% endif %}"{% if v2 %},
-    "@tauri-apps/plugin-shell": "^2"{% endif %}
+    "@tauri-apps/plugin-opener": "^2"{% endif %}
   },
   "devDependencies": {
     "typescript": "~5.6.2",

diff --git a/templates/template-solid/package.json.lte b/templates/template-solid/package.json.lte
@@ -14,7 +14,7 @@
   "dependencies": {
     "solid-js": "^1.9.3",
     "@tauri-apps/api": "{% if v2 %}^2{% else %}^1{% endif %}"{% if v2 %},
-    "@tauri-apps/plugin-shell": "^2"{% endif %}
+    "@tauri-apps/plugin-opener": "^2"{% endif %}
   },
   "devDependencies": {
     "vite": "^6.0.3",

diff --git a/templates/template-svelte-ts/package.json.lte b/templates/template-svelte-ts/package.json.lte
@@ -14,7 +14,7 @@
   "license": "MIT",
   "dependencies": {
     "@tauri-apps/api": "{% if v2 %}^2{% else %}^1{% endif %}"{% if v2 %},
-    "@tauri-apps/plugin-shell": "^2"{% endif %}
+    "@tauri-apps/plugin-opener": "^2"{% endif %}
   },
   "devDependencies": {
     "@sveltejs/adapter-static": "^3.0.6",

diff --git a/templates/template-svelte/package.json.lte b/templates/template-svelte/package.json.lte
@@ -14,7 +14,7 @@
   "license": "MIT",
   "dependencies": {
     "@tauri-apps/api": "{% if v2 %}^2{% else %}^1{% endif %}"{% if v2 %},
-    "@tauri-apps/plugin-shell": "^2"{% endif %}
+    "@tauri-apps/plugin-opener": "^2"{% endif %}
   },
   "devDependencies": {
     "@sveltejs/adapter-static": "^3.0.6",

diff --git a/templates/template-vanilla-ts/package.json.lte b/templates/template-vanilla-ts/package.json.lte
@@ -11,7 +11,7 @@
   },
   "dependencies": {
     "@tauri-apps/api": "{% if v2 %}^2{% else %}^1{% endif %}"{% if v2 %},
-    "@tauri-apps/plugin-shell": "^2"{% endif %}
+    "@tauri-apps/plugin-opener": "^2"{% endif %}
   },
   "devDependencies": {
     "@tauri-apps/cli": "{% if v2 %}^2{% else %}^1{% endif %}",

diff --git a/templates/template-vue-ts/package.json.lte b/templates/template-vue-ts/package.json.lte
@@ -12,7 +12,7 @@
   "dependencies": {
     "vue": "^3.5.13",
     "@tauri-apps/api": "{% if v2 %}^2{% else %}^1{% endif %}"{% if v2 %},
-    "@tauri-apps/plugin-shell": "^2"{% endif %}
+    "@tauri-apps/plugin-opener": "^2"{% endif %}
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.2.1",

diff --git a/templates/template-vue/package.json.lte b/templates/template-vue/package.json.lte
@@ -12,7 +12,7 @@
   "dependencies": {
     "vue": "^3.5.13",
     "@tauri-apps/api": "{% if v2 %}^2{% else %}^1{% endif %}"{% if v2 %},
-    "@tauri-apps/plugin-shell": "^2"{% endif %}
+    "@tauri-apps/plugin-opener": "^2"{% endif %}
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^5.2.1",