mirror of
https://github.com/tauri-apps/plugins-workspace.git
synced 2026-06-18 14:40:07 +02:00
Compare commits
2 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 15fc071773 | |||
| 73c6047b78 |
@@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
fs: patch
|
||||||
|
fs-js: patch
|
||||||
|
---
|
||||||
|
|
||||||
|
Fixed calling `writeFile` with `data: ReadableStream` throws `Invalid argument`
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
nfc: patch
|
||||||
|
nfc-js: patch
|
||||||
|
---
|
||||||
|
|
||||||
|
On iOS, the reader session will now get closed properly on errors, preventing dangling invalid sessions that could prevent subsequent write attempts.
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
"opener": 'minor:enhance'
|
||||||
|
"opener-js": 'minor:enhance'
|
||||||
|
---
|
||||||
|
|
||||||
|
Allow reveal multiple items in the file explorer.
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
store: minor
|
||||||
|
store-js: minor
|
||||||
|
---
|
||||||
|
|
||||||
|
Allow setting defaults from the JavaScript API
|
||||||
@@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
store: minor
|
||||||
|
store-js: minor
|
||||||
|
---
|
||||||
|
|
||||||
|
Add an new option `overrideDefaults` for creating/loading and reloading the store that overrides the store with the on-disk state, ignoring defaults
|
||||||
+1
-1
@@ -58,4 +58,4 @@ pids
|
|||||||
.idea
|
.idea
|
||||||
debug.log
|
debug.log
|
||||||
TODO.md
|
TODO.md
|
||||||
.aider.*
|
.aider*
|
||||||
|
|||||||
Generated
+89
-157
@@ -207,7 +207,7 @@ checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "api"
|
name = "api"
|
||||||
version = "2.0.38"
|
version = "2.0.32"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"log",
|
"log",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -878,7 +878,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "02260d489095346e5cafd04dea8e8cb54d1d74fcd759022a9b72986ebe9a1257"
|
checksum = "02260d489095346e5cafd04dea8e8cb54d1d74fcd759022a9b72986ebe9a1257"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
"toml 0.8.20",
|
"toml",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -1574,9 +1574,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "dlopen2"
|
name = "dlopen2"
|
||||||
version = "0.8.0"
|
version = "0.7.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "b54f373ccf864bf587a89e880fb7610f8d73f3045f13580948ccbcaff26febff"
|
checksum = "9e1297103d2bbaea85724fcee6294c2d50b1081f9ad47d0f6f6f61eda65315a6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"dlopen2_derive",
|
"dlopen2_derive",
|
||||||
"libc",
|
"libc",
|
||||||
@@ -1736,7 +1736,7 @@ dependencies = [
|
|||||||
"cc",
|
"cc",
|
||||||
"memchr",
|
"memchr",
|
||||||
"rustc_version",
|
"rustc_version",
|
||||||
"toml 0.8.20",
|
"toml",
|
||||||
"vswhom",
|
"vswhom",
|
||||||
"winreg 0.52.0",
|
"winreg 0.52.0",
|
||||||
]
|
]
|
||||||
@@ -3605,9 +3605,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "muda"
|
name = "muda"
|
||||||
version = "0.17.1"
|
version = "0.16.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "01c1738382f66ed56b3b9c8119e794a2e23148ac8ea214eda86622d4cb9d415a"
|
checksum = "4de14a9b5d569ca68d7c891d613b390cf5ab4f851c77aaa2f9e435555d3d9492"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"crossbeam-channel",
|
"crossbeam-channel",
|
||||||
"dpi",
|
"dpi",
|
||||||
@@ -3621,7 +3621,7 @@ dependencies = [
|
|||||||
"png",
|
"png",
|
||||||
"serde",
|
"serde",
|
||||||
"thiserror 2.0.12",
|
"thiserror 2.0.12",
|
||||||
"windows-sys 0.60.2",
|
"windows-sys 0.59.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -4053,17 +4053,6 @@ dependencies = [
|
|||||||
"objc2-foundation 0.3.0",
|
"objc2-foundation 0.3.0",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "objc2-security"
|
|
||||||
version = "0.3.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "3126341c65c5d5728423ae95d788e1b660756486ad0592307ab87ba02d9a7268"
|
|
||||||
dependencies = [
|
|
||||||
"bitflags 2.9.0",
|
|
||||||
"objc2 0.6.0",
|
|
||||||
"objc2-core-foundation",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "objc2-ui-kit"
|
name = "objc2-ui-kit"
|
||||||
version = "0.3.0"
|
version = "0.3.0"
|
||||||
@@ -4088,7 +4077,6 @@ dependencies = [
|
|||||||
"objc2-app-kit",
|
"objc2-app-kit",
|
||||||
"objc2-core-foundation",
|
"objc2-core-foundation",
|
||||||
"objc2-foundation 0.3.0",
|
"objc2-foundation 0.3.0",
|
||||||
"objc2-security",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -5574,15 +5562,6 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "serde_spanned"
|
|
||||||
version = "1.0.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "40734c41988f7306bb04f0ecf60ec0f3f1caa34290e4e8ea471dcd3346483b83"
|
|
||||||
dependencies = [
|
|
||||||
"serde",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serde_urlencoded"
|
name = "serde_urlencoded"
|
||||||
version = "0.7.1"
|
version = "0.7.1"
|
||||||
@@ -5627,9 +5606,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serialize-to-javascript"
|
name = "serialize-to-javascript"
|
||||||
version = "0.1.2"
|
version = "0.1.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "04f3666a07a197cdb77cdf306c32be9b7f598d7060d50cfd4d5aa04bfd92f6c5"
|
checksum = "c9823f2d3b6a81d98228151fdeaf848206a7855a7a042bbf9bf870449a66cafb"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
@@ -5638,13 +5617,13 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "serialize-to-javascript-impl"
|
name = "serialize-to-javascript-impl"
|
||||||
version = "0.1.2"
|
version = "0.1.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "772ee033c0916d670af7860b6e1ef7d658a4629a6d0b4c8c3e67f09b3765b75d"
|
checksum = "74064874e9f6a15f04c1f3cb627902d0e6b410abbf36668afa873c61889f1763"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn 2.0.100",
|
"syn 1.0.109",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -6279,18 +6258,17 @@ dependencies = [
|
|||||||
"cfg-expr",
|
"cfg-expr",
|
||||||
"heck 0.5.0",
|
"heck 0.5.0",
|
||||||
"pkg-config",
|
"pkg-config",
|
||||||
"toml 0.8.20",
|
"toml",
|
||||||
"version-compare",
|
"version-compare",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tao"
|
name = "tao"
|
||||||
version = "0.34.2"
|
version = "0.34.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4daa814018fecdfb977b59a094df4bd43b42e8e21f88fddfc05807e6f46efaaf"
|
checksum = "49c380ca75a231b87b6c9dd86948f035012e7171d1a7c40a9c2890489a7ffd8a"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.9.0",
|
"bitflags 2.9.0",
|
||||||
"block2 0.6.0",
|
|
||||||
"core-foundation 0.10.0",
|
"core-foundation 0.10.0",
|
||||||
"core-graphics",
|
"core-graphics",
|
||||||
"crossbeam-channel",
|
"crossbeam-channel",
|
||||||
@@ -6359,17 +6337,16 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri"
|
name = "tauri"
|
||||||
version = "2.8.4"
|
version = "2.6.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "5d545ccf7b60dcd44e07c6fb5aeb09140966f0aabd5d2aa14a6821df7bc99348"
|
checksum = "2f7a0f4019c80391d143ee26cd7cd1ed271ac241d3087d333f99f3269ba90812"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"bytes",
|
"bytes",
|
||||||
"cookie",
|
|
||||||
"dirs 6.0.0",
|
"dirs 6.0.0",
|
||||||
"dunce",
|
"dunce",
|
||||||
"embed_plist",
|
"embed_plist",
|
||||||
"getrandom 0.3.2",
|
"getrandom 0.2.15",
|
||||||
"glob",
|
"glob",
|
||||||
"gtk",
|
"gtk",
|
||||||
"heck 0.5.0",
|
"heck 0.5.0",
|
||||||
@@ -6385,7 +6362,6 @@ dependencies = [
|
|||||||
"objc2-app-kit",
|
"objc2-app-kit",
|
||||||
"objc2-foundation 0.3.0",
|
"objc2-foundation 0.3.0",
|
||||||
"objc2-ui-kit",
|
"objc2-ui-kit",
|
||||||
"objc2-web-kit",
|
|
||||||
"percent-encoding",
|
"percent-encoding",
|
||||||
"plist",
|
"plist",
|
||||||
"raw-window-handle",
|
"raw-window-handle",
|
||||||
@@ -6415,9 +6391,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-build"
|
name = "tauri-build"
|
||||||
version = "2.4.0"
|
version = "2.3.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "67945dbaf8920dbe3a1e56721a419a0c3d085254ab24cff5b9ad55e2b0016e0b"
|
checksum = "12f025c389d3adb83114bec704da973142e82fc6ec799c7c750c5e21cefaec83"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"cargo_toml",
|
"cargo_toml",
|
||||||
@@ -6433,15 +6409,15 @@ dependencies = [
|
|||||||
"tauri-codegen",
|
"tauri-codegen",
|
||||||
"tauri-utils",
|
"tauri-utils",
|
||||||
"tauri-winres",
|
"tauri-winres",
|
||||||
"toml 0.9.5",
|
"toml",
|
||||||
"walkdir",
|
"walkdir",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-codegen"
|
name = "tauri-codegen"
|
||||||
version = "2.4.0"
|
version = "2.3.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1ab3a62cf2e6253936a8b267c2e95839674e7439f104fa96ad0025e149d54d8a"
|
checksum = "f5df493a1075a241065bc865ed5ef8d0fbc1e76c7afdc0bf0eccfaa7d4f0e406"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
"ico",
|
"ico",
|
||||||
@@ -6465,9 +6441,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-macros"
|
name = "tauri-macros"
|
||||||
version = "2.4.0"
|
version = "2.3.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "4368ea8094e7045217edb690f493b55b30caf9f3e61f79b4c24b6db91f07995e"
|
checksum = "1f59e1d1fa9651212dcb890a0c66226d819b716490b0cf43c078514da3591705"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"heck 0.5.0",
|
"heck 0.5.0",
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
@@ -6479,9 +6455,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin"
|
name = "tauri-plugin"
|
||||||
version = "2.4.0"
|
version = "2.3.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9946a3cede302eac0c6eb6c6070ac47b1768e326092d32efbb91f21ed58d978f"
|
checksum = "1d9a0bd00bf1930ad1a604d08b0eb6b2a9c1822686d65d7f4731a7723b8901d3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"glob",
|
"glob",
|
||||||
@@ -6490,13 +6466,13 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"tauri-utils",
|
"tauri-utils",
|
||||||
"toml 0.9.5",
|
"toml",
|
||||||
"walkdir",
|
"walkdir",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-autostart"
|
name = "tauri-plugin-autostart"
|
||||||
version = "2.5.1"
|
version = "2.5.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"auto-launch",
|
"auto-launch",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -6508,7 +6484,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-barcode-scanner"
|
name = "tauri-plugin-barcode-scanner"
|
||||||
version = "2.4.2"
|
version = "2.4.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"log",
|
"log",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -6520,7 +6496,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-biometric"
|
name = "tauri-plugin-biometric"
|
||||||
version = "2.3.2"
|
version = "2.3.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"log",
|
"log",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -6533,7 +6509,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-cli"
|
name = "tauri-plugin-cli"
|
||||||
version = "2.4.1"
|
version = "2.4.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"clap",
|
"clap",
|
||||||
"log",
|
"log",
|
||||||
@@ -6546,7 +6522,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-clipboard-manager"
|
name = "tauri-plugin-clipboard-manager"
|
||||||
version = "2.3.2"
|
version = "2.3.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"arboard",
|
"arboard",
|
||||||
"log",
|
"log",
|
||||||
@@ -6559,10 +6535,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-deep-link"
|
name = "tauri-plugin-deep-link"
|
||||||
version = "2.4.5"
|
version = "2.4.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"dunce",
|
"dunce",
|
||||||
"plist",
|
|
||||||
"rust-ini",
|
"rust-ini",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
@@ -6578,7 +6553,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-dialog"
|
name = "tauri-plugin-dialog"
|
||||||
version = "2.4.2"
|
version = "2.3.2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"log",
|
"log",
|
||||||
"raw-window-handle",
|
"raw-window-handle",
|
||||||
@@ -6594,7 +6569,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-fs"
|
name = "tauri-plugin-fs"
|
||||||
version = "2.4.4"
|
version = "2.4.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"dunce",
|
"dunce",
|
||||||
@@ -6610,13 +6585,13 @@ dependencies = [
|
|||||||
"tauri-plugin",
|
"tauri-plugin",
|
||||||
"tauri-utils",
|
"tauri-utils",
|
||||||
"thiserror 2.0.12",
|
"thiserror 2.0.12",
|
||||||
"toml 0.9.5",
|
"toml",
|
||||||
"url",
|
"url",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-geolocation"
|
name = "tauri-plugin-geolocation"
|
||||||
version = "2.3.2"
|
version = "2.3.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"log",
|
"log",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -6629,7 +6604,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-global-shortcut"
|
name = "tauri-plugin-global-shortcut"
|
||||||
version = "2.3.1"
|
version = "2.3.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"global-hotkey",
|
"global-hotkey",
|
||||||
"log",
|
"log",
|
||||||
@@ -6642,7 +6617,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-haptics"
|
name = "tauri-plugin-haptics"
|
||||||
version = "2.3.2"
|
version = "2.3.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"log",
|
"log",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -6655,7 +6630,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-http"
|
name = "tauri-plugin-http"
|
||||||
version = "2.5.4"
|
version = "2.5.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes",
|
"bytes",
|
||||||
"cookie_store",
|
"cookie_store",
|
||||||
@@ -6678,7 +6653,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-localhost"
|
name = "tauri-plugin-localhost"
|
||||||
version = "2.3.1"
|
version = "2.3.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"http",
|
"http",
|
||||||
"log",
|
"log",
|
||||||
@@ -6691,7 +6666,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-log"
|
name = "tauri-plugin-log"
|
||||||
version = "2.7.1"
|
version = "2.6.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"android_logger",
|
"android_logger",
|
||||||
"byte-unit",
|
"byte-unit",
|
||||||
@@ -6712,7 +6687,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-nfc"
|
name = "tauri-plugin-nfc"
|
||||||
version = "2.3.3"
|
version = "2.3.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"log",
|
"log",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -6725,7 +6700,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-notification"
|
name = "tauri-plugin-notification"
|
||||||
version = "2.3.3"
|
version = "2.3.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"color-backtrace",
|
"color-backtrace",
|
||||||
"ctor",
|
"ctor",
|
||||||
@@ -6747,7 +6722,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-opener"
|
name = "tauri-plugin-opener"
|
||||||
version = "2.5.2"
|
version = "2.4.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"dunce",
|
"dunce",
|
||||||
"glob",
|
"glob",
|
||||||
@@ -6767,7 +6742,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-os"
|
name = "tauri-plugin-os"
|
||||||
version = "2.3.2"
|
version = "2.3.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"gethostname 1.0.1",
|
"gethostname 1.0.1",
|
||||||
"log",
|
"log",
|
||||||
@@ -6783,7 +6758,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-persisted-scope"
|
name = "tauri-plugin-persisted-scope"
|
||||||
version = "2.3.4"
|
version = "2.3.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aho-corasick",
|
"aho-corasick",
|
||||||
"bincode",
|
"bincode",
|
||||||
@@ -6797,7 +6772,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-positioner"
|
name = "tauri-plugin-positioner"
|
||||||
version = "2.3.1"
|
version = "2.3.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"log",
|
"log",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -6810,7 +6785,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-process"
|
name = "tauri-plugin-process"
|
||||||
version = "2.3.1"
|
version = "2.3.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"tauri",
|
"tauri",
|
||||||
"tauri-plugin",
|
"tauri-plugin",
|
||||||
@@ -6818,7 +6793,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-shell"
|
name = "tauri-plugin-shell"
|
||||||
version = "2.3.3"
|
version = "2.3.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"encoding_rs",
|
"encoding_rs",
|
||||||
"log",
|
"log",
|
||||||
@@ -6837,7 +6812,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-single-instance"
|
name = "tauri-plugin-single-instance"
|
||||||
version = "2.3.6"
|
version = "2.3.2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"semver",
|
"semver",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -6852,7 +6827,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-sql"
|
name = "tauri-plugin-sql"
|
||||||
version = "2.3.1"
|
version = "2.3.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"futures-core",
|
"futures-core",
|
||||||
"indexmap 2.9.0",
|
"indexmap 2.9.0",
|
||||||
@@ -6869,7 +6844,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-store"
|
name = "tauri-plugin-store"
|
||||||
version = "2.4.1"
|
version = "2.3.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"dunce",
|
"dunce",
|
||||||
"serde",
|
"serde",
|
||||||
@@ -6883,7 +6858,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-stronghold"
|
name = "tauri-plugin-stronghold"
|
||||||
version = "2.3.1"
|
version = "2.3.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"hex",
|
"hex",
|
||||||
"iota-crypto",
|
"iota-crypto",
|
||||||
@@ -6934,7 +6909,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-upload"
|
name = "tauri-plugin-upload"
|
||||||
version = "2.3.2"
|
version = "2.3.1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"log",
|
"log",
|
||||||
@@ -6952,7 +6927,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-websocket"
|
name = "tauri-plugin-websocket"
|
||||||
version = "2.4.1"
|
version = "2.4.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"http",
|
"http",
|
||||||
@@ -6969,7 +6944,7 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-plugin-window-state"
|
name = "tauri-plugin-window-state"
|
||||||
version = "2.4.1"
|
version = "2.4.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bitflags 2.9.0",
|
"bitflags 2.9.0",
|
||||||
"log",
|
"log",
|
||||||
@@ -6982,9 +6957,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-runtime"
|
name = "tauri-runtime"
|
||||||
version = "2.8.0"
|
version = "2.7.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d4cfc9ad45b487d3fded5a4731a567872a4812e9552e3964161b08edabf93846"
|
checksum = "9e7bb73d1bceac06c20b3f755b2c8a2cb13b20b50083084a8cf3700daf397ba4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cookie",
|
"cookie",
|
||||||
"dpi",
|
"dpi",
|
||||||
@@ -6993,23 +6968,20 @@ dependencies = [
|
|||||||
"jni",
|
"jni",
|
||||||
"objc2 0.6.0",
|
"objc2 0.6.0",
|
||||||
"objc2-ui-kit",
|
"objc2-ui-kit",
|
||||||
"objc2-web-kit",
|
|
||||||
"raw-window-handle",
|
"raw-window-handle",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_json",
|
"serde_json",
|
||||||
"tauri-utils",
|
"tauri-utils",
|
||||||
"thiserror 2.0.12",
|
"thiserror 2.0.12",
|
||||||
"url",
|
"url",
|
||||||
"webkit2gtk",
|
|
||||||
"webview2-com",
|
|
||||||
"windows 0.61.1",
|
"windows 0.61.1",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-runtime-wry"
|
name = "tauri-runtime-wry"
|
||||||
version = "2.8.1"
|
version = "2.7.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "c1fe9d48bd122ff002064e88cfcd7027090d789c4302714e68fcccba0f4b7807"
|
checksum = "fe52ed0ef40fd7ad51a620ecb3018e32eba3040bb95025216a962a37f6f050c5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"gtk",
|
"gtk",
|
||||||
"http",
|
"http",
|
||||||
@@ -7034,16 +7006,16 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tauri-utils"
|
name = "tauri-utils"
|
||||||
version = "2.7.0"
|
version = "2.5.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "41a3852fdf9a4f8fbeaa63dc3e9a85284dd6ef7200751f0bd66ceee30c93f212"
|
checksum = "41743bbbeb96c3a100d234e5a0b60a46d5aa068f266160862c7afdbf828ca02e"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aes-gcm",
|
"aes-gcm",
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"cargo_metadata",
|
"cargo_metadata",
|
||||||
"ctor",
|
"ctor",
|
||||||
"dunce",
|
"dunce",
|
||||||
"getrandom 0.3.2",
|
"getrandom 0.2.15",
|
||||||
"glob",
|
"glob",
|
||||||
"html5ever",
|
"html5ever",
|
||||||
"http",
|
"http",
|
||||||
@@ -7065,7 +7037,7 @@ dependencies = [
|
|||||||
"serialize-to-javascript",
|
"serialize-to-javascript",
|
||||||
"swift-rs",
|
"swift-rs",
|
||||||
"thiserror 2.0.12",
|
"thiserror 2.0.12",
|
||||||
"toml 0.9.5",
|
"toml",
|
||||||
"url",
|
"url",
|
||||||
"urlpattern",
|
"urlpattern",
|
||||||
"uuid",
|
"uuid",
|
||||||
@@ -7079,7 +7051,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "56eaa45f707bedf34d19312c26d350bc0f3c59a47e58e8adbeecdc850d2c13a0"
|
checksum = "56eaa45f707bedf34d19312c26d350bc0f3c59a47e58e8adbeecdc850d2c13a0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"embed-resource",
|
"embed-resource",
|
||||||
"toml 0.8.20",
|
"toml",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -7332,9 +7304,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tokio-tungstenite"
|
name = "tokio-tungstenite"
|
||||||
version = "0.28.0"
|
version = "0.27.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d25a406cddcc431a75d3d9afc6a7c0f7428d4891dd973e4d54c56b46127bf857"
|
checksum = "489a59b6730eda1b0171fcfda8b121f4bee2b35cba8645ca35c5f7ba3eb736c1"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"futures-util",
|
"futures-util",
|
||||||
"log",
|
"log",
|
||||||
@@ -7369,26 +7341,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
|
checksum = "cd87a5cdd6ffab733b2f74bc4fd7ee5fff6634124999ac278c35fc78c6120148"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
"serde_spanned 0.6.8",
|
"serde_spanned",
|
||||||
"toml_datetime 0.6.8",
|
"toml_datetime",
|
||||||
"toml_edit 0.22.24",
|
"toml_edit 0.22.24",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "toml"
|
|
||||||
version = "0.9.5"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "75129e1dc5000bfbaa9fee9d1b21f974f9fbad9daec557a521ee6e080825f6e8"
|
|
||||||
dependencies = [
|
|
||||||
"indexmap 2.9.0",
|
|
||||||
"serde",
|
|
||||||
"serde_spanned 1.0.0",
|
|
||||||
"toml_datetime 0.7.0",
|
|
||||||
"toml_parser",
|
|
||||||
"toml_writer",
|
|
||||||
"winnow 0.7.12",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "toml_datetime"
|
name = "toml_datetime"
|
||||||
version = "0.6.8"
|
version = "0.6.8"
|
||||||
@@ -7398,15 +7355,6 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "toml_datetime"
|
|
||||||
version = "0.7.0"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "bade1c3e902f58d73d3f294cd7f20391c1cb2fbcb643b73566bc773971df91e3"
|
|
||||||
dependencies = [
|
|
||||||
"serde",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "toml_edit"
|
name = "toml_edit"
|
||||||
version = "0.19.15"
|
version = "0.19.15"
|
||||||
@@ -7414,7 +7362,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
|
checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"indexmap 2.9.0",
|
"indexmap 2.9.0",
|
||||||
"toml_datetime 0.6.8",
|
"toml_datetime",
|
||||||
"winnow 0.5.40",
|
"winnow 0.5.40",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -7425,7 +7373,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
|
checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"indexmap 2.9.0",
|
"indexmap 2.9.0",
|
||||||
"toml_datetime 0.6.8",
|
"toml_datetime",
|
||||||
"winnow 0.5.40",
|
"winnow 0.5.40",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -7437,26 +7385,11 @@ checksum = "17b4795ff5edd201c7cd6dca065ae59972ce77d1b80fa0a84d94950ece7d1474"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"indexmap 2.9.0",
|
"indexmap 2.9.0",
|
||||||
"serde",
|
"serde",
|
||||||
"serde_spanned 0.6.8",
|
"serde_spanned",
|
||||||
"toml_datetime 0.6.8",
|
"toml_datetime",
|
||||||
"winnow 0.7.12",
|
"winnow 0.7.6",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "toml_parser"
|
|
||||||
version = "1.0.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "b551886f449aa90d4fe2bdaa9f4a2577ad2dde302c61ecf262d80b116db95c10"
|
|
||||||
dependencies = [
|
|
||||||
"winnow 0.7.12",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "toml_writer"
|
|
||||||
version = "1.0.2"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "fcc842091f2def52017664b53082ecbbeb5c7731092bad69d2c63050401dfd64"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tower"
|
name = "tower"
|
||||||
version = "0.5.2"
|
version = "0.5.2"
|
||||||
@@ -7518,9 +7451,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tray-icon"
|
name = "tray-icon"
|
||||||
version = "0.21.1"
|
version = "0.20.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "a0d92153331e7d02ec09137538996a7786fe679c629c279e82a6be762b7e6fe2"
|
checksum = "d433764348e7084bad2c5ea22c96c71b61b17afe3a11645710f533bd72b6a2b5"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"crossbeam-channel",
|
"crossbeam-channel",
|
||||||
"dirs 6.0.0",
|
"dirs 6.0.0",
|
||||||
@@ -7565,9 +7498,9 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "tungstenite"
|
name = "tungstenite"
|
||||||
version = "0.28.0"
|
version = "0.27.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8628dcc84e5a09eb3d8423d6cb682965dea9133204e8fb3efee74c2a0c259442"
|
checksum = "eadc29d668c91fcc564941132e17b28a7ceb2f3ebf0b9dae3e03fd7a6748eb0d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"bytes",
|
"bytes",
|
||||||
"data-encoding",
|
"data-encoding",
|
||||||
@@ -8721,9 +8654,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winnow"
|
name = "winnow"
|
||||||
version = "0.7.12"
|
version = "0.7.6"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "f3edebf492c8125044983378ecb5766203ad3b4c2f7a922bd7dd207f6d443e95"
|
checksum = "63d3fcd9bba44b03821e7d699eeee959f3126dcc4aa8e4ae18ec617c2a5cea10"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"memchr",
|
"memchr",
|
||||||
]
|
]
|
||||||
@@ -8789,15 +8722,14 @@ checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "wry"
|
name = "wry"
|
||||||
version = "0.53.2"
|
version = "0.52.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e3b6763512fe4b51c80b3ce9b50939d682acb4de335dfabbdb20d7a2642199b7"
|
checksum = "b08db04817a654a7e3339647d9cf8b497ed9ddcd4ec7cfda5a3a220c10a3bba3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
"block2 0.6.0",
|
"block2 0.6.0",
|
||||||
"cookie",
|
"cookie",
|
||||||
"crossbeam-channel",
|
"crossbeam-channel",
|
||||||
"dirs 6.0.0",
|
|
||||||
"dpi",
|
"dpi",
|
||||||
"dunce",
|
"dunce",
|
||||||
"gdkx11",
|
"gdkx11",
|
||||||
@@ -8958,7 +8890,7 @@ dependencies = [
|
|||||||
"tracing",
|
"tracing",
|
||||||
"uds_windows",
|
"uds_windows",
|
||||||
"windows-sys 0.59.0",
|
"windows-sys 0.59.0",
|
||||||
"winnow 0.7.12",
|
"winnow 0.7.6",
|
||||||
"zbus_macros",
|
"zbus_macros",
|
||||||
"zbus_names",
|
"zbus_names",
|
||||||
"zvariant",
|
"zvariant",
|
||||||
@@ -8987,7 +8919,7 @@ checksum = "7be68e64bf6ce8db94f63e72f0c7eb9a60d733f7e0499e628dfab0f84d6bcb97"
|
|||||||
dependencies = [
|
dependencies = [
|
||||||
"serde",
|
"serde",
|
||||||
"static_assertions",
|
"static_assertions",
|
||||||
"winnow 0.7.12",
|
"winnow 0.7.6",
|
||||||
"zvariant",
|
"zvariant",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -9174,7 +9106,7 @@ dependencies = [
|
|||||||
"enumflags2",
|
"enumflags2",
|
||||||
"serde",
|
"serde",
|
||||||
"url",
|
"url",
|
||||||
"winnow 0.7.12",
|
"winnow 0.7.6",
|
||||||
"zvariant_derive",
|
"zvariant_derive",
|
||||||
"zvariant_utils",
|
"zvariant_utils",
|
||||||
]
|
]
|
||||||
@@ -9203,5 +9135,5 @@ dependencies = [
|
|||||||
"serde",
|
"serde",
|
||||||
"static_assertions",
|
"static_assertions",
|
||||||
"syn 2.0.100",
|
"syn 2.0.100",
|
||||||
"winnow 0.7.12",
|
"winnow 0.7.6",
|
||||||
]
|
]
|
||||||
|
|||||||
+4
-4
@@ -12,10 +12,10 @@ resolver = "2"
|
|||||||
serde = { version = "1", features = ["derive"] }
|
serde = { version = "1", features = ["derive"] }
|
||||||
tracing = "0.1"
|
tracing = "0.1"
|
||||||
log = "0.4"
|
log = "0.4"
|
||||||
tauri = { version = "2.8.2", default-features = false }
|
tauri = { version = "2.6", default-features = false }
|
||||||
tauri-build = "2.4"
|
tauri-build = "2.3"
|
||||||
tauri-plugin = "2.4"
|
tauri-plugin = "2.3"
|
||||||
tauri-utils = "2.7"
|
tauri-utils = "2.5"
|
||||||
serde_json = "1"
|
serde_json = "1"
|
||||||
thiserror = "2"
|
thiserror = "2"
|
||||||
url = "2"
|
url = "2"
|
||||||
|
|||||||
+1
-2
@@ -3,12 +3,11 @@
|
|||||||
// SPDX-License-Identifier: MIT
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
import eslint from '@eslint/js'
|
import eslint from '@eslint/js'
|
||||||
import { defineConfig } from 'eslint/config'
|
|
||||||
import eslintConfigPrettier from 'eslint-config-prettier'
|
import eslintConfigPrettier from 'eslint-config-prettier'
|
||||||
import eslintPluginSecurity from 'eslint-plugin-security'
|
import eslintPluginSecurity from 'eslint-plugin-security'
|
||||||
import tseslint from 'typescript-eslint'
|
import tseslint from 'typescript-eslint'
|
||||||
|
|
||||||
export default defineConfig(
|
export default tseslint.config(
|
||||||
{
|
{
|
||||||
ignores: [
|
ignores: [
|
||||||
'**/target',
|
'**/target',
|
||||||
|
|||||||
@@ -1,72 +1,5 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## \[2.0.34]
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
- Upgraded to `barcode-scanner-js@2.4.2`
|
|
||||||
- Upgraded to `biometric-js@2.3.2`
|
|
||||||
- Upgraded to `cli-js@2.4.1`
|
|
||||||
- Upgraded to `clipboard-manager-js@2.3.2`
|
|
||||||
- Upgraded to `dialog-js@2.4.2`
|
|
||||||
- Upgraded to `fs-js@2.4.4`
|
|
||||||
- Upgraded to `global-shortcut-js@2.3.1`
|
|
||||||
- Upgraded to `http-js@2.5.4`
|
|
||||||
- Upgraded to `log-js@2.7.1`
|
|
||||||
- Upgraded to `nfc-js@2.3.3`
|
|
||||||
- Upgraded to `notification-js@2.3.3`
|
|
||||||
- Upgraded to `opener-js@2.5.2`
|
|
||||||
- Upgraded to `os-js@2.3.2`
|
|
||||||
- Upgraded to `process-js@2.3.1`
|
|
||||||
- Upgraded to `shell-js@2.3.3`
|
|
||||||
- Upgraded to `store-js@2.4.1`
|
|
||||||
|
|
||||||
## \[2.0.33]
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
- Upgraded to `barcode-scanner-js@2.4.1`
|
|
||||||
- Upgraded to `biometric-js@2.3.1`
|
|
||||||
- Upgraded to `clipboard-manager-js@2.3.1`
|
|
||||||
- Upgraded to `dialog-js@2.4.1`
|
|
||||||
- Upgraded to `fs-js@2.4.3`
|
|
||||||
- Upgraded to `nfc-js@2.3.2`
|
|
||||||
- Upgraded to `notification-js@2.3.2`
|
|
||||||
- Upgraded to `opener-js@2.5.1`
|
|
||||||
- Upgraded to `shell-js@2.3.2`
|
|
||||||
- Upgraded to `http-js@2.5.3`
|
|
||||||
|
|
||||||
## \[2.0.32]
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
- Upgraded to `dialog-js@2.4.0`
|
|
||||||
- Upgraded to `log-js@2.7.0`
|
|
||||||
|
|
||||||
## \[2.0.31]
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
- Upgraded to `shell-js@2.3.1`
|
|
||||||
|
|
||||||
## \[2.0.30]
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
- Upgraded to `notification-js@2.3.1`
|
|
||||||
|
|
||||||
## \[2.0.29]
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
- Upgraded to `fs-js@2.4.2`
|
|
||||||
- Upgraded to `nfc-js@2.3.1`
|
|
||||||
- Upgraded to `opener-js@2.5.0`
|
|
||||||
- Upgraded to `os-js@2.3.1`
|
|
||||||
- Upgraded to `store-js@2.4.0`
|
|
||||||
- Upgraded to `dialog-js@2.3.3`
|
|
||||||
- Upgraded to `http-js@2.5.2`
|
|
||||||
|
|
||||||
## \[2.0.28]
|
## \[2.0.28]
|
||||||
|
|
||||||
### Dependencies
|
### Dependencies
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
<meta charset="UTF-8" />
|
<meta charset="UTF-8" />
|
||||||
<meta
|
<meta
|
||||||
name="viewport"
|
name="viewport"
|
||||||
content="width=device-width, initial-scale=1.0, viewport-fit=cover, user-scalable=0"
|
content="width=device-width, initial-scale=1.0, viewport-fit=cover"
|
||||||
/>
|
/>
|
||||||
<title>Svelte + Vite App</title>
|
<title>Svelte + Vite App</title>
|
||||||
</head>
|
</head>
|
||||||
|
|||||||
+19
-19
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "api",
|
"name": "api",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "2.0.34",
|
"version": "2.0.28",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite --clearScreen false",
|
"dev": "vite --clearScreen false",
|
||||||
@@ -10,24 +10,24 @@
|
|||||||
"tauri": "tauri"
|
"tauri": "tauri"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tauri-apps/api": "2.9.0",
|
"@tauri-apps/api": "2.7.0",
|
||||||
"@tauri-apps/plugin-barcode-scanner": "^2.4.2",
|
"@tauri-apps/plugin-barcode-scanner": "^2.4.0",
|
||||||
"@tauri-apps/plugin-biometric": "^2.3.2",
|
"@tauri-apps/plugin-biometric": "^2.3.0",
|
||||||
"@tauri-apps/plugin-cli": "^2.4.1",
|
"@tauri-apps/plugin-cli": "^2.4.0",
|
||||||
"@tauri-apps/plugin-clipboard-manager": "^2.3.2",
|
"@tauri-apps/plugin-clipboard-manager": "^2.3.0",
|
||||||
"@tauri-apps/plugin-dialog": "^2.4.2",
|
"@tauri-apps/plugin-dialog": "^2.3.2",
|
||||||
"@tauri-apps/plugin-fs": "^2.4.4",
|
"@tauri-apps/plugin-fs": "^2.4.1",
|
||||||
"@tauri-apps/plugin-geolocation": "^2.2.0",
|
"@tauri-apps/plugin-geolocation": "^2.2.0",
|
||||||
"@tauri-apps/plugin-global-shortcut": "^2.3.1",
|
"@tauri-apps/plugin-global-shortcut": "^2.3.0",
|
||||||
"@tauri-apps/plugin-haptics": "^2.2.0",
|
"@tauri-apps/plugin-haptics": "^2.2.0",
|
||||||
"@tauri-apps/plugin-http": "^2.5.4",
|
"@tauri-apps/plugin-http": "^2.5.1",
|
||||||
"@tauri-apps/plugin-nfc": "^2.3.3",
|
"@tauri-apps/plugin-nfc": "^2.3.0",
|
||||||
"@tauri-apps/plugin-notification": "^2.3.3",
|
"@tauri-apps/plugin-notification": "^2.3.0",
|
||||||
"@tauri-apps/plugin-opener": "^2.5.2",
|
"@tauri-apps/plugin-opener": "^2.4.0",
|
||||||
"@tauri-apps/plugin-os": "^2.3.2",
|
"@tauri-apps/plugin-os": "^2.3.0",
|
||||||
"@tauri-apps/plugin-process": "^2.3.1",
|
"@tauri-apps/plugin-process": "^2.3.0",
|
||||||
"@tauri-apps/plugin-shell": "^2.3.3",
|
"@tauri-apps/plugin-shell": "^2.3.0",
|
||||||
"@tauri-apps/plugin-store": "^2.4.1",
|
"@tauri-apps/plugin-store": "^2.3.0",
|
||||||
"@tauri-apps/plugin-updater": "^2.9.0",
|
"@tauri-apps/plugin-updater": "^2.9.0",
|
||||||
"@tauri-apps/plugin-upload": "^2.3.0",
|
"@tauri-apps/plugin-upload": "^2.3.0",
|
||||||
"@zerodevx/svelte-json-view": "1.0.11"
|
"@zerodevx/svelte-json-view": "1.0.11"
|
||||||
@@ -36,10 +36,10 @@
|
|||||||
"@iconify-json/codicon": "^1.2.12",
|
"@iconify-json/codicon": "^1.2.12",
|
||||||
"@iconify-json/ph": "^1.2.2",
|
"@iconify-json/ph": "^1.2.2",
|
||||||
"@sveltejs/vite-plugin-svelte": "^6.0.0",
|
"@sveltejs/vite-plugin-svelte": "^6.0.0",
|
||||||
"@tauri-apps/cli": "2.9.1",
|
"@tauri-apps/cli": "2.7.1",
|
||||||
"@unocss/extractor-svelte": "^66.3.3",
|
"@unocss/extractor-svelte": "^66.3.3",
|
||||||
"svelte": "^5.20.4",
|
"svelte": "^5.20.4",
|
||||||
"unocss": "^66.3.3",
|
"unocss": "^66.3.3",
|
||||||
"vite": "^7.0.7"
|
"vite": "^7.0.4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,76 +1,5 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## \[2.0.38]
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
- Upgraded to `barcode-scanner@2.4.2`
|
|
||||||
- Upgraded to `biometric@2.3.2`
|
|
||||||
- Upgraded to `cli@2.4.1`
|
|
||||||
- Upgraded to `clipboard-manager@2.3.2`
|
|
||||||
- Upgraded to `dialog@2.4.2`
|
|
||||||
- Upgraded to `fs@2.4.4`
|
|
||||||
- Upgraded to `geolocation@2.3.2`
|
|
||||||
- Upgraded to `global-shortcut@2.3.1`
|
|
||||||
- Upgraded to `haptics@2.3.2`
|
|
||||||
- Upgraded to `http@2.5.4`
|
|
||||||
- Upgraded to `log@2.7.1`
|
|
||||||
- Upgraded to `nfc@2.3.3`
|
|
||||||
- Upgraded to `notification@2.3.3`
|
|
||||||
- Upgraded to `opener@2.5.2`
|
|
||||||
- Upgraded to `os@2.3.2`
|
|
||||||
- Upgraded to `process@2.3.1`
|
|
||||||
- Upgraded to `shell@2.3.3`
|
|
||||||
- Upgraded to `store@2.4.1`
|
|
||||||
|
|
||||||
## \[2.0.37]
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
- Upgraded to `barcode-scanner@2.4.1`
|
|
||||||
- Upgraded to `biometric@2.3.1`
|
|
||||||
- Upgraded to `clipboard-manager@2.3.1`
|
|
||||||
- Upgraded to `dialog@2.4.1`
|
|
||||||
- Upgraded to `fs@2.4.3`
|
|
||||||
- Upgraded to `geolocation@2.3.1`
|
|
||||||
- Upgraded to `haptics@2.3.1`
|
|
||||||
- Upgraded to `nfc@2.3.2`
|
|
||||||
- Upgraded to `notification@2.3.2`
|
|
||||||
- Upgraded to `opener@2.5.1`
|
|
||||||
- Upgraded to `shell@2.3.2`
|
|
||||||
- Upgraded to `http@2.5.3`
|
|
||||||
|
|
||||||
## \[2.0.36]
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
- Upgraded to `dialog@2.4.0`
|
|
||||||
- Upgraded to `log@2.7.0`
|
|
||||||
|
|
||||||
## \[2.0.35]
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
- Upgraded to `shell@2.3.1`
|
|
||||||
|
|
||||||
## \[2.0.34]
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
- Upgraded to `notification@2.3.1`
|
|
||||||
|
|
||||||
## \[2.0.33]
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
- Upgraded to `fs@2.4.2`
|
|
||||||
- Upgraded to `nfc@2.3.1`
|
|
||||||
- Upgraded to `opener@2.5.0`
|
|
||||||
- Upgraded to `os@2.3.1`
|
|
||||||
- Upgraded to `store@2.4.0`
|
|
||||||
- Upgraded to `dialog@2.3.3`
|
|
||||||
- Upgraded to `http@2.5.2`
|
|
||||||
|
|
||||||
## \[2.0.32]
|
## \[2.0.32]
|
||||||
|
|
||||||
### Dependencies
|
### Dependencies
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "api"
|
name = "api"
|
||||||
publish = false
|
publish = false
|
||||||
version = "2.0.38"
|
version = "2.0.32"
|
||||||
description = "An example Tauri Application showcasing the api"
|
description = "An example Tauri Application showcasing the api"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
rust-version = { workspace = true }
|
rust-version = { workspace = true }
|
||||||
@@ -20,24 +20,24 @@ serde = { workspace = true }
|
|||||||
tiny_http = "0.12"
|
tiny_http = "0.12"
|
||||||
time = "0.3"
|
time = "0.3"
|
||||||
log = { workspace = true }
|
log = { workspace = true }
|
||||||
tauri-plugin-log = { path = "../../../plugins/log", version = "2.7.1" }
|
tauri-plugin-log = { path = "../../../plugins/log", version = "2.6.0" }
|
||||||
tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.4.4", features = [
|
tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.4.1", features = [
|
||||||
"watch",
|
"watch",
|
||||||
] }
|
] }
|
||||||
tauri-plugin-clipboard-manager = { path = "../../../plugins/clipboard-manager", version = "2.3.2" }
|
tauri-plugin-clipboard-manager = { path = "../../../plugins/clipboard-manager", version = "2.3.0" }
|
||||||
tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.4.2" }
|
tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.3.2" }
|
||||||
tauri-plugin-http = { path = "../../../plugins/http", features = [
|
tauri-plugin-http = { path = "../../../plugins/http", features = [
|
||||||
"multipart",
|
"multipart",
|
||||||
"cookies",
|
"cookies",
|
||||||
], version = "2.5.4" }
|
], version = "2.5.1" }
|
||||||
tauri-plugin-notification = { path = "../../../plugins/notification", version = "2.3.3", features = [
|
tauri-plugin-notification = { path = "../../../plugins/notification", version = "2.3.0", features = [
|
||||||
"windows7-compat",
|
"windows7-compat",
|
||||||
] }
|
] }
|
||||||
tauri-plugin-os = { path = "../../../plugins/os", version = "2.3.2" }
|
tauri-plugin-os = { path = "../../../plugins/os", version = "2.3.0" }
|
||||||
tauri-plugin-process = { path = "../../../plugins/process", version = "2.3.1" }
|
tauri-plugin-process = { path = "../../../plugins/process", version = "2.3.0" }
|
||||||
tauri-plugin-opener = { path = "../../../plugins/opener", version = "2.5.2" }
|
tauri-plugin-opener = { path = "../../../plugins/opener", version = "2.4.0" }
|
||||||
tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.3.3" }
|
tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.3.0" }
|
||||||
tauri-plugin-store = { path = "../../../plugins/store", version = "2.4.1" }
|
tauri-plugin-store = { path = "../../../plugins/store", version = "2.3.0" }
|
||||||
tauri-plugin-upload = { path = "../../../plugins/upload", version = "2.3.0" }
|
tauri-plugin-upload = { path = "../../../plugins/upload", version = "2.3.0" }
|
||||||
|
|
||||||
[dependencies.tauri]
|
[dependencies.tauri]
|
||||||
@@ -55,17 +55,17 @@ features = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
|
[target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies]
|
||||||
tauri-plugin-cli = { path = "../../../plugins/cli", version = "2.4.1" }
|
tauri-plugin-cli = { path = "../../../plugins/cli", version = "2.4.0" }
|
||||||
tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut", version = "2.3.1" }
|
tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut", version = "2.3.0" }
|
||||||
tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.9.0" }
|
tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.9.0" }
|
||||||
tauri-plugin-window-state = { path = "../../../plugins/window-state", version = "2.2.0" }
|
tauri-plugin-window-state = { path = "../../../plugins/window-state", version = "2.2.0" }
|
||||||
|
|
||||||
[target."cfg(any(target_os = \"android\", target_os = \"ios\"))".dependencies]
|
[target."cfg(any(target_os = \"android\", target_os = \"ios\"))".dependencies]
|
||||||
tauri-plugin-barcode-scanner = { path = "../../../plugins/barcode-scanner/", version = "2.4.2" }
|
tauri-plugin-barcode-scanner = { path = "../../../plugins/barcode-scanner/", version = "2.4.0" }
|
||||||
tauri-plugin-nfc = { path = "../../../plugins/nfc", version = "2.3.3" }
|
tauri-plugin-nfc = { path = "../../../plugins/nfc", version = "2.3.0" }
|
||||||
tauri-plugin-biometric = { path = "../../../plugins/biometric/", version = "2.3.2" }
|
tauri-plugin-biometric = { path = "../../../plugins/biometric/", version = "2.3.0" }
|
||||||
tauri-plugin-geolocation = { path = "../../../plugins/geolocation/", version = "2.3.2" }
|
tauri-plugin-geolocation = { path = "../../../plugins/geolocation/", version = "2.3.0" }
|
||||||
tauri-plugin-haptics = { path = "../../../plugins/haptics/", version = "2.3.2" }
|
tauri-plugin-haptics = { path = "../../../plugins/haptics/", version = "2.3.0" }
|
||||||
|
|
||||||
[features]
|
[features]
|
||||||
prod = ["tauri/custom-protocol"]
|
prod = ["tauri/custom-protocol"]
|
||||||
|
|||||||
@@ -68,9 +68,6 @@
|
|||||||
"fs:allow-rename",
|
"fs:allow-rename",
|
||||||
"fs:allow-mkdir",
|
"fs:allow-mkdir",
|
||||||
"fs:allow-remove",
|
"fs:allow-remove",
|
||||||
"fs:allow-stat",
|
|
||||||
"fs:allow-fstat",
|
|
||||||
"fs:allow-lstat",
|
|
||||||
"fs:allow-write-text-file",
|
"fs:allow-write-text-file",
|
||||||
"fs:read-meta",
|
"fs:read-meta",
|
||||||
"fs:scope-download-recursive",
|
"fs:scope-download-recursive",
|
||||||
@@ -78,9 +75,6 @@
|
|||||||
{
|
{
|
||||||
"identifier": "fs:scope-appdata-recursive",
|
"identifier": "fs:scope-appdata-recursive",
|
||||||
"allow": [
|
"allow": [
|
||||||
{
|
|
||||||
"path": "$APPDATA/db/"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
"path": "$APPDATA/db/**"
|
"path": "$APPDATA/db/**"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,13 +14,13 @@ val tauriProperties = Properties().apply {
|
|||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdk = 36
|
compileSdk = 34
|
||||||
namespace = "com.tauri.api"
|
namespace = "com.tauri.api"
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
manifestPlaceholders["usesCleartextTraffic"] = "false"
|
manifestPlaceholders["usesCleartextTraffic"] = "false"
|
||||||
applicationId = "com.tauri.api"
|
applicationId = "com.tauri.api"
|
||||||
minSdk = 24
|
minSdk = 24
|
||||||
targetSdk = 36
|
targetSdk = 34
|
||||||
versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
|
versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
|
||||||
versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")
|
versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ buildscript {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath("com.android.tools.build:gradle:8.11.0")
|
classpath("com.android.tools.build:gradle:8.5.1")
|
||||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25")
|
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,6 +18,6 @@ repositories {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly(gradleApi())
|
compileOnly(gradleApi())
|
||||||
implementation("com.android.tools.build:gradle:8.11.0")
|
implementation("com.android.tools.build:gradle:8.5.1")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -44,13 +44,6 @@
|
|||||||
await message("Tauri is awesome!");
|
await message("Tauri is awesome!");
|
||||||
}
|
}
|
||||||
|
|
||||||
async function msgCustom(result) {
|
|
||||||
const buttons = { yes: "awesome", no: "amazing", cancel: "stunning" };
|
|
||||||
await message(`Tauri is: `, { buttons })
|
|
||||||
.then((res) => onMessage(`Tauri is ${res}`))
|
|
||||||
.catch(onMessage);
|
|
||||||
}
|
|
||||||
|
|
||||||
function openDialog() {
|
function openDialog() {
|
||||||
open({
|
open({
|
||||||
title: "My wonderful open dialog",
|
title: "My wonderful open dialog",
|
||||||
@@ -143,17 +136,12 @@
|
|||||||
<label for="dialog-directory">Directory</label>
|
<label for="dialog-directory">Directory</label>
|
||||||
</div>
|
</div>
|
||||||
<br />
|
<br />
|
||||||
|
<button class="btn" id="open-dialog" on:click={openDialog}>Open dialog</button>
|
||||||
<div class="flex flex-wrap flex-col md:flex-row gap-2 children:flex-shrink-0">
|
<button class="btn" id="save-dialog" on:click={saveDialog}
|
||||||
<button class="btn" id="open-dialog" on:click={openDialog}>Open dialog</button>
|
>Open save dialog</button
|
||||||
<button class="btn" id="save-dialog" on:click={saveDialog}
|
>
|
||||||
>Open save dialog</button
|
<button class="btn" id="prompt-dialog" on:click={prompt}>Prompt</button>
|
||||||
>
|
<button class="btn" id="custom-prompt-dialog" on:click={promptCustom}
|
||||||
<button class="btn" id="prompt-dialog" on:click={prompt}>Prompt</button>
|
>Prompt (custom)</button
|
||||||
<button class="btn" id="custom-prompt-dialog" on:click={promptCustom}
|
>
|
||||||
>Prompt (custom)</button
|
<button class="btn" id="message-dialog" on:click={msg}>Message</button>
|
||||||
>
|
|
||||||
<button class="btn" id="message-dialog" on:click={msg}>Message</button>
|
|
||||||
<button class="btn" id="message-dialog" on:click={msgCustom}>Message (custom)</button>
|
|
||||||
|
|
||||||
</div>
|
|
||||||
|
|||||||
@@ -1,9 +1,8 @@
|
|||||||
<script>
|
<script>
|
||||||
import * as fs from '@tauri-apps/plugin-fs'
|
import * as fs from '@tauri-apps/plugin-fs'
|
||||||
import * as os from '@tauri-apps/plugin-os'
|
|
||||||
import { convertFileSrc } from '@tauri-apps/api/core'
|
import { convertFileSrc } from '@tauri-apps/api/core'
|
||||||
import { arrayBufferToBase64 } from '../lib/utils'
|
import { arrayBufferToBase64 } from '../lib/utils'
|
||||||
import { onDestroy, onMount } from 'svelte'
|
import { onDestroy } from 'svelte'
|
||||||
|
|
||||||
const { onMessage, insecureRenderHtml } = $props()
|
const { onMessage, insecureRenderHtml } = $props()
|
||||||
|
|
||||||
@@ -19,12 +18,6 @@
|
|||||||
let baseDir = $state()
|
let baseDir = $state()
|
||||||
let unwatchFn
|
let unwatchFn
|
||||||
let unwatchPath = ''
|
let unwatchPath = ''
|
||||||
let isMobile = $state(false)
|
|
||||||
|
|
||||||
onMount(() => {
|
|
||||||
let platform = os.platform()
|
|
||||||
isMobile = platform === 'android' || platform === 'ios'
|
|
||||||
})
|
|
||||||
|
|
||||||
const dirOptions = Object.keys(fs.BaseDirectory).filter((key) =>
|
const dirOptions = Object.keys(fs.BaseDirectory).filter((key) =>
|
||||||
isNaN(parseInt(key))
|
isNaN(parseInt(key))
|
||||||
@@ -45,7 +38,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
function mkdir() {
|
function mkdir() {
|
||||||
fs.mkdir(path, { baseDir, recursive: true })
|
fs.mkdir(path, { baseDir })
|
||||||
.then(() => {
|
.then(() => {
|
||||||
onMessage(`Created dir ${path}`)
|
onMessage(`Created dir ${path}`)
|
||||||
})
|
})
|
||||||
@@ -80,16 +73,6 @@
|
|||||||
.catch(onMessage)
|
.catch(onMessage)
|
||||||
}
|
}
|
||||||
|
|
||||||
function write() {
|
|
||||||
const encoder = new TextEncoder()
|
|
||||||
file
|
|
||||||
.write(encoder.encode('Hello from Tauri :)'))
|
|
||||||
.then(() => {
|
|
||||||
onMessage(`wrote to file`)
|
|
||||||
})
|
|
||||||
.catch(onMessage)
|
|
||||||
}
|
|
||||||
|
|
||||||
function stat() {
|
function stat() {
|
||||||
file
|
file
|
||||||
.stat()
|
.stat()
|
||||||
@@ -197,13 +180,6 @@
|
|||||||
</script>
|
</script>
|
||||||
|
|
||||||
<div class="flex flex-col">
|
<div class="flex flex-col">
|
||||||
{#if isMobile}
|
|
||||||
<div>
|
|
||||||
On mobile, paths outside of App* paths require the use of dialogs
|
|
||||||
regardless of Tauri's scope mechanism.
|
|
||||||
</div>
|
|
||||||
<br />
|
|
||||||
{/if}
|
|
||||||
<div class="flex gap-1">
|
<div class="flex gap-1">
|
||||||
<select class="input" bind:value={baseDir}>
|
<select class="input" bind:value={baseDir}>
|
||||||
<option value={undefined} selected>None</option>
|
<option value={undefined} selected>None</option>
|
||||||
@@ -231,7 +207,6 @@
|
|||||||
</div>
|
</div>
|
||||||
{#if file}
|
{#if file}
|
||||||
<div>
|
<div>
|
||||||
<button class="btn" onclick={write}>Write</button>
|
|
||||||
<button class="btn" onclick={truncate}>Truncate</button>
|
<button class="btn" onclick={truncate}>Truncate</button>
|
||||||
<button class="btn" onclick={stat}>Stat</button>
|
<button class="btn" onclick={stat}>Stat</button>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -1,21 +1,16 @@
|
|||||||
<script>
|
<script>
|
||||||
import { sendNotification } from '@tauri-apps/plugin-notification'
|
|
||||||
export let onMessage
|
export let onMessage
|
||||||
|
|
||||||
let sound = ''
|
|
||||||
|
|
||||||
// send the notification directly
|
// send the notification directly
|
||||||
// the backend is responsible for checking the permission
|
// the backend is responsible for checking the permission
|
||||||
function _sendNotification() {
|
function _sendNotification() {
|
||||||
sendNotification({
|
new Notification('Notification title', {
|
||||||
title: 'Notification title',
|
body: 'This is the notification body'
|
||||||
body: 'This is the notification body',
|
|
||||||
sound: sound || null
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// alternatively, check the permission ourselves
|
// alternatively, check the permission ourselves
|
||||||
function triggerNotification() {
|
function sendNotification() {
|
||||||
if (Notification.permission === 'default') {
|
if (Notification.permission === 'default') {
|
||||||
Notification.requestPermission()
|
Notification.requestPermission()
|
||||||
.then(function (response) {
|
.then(function (response) {
|
||||||
@@ -34,11 +29,6 @@
|
|||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
|
||||||
<input
|
<button class="btn" id="notification" on:click={sendNotification}>
|
||||||
class="input grow"
|
|
||||||
placeholder="Notification sound..."
|
|
||||||
bind:value={sound}
|
|
||||||
/>
|
|
||||||
<button class="btn" id="notification" on:click={triggerNotification}>
|
|
||||||
Send test notification
|
Send test notification
|
||||||
</button>
|
</button>
|
||||||
|
|||||||
+8
-9
@@ -11,21 +11,20 @@
|
|||||||
"example:api:dev": "pnpm run --filter \"api\" tauri dev"
|
"example:api:dev": "pnpm run --filter \"api\" tauri dev"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@eslint/js": "9.38.0",
|
"@eslint/js": "9.32.0",
|
||||||
"@rollup/plugin-node-resolve": "16.0.3",
|
"@rollup/plugin-node-resolve": "16.0.1",
|
||||||
"@rollup/plugin-terser": "0.4.4",
|
"@rollup/plugin-terser": "0.4.4",
|
||||||
"@rollup/plugin-typescript": "12.3.0",
|
"@rollup/plugin-typescript": "12.1.4",
|
||||||
"covector": "^0.12.4",
|
"covector": "^0.12.4",
|
||||||
"eslint": "9.38.0",
|
"eslint": "9.32.0",
|
||||||
"eslint-config-prettier": "10.1.8",
|
"eslint-config-prettier": "10.1.8",
|
||||||
"eslint-plugin-security": "3.0.1",
|
"eslint-plugin-security": "3.0.1",
|
||||||
"prettier": "3.6.2",
|
"prettier": "3.6.2",
|
||||||
"rollup": "4.52.5",
|
"rollup": "4.46.2",
|
||||||
"tslib": "2.8.1",
|
"tslib": "2.8.1",
|
||||||
"typescript": "5.9.3",
|
"typescript": "5.9.2",
|
||||||
"typescript-eslint": "8.46.2"
|
"typescript-eslint": "8.39.0"
|
||||||
},
|
},
|
||||||
"minimumReleaseAge": 4320,
|
|
||||||
"pnpm": {
|
"pnpm": {
|
||||||
"overrides": {
|
"overrides": {
|
||||||
"esbuild@<0.25.0": ">=0.25.0"
|
"esbuild@<0.25.0": ">=0.25.0"
|
||||||
@@ -35,6 +34,6 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"engines": {
|
"engines": {
|
||||||
"pnpm": "^10.16.0"
|
"pnpm": "^10.0.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,5 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## \[2.5.1]
|
|
||||||
|
|
||||||
- [`93426f85`](https://github.com/tauri-apps/plugins-workspace/commit/93426f85120f49beb9f40222bff45185a32d54a9) Fixed an issue that caused docs.rs builds to fail. No user facing changes.
|
|
||||||
|
|
||||||
## \[2.5.0]
|
## \[2.5.0]
|
||||||
|
|
||||||
- [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
|
- [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "tauri-plugin-autostart"
|
name = "tauri-plugin-autostart"
|
||||||
version = "2.5.1"
|
version = "2.5.0"
|
||||||
description = "Automatically launch your application at startup."
|
description = "Automatically launch your application at startup."
|
||||||
authors = { workspace = true }
|
authors = { workspace = true }
|
||||||
license = { workspace = true }
|
license = { workspace = true }
|
||||||
@@ -9,6 +9,10 @@ rust-version = { workspace = true }
|
|||||||
repository = { workspace = true }
|
repository = { workspace = true }
|
||||||
links = "tauri-plugin-autostart"
|
links = "tauri-plugin-autostart"
|
||||||
|
|
||||||
|
[package.metadata.docs.rs]
|
||||||
|
rustc-args = ["--cfg", "docsrs"]
|
||||||
|
rustdoc-args = ["--cfg", "docsrs"]
|
||||||
|
|
||||||
[package.metadata.platforms.support]
|
[package.metadata.platforms.support]
|
||||||
windows = { level = "full", notes = "" }
|
windows = { level = "full", notes = "" }
|
||||||
linux = { level = "full", notes = "" }
|
linux = { level = "full", notes = "" }
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@tauri-apps/plugin-autostart",
|
"name": "@tauri-apps/plugin-autostart",
|
||||||
"version": "2.5.1",
|
"version": "2.5.0",
|
||||||
"license": "MIT OR Apache-2.0",
|
"license": "MIT OR Apache-2.0",
|
||||||
"authors": [
|
"authors": [
|
||||||
"Tauri Programme within The Commons Conservancy"
|
"Tauri Programme within The Commons Conservancy"
|
||||||
@@ -24,6 +24,6 @@
|
|||||||
"LICENSE"
|
"LICENSE"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tauri-apps/api": "^2.8.0"
|
"@tauri-apps/api": "^2.6.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,14 +1,5 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## \[2.4.2]
|
|
||||||
|
|
||||||
- [`93426f85`](https://github.com/tauri-apps/plugins-workspace/commit/93426f85120f49beb9f40222bff45185a32d54a9) Fixed an issue that caused docs.rs builds to fail. No user facing changes.
|
|
||||||
|
|
||||||
## \[2.4.1]
|
|
||||||
|
|
||||||
- [`654bf489`](https://github.com/tauri-apps/plugins-workspace/commit/654bf4891a35769f7e82971641d3ad99974b2dfe) ([#3038](https://github.com/tauri-apps/plugins-workspace/pull/3038) by [@daniel-mader](https://github.com/tauri-apps/plugins-workspace/../../daniel-mader)) Update `androidx.camera` from `1.1.0` to `1.5.1` to support 16 KB memory page sizes.
|
|
||||||
- [`6c9b61fb`](https://github.com/tauri-apps/plugins-workspace/commit/6c9b61fb658145d13893626112fc489f7458aa17) ([#3039](https://github.com/tauri-apps/plugins-workspace/pull/3039) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) On Android, updated compileSdk to 36.
|
|
||||||
|
|
||||||
## \[2.4.0]
|
## \[2.4.0]
|
||||||
|
|
||||||
- [`aa9140e1`](https://github.com/tauri-apps/plugins-workspace/commit/aa9140e1ac239ab9f015f92b2ed52bbf0eda7c12) ([#2437](https://github.com/tauri-apps/plugins-workspace/pull/2437) by [@enkhjile](https://github.com/tauri-apps/plugins-workspace/../../enkhjile)) Added support for GS1 DataBar on iOS 15.4+
|
- [`aa9140e1`](https://github.com/tauri-apps/plugins-workspace/commit/aa9140e1ac239ab9f015f92b2ed52bbf0eda7c12) ([#2437](https://github.com/tauri-apps/plugins-workspace/pull/2437) by [@enkhjile](https://github.com/tauri-apps/plugins-workspace/../../enkhjile)) Added support for GS1 DataBar on iOS 15.4+
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "tauri-plugin-barcode-scanner"
|
name = "tauri-plugin-barcode-scanner"
|
||||||
version = "2.4.2"
|
version = "2.4.0"
|
||||||
description = "Scan QR codes, EAN-13 and other kinds of barcodes on Android and iOS"
|
description = "Scan QR codes, EAN-13 and other kinds of barcodes on Android and iOS"
|
||||||
edition = { workspace = true }
|
edition = { workspace = true }
|
||||||
authors = { workspace = true }
|
authors = { workspace = true }
|
||||||
@@ -10,6 +10,8 @@ repository = { workspace = true }
|
|||||||
links = "tauri-plugin-barcode-scanner"
|
links = "tauri-plugin-barcode-scanner"
|
||||||
|
|
||||||
[package.metadata.docs.rs]
|
[package.metadata.docs.rs]
|
||||||
|
rustc-args = ["--cfg", "docsrs"]
|
||||||
|
rustdoc-args = ["--cfg", "docsrs"]
|
||||||
targets = ["x86_64-linux-android"]
|
targets = ["x86_64-linux-android"]
|
||||||
|
|
||||||
[package.metadata.platforms.support]
|
[package.metadata.platforms.support]
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ plugins {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = "app.tauri.barcodescanner"
|
namespace = "app.tauri.barcodescanner"
|
||||||
compileSdk = 36
|
compileSdk = 34
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdk = 24
|
minSdk = 24
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
consumerProguardFiles("consumer-rules.pro")
|
consumerProguardFiles("consumer-rules.pro")
|
||||||
@@ -33,14 +33,16 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
val camerax_version = "1.5.1"
|
|
||||||
implementation("androidx.core:core-ktx:1.9.0")
|
implementation("androidx.core:core-ktx:1.9.0")
|
||||||
implementation("androidx.appcompat:appcompat:1.6.0")
|
implementation("androidx.appcompat:appcompat:1.6.0")
|
||||||
implementation("com.google.android.material:material:1.7.0")
|
implementation("com.google.android.material:material:1.7.0")
|
||||||
implementation("androidx.camera:camera-core:${camerax_version}")
|
implementation("androidx.camera:camera-core:1.1.0")
|
||||||
implementation("androidx.camera:camera-camera2:${camerax_version}")
|
implementation("androidx.camera:camera-view:1.1.0")
|
||||||
implementation("androidx.camera:camera-lifecycle:${camerax_version}")
|
implementation("androidx.camera:camera-lifecycle:1.1.0")
|
||||||
implementation("androidx.camera:camera-view:${camerax_version}")
|
implementation("androidx.camera:camera-camera2:1.1.0")
|
||||||
|
implementation("androidx.camera:camera-lifecycle:1.1.0")
|
||||||
|
implementation("androidx.camera:camera-view:1.1.0")
|
||||||
implementation("com.google.android.gms:play-services-mlkit-barcode-scanning:18.1.0")
|
implementation("com.google.android.gms:play-services-mlkit-barcode-scanning:18.1.0")
|
||||||
testImplementation("junit:junit:4.13.2")
|
testImplementation("junit:junit:4.13.2")
|
||||||
androidTestImplementation("androidx.test.ext:junit:1.1.5")
|
androidTestImplementation("androidx.test.ext:junit:1.1.5")
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@tauri-apps/plugin-barcode-scanner",
|
"name": "@tauri-apps/plugin-barcode-scanner",
|
||||||
"version": "2.4.2",
|
"version": "2.4.0",
|
||||||
"description": "Scan QR codes, EAN-13 and other kinds of barcodes on Android and iOS",
|
"description": "Scan QR codes, EAN-13 and other kinds of barcodes on Android and iOS",
|
||||||
"license": "MIT OR Apache-2.0",
|
"license": "MIT OR Apache-2.0",
|
||||||
"authors": [
|
"authors": [
|
||||||
@@ -25,6 +25,6 @@
|
|||||||
"LICENSE"
|
"LICENSE"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tauri-apps/api": "^2.8.0"
|
"@tauri-apps/api": "^2.6.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,5 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## \[2.3.2]
|
|
||||||
|
|
||||||
- [`93426f85`](https://github.com/tauri-apps/plugins-workspace/commit/93426f85120f49beb9f40222bff45185a32d54a9) Fixed an issue that caused docs.rs builds to fail. No user facing changes.
|
|
||||||
|
|
||||||
## \[2.3.1]
|
|
||||||
|
|
||||||
- [`6c9b61fb`](https://github.com/tauri-apps/plugins-workspace/commit/6c9b61fb658145d13893626112fc489f7458aa17) ([#3039](https://github.com/tauri-apps/plugins-workspace/pull/3039) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) On Android, updated compileSdk to 36.
|
|
||||||
|
|
||||||
## \[2.3.0]
|
## \[2.3.0]
|
||||||
|
|
||||||
- [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
|
- [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "tauri-plugin-biometric"
|
name = "tauri-plugin-biometric"
|
||||||
version = "2.3.2"
|
version = "2.3.0"
|
||||||
description = "Prompt the user for biometric authentication on Android and iOS."
|
description = "Prompt the user for biometric authentication on Android and iOS."
|
||||||
edition = { workspace = true }
|
edition = { workspace = true }
|
||||||
authors = { workspace = true }
|
authors = { workspace = true }
|
||||||
@@ -9,6 +9,8 @@ repository = { workspace = true }
|
|||||||
links = "tauri-plugin-biometric"
|
links = "tauri-plugin-biometric"
|
||||||
|
|
||||||
[package.metadata.docs.rs]
|
[package.metadata.docs.rs]
|
||||||
|
rustc-args = ["--cfg", "docsrs"]
|
||||||
|
rustdoc-args = ["--cfg", "docsrs"]
|
||||||
targets = ["x86_64-linux-android"]
|
targets = ["x86_64-linux-android"]
|
||||||
|
|
||||||
[package.metadata.platforms.support]
|
[package.metadata.platforms.support]
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ plugins {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = "app.tauri.biometric"
|
namespace = "app.tauri.biometric"
|
||||||
compileSdk = 36
|
compileSdk = 34
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdk = 24
|
minSdk = 24
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
consumerProguardFiles("consumer-rules.pro")
|
consumerProguardFiles("consumer-rules.pro")
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@tauri-apps/plugin-biometric",
|
"name": "@tauri-apps/plugin-biometric",
|
||||||
"version": "2.3.2",
|
"version": "2.3.0",
|
||||||
"license": "MIT OR Apache-2.0",
|
"license": "MIT OR Apache-2.0",
|
||||||
"authors": [
|
"authors": [
|
||||||
"Tauri Programme within The Commons Conservancy"
|
"Tauri Programme within The Commons Conservancy"
|
||||||
@@ -25,6 +25,6 @@
|
|||||||
"LICENSE"
|
"LICENSE"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tauri-apps/api": "^2.8.0"
|
"@tauri-apps/api": "^2.6.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,5 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## \[2.4.1]
|
|
||||||
|
|
||||||
- [`93426f85`](https://github.com/tauri-apps/plugins-workspace/commit/93426f85120f49beb9f40222bff45185a32d54a9) Fixed an issue that caused docs.rs builds to fail. No user facing changes.
|
|
||||||
|
|
||||||
## \[2.4.0]
|
## \[2.4.0]
|
||||||
|
|
||||||
- [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
|
- [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "tauri-plugin-cli"
|
name = "tauri-plugin-cli"
|
||||||
version = "2.4.1"
|
version = "2.4.0"
|
||||||
description = "Parse arguments from your Tauri application's command line interface."
|
description = "Parse arguments from your Tauri application's command line interface."
|
||||||
edition = { workspace = true }
|
edition = { workspace = true }
|
||||||
authors = { workspace = true }
|
authors = { workspace = true }
|
||||||
@@ -9,6 +9,10 @@ rust-version = { workspace = true }
|
|||||||
repository = { workspace = true }
|
repository = { workspace = true }
|
||||||
links = "tauri-plugin-cli"
|
links = "tauri-plugin-cli"
|
||||||
|
|
||||||
|
[package.metadata.docs.rs]
|
||||||
|
rustc-args = ["--cfg", "docsrs"]
|
||||||
|
rustdoc-args = ["--cfg", "docsrs"]
|
||||||
|
|
||||||
[package.metadata.platforms.support]
|
[package.metadata.platforms.support]
|
||||||
windows = { level = "full", notes = "" }
|
windows = { level = "full", notes = "" }
|
||||||
linux = { level = "full", notes = "" }
|
linux = { level = "full", notes = "" }
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@tauri-apps/plugin-cli",
|
"name": "@tauri-apps/plugin-cli",
|
||||||
"version": "2.4.1",
|
"version": "2.4.0",
|
||||||
"license": "MIT OR Apache-2.0",
|
"license": "MIT OR Apache-2.0",
|
||||||
"authors": [
|
"authors": [
|
||||||
"Tauri Programme within The Commons Conservancy"
|
"Tauri Programme within The Commons Conservancy"
|
||||||
@@ -24,6 +24,6 @@
|
|||||||
"LICENSE"
|
"LICENSE"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tauri-apps/api": "^2.8.0"
|
"@tauri-apps/api": "^2.6.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,5 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## \[2.3.2]
|
|
||||||
|
|
||||||
- [`93426f85`](https://github.com/tauri-apps/plugins-workspace/commit/93426f85120f49beb9f40222bff45185a32d54a9) Fixed an issue that caused docs.rs builds to fail. No user facing changes.
|
|
||||||
|
|
||||||
## \[2.3.1]
|
|
||||||
|
|
||||||
- [`6c9b61fb`](https://github.com/tauri-apps/plugins-workspace/commit/6c9b61fb658145d13893626112fc489f7458aa17) ([#3039](https://github.com/tauri-apps/plugins-workspace/pull/3039) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) On Android, updated compileSdk to 36.
|
|
||||||
|
|
||||||
## \[2.3.0]
|
## \[2.3.0]
|
||||||
|
|
||||||
- [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
|
- [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "tauri-plugin-clipboard-manager"
|
name = "tauri-plugin-clipboard-manager"
|
||||||
version = "2.3.2"
|
version = "2.3.0"
|
||||||
description = "Read and write to the system clipboard."
|
description = "Read and write to the system clipboard."
|
||||||
edition = { workspace = true }
|
edition = { workspace = true }
|
||||||
authors = { workspace = true }
|
authors = { workspace = true }
|
||||||
@@ -10,7 +10,8 @@ repository = { workspace = true }
|
|||||||
links = "tauri-plugin-clipboard-manager"
|
links = "tauri-plugin-clipboard-manager"
|
||||||
|
|
||||||
[package.metadata.docs.rs]
|
[package.metadata.docs.rs]
|
||||||
|
rustc-args = ["--cfg", "docsrs"]
|
||||||
|
rustdoc-args = ["--cfg", "docsrs"]
|
||||||
targets = ["x86_64-unknown-linux-gnu", "x86_64-linux-android"]
|
targets = ["x86_64-unknown-linux-gnu", "x86_64-linux-android"]
|
||||||
|
|
||||||
[package.metadata.platforms.support]
|
[package.metadata.platforms.support]
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ plugins {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = "app.tauri.clipboard"
|
namespace = "app.tauri.clipboard"
|
||||||
compileSdk = 36
|
compileSdk = 34
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdk = 24
|
minSdk = 24
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
consumerProguardFiles("consumer-rules.pro")
|
consumerProguardFiles("consumer-rules.pro")
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@tauri-apps/plugin-clipboard-manager",
|
"name": "@tauri-apps/plugin-clipboard-manager",
|
||||||
"version": "2.3.2",
|
"version": "2.3.0",
|
||||||
"license": "MIT OR Apache-2.0",
|
"license": "MIT OR Apache-2.0",
|
||||||
"authors": [
|
"authors": [
|
||||||
"Tauri Programme within The Commons Conservancy"
|
"Tauri Programme within The Commons Conservancy"
|
||||||
@@ -24,6 +24,6 @@
|
|||||||
"LICENSE"
|
"LICENSE"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tauri-apps/api": "^2.8.0"
|
"@tauri-apps/api": "^2.6.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,22 +1,5 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## \[2.4.5]
|
|
||||||
|
|
||||||
- [`93426f85`](https://github.com/tauri-apps/plugins-workspace/commit/93426f85120f49beb9f40222bff45185a32d54a9) Fixed an issue that caused docs.rs builds to fail. No user facing changes.
|
|
||||||
|
|
||||||
## \[2.4.4]
|
|
||||||
|
|
||||||
- [`6c9b61fb`](https://github.com/tauri-apps/plugins-workspace/commit/6c9b61fb658145d13893626112fc489f7458aa17) ([#3039](https://github.com/tauri-apps/plugins-workspace/pull/3039) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) On Android, updated compileSdk to 36.
|
|
||||||
- [`e25a9339`](https://github.com/tauri-apps/plugins-workspace/commit/e25a9339f46268f70dc9afd0c5ab3decbf79b330) ([#3019](https://github.com/tauri-apps/plugins-workspace/pull/3019) by [@kevinschoonover](https://github.com/tauri-apps/plugins-workspace/../../kevinschoonover)) Fix Exec= field in desktop handler if executable path changes
|
|
||||||
|
|
||||||
## \[2.4.3]
|
|
||||||
|
|
||||||
- [`2522b71f`](https://github.com/tauri-apps/plugins-workspace/commit/2522b71f6bcae65c03b24415eb9295c9e7c84ffc) ([#2970](https://github.com/tauri-apps/plugins-workspace/pull/2970) by [@WSH032](https://github.com/tauri-apps/plugins-workspace/../../WSH032)) Revert the breaking change introduced by [#2928](https://github.com/tauri-apps/plugins-workspace/pull/2928).
|
|
||||||
|
|
||||||
## \[2.4.2]
|
|
||||||
|
|
||||||
- [`21d721a0`](https://github.com/tauri-apps/plugins-workspace/commit/21d721a0c2731fc201872f5b99ea8bbdc61b0b60) ([#2928](https://github.com/tauri-apps/plugins-workspace/pull/2928) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) On Linux, improved error messages when OS commands fail.
|
|
||||||
|
|
||||||
## \[2.4.1]
|
## \[2.4.1]
|
||||||
|
|
||||||
- [`d4f8299b`](https://github.com/tauri-apps/plugins-workspace/commit/d4f8299b12f107718c70692840a63768d65baaf9) ([#2844](https://github.com/tauri-apps/plugins-workspace/pull/2844) by [@yobson1](https://github.com/tauri-apps/plugins-workspace/../../yobson1)) Fix deep link protocol handler not set as default on linux
|
- [`d4f8299b`](https://github.com/tauri-apps/plugins-workspace/commit/d4f8299b12f107718c70692840a63768d65baaf9) ([#2844](https://github.com/tauri-apps/plugins-workspace/pull/2844) by [@yobson1](https://github.com/tauri-apps/plugins-workspace/../../yobson1)) Fix deep link protocol handler not set as default on linux
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "tauri-plugin-deep-link"
|
name = "tauri-plugin-deep-link"
|
||||||
version = "2.4.5"
|
version = "2.4.1"
|
||||||
description = "Set your Tauri application as the default handler for an URL"
|
description = "Set your Tauri application as the default handler for an URL"
|
||||||
authors = { workspace = true }
|
authors = { workspace = true }
|
||||||
license = { workspace = true }
|
license = { workspace = true }
|
||||||
@@ -10,6 +10,8 @@ repository = { workspace = true }
|
|||||||
links = "tauri-plugin-deep-link"
|
links = "tauri-plugin-deep-link"
|
||||||
|
|
||||||
[package.metadata.docs.rs]
|
[package.metadata.docs.rs]
|
||||||
|
rustc-args = ["--cfg", "docsrs"]
|
||||||
|
rustdoc-args = ["--cfg", "docsrs"]
|
||||||
targets = ["x86_64-linux-android"]
|
targets = ["x86_64-linux-android"]
|
||||||
|
|
||||||
[package.metadata.platforms.support]
|
[package.metadata.platforms.support]
|
||||||
@@ -25,9 +27,6 @@ serde_json = { workspace = true }
|
|||||||
tauri-utils = { workspace = true }
|
tauri-utils = { workspace = true }
|
||||||
tauri-plugin = { workspace = true, features = ["build"] }
|
tauri-plugin = { workspace = true, features = ["build"] }
|
||||||
|
|
||||||
[target."cfg(target_os = \"macos\")".build-dependencies]
|
|
||||||
plist = "1"
|
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
serde = { workspace = true }
|
serde = { workspace = true }
|
||||||
serde_json = { workspace = true }
|
serde_json = { workspace = true }
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ plugins {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = "app.tauri.deep_link"
|
namespace = "app.tauri.deep_link"
|
||||||
compileSdk = 36
|
compileSdk = 34
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdk = 24
|
minSdk = 24
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
consumerProguardFiles("consumer-rules.pro")
|
consumerProguardFiles("consumer-rules.pro")
|
||||||
|
|||||||
+26
-119
@@ -10,64 +10,50 @@ const COMMANDS: &[&str] = &["get_current", "register", "unregister", "is_registe
|
|||||||
|
|
||||||
// TODO: Consider using activity-alias in case users may have multiple activities in their app.
|
// TODO: Consider using activity-alias in case users may have multiple activities in their app.
|
||||||
fn intent_filter(domain: &AssociatedDomain) -> String {
|
fn intent_filter(domain: &AssociatedDomain) -> String {
|
||||||
let host = domain
|
|
||||||
.host
|
|
||||||
.as_ref()
|
|
||||||
.map(|h| format!(r#"<data android:host="{h}" />"#))
|
|
||||||
.unwrap_or_default();
|
|
||||||
|
|
||||||
let auto_verify = if domain.is_app_link() {
|
|
||||||
r#"android:autoVerify="true" "#.to_string()
|
|
||||||
} else {
|
|
||||||
String::new()
|
|
||||||
};
|
|
||||||
|
|
||||||
format!(
|
format!(
|
||||||
r#"<intent-filter {auto_verify}>
|
r#"<intent-filter android:autoVerify="true">
|
||||||
<action android:name="android.intent.action.VIEW" />
|
<action android:name="android.intent.action.VIEW" />
|
||||||
<category android:name="android.intent.category.DEFAULT" />
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
<category android:name="android.intent.category.BROWSABLE" />
|
<category android:name="android.intent.category.BROWSABLE" />
|
||||||
{schemes}
|
{}
|
||||||
{host}
|
<data android:host="{}" />
|
||||||
{domains}
|
{}
|
||||||
{path_patterns}
|
{}
|
||||||
{path_prefixes}
|
{}
|
||||||
{path_suffixes}
|
{}
|
||||||
</intent-filter>"#,
|
</intent-filter>"#,
|
||||||
schemes = domain
|
domain
|
||||||
.scheme
|
.scheme
|
||||||
.iter()
|
.iter()
|
||||||
.map(|scheme| format!(r#"<data android:scheme="{scheme}" />"#))
|
.map(|scheme| format!(r#"<data android:scheme="{scheme}" />"#))
|
||||||
.collect::<Vec<_>>()
|
.collect::<Vec<_>>()
|
||||||
.join("\n "),
|
.join("\n "),
|
||||||
host = host,
|
domain.host,
|
||||||
domains = domain
|
domain
|
||||||
.path
|
.path
|
||||||
.iter()
|
.iter()
|
||||||
.map(|path| format!(r#"<data android:path="{path}" />"#))
|
.map(|path| format!(r#"<data android:path="{path}" />"#))
|
||||||
.collect::<Vec<_>>()
|
.collect::<Vec<_>>()
|
||||||
.join("\n "),
|
.join("\n "),
|
||||||
path_patterns = domain
|
domain
|
||||||
.path_pattern
|
.path_pattern
|
||||||
.iter()
|
.iter()
|
||||||
.map(|pattern| format!(r#"<data android:pathPattern="{pattern}" />"#))
|
.map(|pattern| format!(r#"<data android:pathPattern="{pattern}" />"#))
|
||||||
.collect::<Vec<_>>()
|
.collect::<Vec<_>>()
|
||||||
.join("\n "),
|
.join("\n "),
|
||||||
path_prefixes = domain
|
domain
|
||||||
.path_prefix
|
.path_prefix
|
||||||
.iter()
|
.iter()
|
||||||
.map(|prefix| format!(r#"<data android:pathPrefix="{prefix}" />"#))
|
.map(|prefix| format!(r#"<data android:pathPrefix="{prefix}" />"#))
|
||||||
.collect::<Vec<_>>()
|
.collect::<Vec<_>>()
|
||||||
.join("\n "),
|
.join("\n "),
|
||||||
path_suffixes = domain
|
domain
|
||||||
.path_suffix
|
.path_suffix
|
||||||
.iter()
|
.iter()
|
||||||
.map(|suffix| format!(r#"<data android:pathSuffix="{suffix}" />"#))
|
.map(|suffix| format!(r#"<data android:pathSuffix="{suffix}" />"#))
|
||||||
.collect::<Vec<_>>()
|
.collect::<Vec<_>>()
|
||||||
.join("\n "),
|
.join("\n "),
|
||||||
)
|
)
|
||||||
.trim()
|
|
||||||
.to_string()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
@@ -82,16 +68,6 @@ fn main() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if let Some(config) = tauri_plugin::plugin_config::<Config>("deep-link") {
|
if let Some(config) = tauri_plugin::plugin_config::<Config>("deep-link") {
|
||||||
let errors: Vec<String> = config
|
|
||||||
.mobile
|
|
||||||
.iter()
|
|
||||||
.filter_map(|d| d.validate().err())
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
if !errors.is_empty() {
|
|
||||||
panic!("Deep link config validation failed:\n{}", errors.join("\n"));
|
|
||||||
}
|
|
||||||
|
|
||||||
tauri_plugin::mobile::update_android_manifest(
|
tauri_plugin::mobile::update_android_manifest(
|
||||||
"DEEP LINK PLUGIN",
|
"DEEP LINK PLUGIN",
|
||||||
"activity",
|
"activity",
|
||||||
@@ -104,89 +80,20 @@ fn main() {
|
|||||||
)
|
)
|
||||||
.expect("failed to rewrite AndroidManifest.xml");
|
.expect("failed to rewrite AndroidManifest.xml");
|
||||||
|
|
||||||
#[cfg(any(target_os = "macos", target_os = "ios"))]
|
#[cfg(target_os = "macos")]
|
||||||
{
|
{
|
||||||
// we need to ensure that the entitlements are only
|
tauri_plugin::mobile::update_entitlements(|entitlements| {
|
||||||
// generated for explicit app links and not
|
entitlements.insert(
|
||||||
// other deep links because then they
|
"com.apple.developer.associated-domains".into(),
|
||||||
// are just going to complain and not be built or signed
|
config
|
||||||
let has_app_links = config.mobile.iter().any(|d| d.is_app_link());
|
.mobile
|
||||||
|
.into_iter()
|
||||||
if !has_app_links {
|
.map(|d| format!("applinks:{}", d.host).into())
|
||||||
tauri_plugin::mobile::update_entitlements(|entitlements| {
|
.collect::<Vec<_>>()
|
||||||
entitlements.remove("com.apple.developer.associated-domains");
|
.into(),
|
||||||
})
|
);
|
||||||
.expect("failed to update entitlements");
|
})
|
||||||
} else {
|
.expect("failed to update entitlements");
|
||||||
tauri_plugin::mobile::update_entitlements(|entitlements| {
|
|
||||||
entitlements.insert(
|
|
||||||
"com.apple.developer.associated-domains".into(),
|
|
||||||
config
|
|
||||||
.mobile
|
|
||||||
.iter()
|
|
||||||
.filter(|d| d.is_app_link())
|
|
||||||
.filter_map(|d| d.host.as_ref())
|
|
||||||
.map(|host| format!("applinks:{}", host).into())
|
|
||||||
.collect::<Vec<_>>()
|
|
||||||
.into(),
|
|
||||||
);
|
|
||||||
})
|
|
||||||
.expect("failed to update entitlements");
|
|
||||||
}
|
|
||||||
|
|
||||||
let deep_link_domains = config
|
|
||||||
.mobile
|
|
||||||
.iter()
|
|
||||||
.filter_map(|domain| {
|
|
||||||
if domain.is_app_link() {
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
|
|
||||||
Some(domain)
|
|
||||||
})
|
|
||||||
.collect::<Vec<_>>();
|
|
||||||
|
|
||||||
if deep_link_domains.is_empty() {
|
|
||||||
tauri_plugin::mobile::update_info_plist(|info_plist| {
|
|
||||||
info_plist.remove("CFBundleURLTypes");
|
|
||||||
})
|
|
||||||
.expect("failed to update Info.plist");
|
|
||||||
} else {
|
|
||||||
tauri_plugin::mobile::update_info_plist(|info_plist| {
|
|
||||||
info_plist.insert(
|
|
||||||
"CFBundleURLTypes".into(),
|
|
||||||
deep_link_domains
|
|
||||||
.iter()
|
|
||||||
.map(|domain| {
|
|
||||||
let schemes = domain
|
|
||||||
.scheme
|
|
||||||
.iter()
|
|
||||||
.filter(|scheme| {
|
|
||||||
scheme.as_str() != "https" && scheme.as_str() != "http"
|
|
||||||
})
|
|
||||||
.collect::<Vec<_>>();
|
|
||||||
|
|
||||||
let mut dict = plist::Dictionary::new();
|
|
||||||
dict.insert(
|
|
||||||
"CFBundleURLSchemes".into(),
|
|
||||||
schemes
|
|
||||||
.iter()
|
|
||||||
.map(|s| s.to_string().into())
|
|
||||||
.collect::<Vec<_>>()
|
|
||||||
.into(),
|
|
||||||
);
|
|
||||||
dict.insert(
|
|
||||||
"CFBundleURLName".into(),
|
|
||||||
format!("{}", domain.scheme[0]).into(),
|
|
||||||
);
|
|
||||||
plist::Value::Dictionary(dict)
|
|
||||||
})
|
|
||||||
.collect::<Vec<_>>()
|
|
||||||
.into(),
|
|
||||||
);
|
|
||||||
})
|
|
||||||
.expect("failed to update Info.plist");
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,29 +1,5 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## \[2.2.8]
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
- Upgraded to `deep-link-js@2.4.5`
|
|
||||||
|
|
||||||
## \[2.2.7]
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
- Upgraded to `deep-link-js@2.4.4`
|
|
||||||
|
|
||||||
## \[2.2.6]
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
- Upgraded to `deep-link-js@2.4.3`
|
|
||||||
|
|
||||||
## \[2.2.5]
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
- Upgraded to `deep-link-js@2.4.2`
|
|
||||||
|
|
||||||
## \[2.2.4]
|
## \[2.2.4]
|
||||||
|
|
||||||
### Dependencies
|
### Dependencies
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{
|
{
|
||||||
"name": "deep-link-example",
|
"name": "deep-link-example",
|
||||||
"private": true,
|
"private": true,
|
||||||
"version": "2.2.8",
|
"version": "2.2.4",
|
||||||
"type": "module",
|
"type": "module",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"dev": "vite",
|
"dev": "vite",
|
||||||
@@ -10,12 +10,12 @@
|
|||||||
"tauri": "tauri"
|
"tauri": "tauri"
|
||||||
},
|
},
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tauri-apps/api": "2.9.0",
|
"@tauri-apps/api": "2.7.0",
|
||||||
"@tauri-apps/plugin-deep-link": "2.4.5"
|
"@tauri-apps/plugin-deep-link": "2.4.1"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
"@tauri-apps/cli": "2.9.1",
|
"@tauri-apps/cli": "2.7.1",
|
||||||
"typescript": "^5.7.3",
|
"typescript": "^5.7.3",
|
||||||
"vite": "^7.0.7"
|
"vite": "^7.0.4"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -14,13 +14,13 @@ val tauriProperties = Properties().apply {
|
|||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdk = 36
|
compileSdk = 34
|
||||||
namespace = "com.tauri.deep_link_example"
|
namespace = "com.tauri.deep_link_example"
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
manifestPlaceholders["usesCleartextTraffic"] = "false"
|
manifestPlaceholders["usesCleartextTraffic"] = "false"
|
||||||
applicationId = "com.tauri.deep_link_example"
|
applicationId = "com.tauri.deep_link_example"
|
||||||
minSdk = 24
|
minSdk = 24
|
||||||
targetSdk = 36
|
targetSdk = 34
|
||||||
versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
|
versionCode = tauriProperties.getProperty("tauri.android.versionCode", "1").toInt()
|
||||||
versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")
|
versionName = tauriProperties.getProperty("tauri.android.versionName", "1.0")
|
||||||
}
|
}
|
||||||
@@ -58,10 +58,9 @@ rust {
|
|||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation("androidx.webkit:webkit:1.14.0")
|
implementation("androidx.webkit:webkit:1.6.1")
|
||||||
implementation("androidx.appcompat:appcompat:1.7.1")
|
implementation("androidx.appcompat:appcompat:1.6.1")
|
||||||
implementation("androidx.activity:activity-ktx:1.10.1")
|
implementation("com.google.android.material:material:1.8.0")
|
||||||
implementation("com.google.android.material:material:1.12.0")
|
|
||||||
testImplementation("junit:junit:4.13.2")
|
testImplementation("junit:junit:4.13.2")
|
||||||
androidTestImplementation("androidx.test.ext:junit:1.1.4")
|
androidTestImplementation("androidx.test.ext:junit:1.1.4")
|
||||||
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.0")
|
androidTestImplementation("androidx.test.espresso:espresso-core:3.5.0")
|
||||||
|
|||||||
+4
-21
@@ -23,40 +23,23 @@
|
|||||||
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
|
<category android:name="android.intent.category.LEANBACK_LAUNCHER" />
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
<!-- DEEP LINK PLUGIN. AUTO-GENERATED. DO NOT REMOVE. -->
|
<!-- DEEP LINK PLUGIN. AUTO-GENERATED. DO NOT REMOVE. -->
|
||||||
<intent-filter android:autoVerify="true" >
|
<intent-filter android:autoVerify="true">
|
||||||
<action android:name="android.intent.action.VIEW" />
|
<action android:name="android.intent.action.VIEW" />
|
||||||
<category android:name="android.intent.category.DEFAULT" />
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
<category android:name="android.intent.category.BROWSABLE" />
|
<category android:name="android.intent.category.BROWSABLE" />
|
||||||
<data android:scheme="https" />
|
|
||||||
<data android:scheme="http" />
|
<data android:scheme="http" />
|
||||||
|
<data android:scheme="https" />
|
||||||
<data android:host="fabianlars.de" />
|
<data android:host="fabianlars.de" />
|
||||||
|
|
||||||
|
|
||||||
<data android:pathPrefix="/intent" />
|
<data android:pathPrefix="/intent" />
|
||||||
|
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
<intent-filter android:autoVerify="true" >
|
<intent-filter android:autoVerify="true">
|
||||||
<action android:name="android.intent.action.VIEW" />
|
<action android:name="android.intent.action.VIEW" />
|
||||||
<category android:name="android.intent.category.DEFAULT" />
|
<category android:name="android.intent.category.DEFAULT" />
|
||||||
<category android:name="android.intent.category.BROWSABLE" />
|
<category android:name="android.intent.category.BROWSABLE" />
|
||||||
<data android:scheme="https" />
|
|
||||||
<data android:scheme="http" />
|
<data android:scheme="http" />
|
||||||
|
<data android:scheme="https" />
|
||||||
<data android:host="tauri.app" />
|
<data android:host="tauri.app" />
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</intent-filter>
|
|
||||||
<intent-filter >
|
|
||||||
<action android:name="android.intent.action.VIEW" />
|
|
||||||
<category android:name="android.intent.category.DEFAULT" />
|
|
||||||
<category android:name="android.intent.category.BROWSABLE" />
|
|
||||||
<data android:scheme="taurideeplink" />
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
</intent-filter>
|
</intent-filter>
|
||||||
<!-- DEEP LINK PLUGIN. AUTO-GENERATED. DO NOT REMOVE. -->
|
<!-- DEEP LINK PLUGIN. AUTO-GENERATED. DO NOT REMOVE. -->
|
||||||
</activity>
|
</activity>
|
||||||
|
|||||||
+5
-9
@@ -1,11 +1,7 @@
|
|||||||
|
// Copyright 2019-2023 Tauri Programme within The Commons Conservancy
|
||||||
|
// SPDX-License-Identifier: Apache-2.0
|
||||||
|
// SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
package com.tauri.deep_link_example
|
package com.tauri.deep_link_example
|
||||||
|
|
||||||
import android.os.Bundle
|
class MainActivity : TauriActivity()
|
||||||
import androidx.activity.enableEdgeToEdge
|
|
||||||
|
|
||||||
class MainActivity : TauriActivity() {
|
|
||||||
override fun onCreate(savedInstanceState: Bundle?) {
|
|
||||||
enableEdgeToEdge()
|
|
||||||
super.onCreate(savedInstanceState)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ buildscript {
|
|||||||
mavenCentral()
|
mavenCentral()
|
||||||
}
|
}
|
||||||
dependencies {
|
dependencies {
|
||||||
classpath("com.android.tools.build:gradle:8.11.0")
|
classpath("com.android.tools.build:gradle:8.5.1")
|
||||||
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25")
|
classpath("org.jetbrains.kotlin:kotlin-gradle-plugin:1.9.25")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -18,6 +18,6 @@ repositories {
|
|||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
compileOnly(gradleApi())
|
compileOnly(gradleApi())
|
||||||
implementation("com.android.tools.build:gradle:8.11.0")
|
implementation("com.android.tools.build:gradle:8.5.1")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Vendored
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
#Tue May 10 19:22:52 CST 2022
|
#Tue May 10 19:22:52 CST 2022
|
||||||
distributionBase=GRADLE_USER_HOME
|
distributionBase=GRADLE_USER_HOME
|
||||||
distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.3-bin.zip
|
distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
|
||||||
distributionPath=wrapper/dists
|
distributionPath=wrapper/dists
|
||||||
zipStorePath=wrapper/dists
|
zipStorePath=wrapper/dists
|
||||||
zipStoreBase=GRADLE_USER_HOME
|
zipStoreBase=GRADLE_USER_HOME
|
||||||
|
|||||||
+77
-77
@@ -1,116 +1,116 @@
|
|||||||
{
|
{
|
||||||
"images" : [
|
"images": [
|
||||||
{
|
{
|
||||||
"size" : "20x20",
|
"size": "20x20",
|
||||||
"idiom" : "iphone",
|
"idiom": "iphone",
|
||||||
"filename" : "AppIcon-20x20@2x.png",
|
"filename": "AppIcon-20x20@2x.png",
|
||||||
"scale" : "2x"
|
"scale": "2x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size" : "20x20",
|
"size": "20x20",
|
||||||
"idiom" : "iphone",
|
"idiom": "iphone",
|
||||||
"filename" : "AppIcon-20x20@3x.png",
|
"filename": "AppIcon-20x20@3x.png",
|
||||||
"scale" : "3x"
|
"scale": "3x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size" : "29x29",
|
"size": "29x29",
|
||||||
"idiom" : "iphone",
|
"idiom": "iphone",
|
||||||
"filename" : "AppIcon-29x29@2x-1.png",
|
"filename": "AppIcon-29x29@2x-1.png",
|
||||||
"scale" : "2x"
|
"scale": "2x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size" : "29x29",
|
"size": "29x29",
|
||||||
"idiom" : "iphone",
|
"idiom": "iphone",
|
||||||
"filename" : "AppIcon-29x29@3x.png",
|
"filename": "AppIcon-29x29@3x.png",
|
||||||
"scale" : "3x"
|
"scale": "3x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size" : "40x40",
|
"size": "40x40",
|
||||||
"idiom" : "iphone",
|
"idiom": "iphone",
|
||||||
"filename" : "AppIcon-40x40@2x.png",
|
"filename": "AppIcon-40x40@2x.png",
|
||||||
"scale" : "2x"
|
"scale": "2x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size" : "40x40",
|
"size": "40x40",
|
||||||
"idiom" : "iphone",
|
"idiom": "iphone",
|
||||||
"filename" : "AppIcon-40x40@3x.png",
|
"filename": "AppIcon-40x40@3x.png",
|
||||||
"scale" : "3x"
|
"scale": "3x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size" : "60x60",
|
"size": "60x60",
|
||||||
"idiom" : "iphone",
|
"idiom": "iphone",
|
||||||
"filename" : "AppIcon-60x60@2x.png",
|
"filename": "AppIcon-60x60@2x.png",
|
||||||
"scale" : "2x"
|
"scale": "2x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size" : "60x60",
|
"size": "60x60",
|
||||||
"idiom" : "iphone",
|
"idiom": "iphone",
|
||||||
"filename" : "AppIcon-60x60@3x.png",
|
"filename": "AppIcon-60x60@3x.png",
|
||||||
"scale" : "3x"
|
"scale": "3x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size" : "20x20",
|
"size": "20x20",
|
||||||
"idiom" : "ipad",
|
"idiom": "ipad",
|
||||||
"filename" : "AppIcon-20x20@1x.png",
|
"filename": "AppIcon-20x20@1x.png",
|
||||||
"scale" : "1x"
|
"scale": "1x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size" : "20x20",
|
"size": "20x20",
|
||||||
"idiom" : "ipad",
|
"idiom": "ipad",
|
||||||
"filename" : "AppIcon-20x20@2x-1.png",
|
"filename": "AppIcon-20x20@2x-1.png",
|
||||||
"scale" : "2x"
|
"scale": "2x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size" : "29x29",
|
"size": "29x29",
|
||||||
"idiom" : "ipad",
|
"idiom": "ipad",
|
||||||
"filename" : "AppIcon-29x29@1x.png",
|
"filename": "AppIcon-29x29@1x.png",
|
||||||
"scale" : "1x"
|
"scale": "1x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size" : "29x29",
|
"size": "29x29",
|
||||||
"idiom" : "ipad",
|
"idiom": "ipad",
|
||||||
"filename" : "AppIcon-29x29@2x.png",
|
"filename": "AppIcon-29x29@2x.png",
|
||||||
"scale" : "2x"
|
"scale": "2x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size" : "40x40",
|
"size": "40x40",
|
||||||
"idiom" : "ipad",
|
"idiom": "ipad",
|
||||||
"filename" : "AppIcon-40x40@1x.png",
|
"filename": "AppIcon-40x40@1x.png",
|
||||||
"scale" : "1x"
|
"scale": "1x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size" : "40x40",
|
"size": "40x40",
|
||||||
"idiom" : "ipad",
|
"idiom": "ipad",
|
||||||
"filename" : "AppIcon-40x40@2x-1.png",
|
"filename": "AppIcon-40x40@2x-1.png",
|
||||||
"scale" : "2x"
|
"scale": "2x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size" : "76x76",
|
"size": "76x76",
|
||||||
"idiom" : "ipad",
|
"idiom": "ipad",
|
||||||
"filename" : "AppIcon-76x76@1x.png",
|
"filename": "AppIcon-76x76@1x.png",
|
||||||
"scale" : "1x"
|
"scale": "1x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size" : "76x76",
|
"size": "76x76",
|
||||||
"idiom" : "ipad",
|
"idiom": "ipad",
|
||||||
"filename" : "AppIcon-76x76@2x.png",
|
"filename": "AppIcon-76x76@2x.png",
|
||||||
"scale" : "2x"
|
"scale": "2x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size" : "83.5x83.5",
|
"size": "83.5x83.5",
|
||||||
"idiom" : "ipad",
|
"idiom": "ipad",
|
||||||
"filename" : "AppIcon-83.5x83.5@2x.png",
|
"filename": "AppIcon-83.5x83.5@2x.png",
|
||||||
"scale" : "2x"
|
"scale": "2x"
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"size" : "1024x1024",
|
"size": "1024x1024",
|
||||||
"idiom" : "ios-marketing",
|
"idiom": "ios-marketing",
|
||||||
"filename" : "AppIcon-512@2x.png",
|
"filename": "AppIcon-512@2x.png",
|
||||||
"scale" : "1x"
|
"scale": "1x"
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"info" : {
|
"info": {
|
||||||
"version" : 1,
|
"version": 1,
|
||||||
"author" : "xcode"
|
"author": "xcode"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"info" : {
|
"info": {
|
||||||
"version" : 1,
|
"version": 1,
|
||||||
"author" : "xcode"
|
"author": "xcode"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17150" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES" initialViewController="Y6W-OH-hqX">
|
<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="17150" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
|
||||||
<dependencies>
|
<dependencies>
|
||||||
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17122"/>
|
<plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="17122"/>
|
||||||
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
|
<capability name="Safe area layout guides" minToolsVersion="9.0"/>
|
||||||
|
|||||||
+34
-12
@@ -3,7 +3,7 @@
|
|||||||
archiveVersion = 1;
|
archiveVersion = 1;
|
||||||
classes = {
|
classes = {
|
||||||
};
|
};
|
||||||
objectVersion = 63;
|
objectVersion = 56;
|
||||||
objects = {
|
objects = {
|
||||||
|
|
||||||
/* Begin PBXBuildFile section */
|
/* Begin PBXBuildFile section */
|
||||||
@@ -167,8 +167,6 @@
|
|||||||
dependencies = (
|
dependencies = (
|
||||||
);
|
);
|
||||||
name = "deep-link-example_iOS";
|
name = "deep-link-example_iOS";
|
||||||
packageProductDependencies = (
|
|
||||||
);
|
|
||||||
productName = "deep-link-example_iOS";
|
productName = "deep-link-example_iOS";
|
||||||
productReference = 1CAAFA750FD735A285DC1238 /* deep-link-example.app */;
|
productReference = 1CAAFA750FD735A285DC1238 /* deep-link-example.app */;
|
||||||
productType = "com.apple.product-type.application";
|
productType = "com.apple.product-type.application";
|
||||||
@@ -191,7 +189,6 @@
|
|||||||
en,
|
en,
|
||||||
);
|
);
|
||||||
mainGroup = 1DC58B1705AA3ECC6B887FE7;
|
mainGroup = 1DC58B1705AA3ECC6B887FE7;
|
||||||
minimizedProjectReferenceProxies = 1;
|
|
||||||
projectDirPath = "";
|
projectDirPath = "";
|
||||||
projectRoot = "";
|
projectRoot = "";
|
||||||
targets = (
|
targets = (
|
||||||
@@ -230,6 +227,7 @@
|
|||||||
outputPaths = (
|
outputPaths = (
|
||||||
"$(SRCROOT)/Externals/x86_64/${CONFIGURATION}/libapp.a",
|
"$(SRCROOT)/Externals/x86_64/${CONFIGURATION}/libapp.a",
|
||||||
"$(SRCROOT)/Externals/arm64/${CONFIGURATION}/libapp.a",
|
"$(SRCROOT)/Externals/arm64/${CONFIGURATION}/libapp.a",
|
||||||
|
"$(SRCROOT)/Externals/arm64-sim/${CONFIGURATION}/libapp.a",
|
||||||
);
|
);
|
||||||
runOnlyForDeploymentPostprocessing = 0;
|
runOnlyForDeploymentPostprocessing = 0;
|
||||||
shellPath = /bin/sh;
|
shellPath = /bin/sh;
|
||||||
@@ -316,13 +314,18 @@
|
|||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
|
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
|
||||||
ARCHS = arm64;
|
ARCHS = (
|
||||||
|
arm64,
|
||||||
|
"arm64-sim",
|
||||||
|
);
|
||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
CODE_SIGN_ENTITLEMENTS = "deep-link-example_iOS/deep-link-example_iOS.entitlements";
|
CODE_SIGN_ENTITLEMENTS = "deep-link-example_iOS/deep-link-example_iOS.entitlements";
|
||||||
CODE_SIGN_IDENTITY = "iPhone Developer";
|
CODE_SIGN_IDENTITY = "iPhone Developer";
|
||||||
DEVELOPMENT_TEAM = "Q93MBH6S2F";
|
CODE_SIGN_STYLE = Automatic;
|
||||||
|
DEVELOPMENT_TEAM = Q93MBH6S2F;
|
||||||
ENABLE_BITCODE = NO;
|
ENABLE_BITCODE = NO;
|
||||||
"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
|
"EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
|
||||||
|
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
|
||||||
FRAMEWORK_SEARCH_PATHS = (
|
FRAMEWORK_SEARCH_PATHS = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"\".\"",
|
"\".\"",
|
||||||
@@ -332,6 +335,13 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
|
"LIBRARY_SEARCH_PATHS[arch=arm64-sim]" = (
|
||||||
|
"$(inherited)",
|
||||||
|
"$(PROJECT_DIR)/Externals/arm64-sim/$(CONFIGURATION)",
|
||||||
|
"$(SDKROOT)/usr/lib/swift",
|
||||||
|
"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
|
||||||
|
"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
|
||||||
|
);
|
||||||
"LIBRARY_SEARCH_PATHS[arch=arm64]" = (
|
"LIBRARY_SEARCH_PATHS[arch=arm64]" = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"$(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION)",
|
"$(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION)",
|
||||||
@@ -350,7 +360,7 @@
|
|||||||
PRODUCT_NAME = "deep-link-example";
|
PRODUCT_NAME = "deep-link-example";
|
||||||
SDKROOT = iphoneos;
|
SDKROOT = iphoneos;
|
||||||
TARGETED_DEVICE_FAMILY = "1,2";
|
TARGETED_DEVICE_FAMILY = "1,2";
|
||||||
VALID_ARCHS = arm64;
|
VALID_ARCHS = "arm64 arm64-sim";
|
||||||
};
|
};
|
||||||
name = debug;
|
name = debug;
|
||||||
};
|
};
|
||||||
@@ -414,13 +424,18 @@
|
|||||||
isa = XCBuildConfiguration;
|
isa = XCBuildConfiguration;
|
||||||
buildSettings = {
|
buildSettings = {
|
||||||
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
|
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES = YES;
|
||||||
ARCHS = arm64;
|
ARCHS = (
|
||||||
|
arm64,
|
||||||
|
"arm64-sim",
|
||||||
|
);
|
||||||
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
|
||||||
CODE_SIGN_ENTITLEMENTS = "deep-link-example_iOS/deep-link-example_iOS.entitlements";
|
CODE_SIGN_ENTITLEMENTS = "deep-link-example_iOS/deep-link-example_iOS.entitlements";
|
||||||
CODE_SIGN_IDENTITY = "iPhone Developer";
|
CODE_SIGN_IDENTITY = "iPhone Developer";
|
||||||
DEVELOPMENT_TEAM = "Q93MBH6S2F";
|
CODE_SIGN_STYLE = Automatic;
|
||||||
|
DEVELOPMENT_TEAM = Q93MBH6S2F;
|
||||||
ENABLE_BITCODE = NO;
|
ENABLE_BITCODE = NO;
|
||||||
"EXCLUDED_ARCHS[sdk=iphoneos*]" = x86_64;
|
"EXCLUDED_ARCHS[sdk=iphoneos*]" = "arm64-sim x86_64";
|
||||||
|
"EXCLUDED_ARCHS[sdk=iphonesimulator*]" = arm64;
|
||||||
FRAMEWORK_SEARCH_PATHS = (
|
FRAMEWORK_SEARCH_PATHS = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"\".\"",
|
"\".\"",
|
||||||
@@ -430,6 +445,13 @@
|
|||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"@executable_path/Frameworks",
|
"@executable_path/Frameworks",
|
||||||
);
|
);
|
||||||
|
"LIBRARY_SEARCH_PATHS[arch=arm64-sim]" = (
|
||||||
|
"$(inherited)",
|
||||||
|
"$(PROJECT_DIR)/Externals/arm64-sim/$(CONFIGURATION)",
|
||||||
|
"$(SDKROOT)/usr/lib/swift",
|
||||||
|
"$(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME)",
|
||||||
|
"$(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)",
|
||||||
|
);
|
||||||
"LIBRARY_SEARCH_PATHS[arch=arm64]" = (
|
"LIBRARY_SEARCH_PATHS[arch=arm64]" = (
|
||||||
"$(inherited)",
|
"$(inherited)",
|
||||||
"$(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION)",
|
"$(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION)",
|
||||||
@@ -448,7 +470,7 @@
|
|||||||
PRODUCT_NAME = "deep-link-example";
|
PRODUCT_NAME = "deep-link-example";
|
||||||
SDKROOT = iphoneos;
|
SDKROOT = iphoneos;
|
||||||
TARGETED_DEVICE_FAMILY = "1,2";
|
TARGETED_DEVICE_FAMILY = "1,2";
|
||||||
VALID_ARCHS = arm64;
|
VALID_ARCHS = "arm64 arm64-sim";
|
||||||
};
|
};
|
||||||
name = release;
|
name = release;
|
||||||
};
|
};
|
||||||
|
|||||||
+8
@@ -0,0 +1,8 @@
|
|||||||
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
|
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
|
||||||
|
<plist version="1.0">
|
||||||
|
<dict>
|
||||||
|
<key>IDEDidComputeMac32BitWarning</key>
|
||||||
|
<true/>
|
||||||
|
</dict>
|
||||||
|
</plist>
|
||||||
+1
-12
@@ -15,7 +15,7 @@
|
|||||||
<key>CFBundlePackageType</key>
|
<key>CFBundlePackageType</key>
|
||||||
<string>APPL</string>
|
<string>APPL</string>
|
||||||
<key>CFBundleShortVersionString</key>
|
<key>CFBundleShortVersionString</key>
|
||||||
<string>0.1.0</string>
|
<string>0.0.0</string>
|
||||||
<key>CFBundleVersion</key>
|
<key>CFBundleVersion</key>
|
||||||
<string>0.1.0</string>
|
<string>0.1.0</string>
|
||||||
<key>LSRequiresIPhoneOS</key>
|
<key>LSRequiresIPhoneOS</key>
|
||||||
@@ -40,16 +40,5 @@
|
|||||||
<string>UIInterfaceOrientationLandscapeLeft</string>
|
<string>UIInterfaceOrientationLandscapeLeft</string>
|
||||||
<string>UIInterfaceOrientationLandscapeRight</string>
|
<string>UIInterfaceOrientationLandscapeRight</string>
|
||||||
</array>
|
</array>
|
||||||
<key>CFBundleURLTypes</key>
|
|
||||||
<array>
|
|
||||||
<dict>
|
|
||||||
<key>CFBundleURLSchemes</key>
|
|
||||||
<array>
|
|
||||||
<string>taurideeplink</string>
|
|
||||||
</array>
|
|
||||||
<key>CFBundleURLName</key>
|
|
||||||
<string>taurideeplink</string>
|
|
||||||
</dict>
|
|
||||||
</array>
|
|
||||||
</dict>
|
</dict>
|
||||||
</plist>
|
</plist>
|
||||||
@@ -1,3 +1,7 @@
|
|||||||
|
# Copyright 2019-2023 Tauri Programme within The Commons Conservancy
|
||||||
|
# SPDX-License-Identifier: Apache-2.0
|
||||||
|
# SPDX-License-Identifier: MIT
|
||||||
|
|
||||||
name: deep-link-example
|
name: deep-link-example
|
||||||
options:
|
options:
|
||||||
bundleIdPrefix: com.tauri.deep-link-example
|
bundleIdPrefix: com.tauri.deep-link-example
|
||||||
@@ -12,6 +16,7 @@ settingGroups:
|
|||||||
base:
|
base:
|
||||||
PRODUCT_NAME: deep-link-example
|
PRODUCT_NAME: deep-link-example
|
||||||
PRODUCT_BUNDLE_IDENTIFIER: com.tauri.deep-link-example
|
PRODUCT_BUNDLE_IDENTIFIER: com.tauri.deep-link-example
|
||||||
|
DEVELOPMENT_TEAM: Q93MBH6S2F
|
||||||
targetTemplates:
|
targetTemplates:
|
||||||
app:
|
app:
|
||||||
type: application
|
type: application
|
||||||
@@ -51,8 +56,8 @@ targets:
|
|||||||
- UIInterfaceOrientationPortraitUpsideDown
|
- UIInterfaceOrientationPortraitUpsideDown
|
||||||
- UIInterfaceOrientationLandscapeLeft
|
- UIInterfaceOrientationLandscapeLeft
|
||||||
- UIInterfaceOrientationLandscapeRight
|
- UIInterfaceOrientationLandscapeRight
|
||||||
CFBundleShortVersionString: 0.1.0
|
CFBundleShortVersionString: 0.0.0
|
||||||
CFBundleVersion: '0.1.0'
|
CFBundleVersion: 0.0.0
|
||||||
entitlements:
|
entitlements:
|
||||||
path: deep-link-example_iOS/deep-link-example_iOS.entitlements
|
path: deep-link-example_iOS/deep-link-example_iOS.entitlements
|
||||||
scheme:
|
scheme:
|
||||||
@@ -62,12 +67,14 @@ targets:
|
|||||||
settings:
|
settings:
|
||||||
base:
|
base:
|
||||||
ENABLE_BITCODE: false
|
ENABLE_BITCODE: false
|
||||||
ARCHS: [arm64]
|
ARCHS: [arm64, arm64-sim]
|
||||||
VALID_ARCHS: arm64
|
VALID_ARCHS: arm64 arm64-sim
|
||||||
LIBRARY_SEARCH_PATHS[arch=x86_64]: $(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)
|
LIBRARY_SEARCH_PATHS[arch=x86_64]: $(inherited) $(PROJECT_DIR)/Externals/x86_64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)
|
||||||
LIBRARY_SEARCH_PATHS[arch=arm64]: $(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)
|
LIBRARY_SEARCH_PATHS[arch=arm64]: $(inherited) $(PROJECT_DIR)/Externals/arm64/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)
|
||||||
|
LIBRARY_SEARCH_PATHS[arch=arm64-sim]: $(inherited) $(PROJECT_DIR)/Externals/arm64-sim/$(CONFIGURATION) $(SDKROOT)/usr/lib/swift $(TOOLCHAIN_DIR)/usr/lib/swift/$(PLATFORM_NAME) $(TOOLCHAIN_DIR)/usr/lib/swift-5.0/$(PLATFORM_NAME)
|
||||||
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: true
|
ALWAYS_EMBED_SWIFT_STANDARD_LIBRARIES: true
|
||||||
EXCLUDED_ARCHS[sdk=iphoneos*]: x86_64
|
EXCLUDED_ARCHS[sdk=iphonesimulator*]: arm64
|
||||||
|
EXCLUDED_ARCHS[sdk=iphoneos*]: arm64-sim x86_64
|
||||||
groups: [app]
|
groups: [app]
|
||||||
dependencies:
|
dependencies:
|
||||||
- framework: libapp.a
|
- framework: libapp.a
|
||||||
@@ -86,3 +93,4 @@ targets:
|
|||||||
outputFiles:
|
outputFiles:
|
||||||
- $(SRCROOT)/Externals/x86_64/${CONFIGURATION}/libapp.a
|
- $(SRCROOT)/Externals/x86_64/${CONFIGURATION}/libapp.a
|
||||||
- $(SRCROOT)/Externals/arm64/${CONFIGURATION}/libapp.a
|
- $(SRCROOT)/Externals/arm64/${CONFIGURATION}/libapp.a
|
||||||
|
- $(SRCROOT)/Externals/arm64-sim/${CONFIGURATION}/libapp.a
|
||||||
|
|||||||
@@ -35,9 +35,6 @@
|
|||||||
},
|
},
|
||||||
{
|
{
|
||||||
"host": "tauri.app"
|
"host": "tauri.app"
|
||||||
},
|
|
||||||
{
|
|
||||||
"scheme": ["taurideeplink"]
|
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
"desktop": {
|
"desktop": {
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@tauri-apps/plugin-deep-link",
|
"name": "@tauri-apps/plugin-deep-link",
|
||||||
"version": "2.4.5",
|
"version": "2.4.1",
|
||||||
"description": "Set your Tauri application as the default handler for an URL",
|
"description": "Set your Tauri application as the default handler for an URL",
|
||||||
"license": "MIT OR Apache-2.0",
|
"license": "MIT OR Apache-2.0",
|
||||||
"authors": [
|
"authors": [
|
||||||
@@ -25,9 +25,6 @@
|
|||||||
"LICENSE"
|
"LICENSE"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tauri-apps/api": "^2.8.0"
|
"@tauri-apps/api": "^2.6.0"
|
||||||
},
|
|
||||||
"devDependencies": {
|
|
||||||
"@tauri-apps/cli": "2.9.1"
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,8 +11,10 @@ use tauri_utils::config::DeepLinkProtocol;
|
|||||||
pub struct AssociatedDomain {
|
pub struct AssociatedDomain {
|
||||||
#[serde(default = "default_schemes")]
|
#[serde(default = "default_schemes")]
|
||||||
pub scheme: Vec<String>,
|
pub scheme: Vec<String>,
|
||||||
#[serde(default, deserialize_with = "deserialize_associated_host")]
|
|
||||||
pub host: Option<String>, // Optional custom uri schemes dont NEED a host (may have one still), but required for https/http schemes
|
#[serde(deserialize_with = "deserialize_associated_host")]
|
||||||
|
pub host: String,
|
||||||
|
|
||||||
#[serde(default)]
|
#[serde(default)]
|
||||||
pub path: Vec<String>,
|
pub path: Vec<String>,
|
||||||
#[serde(default, alias = "path-pattern", rename = "pathPattern")]
|
#[serde(default, alias = "path-pattern", rename = "pathPattern")]
|
||||||
@@ -21,41 +23,6 @@ pub struct AssociatedDomain {
|
|||||||
pub path_prefix: Vec<String>,
|
pub path_prefix: Vec<String>,
|
||||||
#[serde(default, alias = "path-suffix", rename = "pathSuffix")]
|
#[serde(default, alias = "path-suffix", rename = "pathSuffix")]
|
||||||
pub path_suffix: Vec<String>,
|
pub path_suffix: Vec<String>,
|
||||||
#[serde(default, alias = "app-link", rename = "appLink")]
|
|
||||||
pub app_link: Option<bool>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl AssociatedDomain {
|
|
||||||
/// Returns true if the domain uses http or https scheme.
|
|
||||||
pub fn is_web_link(&self) -> bool {
|
|
||||||
self.scheme.iter().any(|s| s == "https" || s == "http")
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Returns true if the domain uses http or https scheme and has proper host configuration.
|
|
||||||
pub fn is_app_link(&self) -> bool {
|
|
||||||
self.app_link
|
|
||||||
.unwrap_or_else(|| self.is_web_link() && self.host.is_some())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn validate(&self) -> Result<(), String> {
|
|
||||||
// Rule 1: All web links require a host.
|
|
||||||
if self.is_web_link() && self.host.is_none() {
|
|
||||||
return Err("Web link requires a host".into());
|
|
||||||
}
|
|
||||||
|
|
||||||
// Rule 2: If it's an App Link, ensure http(s) and host.
|
|
||||||
if self.is_app_link() {
|
|
||||||
if !self.is_web_link() {
|
|
||||||
return Err("AppLink must be a valid web link (https/http + host)".into());
|
|
||||||
}
|
|
||||||
if self.scheme.iter().any(|s| s == "http") && !self.scheme.iter().any(|s| s == "https")
|
|
||||||
{
|
|
||||||
eprintln!("Warning: AppLink uses only 'http' — allowed on Android but not secure for production.");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Consider removing this in v3
|
// TODO: Consider removing this in v3
|
||||||
@@ -63,19 +30,18 @@ fn default_schemes() -> Vec<String> {
|
|||||||
vec!["https".to_string(), "http".to_string()]
|
vec!["https".to_string(), "http".to_string()]
|
||||||
}
|
}
|
||||||
|
|
||||||
fn deserialize_associated_host<'de, D>(deserializer: D) -> Result<Option<String>, D::Error>
|
fn deserialize_associated_host<'de, D>(deserializer: D) -> Result<String, D::Error>
|
||||||
where
|
where
|
||||||
D: Deserializer<'de>,
|
D: Deserializer<'de>,
|
||||||
{
|
{
|
||||||
let opt = Option::<String>::deserialize(deserializer)?;
|
let host = String::deserialize(deserializer)?;
|
||||||
if let Some(ref host) = opt {
|
if let Some((scheme, _host)) = host.split_once("://") {
|
||||||
if let Some((scheme, _)) = host.split_once("://") {
|
Err(serde::de::Error::custom(format!(
|
||||||
return Err(serde::de::Error::custom(format!(
|
"host `{host}` cannot start with a scheme, please remove the `{scheme}://` prefix"
|
||||||
"host `{host}` cannot start with a scheme, please remove the `{scheme}://` prefix"
|
)))
|
||||||
)));
|
} else {
|
||||||
}
|
Ok(host)
|
||||||
}
|
}
|
||||||
Ok(opt)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Deserialize, Clone)]
|
#[derive(Deserialize, Clone)]
|
||||||
|
|||||||
@@ -28,16 +28,6 @@ pub enum Error {
|
|||||||
PluginInvoke(#[from] tauri::plugin::mobile::PluginInvokeError),
|
PluginInvoke(#[from] tauri::plugin::mobile::PluginInvokeError),
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO(v3): change this into an error in v3,
|
|
||||||
// see <https://github.com/tauri-apps/plugins-workspace/pull/2970#issuecomment-3244660138>.
|
|
||||||
#[inline]
|
|
||||||
#[cfg(target_os = "linux")]
|
|
||||||
pub(crate) fn inspect_command_error<'a>(command: &'a str) -> impl Fn(&std::io::Error) + 'a {
|
|
||||||
move |e| {
|
|
||||||
tracing::error!("Failed to run OS command `{command}`: {e}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Serialize for Error {
|
impl Serialize for Error {
|
||||||
fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
|
fn serialize<S>(&self, serializer: S) -> std::result::Result<S::Ok, S::Error>
|
||||||
where
|
where
|
||||||
|
|||||||
@@ -254,7 +254,6 @@ mod imp {
|
|||||||
///
|
///
|
||||||
/// ## Platform-specific:
|
/// ## Platform-specific:
|
||||||
///
|
///
|
||||||
/// - **Linux**: Needs the `xdg-mime` and `update-desktop-database` commands available on the system.
|
|
||||||
/// - **macOS / Android / iOS**: Unsupported, will return [`Error::UnsupportedPlatform`](`crate::Error::UnsupportedPlatform`).
|
/// - **macOS / Android / iOS**: Unsupported, will return [`Error::UnsupportedPlatform`](`crate::Error::UnsupportedPlatform`).
|
||||||
pub fn register<S: AsRef<str>>(&self, _protocol: S) -> crate::Result<()> {
|
pub fn register<S: AsRef<str>>(&self, _protocol: S) -> crate::Result<()> {
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
@@ -293,7 +292,6 @@ mod imp {
|
|||||||
.unwrap_or_else(|| bin.into_os_string())
|
.unwrap_or_else(|| bin.into_os_string())
|
||||||
.to_string_lossy()
|
.to_string_lossy()
|
||||||
.to_string();
|
.to_string();
|
||||||
let qualified_exec = format!("{} %u", exec);
|
|
||||||
|
|
||||||
let target = self.app.path().data_dir()?.join("applications");
|
let target = self.app.path().data_dir()?.join("applications");
|
||||||
|
|
||||||
@@ -305,28 +303,12 @@ mod imp {
|
|||||||
|
|
||||||
if let Ok(mut desktop_file) = ini::Ini::load_from_file(&target_file) {
|
if let Ok(mut desktop_file) = ini::Ini::load_from_file(&target_file) {
|
||||||
if let Some(section) = desktop_file.section_mut(Some("Desktop Entry")) {
|
if let Some(section) = desktop_file.section_mut(Some("Desktop Entry")) {
|
||||||
|
// it's ok to remove it - we only write to the file if it's missing
|
||||||
|
// and in that case we include old_mimes
|
||||||
let old_mimes = section.remove("MimeType").unwrap_or_default();
|
let old_mimes = section.remove("MimeType").unwrap_or_default();
|
||||||
let mut change = false;
|
|
||||||
|
|
||||||
// if the mime type is not present, append it to the list
|
|
||||||
if !old_mimes.split(';').any(|mime| mime == mime_type) {
|
if !old_mimes.split(';').any(|mime| mime == mime_type) {
|
||||||
section.append("MimeType", format!("{mime_type};{old_mimes}"));
|
section.append("MimeType", format!("{mime_type};{old_mimes}"));
|
||||||
change = true;
|
|
||||||
} else {
|
|
||||||
section.insert("MimeType".to_string(), old_mimes);
|
|
||||||
}
|
|
||||||
|
|
||||||
// if the exec command doesnt match, update to the new one
|
|
||||||
let old_exec = section.remove("Exec").unwrap_or_default();
|
|
||||||
if old_exec != qualified_exec {
|
|
||||||
section.append("Exec", qualified_exec);
|
|
||||||
change = true;
|
|
||||||
} else {
|
|
||||||
section.insert("Exec".to_string(), old_exec.to_string());
|
|
||||||
}
|
|
||||||
|
|
||||||
// if any property has changed, rewrite the .desktop file
|
|
||||||
if change {
|
|
||||||
desktop_file.write_to_file(&target_file)?;
|
desktop_file.write_to_file(&target_file)?;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -341,7 +323,7 @@ mod imp {
|
|||||||
.product_name
|
.product_name
|
||||||
.clone()
|
.clone()
|
||||||
.unwrap_or_else(|| file_name.clone()),
|
.unwrap_or_else(|| file_name.clone()),
|
||||||
qualified_exec = qualified_exec,
|
exec = exec,
|
||||||
mime_type = mime_type
|
mime_type = mime_type
|
||||||
)
|
)
|
||||||
.as_bytes(),
|
.as_bytes(),
|
||||||
@@ -350,15 +332,11 @@ mod imp {
|
|||||||
|
|
||||||
Command::new("update-desktop-database")
|
Command::new("update-desktop-database")
|
||||||
.arg(target)
|
.arg(target)
|
||||||
.status()
|
.status()?;
|
||||||
.inspect_err(crate::error::inspect_command_error(
|
|
||||||
"update-desktop-database",
|
|
||||||
))?;
|
|
||||||
|
|
||||||
Command::new("xdg-mime")
|
Command::new("xdg-mime")
|
||||||
.args(["default", &file_name, mime_type.as_str()])
|
.args(["default", &file_name, mime_type.as_str()])
|
||||||
.status()
|
.status()?;
|
||||||
.inspect_err(crate::error::inspect_command_error("xdg-mime"))?;
|
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -427,7 +405,6 @@ mod imp {
|
|||||||
///
|
///
|
||||||
/// ## Platform-specific:
|
/// ## Platform-specific:
|
||||||
///
|
///
|
||||||
/// - **Linux**: Needs the `xdg-mime` command available on the system.
|
|
||||||
/// - **macOS / Android / iOS**: Unsupported, will return [`Error::UnsupportedPlatform`](`crate::Error::UnsupportedPlatform`).
|
/// - **macOS / Android / iOS**: Unsupported, will return [`Error::UnsupportedPlatform`](`crate::Error::UnsupportedPlatform`).
|
||||||
pub fn is_registered<S: AsRef<str>>(&self, _protocol: S) -> crate::Result<bool> {
|
pub fn is_registered<S: AsRef<str>>(&self, _protocol: S) -> crate::Result<bool> {
|
||||||
#[cfg(windows)]
|
#[cfg(windows)]
|
||||||
@@ -462,8 +439,7 @@ mod imp {
|
|||||||
"default",
|
"default",
|
||||||
&format!("x-scheme-handler/{}", _protocol.as_ref()),
|
&format!("x-scheme-handler/{}", _protocol.as_ref()),
|
||||||
])
|
])
|
||||||
.output()
|
.output()?;
|
||||||
.inspect_err(crate::error::inspect_command_error("xdg-mime"))?;
|
|
||||||
|
|
||||||
Ok(String::from_utf8_lossy(&output.stdout).contains(&file_name))
|
Ok(String::from_utf8_lossy(&output.stdout).contains(&file_name))
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
[Desktop Entry]
|
[Desktop Entry]
|
||||||
Type=Application
|
Type=Application
|
||||||
Name={name}
|
Name={name}
|
||||||
Exec={qualified_exec}
|
Exec={exec} %u
|
||||||
Terminal=false
|
Terminal=false
|
||||||
MimeType={mime_type}
|
MimeType={mime_type}
|
||||||
NoDisplay=true
|
NoDisplay=true
|
||||||
@@ -1,31 +1,5 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## \[2.4.2]
|
|
||||||
|
|
||||||
- [`93426f85`](https://github.com/tauri-apps/plugins-workspace/commit/93426f85120f49beb9f40222bff45185a32d54a9) Fixed an issue that caused docs.rs builds to fail. No user facing changes.
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
- Upgraded to `fs-js@2.4.4`
|
|
||||||
|
|
||||||
## \[2.4.1]
|
|
||||||
|
|
||||||
- [`6c9b61fb`](https://github.com/tauri-apps/plugins-workspace/commit/6c9b61fb658145d13893626112fc489f7458aa17) ([#3039](https://github.com/tauri-apps/plugins-workspace/pull/3039) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) On Android, updated compileSdk to 36.
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
- Upgraded to `fs-js@2.4.3`
|
|
||||||
|
|
||||||
## \[2.4.0]
|
|
||||||
|
|
||||||
- [`509eba8d`](https://github.com/tauri-apps/plugins-workspace/commit/509eba8d441c4f6ecf0af77b572cb2afd69a752d) ([#2641](https://github.com/tauri-apps/plugins-workspace/pull/2641) by [@amrbashir](https://github.com/tauri-apps/plugins-workspace/../../amrbashir)) Add support for showing a message dialog with 3 buttons.
|
|
||||||
|
|
||||||
## \[2.3.3]
|
|
||||||
|
|
||||||
### Dependencies
|
|
||||||
|
|
||||||
- Upgraded to `fs-js@2.4.2`
|
|
||||||
|
|
||||||
## \[2.3.2]
|
## \[2.3.2]
|
||||||
|
|
||||||
- [`af08c66f`](https://github.com/tauri-apps/plugins-workspace/commit/af08c66faafe0dffc4b0a80aef030cd3f0f89a9c) ([#2871](https://github.com/tauri-apps/plugins-workspace/pull/2871) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Fixed an issue that caused the file picker not to open on Android when extension filters were set.
|
- [`af08c66f`](https://github.com/tauri-apps/plugins-workspace/commit/af08c66faafe0dffc4b0a80aef030cd3f0f89a9c) ([#2871](https://github.com/tauri-apps/plugins-workspace/pull/2871) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Fixed an issue that caused the file picker not to open on Android when extension filters were set.
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "tauri-plugin-dialog"
|
name = "tauri-plugin-dialog"
|
||||||
version = "2.4.2"
|
version = "2.3.2"
|
||||||
description = "Native system dialogs for opening and saving files along with message dialogs on your Tauri application."
|
description = "Native system dialogs for opening and saving files along with message dialogs on your Tauri application."
|
||||||
edition = { workspace = true }
|
edition = { workspace = true }
|
||||||
authors = { workspace = true }
|
authors = { workspace = true }
|
||||||
@@ -10,6 +10,8 @@ repository = { workspace = true }
|
|||||||
links = "tauri-plugin-dialog"
|
links = "tauri-plugin-dialog"
|
||||||
|
|
||||||
[package.metadata.docs.rs]
|
[package.metadata.docs.rs]
|
||||||
|
rustc-args = ["--cfg", "docsrs"]
|
||||||
|
rustdoc-args = ["--cfg", "docsrs"]
|
||||||
targets = ["x86_64-unknown-linux-gnu", "x86_64-linux-android"]
|
targets = ["x86_64-unknown-linux-gnu", "x86_64-linux-android"]
|
||||||
|
|
||||||
[package.metadata.platforms.support]
|
[package.metadata.platforms.support]
|
||||||
@@ -32,7 +34,7 @@ tauri = { workspace = true }
|
|||||||
log = { workspace = true }
|
log = { workspace = true }
|
||||||
thiserror = { workspace = true }
|
thiserror = { workspace = true }
|
||||||
url = { workspace = true }
|
url = { workspace = true }
|
||||||
tauri-plugin-fs = { path = "../fs", version = "2.4.4" }
|
tauri-plugin-fs = { path = "../fs", version = "2.4.1" }
|
||||||
|
|
||||||
[target.'cfg(target_os = "ios")'.dependencies]
|
[target.'cfg(target_os = "ios")'.dependencies]
|
||||||
tauri = { workspace = true, features = ["wry"] }
|
tauri = { workspace = true, features = ["wry"] }
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ plugins {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = "app.tauri.dialog"
|
namespace = "app.tauri.dialog"
|
||||||
compileSdk = 36
|
compileSdk = 34
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdk = 24
|
minSdk = 24
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
consumerProguardFiles("consumer-rules.pro")
|
consumerProguardFiles("consumer-rules.pro")
|
||||||
|
|||||||
@@ -38,7 +38,6 @@ class MessageOptions {
|
|||||||
var title: String? = null
|
var title: String? = null
|
||||||
lateinit var message: String
|
lateinit var message: String
|
||||||
var okButtonLabel: String? = null
|
var okButtonLabel: String? = null
|
||||||
var noButtonLabel: String? = null
|
|
||||||
var cancelButtonLabel: String? = null
|
var cancelButtonLabel: String? = null
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -140,8 +139,9 @@ class DialogPlugin(private val activity: Activity): Plugin(activity) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
val handler = { value: String ->
|
val handler = { cancelled: Boolean, value: Boolean ->
|
||||||
val ret = JSObject()
|
val ret = JSObject()
|
||||||
|
ret.put("cancelled", cancelled)
|
||||||
ret.put("value", value)
|
ret.put("value", value)
|
||||||
invoke.resolve(ret)
|
invoke.resolve(ret)
|
||||||
}
|
}
|
||||||
@@ -153,34 +153,24 @@ class DialogPlugin(private val activity: Activity): Plugin(activity) {
|
|||||||
if (args.title != null) {
|
if (args.title != null) {
|
||||||
builder.setTitle(args.title)
|
builder.setTitle(args.title)
|
||||||
}
|
}
|
||||||
|
|
||||||
val okButtonLabel = args.okButtonLabel ?: "Ok"
|
|
||||||
|
|
||||||
builder
|
builder
|
||||||
.setMessage(args.message)
|
.setMessage(args.message)
|
||||||
.setPositiveButton(okButtonLabel) { dialog, _ ->
|
.setPositiveButton(
|
||||||
|
args.okButtonLabel ?: "OK"
|
||||||
|
) { dialog, _ ->
|
||||||
dialog.dismiss()
|
dialog.dismiss()
|
||||||
handler(okButtonLabel)
|
handler(false, true)
|
||||||
}
|
}
|
||||||
.setOnCancelListener { dialog ->
|
.setOnCancelListener { dialog ->
|
||||||
dialog.dismiss()
|
dialog.dismiss()
|
||||||
handler(args.cancelButtonLabel ?: "Cancel")
|
handler(true, false)
|
||||||
}
|
}
|
||||||
|
|
||||||
if (args.noButtonLabel != null) {
|
|
||||||
builder.setNeutralButton(args.noButtonLabel) { dialog, _ ->
|
|
||||||
dialog.dismiss()
|
|
||||||
handler(args.noButtonLabel!!)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (args.cancelButtonLabel != null) {
|
if (args.cancelButtonLabel != null) {
|
||||||
builder.setNegativeButton( args.cancelButtonLabel) { dialog, _ ->
|
builder.setNegativeButton( args.cancelButtonLabel) { dialog, _ ->
|
||||||
dialog.dismiss()
|
dialog.dismiss()
|
||||||
handler(args.cancelButtonLabel!!)
|
handler(false, false)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val dialog = builder.create()
|
val dialog = builder.create()
|
||||||
dialog.show()
|
dialog.show()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1 +1 @@
|
|||||||
if("__TAURI__"in window){var __TAURI_PLUGIN_DIALOG__=function(t){"use strict";async function n(t,n={},e){return window.__TAURI_INTERNALS__.invoke(t,n,e)}function e(t){if(void 0!==t)return"string"==typeof t?t:"ok"in t&&"cancel"in t?{OkCancelCustom:[t.ok,t.cancel]}:"yes"in t&&"no"in t&&"cancel"in t?{YesNoCancelCustom:[t.yes,t.no,t.cancel]}:"ok"in t?{OkCustom:t.ok}:void 0}return"function"==typeof SuppressedError&&SuppressedError,t.ask=async function(t,e){const o="string"==typeof e?{title:e}:e;return await n("plugin:dialog|ask",{message:t.toString(),title:o?.title?.toString(),kind:o?.kind,yesButtonLabel:o?.okLabel?.toString(),noButtonLabel:o?.cancelLabel?.toString()})},t.confirm=async function(t,e){const o="string"==typeof e?{title:e}:e;return await n("plugin:dialog|confirm",{message:t.toString(),title:o?.title?.toString(),kind:o?.kind,okButtonLabel:o?.okLabel?.toString(),cancelButtonLabel:o?.cancelLabel?.toString()})},t.message=async function(t,o){const i="string"==typeof o?{title:o}:o;return n("plugin:dialog|message",{message:t.toString(),title:i?.title?.toString(),kind:i?.kind,okButtonLabel:i?.okLabel?.toString(),buttons:e(i?.buttons)})},t.open=async function(t={}){return"object"==typeof t&&Object.freeze(t),await n("plugin:dialog|open",{options:t})},t.save=async function(t={}){return"object"==typeof t&&Object.freeze(t),await n("plugin:dialog|save",{options:t})},t}({});Object.defineProperty(window.__TAURI__,"dialog",{value:__TAURI_PLUGIN_DIALOG__})}
|
if("__TAURI__"in window){var __TAURI_PLUGIN_DIALOG__=function(t){"use strict";async function n(t,n={},e){return window.__TAURI_INTERNALS__.invoke(t,n,e)}return"function"==typeof SuppressedError&&SuppressedError,t.ask=async function(t,e){const i="string"==typeof e?{title:e}:e;return await n("plugin:dialog|ask",{message:t.toString(),title:i?.title?.toString(),kind:i?.kind,yesButtonLabel:i?.okLabel?.toString(),noButtonLabel:i?.cancelLabel?.toString()})},t.confirm=async function(t,e){const i="string"==typeof e?{title:e}:e;return await n("plugin:dialog|confirm",{message:t.toString(),title:i?.title?.toString(),kind:i?.kind,okButtonLabel:i?.okLabel?.toString(),cancelButtonLabel:i?.cancelLabel?.toString()})},t.message=async function(t,e){const i="string"==typeof e?{title:e}:e;await n("plugin:dialog|message",{message:t.toString(),title:i?.title?.toString(),kind:i?.kind,okButtonLabel:i?.okLabel?.toString()})},t.open=async function(t={}){return"object"==typeof t&&Object.freeze(t),await n("plugin:dialog|open",{options:t})},t.save=async function(t={}){return"object"==typeof t&&Object.freeze(t),await n("plugin:dialog|save",{options:t})},t}({});Object.defineProperty(window.__TAURI__,"dialog",{value:__TAURI_PLUGIN_DIALOG__})}
|
||||||
|
|||||||
@@ -77,80 +77,6 @@ interface SaveDialogOptions {
|
|||||||
canCreateDirectories?: boolean
|
canCreateDirectories?: boolean
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Default buttons for a message dialog.
|
|
||||||
*
|
|
||||||
* @since 2.4.0
|
|
||||||
*/
|
|
||||||
export type MessageDialogDefaultButtons =
|
|
||||||
| 'Ok'
|
|
||||||
| 'OkCancel'
|
|
||||||
| 'YesNo'
|
|
||||||
| 'YesNoCancel'
|
|
||||||
|
|
||||||
/** All possible button keys. */
|
|
||||||
type ButtonKey = 'ok' | 'cancel' | 'yes' | 'no'
|
|
||||||
|
|
||||||
/** Ban everything except a set of keys. */
|
|
||||||
type BanExcept<Allowed extends ButtonKey> = Partial<
|
|
||||||
Record<Exclude<ButtonKey, Allowed>, never>
|
|
||||||
>
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The Yes, No and Cancel buttons of a message dialog.
|
|
||||||
*
|
|
||||||
* @since 2.4.0
|
|
||||||
*/
|
|
||||||
export type MessageDialogButtonsYesNoCancel = {
|
|
||||||
/** The Yes button. */
|
|
||||||
yes: string
|
|
||||||
/** The No button. */
|
|
||||||
no: string
|
|
||||||
/** The Cancel button. */
|
|
||||||
cancel: string
|
|
||||||
} & BanExcept<'yes' | 'no' | 'cancel'>
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The Ok and Cancel buttons of a message dialog.
|
|
||||||
*
|
|
||||||
* @since 2.4.0
|
|
||||||
*/
|
|
||||||
export type MessageDialogButtonsOkCancel = {
|
|
||||||
/** The Ok button. */
|
|
||||||
ok: string
|
|
||||||
/** The Cancel button. */
|
|
||||||
cancel: string
|
|
||||||
} & BanExcept<'ok' | 'cancel'>
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The Ok button of a message dialog.
|
|
||||||
*
|
|
||||||
* @since 2.4.0
|
|
||||||
*/
|
|
||||||
export type MessageDialogButtonsOk = {
|
|
||||||
/** The Ok button. */
|
|
||||||
ok: string
|
|
||||||
} & BanExcept<'ok'>
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Custom buttons for a message dialog.
|
|
||||||
*
|
|
||||||
* @since 2.4.0
|
|
||||||
*/
|
|
||||||
export type MessageDialogCustomButtons =
|
|
||||||
| MessageDialogButtonsYesNoCancel
|
|
||||||
| MessageDialogButtonsOkCancel
|
|
||||||
| MessageDialogButtonsOk
|
|
||||||
|
|
||||||
/**
|
|
||||||
* The buttons of a message dialog.
|
|
||||||
*
|
|
||||||
* @since 2.4.0
|
|
||||||
*/
|
|
||||||
export type MessageDialogButtons =
|
|
||||||
| MessageDialogDefaultButtons
|
|
||||||
| MessageDialogCustomButtons
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* @since 2.0.0
|
* @since 2.0.0
|
||||||
*/
|
*/
|
||||||
@@ -159,58 +85,8 @@ interface MessageDialogOptions {
|
|||||||
title?: string
|
title?: string
|
||||||
/** The kind of the dialog. Defaults to `info`. */
|
/** The kind of the dialog. Defaults to `info`. */
|
||||||
kind?: 'info' | 'warning' | 'error'
|
kind?: 'info' | 'warning' | 'error'
|
||||||
/**
|
/** The label of the confirm button. */
|
||||||
* The label of the Ok button.
|
|
||||||
*
|
|
||||||
* @deprecated Use {@linkcode MessageDialogOptions.buttons} instead.
|
|
||||||
*/
|
|
||||||
okLabel?: string
|
okLabel?: string
|
||||||
/**
|
|
||||||
* The buttons of the dialog.
|
|
||||||
*
|
|
||||||
* @example
|
|
||||||
*
|
|
||||||
* ```ts
|
|
||||||
* // Use system default buttons texts
|
|
||||||
* await message('Hello World!', { buttons: 'Ok' })
|
|
||||||
* await message('Hello World!', { buttons: 'OkCancel' })
|
|
||||||
*
|
|
||||||
* // Or with custom button texts
|
|
||||||
* await message('Hello World!', { buttons: { ok: 'Yes!' } })
|
|
||||||
* await message('Take on the task?', {
|
|
||||||
* buttons: { ok: 'Accept', cancel: 'Cancel' }
|
|
||||||
* })
|
|
||||||
* await message('Show the file content?', {
|
|
||||||
* buttons: { yes: 'Show content', no: 'Show in folder', cancel: 'Cancel' }
|
|
||||||
* })
|
|
||||||
* ```
|
|
||||||
*
|
|
||||||
* @since 2.4.0
|
|
||||||
*/
|
|
||||||
buttons?: MessageDialogButtons
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Internal function to convert the buttons to the Rust type.
|
|
||||||
*/
|
|
||||||
function buttonsToRust(buttons: MessageDialogButtons | undefined) {
|
|
||||||
if (buttons === undefined) {
|
|
||||||
return undefined
|
|
||||||
}
|
|
||||||
|
|
||||||
if (typeof buttons === 'string') {
|
|
||||||
return buttons
|
|
||||||
} else if ('ok' in buttons && 'cancel' in buttons) {
|
|
||||||
return { OkCancelCustom: [buttons.ok, buttons.cancel] }
|
|
||||||
} else if ('yes' in buttons && 'no' in buttons && 'cancel' in buttons) {
|
|
||||||
return {
|
|
||||||
YesNoCancelCustom: [buttons.yes, buttons.no, buttons.cancel]
|
|
||||||
}
|
|
||||||
} else if ('ok' in buttons) {
|
|
||||||
return { OkCustom: buttons.ok }
|
|
||||||
}
|
|
||||||
|
|
||||||
return undefined
|
|
||||||
}
|
}
|
||||||
|
|
||||||
interface ConfirmDialogOptions {
|
interface ConfirmDialogOptions {
|
||||||
@@ -326,16 +202,6 @@ async function save(options: SaveDialogOptions = {}): Promise<string | null> {
|
|||||||
return await invoke('plugin:dialog|save', { options })
|
return await invoke('plugin:dialog|save', { options })
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* The result of a message dialog.
|
|
||||||
*
|
|
||||||
* The result is a string if the dialog has custom buttons,
|
|
||||||
* otherwise it is one of the default buttons.
|
|
||||||
*
|
|
||||||
* @since 2.4.0
|
|
||||||
*/
|
|
||||||
export type MessageDialogResult = 'Yes' | 'No' | 'Ok' | 'Cancel' | (string & {})
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Shows a message dialog with an `Ok` button.
|
* Shows a message dialog with an `Ok` button.
|
||||||
* @example
|
* @example
|
||||||
@@ -356,15 +222,13 @@ export type MessageDialogResult = 'Yes' | 'No' | 'Ok' | 'Cancel' | (string & {})
|
|||||||
async function message(
|
async function message(
|
||||||
message: string,
|
message: string,
|
||||||
options?: string | MessageDialogOptions
|
options?: string | MessageDialogOptions
|
||||||
): Promise<MessageDialogResult> {
|
): Promise<void> {
|
||||||
const opts = typeof options === 'string' ? { title: options } : options
|
const opts = typeof options === 'string' ? { title: options } : options
|
||||||
|
await invoke('plugin:dialog|message', {
|
||||||
return invoke<MessageDialogResult>('plugin:dialog|message', {
|
|
||||||
message: message.toString(),
|
message: message.toString(),
|
||||||
title: opts?.title?.toString(),
|
title: opts?.title?.toString(),
|
||||||
kind: opts?.kind,
|
kind: opts?.kind,
|
||||||
okButtonLabel: opts?.okLabel?.toString(),
|
okButtonLabel: opts?.okLabel?.toString()
|
||||||
buttons: buttonsToRust(opts?.buttons)
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -20,7 +20,6 @@ struct MessageDialogOptions: Decodable {
|
|||||||
var title: String?
|
var title: String?
|
||||||
let message: String
|
let message: String
|
||||||
var okButtonLabel: String?
|
var okButtonLabel: String?
|
||||||
var noButtonLabel: String?
|
|
||||||
var cancelButtonLabel: String?
|
var cancelButtonLabel: String?
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -201,37 +200,35 @@ class DialogPlugin: Plugin {
|
|||||||
let alert = UIAlertController(
|
let alert = UIAlertController(
|
||||||
title: args.title, message: args.message, preferredStyle: UIAlertController.Style.alert)
|
title: args.title, message: args.message, preferredStyle: UIAlertController.Style.alert)
|
||||||
|
|
||||||
if let cancelButtonLabel = args.cancelButtonLabel {
|
let cancelButtonLabel = args.cancelButtonLabel ?? ""
|
||||||
|
if !cancelButtonLabel.isEmpty {
|
||||||
alert.addAction(
|
alert.addAction(
|
||||||
UIAlertAction(
|
UIAlertAction(
|
||||||
title: cancelButtonLabel, style: UIAlertAction.Style.default,
|
title: cancelButtonLabel, style: UIAlertAction.Style.default,
|
||||||
handler: { (_) -> Void in
|
handler: { (_) -> Void in
|
||||||
invoke.resolve(["value": cancelButtonLabel])
|
Logger.error("cancel")
|
||||||
}
|
|
||||||
)
|
invoke.resolve([
|
||||||
)
|
"value": false,
|
||||||
|
"cancelled": false,
|
||||||
|
])
|
||||||
|
}))
|
||||||
}
|
}
|
||||||
|
|
||||||
if let noButtonLabel = args.noButtonLabel {
|
let okButtonLabel = args.okButtonLabel ?? (cancelButtonLabel.isEmpty ? "OK" : "")
|
||||||
|
if !okButtonLabel.isEmpty {
|
||||||
alert.addAction(
|
alert.addAction(
|
||||||
UIAlertAction(
|
UIAlertAction(
|
||||||
title: noButtonLabel, style: UIAlertAction.Style.default,
|
title: okButtonLabel, style: UIAlertAction.Style.default,
|
||||||
handler: { (_) -> Void in
|
handler: { (_) -> Void in
|
||||||
invoke.resolve(["value": noButtonLabel])
|
Logger.error("ok")
|
||||||
}
|
|
||||||
)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
let okButtonLabel = args.okButtonLabel ?? "Ok"
|
invoke.resolve([
|
||||||
alert.addAction(
|
"value": true,
|
||||||
UIAlertAction(
|
"cancelled": false,
|
||||||
title: okButtonLabel, style: UIAlertAction.Style.default,
|
])
|
||||||
handler: { (_) -> Void in
|
}))
|
||||||
invoke.resolve(["value": okButtonLabel])
|
}
|
||||||
}
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
manager.viewController?.present(alert, animated: true, completion: nil)
|
manager.viewController?.present(alert, animated: true, completion: nil)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@tauri-apps/plugin-dialog",
|
"name": "@tauri-apps/plugin-dialog",
|
||||||
"version": "2.4.2",
|
"version": "2.3.2",
|
||||||
"license": "MIT OR Apache-2.0",
|
"license": "MIT OR Apache-2.0",
|
||||||
"authors": [
|
"authors": [
|
||||||
"Tauri Programme within The Commons Conservancy"
|
"Tauri Programme within The Commons Conservancy"
|
||||||
@@ -24,6 +24,6 @@
|
|||||||
"LICENSE"
|
"LICENSE"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tauri-apps/api": "^2.8.0"
|
"@tauri-apps/api": "^2.6.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,8 +9,8 @@ use tauri::{command, Manager, Runtime, State, Window};
|
|||||||
use tauri_plugin_fs::FsExt;
|
use tauri_plugin_fs::FsExt;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
Dialog, FileDialogBuilder, FilePath, MessageDialogBuilder, MessageDialogButtons,
|
Dialog, FileDialogBuilder, FilePath, MessageDialogButtons, MessageDialogKind, Result, CANCEL,
|
||||||
MessageDialogKind, MessageDialogResult, Result, CANCEL, NO, OK, YES,
|
NO, OK, YES,
|
||||||
};
|
};
|
||||||
|
|
||||||
#[derive(Serialize)]
|
#[derive(Serialize)]
|
||||||
@@ -248,7 +248,7 @@ fn message_dialog<R: Runtime>(
|
|||||||
message: String,
|
message: String,
|
||||||
kind: Option<MessageDialogKind>,
|
kind: Option<MessageDialogKind>,
|
||||||
buttons: MessageDialogButtons,
|
buttons: MessageDialogButtons,
|
||||||
) -> MessageDialogBuilder<R> {
|
) -> bool {
|
||||||
let mut builder = dialog.message(message);
|
let mut builder = dialog.message(message);
|
||||||
|
|
||||||
builder = builder.buttons(buttons);
|
builder = builder.buttons(buttons);
|
||||||
@@ -266,7 +266,7 @@ fn message_dialog<R: Runtime>(
|
|||||||
builder = builder.kind(kind);
|
builder = builder.kind(kind);
|
||||||
}
|
}
|
||||||
|
|
||||||
builder
|
builder.blocking_show()
|
||||||
}
|
}
|
||||||
|
|
||||||
#[command]
|
#[command]
|
||||||
@@ -277,15 +277,19 @@ pub(crate) async fn message<R: Runtime>(
|
|||||||
message: String,
|
message: String,
|
||||||
kind: Option<MessageDialogKind>,
|
kind: Option<MessageDialogKind>,
|
||||||
ok_button_label: Option<String>,
|
ok_button_label: Option<String>,
|
||||||
buttons: Option<MessageDialogButtons>,
|
) -> Result<bool> {
|
||||||
) -> Result<MessageDialogResult> {
|
Ok(message_dialog(
|
||||||
let buttons = buttons.unwrap_or(if let Some(ok_button_label) = ok_button_label {
|
window,
|
||||||
MessageDialogButtons::OkCustom(ok_button_label)
|
dialog,
|
||||||
} else {
|
title,
|
||||||
MessageDialogButtons::Ok
|
message,
|
||||||
});
|
kind,
|
||||||
|
if let Some(ok_button_label) = ok_button_label {
|
||||||
Ok(message_dialog(window, dialog, title, message, kind, buttons).blocking_show_with_result())
|
MessageDialogButtons::OkCustom(ok_button_label)
|
||||||
|
} else {
|
||||||
|
MessageDialogButtons::Ok
|
||||||
|
},
|
||||||
|
))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[command]
|
#[command]
|
||||||
@@ -298,7 +302,7 @@ pub(crate) async fn ask<R: Runtime>(
|
|||||||
yes_button_label: Option<String>,
|
yes_button_label: Option<String>,
|
||||||
no_button_label: Option<String>,
|
no_button_label: Option<String>,
|
||||||
) -> Result<bool> {
|
) -> Result<bool> {
|
||||||
let dialog = message_dialog(
|
Ok(message_dialog(
|
||||||
window,
|
window,
|
||||||
dialog,
|
dialog,
|
||||||
title,
|
title,
|
||||||
@@ -314,9 +318,7 @@ pub(crate) async fn ask<R: Runtime>(
|
|||||||
} else {
|
} else {
|
||||||
MessageDialogButtons::YesNo
|
MessageDialogButtons::YesNo
|
||||||
},
|
},
|
||||||
);
|
))
|
||||||
|
|
||||||
Ok(dialog.blocking_show())
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[command]
|
#[command]
|
||||||
@@ -329,7 +331,7 @@ pub(crate) async fn confirm<R: Runtime>(
|
|||||||
ok_button_label: Option<String>,
|
ok_button_label: Option<String>,
|
||||||
cancel_button_label: Option<String>,
|
cancel_button_label: Option<String>,
|
||||||
) -> Result<bool> {
|
) -> Result<bool> {
|
||||||
let dialog = message_dialog(
|
Ok(message_dialog(
|
||||||
window,
|
window,
|
||||||
dialog,
|
dialog,
|
||||||
title,
|
title,
|
||||||
@@ -345,7 +347,5 @@ pub(crate) async fn confirm<R: Runtime>(
|
|||||||
} else {
|
} else {
|
||||||
MessageDialogButtons::OkCancel
|
MessageDialogButtons::OkCancel
|
||||||
},
|
},
|
||||||
);
|
))
|
||||||
|
|
||||||
Ok(dialog.blocking_show())
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ use rfd::{AsyncFileDialog, AsyncMessageDialog};
|
|||||||
use serde::de::DeserializeOwned;
|
use serde::de::DeserializeOwned;
|
||||||
use tauri::{plugin::PluginApi, AppHandle, Runtime};
|
use tauri::{plugin::PluginApi, AppHandle, Runtime};
|
||||||
|
|
||||||
use crate::{models::*, FileDialogBuilder, FilePath, MessageDialogBuilder};
|
use crate::{models::*, FileDialogBuilder, FilePath, MessageDialogBuilder, OK};
|
||||||
|
|
||||||
pub fn init<R: Runtime, C: DeserializeOwned>(
|
pub fn init<R: Runtime, C: DeserializeOwned>(
|
||||||
app: &AppHandle<R>,
|
app: &AppHandle<R>,
|
||||||
@@ -115,10 +115,6 @@ impl From<MessageDialogButtons> for rfd::MessageButtons {
|
|||||||
MessageDialogButtons::YesNo => Self::YesNo,
|
MessageDialogButtons::YesNo => Self::YesNo,
|
||||||
MessageDialogButtons::OkCustom(ok) => Self::OkCustom(ok),
|
MessageDialogButtons::OkCustom(ok) => Self::OkCustom(ok),
|
||||||
MessageDialogButtons::OkCancelCustom(ok, cancel) => Self::OkCancelCustom(ok, cancel),
|
MessageDialogButtons::OkCancelCustom(ok, cancel) => Self::OkCancelCustom(ok, cancel),
|
||||||
MessageDialogButtons::YesNoCancel => Self::YesNoCancel,
|
|
||||||
MessageDialogButtons::YesNoCancelCustom(yes, no, cancel) => {
|
|
||||||
Self::YesNoCancelCustom(yes, no, cancel)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -212,46 +208,28 @@ pub fn save_file<R: Runtime, F: FnOnce(Option<FilePath>) + Send + 'static>(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Shows a message dialog
|
/// Shows a message dialog
|
||||||
pub fn show_message_dialog<R: Runtime, F: FnOnce(MessageDialogResult) + Send + 'static>(
|
pub fn show_message_dialog<R: Runtime, F: FnOnce(bool) + Send + 'static>(
|
||||||
dialog: MessageDialogBuilder<R>,
|
dialog: MessageDialogBuilder<R>,
|
||||||
callback: F,
|
f: F,
|
||||||
) {
|
) {
|
||||||
let f = move |res: rfd::MessageDialogResult| callback(res.into());
|
use rfd::MessageDialogResult;
|
||||||
|
|
||||||
|
let ok_label = match &dialog.buttons {
|
||||||
|
MessageDialogButtons::OkCustom(ok) => Some(ok.clone()),
|
||||||
|
MessageDialogButtons::OkCancelCustom(ok, _) => Some(ok.clone()),
|
||||||
|
_ => None,
|
||||||
|
};
|
||||||
|
let f = move |res| {
|
||||||
|
f(match res {
|
||||||
|
MessageDialogResult::Ok | MessageDialogResult::Yes => true,
|
||||||
|
MessageDialogResult::Custom(s) => ok_label.map_or(s == OK, |ok_label| ok_label == s),
|
||||||
|
_ => false,
|
||||||
|
});
|
||||||
|
};
|
||||||
|
|
||||||
let handle = dialog.dialog.app_handle().to_owned();
|
let handle = dialog.dialog.app_handle().to_owned();
|
||||||
let _ = handle.run_on_main_thread(move || {
|
let _ = handle.run_on_main_thread(move || {
|
||||||
let buttons = dialog.buttons.clone();
|
|
||||||
let dialog = AsyncMessageDialog::from(dialog).show();
|
let dialog = AsyncMessageDialog::from(dialog).show();
|
||||||
std::thread::spawn(move || {
|
std::thread::spawn(move || f(tauri::async_runtime::block_on(dialog)));
|
||||||
let result = tauri::async_runtime::block_on(dialog);
|
|
||||||
// on Linux rfd does not return rfd::MessageDialogResult::Custom, so we must map manually
|
|
||||||
let result = match (result, buttons) {
|
|
||||||
(rfd::MessageDialogResult::Ok, MessageDialogButtons::OkCustom(s)) => {
|
|
||||||
rfd::MessageDialogResult::Custom(s)
|
|
||||||
}
|
|
||||||
(
|
|
||||||
rfd::MessageDialogResult::Ok,
|
|
||||||
MessageDialogButtons::OkCancelCustom(ok, _cancel),
|
|
||||||
) => rfd::MessageDialogResult::Custom(ok),
|
|
||||||
(
|
|
||||||
rfd::MessageDialogResult::Cancel,
|
|
||||||
MessageDialogButtons::OkCancelCustom(_ok, cancel),
|
|
||||||
) => rfd::MessageDialogResult::Custom(cancel),
|
|
||||||
(
|
|
||||||
rfd::MessageDialogResult::Yes,
|
|
||||||
MessageDialogButtons::YesNoCancelCustom(yes, _no, _cancel),
|
|
||||||
) => rfd::MessageDialogResult::Custom(yes),
|
|
||||||
(
|
|
||||||
rfd::MessageDialogResult::No,
|
|
||||||
MessageDialogButtons::YesNoCancelCustom(_yes, no, _cancel),
|
|
||||||
) => rfd::MessageDialogResult::Custom(no),
|
|
||||||
(
|
|
||||||
rfd::MessageDialogResult::Cancel,
|
|
||||||
MessageDialogButtons::YesNoCancelCustom(_yes, _no, cancel),
|
|
||||||
) => rfd::MessageDialogResult::Custom(cancel),
|
|
||||||
(result, _) => result,
|
|
||||||
};
|
|
||||||
f(result);
|
|
||||||
});
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -216,7 +216,6 @@ pub(crate) struct MessageDialogPayload<'a> {
|
|||||||
message: &'a String,
|
message: &'a String,
|
||||||
kind: &'a MessageDialogKind,
|
kind: &'a MessageDialogKind,
|
||||||
ok_button_label: Option<&'a str>,
|
ok_button_label: Option<&'a str>,
|
||||||
no_button_label: Option<&'a str>,
|
|
||||||
cancel_button_label: Option<&'a str>,
|
cancel_button_label: Option<&'a str>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -239,17 +238,13 @@ impl<R: Runtime> MessageDialogBuilder<R> {
|
|||||||
|
|
||||||
#[cfg(mobile)]
|
#[cfg(mobile)]
|
||||||
pub(crate) fn payload(&self) -> MessageDialogPayload<'_> {
|
pub(crate) fn payload(&self) -> MessageDialogPayload<'_> {
|
||||||
let (ok_button_label, no_button_label, cancel_button_label) = match &self.buttons {
|
let (ok_button_label, cancel_button_label) = match &self.buttons {
|
||||||
MessageDialogButtons::Ok => (Some(OK), None, None),
|
MessageDialogButtons::Ok => (Some(OK), None),
|
||||||
MessageDialogButtons::OkCancel => (Some(OK), None, Some(CANCEL)),
|
MessageDialogButtons::OkCancel => (Some(OK), Some(CANCEL)),
|
||||||
MessageDialogButtons::YesNo => (Some(YES), Some(NO), None),
|
MessageDialogButtons::YesNo => (Some(YES), Some(NO)),
|
||||||
MessageDialogButtons::YesNoCancel => (Some(YES), Some(NO), Some(CANCEL)),
|
MessageDialogButtons::OkCustom(ok) => (Some(ok.as_str()), Some(CANCEL)),
|
||||||
MessageDialogButtons::OkCustom(ok) => (Some(ok.as_str()), None, None),
|
|
||||||
MessageDialogButtons::OkCancelCustom(ok, cancel) => {
|
MessageDialogButtons::OkCancelCustom(ok, cancel) => {
|
||||||
(Some(ok.as_str()), None, Some(cancel.as_str()))
|
(Some(ok.as_str()), Some(cancel.as_str()))
|
||||||
}
|
|
||||||
MessageDialogButtons::YesNoCancelCustom(yes, no, cancel) => {
|
|
||||||
(Some(yes.as_str()), Some(no.as_str()), Some(cancel.as_str()))
|
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
MessageDialogPayload {
|
MessageDialogPayload {
|
||||||
@@ -257,7 +252,6 @@ impl<R: Runtime> MessageDialogBuilder<R> {
|
|||||||
message: &self.message,
|
message: &self.message,
|
||||||
kind: &self.kind,
|
kind: &self.kind,
|
||||||
ok_button_label,
|
ok_button_label,
|
||||||
no_button_label,
|
|
||||||
cancel_button_label,
|
cancel_button_label,
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -301,55 +295,16 @@ impl<R: Runtime> MessageDialogBuilder<R> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/// Shows a message dialog
|
/// Shows a message dialog
|
||||||
///
|
|
||||||
/// Returns `true` if the user pressed the OK/Yes button,
|
|
||||||
pub fn show<F: FnOnce(bool) + Send + 'static>(self, f: F) {
|
pub fn show<F: FnOnce(bool) + Send + 'static>(self, f: F) {
|
||||||
let ok_label = match &self.buttons {
|
|
||||||
MessageDialogButtons::OkCustom(ok) => Some(ok.clone()),
|
|
||||||
MessageDialogButtons::OkCancelCustom(ok, _) => Some(ok.clone()),
|
|
||||||
MessageDialogButtons::YesNoCancelCustom(yes, _, _) => Some(yes.clone()),
|
|
||||||
_ => None,
|
|
||||||
};
|
|
||||||
|
|
||||||
show_message_dialog(self, move |res| {
|
|
||||||
let sucess = match res {
|
|
||||||
MessageDialogResult::Ok | MessageDialogResult::Yes => true,
|
|
||||||
MessageDialogResult::Custom(s) => {
|
|
||||||
ok_label.map_or(s == OK, |ok_label| ok_label == s)
|
|
||||||
}
|
|
||||||
_ => false,
|
|
||||||
};
|
|
||||||
|
|
||||||
f(sucess)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Shows a message dialog and returns the button that was pressed.
|
|
||||||
///
|
|
||||||
/// Returns a [`MessageDialogResult`] enum that indicates which button was pressed.
|
|
||||||
pub fn show_with_result<F: FnOnce(MessageDialogResult) + Send + 'static>(self, f: F) {
|
|
||||||
show_message_dialog(self, f)
|
show_message_dialog(self, f)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Shows a message dialog.
|
/// Shows a message dialog.
|
||||||
///
|
|
||||||
/// Returns `true` if the user pressed the OK/Yes button,
|
|
||||||
///
|
|
||||||
/// This is a blocking operation,
|
/// This is a blocking operation,
|
||||||
/// and should *NOT* be used when running on the main thread context.
|
/// and should *NOT* be used when running on the main thread context.
|
||||||
pub fn blocking_show(self) -> bool {
|
pub fn blocking_show(self) -> bool {
|
||||||
blocking_fn!(self, show)
|
blocking_fn!(self, show)
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Shows a message dialog and returns the button that was pressed.
|
|
||||||
///
|
|
||||||
/// Returns a [`MessageDialogResult`] enum that indicates which button was pressed.
|
|
||||||
///
|
|
||||||
/// This is a blocking operation,
|
|
||||||
/// and should *NOT* be used when running on the main thread context.
|
|
||||||
pub fn blocking_show_with_result(self) -> MessageDialogResult {
|
|
||||||
blocking_fn!(self, show_with_result)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
#[derive(Debug, Serialize)]
|
#[derive(Debug, Serialize)]
|
||||||
pub(crate) struct Filter {
|
pub(crate) struct Filter {
|
||||||
|
|||||||
@@ -8,7 +8,7 @@ use tauri::{
|
|||||||
AppHandle, Runtime,
|
AppHandle, Runtime,
|
||||||
};
|
};
|
||||||
|
|
||||||
use crate::{FileDialogBuilder, FilePath, MessageDialogBuilder, MessageDialogResult};
|
use crate::{FileDialogBuilder, FilePath, MessageDialogBuilder};
|
||||||
|
|
||||||
#[cfg(target_os = "android")]
|
#[cfg(target_os = "android")]
|
||||||
const PLUGIN_IDENTIFIER: &str = "app.tauri.dialog";
|
const PLUGIN_IDENTIFIER: &str = "app.tauri.dialog";
|
||||||
@@ -107,11 +107,13 @@ pub fn save_file<R: Runtime, F: FnOnce(Option<FilePath>) + Send + 'static>(
|
|||||||
|
|
||||||
#[derive(Debug, Deserialize)]
|
#[derive(Debug, Deserialize)]
|
||||||
struct ShowMessageDialogResponse {
|
struct ShowMessageDialogResponse {
|
||||||
value: String,
|
#[allow(dead_code)]
|
||||||
|
cancelled: bool,
|
||||||
|
value: bool,
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Shows a message dialog
|
/// Shows a message dialog
|
||||||
pub fn show_message_dialog<R: Runtime, F: FnOnce(MessageDialogResult) + Send + 'static>(
|
pub fn show_message_dialog<R: Runtime, F: FnOnce(bool) + Send + 'static>(
|
||||||
dialog: MessageDialogBuilder<R>,
|
dialog: MessageDialogBuilder<R>,
|
||||||
f: F,
|
f: F,
|
||||||
) {
|
) {
|
||||||
@@ -120,8 +122,6 @@ pub fn show_message_dialog<R: Runtime, F: FnOnce(MessageDialogResult) + Send + '
|
|||||||
.dialog
|
.dialog
|
||||||
.0
|
.0
|
||||||
.run_mobile_plugin::<ShowMessageDialogResponse>("showMessageDialog", dialog.payload());
|
.run_mobile_plugin::<ShowMessageDialogResponse>("showMessageDialog", dialog.payload());
|
||||||
|
f(res.map(|r| r.value).unwrap_or_default())
|
||||||
let res = res.map(|res| res.value.into());
|
|
||||||
f(res.unwrap_or_default())
|
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ impl Serialize for MessageDialogKind {
|
|||||||
|
|
||||||
/// Set of button that will be displayed on the dialog
|
/// Set of button that will be displayed on the dialog
|
||||||
#[non_exhaustive]
|
#[non_exhaustive]
|
||||||
#[derive(Debug, Default, Clone, Serialize, Deserialize)]
|
#[derive(Debug, Default, Clone)]
|
||||||
pub enum MessageDialogButtons {
|
pub enum MessageDialogButtons {
|
||||||
#[default]
|
#[default]
|
||||||
/// A single `Ok` button with OS default dialog text
|
/// A single `Ok` button with OS default dialog text
|
||||||
@@ -61,49 +61,8 @@ pub enum MessageDialogButtons {
|
|||||||
OkCancel,
|
OkCancel,
|
||||||
/// 2 buttons `Yes` and `No` with OS default dialog texts
|
/// 2 buttons `Yes` and `No` with OS default dialog texts
|
||||||
YesNo,
|
YesNo,
|
||||||
/// 3 buttons `Yes`, `No` and `Cancel` with OS default dialog texts
|
|
||||||
YesNoCancel,
|
|
||||||
/// A single `Ok` button with custom text
|
/// A single `Ok` button with custom text
|
||||||
OkCustom(String),
|
OkCustom(String),
|
||||||
/// 2 buttons `Ok` and `Cancel` with custom texts
|
/// 2 buttons `Ok` and `Cancel` with custom texts
|
||||||
OkCancelCustom(String, String),
|
OkCancelCustom(String, String),
|
||||||
/// 3 buttons `Yes`, `No` and `Cancel` with custom texts
|
|
||||||
YesNoCancelCustom(String, String, String),
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Result of a message dialog
|
|
||||||
#[derive(Debug, Default, Clone, PartialEq, Eq, Deserialize, Serialize)]
|
|
||||||
pub enum MessageDialogResult {
|
|
||||||
Yes,
|
|
||||||
No,
|
|
||||||
Ok,
|
|
||||||
#[default]
|
|
||||||
Cancel,
|
|
||||||
#[serde(untagged)]
|
|
||||||
Custom(String),
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(desktop)]
|
|
||||||
impl From<rfd::MessageDialogResult> for MessageDialogResult {
|
|
||||||
fn from(result: rfd::MessageDialogResult) -> Self {
|
|
||||||
match result {
|
|
||||||
rfd::MessageDialogResult::Yes => Self::Yes,
|
|
||||||
rfd::MessageDialogResult::No => Self::No,
|
|
||||||
rfd::MessageDialogResult::Ok => Self::Ok,
|
|
||||||
rfd::MessageDialogResult::Cancel => Self::Cancel,
|
|
||||||
rfd::MessageDialogResult::Custom(s) => Self::Custom(s),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<String> for MessageDialogResult {
|
|
||||||
fn from(value: String) -> Self {
|
|
||||||
match value.as_str() {
|
|
||||||
"Yes" => Self::Yes,
|
|
||||||
"No" => Self::No,
|
|
||||||
"Ok" => Self::Ok,
|
|
||||||
"Cancel" => Self::Cancel,
|
|
||||||
_ => Self::Custom(value),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,19 +1,5 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## \[2.4.4]
|
|
||||||
|
|
||||||
- [`93426f85`](https://github.com/tauri-apps/plugins-workspace/commit/93426f85120f49beb9f40222bff45185a32d54a9) Fixed an issue that caused docs.rs builds to fail. No user facing changes.
|
|
||||||
|
|
||||||
## \[2.4.3]
|
|
||||||
|
|
||||||
- [`6c9b61fb`](https://github.com/tauri-apps/plugins-workspace/commit/6c9b61fb658145d13893626112fc489f7458aa17) ([#3039](https://github.com/tauri-apps/plugins-workspace/pull/3039) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) On Android, updated compileSdk to 36.
|
|
||||||
- [`6b5b1053`](https://github.com/tauri-apps/plugins-workspace/commit/6b5b1053ba8aeb789dd5cb5fb05b7e98f3b8de0b) ([#1939](https://github.com/tauri-apps/plugins-workspace/pull/1939) by [@amrbashir](https://github.com/tauri-apps/plugins-workspace/../../amrbashir)) Enhance error messages.
|
|
||||||
|
|
||||||
## \[2.4.2]
|
|
||||||
|
|
||||||
- [`4eb36b0f`](https://github.com/tauri-apps/plugins-workspace/commit/4eb36b0ff57acb0bb1b911c583efa3bf2f56aa32) ([#2907](https://github.com/tauri-apps/plugins-workspace/pull/2907) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) Fixed calling `writeFile` with `data: ReadableStream` throws `Invalid argument`
|
|
||||||
- [`515182a1`](https://github.com/tauri-apps/plugins-workspace/commit/515182a179d4439079b2b7f6927555ba5ab0b035) ([#2915](https://github.com/tauri-apps/plugins-workspace/pull/2915) by [@samhinshaw](https://github.com/tauri-apps/plugins-workspace/../../samhinshaw)) `readFile` now returns a more specific type `Promise<Uint8Array<ArrayBuffer>>` instead of the default `Promise<Uint8Array<ArrayBufferLike>`
|
|
||||||
|
|
||||||
## \[2.4.1]
|
## \[2.4.1]
|
||||||
|
|
||||||
- [`44a1f659`](https://github.com/tauri-apps/plugins-workspace/commit/44a1f659125a341191420e650608b0b6ff316a0e) ([#2846](https://github.com/tauri-apps/plugins-workspace/pull/2846) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) Fix `writeFile` doesn't create a new file by default when the data is a `ReadableStream`
|
- [`44a1f659`](https://github.com/tauri-apps/plugins-workspace/commit/44a1f659125a341191420e650608b0b6ff316a0e) ([#2846](https://github.com/tauri-apps/plugins-workspace/pull/2846) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) Fix `writeFile` doesn't create a new file by default when the data is a `ReadableStream`
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "tauri-plugin-fs"
|
name = "tauri-plugin-fs"
|
||||||
version = "2.4.4"
|
version = "2.4.1"
|
||||||
description = "Access the file system."
|
description = "Access the file system."
|
||||||
authors = { workspace = true }
|
authors = { workspace = true }
|
||||||
license = { workspace = true }
|
license = { workspace = true }
|
||||||
@@ -9,6 +9,10 @@ rust-version = { workspace = true }
|
|||||||
repository = { workspace = true }
|
repository = { workspace = true }
|
||||||
links = "tauri-plugin-fs"
|
links = "tauri-plugin-fs"
|
||||||
|
|
||||||
|
[package.metadata.docs.rs]
|
||||||
|
rustc-args = ["--cfg", "docsrs"]
|
||||||
|
rustdoc-args = ["--cfg", "docsrs"]
|
||||||
|
|
||||||
[package.metadata.platforms.support]
|
[package.metadata.platforms.support]
|
||||||
windows = { level = "full", notes = "Apps installed via MSI or NSIS in `perMachine` and `both` mode require admin permissions for write access in `$RESOURCES` folder" }
|
windows = { level = "full", notes = "Apps installed via MSI or NSIS in `perMachine` and `both` mode require admin permissions for write access in `$RESOURCES` folder" }
|
||||||
linux = { level = "full", notes = "No write access to `$RESOURCES` folder" }
|
linux = { level = "full", notes = "No write access to `$RESOURCES` folder" }
|
||||||
@@ -20,7 +24,7 @@ ios = { level = "partial", notes = "Access is restricted to Application folder b
|
|||||||
tauri-plugin = { workspace = true, features = ["build"] }
|
tauri-plugin = { workspace = true, features = ["build"] }
|
||||||
schemars = { workspace = true }
|
schemars = { workspace = true }
|
||||||
serde = { workspace = true }
|
serde = { workspace = true }
|
||||||
toml = "0.9"
|
toml = "0.8"
|
||||||
tauri-utils = { workspace = true, features = ["build"] }
|
tauri-utils = { workspace = true, features = ["build"] }
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
|
|||||||
@@ -5,10 +5,11 @@ plugins {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = "com.plugin.fs"
|
namespace = "com.plugin.fs"
|
||||||
compileSdk = 36
|
compileSdk = 34
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdk = 21
|
minSdk = 21
|
||||||
|
targetSdk = 34
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
consumerProguardFiles("consumer-rules.pro")
|
consumerProguardFiles("consumer-rules.pro")
|
||||||
|
|||||||
@@ -739,7 +739,7 @@ interface ReadFileOptions {
|
|||||||
async function readFile(
|
async function readFile(
|
||||||
path: string | URL,
|
path: string | URL,
|
||||||
options?: ReadFileOptions
|
options?: ReadFileOptions
|
||||||
): Promise<Uint8Array<ArrayBuffer>> {
|
): Promise<Uint8Array> {
|
||||||
if (path instanceof URL && path.protocol !== 'file:') {
|
if (path instanceof URL && path.protocol !== 'file:') {
|
||||||
throw new TypeError('Must be a file URL.')
|
throw new TypeError('Must be a file URL.')
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@tauri-apps/plugin-fs",
|
"name": "@tauri-apps/plugin-fs",
|
||||||
"version": "2.4.4",
|
"version": "2.4.1",
|
||||||
"description": "Access the file system.",
|
"description": "Access the file system.",
|
||||||
"license": "MIT OR Apache-2.0",
|
"license": "MIT OR Apache-2.0",
|
||||||
"authors": [
|
"authors": [
|
||||||
@@ -25,6 +25,6 @@
|
|||||||
"LICENSE"
|
"LICENSE"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tauri-apps/api": "^2.8.0"
|
"@tauri-apps/api": "^2.6.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -3748,28 +3748,6 @@ This enables all index or metadata related commands without any pre-configured a
|
|||||||
|
|
||||||
An empty permission you can use to modify the global scope.
|
An empty permission you can use to modify the global scope.
|
||||||
|
|
||||||
## Example
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"identifier": "read-documents",
|
|
||||||
"windows": ["main"],
|
|
||||||
"permissions": [
|
|
||||||
"fs:allow-read",
|
|
||||||
{
|
|
||||||
"identifier": "fs:scope",
|
|
||||||
"allow": [
|
|
||||||
"$APPDATA/documents/**/*"
|
|
||||||
],
|
|
||||||
"deny": [
|
|
||||||
"$APPDATA/documents/secret.txt"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
|
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
|
|||||||
@@ -2005,10 +2005,10 @@
|
|||||||
"markdownDescription": "This enables all index or metadata related commands without any pre-configured accessible paths."
|
"markdownDescription": "This enables all index or metadata related commands without any pre-configured accessible paths."
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n \"identifier\": \"read-documents\",\n \"windows\": [\"main\"],\n \"permissions\": [\n \"fs:allow-read\",\n {\n \"identifier\": \"fs:scope\",\n \"allow\": [\n \"$APPDATA/documents/**/*\"\n ],\n \"deny\": [\n \"$APPDATA/documents/secret.txt\"\n ]\n }\n ]\n}\n```\n",
|
"description": "An empty permission you can use to modify the global scope.",
|
||||||
"type": "string",
|
"type": "string",
|
||||||
"const": "scope",
|
"const": "scope",
|
||||||
"markdownDescription": "An empty permission you can use to modify the global scope.\n\n## Example\n\n```json\n{\n \"identifier\": \"read-documents\",\n \"windows\": [\"main\"],\n \"permissions\": [\n \"fs:allow-read\",\n {\n \"identifier\": \"fs:scope\",\n \"allow\": [\n \"$APPDATA/documents/**/*\"\n ],\n \"deny\": [\n \"$APPDATA/documents/secret.txt\"\n ]\n }\n ]\n}\n```\n"
|
"markdownDescription": "An empty permission you can use to modify the global scope."
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"description": "This enables all write related commands without any pre-configured accessible paths.",
|
"description": "This enables all write related commands without any pre-configured accessible paths.",
|
||||||
|
|||||||
@@ -2,27 +2,4 @@
|
|||||||
|
|
||||||
[[permission]]
|
[[permission]]
|
||||||
identifier = "scope"
|
identifier = "scope"
|
||||||
description = """
|
description = "An empty permission you can use to modify the global scope."
|
||||||
An empty permission you can use to modify the global scope.
|
|
||||||
|
|
||||||
## Example
|
|
||||||
|
|
||||||
```json
|
|
||||||
{
|
|
||||||
"identifier": "read-documents",
|
|
||||||
"windows": ["main"],
|
|
||||||
"permissions": [
|
|
||||||
"fs:allow-read",
|
|
||||||
{
|
|
||||||
"identifier": "fs:scope",
|
|
||||||
"allow": [
|
|
||||||
"$APPDATA/documents/**/*"
|
|
||||||
],
|
|
||||||
"deny": [
|
|
||||||
"$APPDATA/documents/secret.txt"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
]
|
|
||||||
}
|
|
||||||
```
|
|
||||||
"""
|
|
||||||
|
|||||||
+18
-110
@@ -85,7 +85,6 @@ pub fn create<R: Runtime>(
|
|||||||
options: Option<BaseOptions>,
|
options: Option<BaseOptions>,
|
||||||
) -> CommandResult<ResourceId> {
|
) -> CommandResult<ResourceId> {
|
||||||
let resolved_path = resolve_path(
|
let resolved_path = resolve_path(
|
||||||
"create",
|
|
||||||
&webview,
|
&webview,
|
||||||
&global_scope,
|
&global_scope,
|
||||||
&command_scope,
|
&command_scope,
|
||||||
@@ -120,7 +119,6 @@ pub fn open<R: Runtime>(
|
|||||||
options: Option<OpenOptions>,
|
options: Option<OpenOptions>,
|
||||||
) -> CommandResult<ResourceId> {
|
) -> CommandResult<ResourceId> {
|
||||||
let (file, _path) = resolve_file(
|
let (file, _path) = resolve_file(
|
||||||
"open",
|
|
||||||
&webview,
|
&webview,
|
||||||
&global_scope,
|
&global_scope,
|
||||||
&command_scope,
|
&command_scope,
|
||||||
@@ -169,7 +167,6 @@ pub async fn copy_file<R: Runtime>(
|
|||||||
options: Option<CopyFileOptions>,
|
options: Option<CopyFileOptions>,
|
||||||
) -> CommandResult<()> {
|
) -> CommandResult<()> {
|
||||||
let resolved_from_path = resolve_path(
|
let resolved_from_path = resolve_path(
|
||||||
"copy-file",
|
|
||||||
&webview,
|
&webview,
|
||||||
&global_scope,
|
&global_scope,
|
||||||
&command_scope,
|
&command_scope,
|
||||||
@@ -177,7 +174,6 @@ pub async fn copy_file<R: Runtime>(
|
|||||||
options.as_ref().and_then(|o| o.from_path_base_dir),
|
options.as_ref().and_then(|o| o.from_path_base_dir),
|
||||||
)?;
|
)?;
|
||||||
let resolved_to_path = resolve_path(
|
let resolved_to_path = resolve_path(
|
||||||
"copy-file",
|
|
||||||
&webview,
|
&webview,
|
||||||
&global_scope,
|
&global_scope,
|
||||||
&command_scope,
|
&command_scope,
|
||||||
@@ -212,7 +208,6 @@ pub fn mkdir<R: Runtime>(
|
|||||||
options: Option<MkdirOptions>,
|
options: Option<MkdirOptions>,
|
||||||
) -> CommandResult<()> {
|
) -> CommandResult<()> {
|
||||||
let resolved_path = resolve_path(
|
let resolved_path = resolve_path(
|
||||||
"mkdir",
|
|
||||||
&webview,
|
&webview,
|
||||||
&global_scope,
|
&global_scope,
|
||||||
&command_scope,
|
&command_scope,
|
||||||
@@ -260,7 +255,6 @@ pub async fn read_dir<R: Runtime>(
|
|||||||
options: Option<BaseOptions>,
|
options: Option<BaseOptions>,
|
||||||
) -> CommandResult<Vec<DirEntry>> {
|
) -> CommandResult<Vec<DirEntry>> {
|
||||||
let resolved_path = resolve_path(
|
let resolved_path = resolve_path(
|
||||||
"read-dir",
|
|
||||||
&webview,
|
&webview,
|
||||||
&global_scope,
|
&global_scope,
|
||||||
&command_scope,
|
&command_scope,
|
||||||
@@ -337,8 +331,8 @@ pub async fn read<R: Runtime>(
|
|||||||
Ok(tauri::ipc::Response::new(data))
|
Ok(tauri::ipc::Response::new(data))
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn read_file_inner<R: Runtime>(
|
#[tauri::command]
|
||||||
permission: &str,
|
pub async fn read_file<R: Runtime>(
|
||||||
webview: Webview<R>,
|
webview: Webview<R>,
|
||||||
global_scope: GlobalScope<Entry>,
|
global_scope: GlobalScope<Entry>,
|
||||||
command_scope: CommandScope<Entry>,
|
command_scope: CommandScope<Entry>,
|
||||||
@@ -346,7 +340,6 @@ async fn read_file_inner<R: Runtime>(
|
|||||||
options: Option<BaseOptions>,
|
options: Option<BaseOptions>,
|
||||||
) -> CommandResult<tauri::ipc::Response> {
|
) -> CommandResult<tauri::ipc::Response> {
|
||||||
let (mut file, path) = resolve_file(
|
let (mut file, path) = resolve_file(
|
||||||
permission,
|
|
||||||
&webview,
|
&webview,
|
||||||
&global_scope,
|
&global_scope,
|
||||||
&command_scope,
|
&command_scope,
|
||||||
@@ -374,25 +367,6 @@ async fn read_file_inner<R: Runtime>(
|
|||||||
Ok(tauri::ipc::Response::new(contents))
|
Ok(tauri::ipc::Response::new(contents))
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
pub async fn read_file<R: Runtime>(
|
|
||||||
webview: Webview<R>,
|
|
||||||
global_scope: GlobalScope<Entry>,
|
|
||||||
command_scope: CommandScope<Entry>,
|
|
||||||
path: SafeFilePath,
|
|
||||||
options: Option<BaseOptions>,
|
|
||||||
) -> CommandResult<tauri::ipc::Response> {
|
|
||||||
read_file_inner(
|
|
||||||
"read-file",
|
|
||||||
webview,
|
|
||||||
global_scope,
|
|
||||||
command_scope,
|
|
||||||
path,
|
|
||||||
options,
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO, remove in v3, rely on `read_file` command instead
|
// TODO, remove in v3, rely on `read_file` command instead
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn read_text_file<R: Runtime>(
|
pub async fn read_text_file<R: Runtime>(
|
||||||
@@ -402,15 +376,7 @@ pub async fn read_text_file<R: Runtime>(
|
|||||||
path: SafeFilePath,
|
path: SafeFilePath,
|
||||||
options: Option<BaseOptions>,
|
options: Option<BaseOptions>,
|
||||||
) -> CommandResult<tauri::ipc::Response> {
|
) -> CommandResult<tauri::ipc::Response> {
|
||||||
read_file_inner(
|
read_file(webview, global_scope, command_scope, path, options).await
|
||||||
"read-text-file",
|
|
||||||
webview,
|
|
||||||
global_scope,
|
|
||||||
command_scope,
|
|
||||||
path,
|
|
||||||
options,
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
@@ -422,7 +388,6 @@ pub fn read_text_file_lines<R: Runtime>(
|
|||||||
options: Option<BaseOptions>,
|
options: Option<BaseOptions>,
|
||||||
) -> CommandResult<ResourceId> {
|
) -> CommandResult<ResourceId> {
|
||||||
let resolved_path = resolve_path(
|
let resolved_path = resolve_path(
|
||||||
"read-text-file-lines",
|
|
||||||
&webview,
|
&webview,
|
||||||
&global_scope,
|
&global_scope,
|
||||||
&command_scope,
|
&command_scope,
|
||||||
@@ -487,7 +452,6 @@ pub fn remove<R: Runtime>(
|
|||||||
options: Option<RemoveOptions>,
|
options: Option<RemoveOptions>,
|
||||||
) -> CommandResult<()> {
|
) -> CommandResult<()> {
|
||||||
let resolved_path = resolve_path(
|
let resolved_path = resolve_path(
|
||||||
"remove",
|
|
||||||
&webview,
|
&webview,
|
||||||
&global_scope,
|
&global_scope,
|
||||||
&command_scope,
|
&command_scope,
|
||||||
@@ -557,7 +521,6 @@ pub fn rename<R: Runtime>(
|
|||||||
options: Option<RenameOptions>,
|
options: Option<RenameOptions>,
|
||||||
) -> CommandResult<()> {
|
) -> CommandResult<()> {
|
||||||
let resolved_old_path = resolve_path(
|
let resolved_old_path = resolve_path(
|
||||||
"rename",
|
|
||||||
&webview,
|
&webview,
|
||||||
&global_scope,
|
&global_scope,
|
||||||
&command_scope,
|
&command_scope,
|
||||||
@@ -565,7 +528,6 @@ pub fn rename<R: Runtime>(
|
|||||||
options.as_ref().and_then(|o| o.old_path_base_dir),
|
options.as_ref().and_then(|o| o.old_path_base_dir),
|
||||||
)?;
|
)?;
|
||||||
let resolved_new_path = resolve_path(
|
let resolved_new_path = resolve_path(
|
||||||
"rename",
|
|
||||||
&webview,
|
&webview,
|
||||||
&global_scope,
|
&global_scope,
|
||||||
&command_scope,
|
&command_scope,
|
||||||
@@ -613,7 +575,6 @@ pub async fn seek<R: Runtime>(
|
|||||||
|
|
||||||
#[cfg(target_os = "android")]
|
#[cfg(target_os = "android")]
|
||||||
fn get_metadata<R: Runtime, F: FnOnce(&PathBuf) -> std::io::Result<std::fs::Metadata>>(
|
fn get_metadata<R: Runtime, F: FnOnce(&PathBuf) -> std::io::Result<std::fs::Metadata>>(
|
||||||
permission: &str,
|
|
||||||
metadata_fn: F,
|
metadata_fn: F,
|
||||||
webview: &Webview<R>,
|
webview: &Webview<R>,
|
||||||
global_scope: &GlobalScope<Entry>,
|
global_scope: &GlobalScope<Entry>,
|
||||||
@@ -624,7 +585,6 @@ fn get_metadata<R: Runtime, F: FnOnce(&PathBuf) -> std::io::Result<std::fs::Meta
|
|||||||
match path {
|
match path {
|
||||||
SafeFilePath::Url(url) => {
|
SafeFilePath::Url(url) => {
|
||||||
let (file, path) = resolve_file(
|
let (file, path) = resolve_file(
|
||||||
permission,
|
|
||||||
webview,
|
webview,
|
||||||
global_scope,
|
global_scope,
|
||||||
command_scope,
|
command_scope,
|
||||||
@@ -646,7 +606,6 @@ fn get_metadata<R: Runtime, F: FnOnce(&PathBuf) -> std::io::Result<std::fs::Meta
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
SafeFilePath::Path(p) => get_fs_metadata(
|
SafeFilePath::Path(p) => get_fs_metadata(
|
||||||
permission,
|
|
||||||
metadata_fn,
|
metadata_fn,
|
||||||
webview,
|
webview,
|
||||||
global_scope,
|
global_scope,
|
||||||
@@ -659,7 +618,6 @@ fn get_metadata<R: Runtime, F: FnOnce(&PathBuf) -> std::io::Result<std::fs::Meta
|
|||||||
|
|
||||||
#[cfg(not(target_os = "android"))]
|
#[cfg(not(target_os = "android"))]
|
||||||
fn get_metadata<R: Runtime, F: FnOnce(&PathBuf) -> std::io::Result<std::fs::Metadata>>(
|
fn get_metadata<R: Runtime, F: FnOnce(&PathBuf) -> std::io::Result<std::fs::Metadata>>(
|
||||||
permission: &str,
|
|
||||||
metadata_fn: F,
|
metadata_fn: F,
|
||||||
webview: &Webview<R>,
|
webview: &Webview<R>,
|
||||||
global_scope: &GlobalScope<Entry>,
|
global_scope: &GlobalScope<Entry>,
|
||||||
@@ -668,7 +626,6 @@ fn get_metadata<R: Runtime, F: FnOnce(&PathBuf) -> std::io::Result<std::fs::Meta
|
|||||||
options: Option<BaseOptions>,
|
options: Option<BaseOptions>,
|
||||||
) -> CommandResult<std::fs::Metadata> {
|
) -> CommandResult<std::fs::Metadata> {
|
||||||
get_fs_metadata(
|
get_fs_metadata(
|
||||||
permission,
|
|
||||||
metadata_fn,
|
metadata_fn,
|
||||||
webview,
|
webview,
|
||||||
global_scope,
|
global_scope,
|
||||||
@@ -679,7 +636,6 @@ fn get_metadata<R: Runtime, F: FnOnce(&PathBuf) -> std::io::Result<std::fs::Meta
|
|||||||
}
|
}
|
||||||
|
|
||||||
fn get_fs_metadata<R: Runtime, F: FnOnce(&PathBuf) -> std::io::Result<std::fs::Metadata>>(
|
fn get_fs_metadata<R: Runtime, F: FnOnce(&PathBuf) -> std::io::Result<std::fs::Metadata>>(
|
||||||
permission: &str,
|
|
||||||
metadata_fn: F,
|
metadata_fn: F,
|
||||||
webview: &Webview<R>,
|
webview: &Webview<R>,
|
||||||
global_scope: &GlobalScope<Entry>,
|
global_scope: &GlobalScope<Entry>,
|
||||||
@@ -688,7 +644,6 @@ fn get_fs_metadata<R: Runtime, F: FnOnce(&PathBuf) -> std::io::Result<std::fs::M
|
|||||||
options: Option<BaseOptions>,
|
options: Option<BaseOptions>,
|
||||||
) -> CommandResult<std::fs::Metadata> {
|
) -> CommandResult<std::fs::Metadata> {
|
||||||
let resolved_path = resolve_path(
|
let resolved_path = resolve_path(
|
||||||
permission,
|
|
||||||
webview,
|
webview,
|
||||||
global_scope,
|
global_scope,
|
||||||
command_scope,
|
command_scope,
|
||||||
@@ -713,7 +668,6 @@ pub fn stat<R: Runtime>(
|
|||||||
options: Option<BaseOptions>,
|
options: Option<BaseOptions>,
|
||||||
) -> CommandResult<FileInfo> {
|
) -> CommandResult<FileInfo> {
|
||||||
let metadata = get_metadata(
|
let metadata = get_metadata(
|
||||||
"stat",
|
|
||||||
|p| std::fs::metadata(p),
|
|p| std::fs::metadata(p),
|
||||||
&webview,
|
&webview,
|
||||||
&global_scope,
|
&global_scope,
|
||||||
@@ -734,7 +688,6 @@ pub fn lstat<R: Runtime>(
|
|||||||
options: Option<BaseOptions>,
|
options: Option<BaseOptions>,
|
||||||
) -> CommandResult<FileInfo> {
|
) -> CommandResult<FileInfo> {
|
||||||
let metadata = get_metadata(
|
let metadata = get_metadata(
|
||||||
"lstat",
|
|
||||||
|p| std::fs::symlink_metadata(p),
|
|p| std::fs::symlink_metadata(p),
|
||||||
&webview,
|
&webview,
|
||||||
&global_scope,
|
&global_scope,
|
||||||
@@ -763,7 +716,6 @@ pub async fn truncate<R: Runtime>(
|
|||||||
options: Option<BaseOptions>,
|
options: Option<BaseOptions>,
|
||||||
) -> CommandResult<()> {
|
) -> CommandResult<()> {
|
||||||
let resolved_path = resolve_path(
|
let resolved_path = resolve_path(
|
||||||
"truncate",
|
|
||||||
&webview,
|
&webview,
|
||||||
&global_scope,
|
&global_scope,
|
||||||
&command_scope,
|
&command_scope,
|
||||||
@@ -832,13 +784,23 @@ fn default_create_value() -> bool {
|
|||||||
true
|
true
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn write_file_inner<R: Runtime>(
|
#[tauri::command]
|
||||||
permission: &str,
|
pub async fn write_file<R: Runtime>(
|
||||||
webview: Webview<R>,
|
webview: Webview<R>,
|
||||||
global_scope: GlobalScope<Entry>,
|
global_scope: GlobalScope<Entry>,
|
||||||
command_scope: CommandScope<Entry>,
|
command_scope: CommandScope<Entry>,
|
||||||
request: tauri::ipc::Request<'_>,
|
request: tauri::ipc::Request<'_>,
|
||||||
) -> CommandResult<()> {
|
) -> CommandResult<()> {
|
||||||
|
let data = match request.body() {
|
||||||
|
tauri::ipc::InvokeBody::Raw(data) => Cow::Borrowed(data),
|
||||||
|
tauri::ipc::InvokeBody::Json(serde_json::Value::Array(data)) => Cow::Owned(
|
||||||
|
data.iter()
|
||||||
|
.flat_map(|v| v.as_number().and_then(|v| v.as_u64().map(|v| v as u8)))
|
||||||
|
.collect(),
|
||||||
|
),
|
||||||
|
_ => return Err(anyhow::anyhow!("unexpected invoke body").into()),
|
||||||
|
};
|
||||||
|
|
||||||
let path = request
|
let path = request
|
||||||
.headers()
|
.headers()
|
||||||
.get("path")
|
.get("path")
|
||||||
@@ -849,7 +811,6 @@ async fn write_file_inner<R: Runtime>(
|
|||||||
.map_err(|_| anyhow::anyhow!("path is not a valid UTF-8").into())
|
.map_err(|_| anyhow::anyhow!("path is not a valid UTF-8").into())
|
||||||
})
|
})
|
||||||
.and_then(|p| SafeFilePath::from_str(&p).map_err(CommandError::from))?;
|
.and_then(|p| SafeFilePath::from_str(&p).map_err(CommandError::from))?;
|
||||||
|
|
||||||
let options: Option<WriteFileOptions> = request
|
let options: Option<WriteFileOptions> = request
|
||||||
.headers()
|
.headers()
|
||||||
.get("options")
|
.get("options")
|
||||||
@@ -857,7 +818,6 @@ async fn write_file_inner<R: Runtime>(
|
|||||||
.and_then(|opts| serde_json::from_str(opts).ok());
|
.and_then(|opts| serde_json::from_str(opts).ok());
|
||||||
|
|
||||||
let (mut file, path) = resolve_file(
|
let (mut file, path) = resolve_file(
|
||||||
permission,
|
|
||||||
&webview,
|
&webview,
|
||||||
&global_scope,
|
&global_scope,
|
||||||
&command_scope,
|
&command_scope,
|
||||||
@@ -893,16 +853,6 @@ async fn write_file_inner<R: Runtime>(
|
|||||||
},
|
},
|
||||||
)?;
|
)?;
|
||||||
|
|
||||||
let data = match request.body() {
|
|
||||||
tauri::ipc::InvokeBody::Raw(data) => Cow::Borrowed(data),
|
|
||||||
tauri::ipc::InvokeBody::Json(serde_json::Value::Array(data)) => Cow::Owned(
|
|
||||||
data.iter()
|
|
||||||
.flat_map(|v| v.as_number().and_then(|v| v.as_u64().map(|v| v as u8)))
|
|
||||||
.collect(),
|
|
||||||
),
|
|
||||||
_ => return Err(anyhow::anyhow!("unexpected invoke body").into()),
|
|
||||||
};
|
|
||||||
|
|
||||||
file.write_all(&data)
|
file.write_all(&data)
|
||||||
.map_err(|e| {
|
.map_err(|e| {
|
||||||
format!(
|
format!(
|
||||||
@@ -913,16 +863,6 @@ async fn write_file_inner<R: Runtime>(
|
|||||||
.map_err(Into::into)
|
.map_err(Into::into)
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
|
||||||
pub async fn write_file<R: Runtime>(
|
|
||||||
webview: Webview<R>,
|
|
||||||
global_scope: GlobalScope<Entry>,
|
|
||||||
command_scope: CommandScope<Entry>,
|
|
||||||
request: tauri::ipc::Request<'_>,
|
|
||||||
) -> CommandResult<()> {
|
|
||||||
write_file_inner("write-file", webview, global_scope, command_scope, request).await
|
|
||||||
}
|
|
||||||
|
|
||||||
// TODO, remove in v3, rely on `write_file` command instead
|
// TODO, remove in v3, rely on `write_file` command instead
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
pub async fn write_text_file<R: Runtime>(
|
pub async fn write_text_file<R: Runtime>(
|
||||||
@@ -931,14 +871,7 @@ pub async fn write_text_file<R: Runtime>(
|
|||||||
command_scope: CommandScope<Entry>,
|
command_scope: CommandScope<Entry>,
|
||||||
request: tauri::ipc::Request<'_>,
|
request: tauri::ipc::Request<'_>,
|
||||||
) -> CommandResult<()> {
|
) -> CommandResult<()> {
|
||||||
write_file_inner(
|
write_file(webview, global_scope, command_scope, request).await
|
||||||
"write-text-file",
|
|
||||||
webview,
|
|
||||||
global_scope,
|
|
||||||
command_scope,
|
|
||||||
request,
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[tauri::command]
|
#[tauri::command]
|
||||||
@@ -950,7 +883,6 @@ pub fn exists<R: Runtime>(
|
|||||||
options: Option<BaseOptions>,
|
options: Option<BaseOptions>,
|
||||||
) -> CommandResult<bool> {
|
) -> CommandResult<bool> {
|
||||||
let resolved_path = resolve_path(
|
let resolved_path = resolve_path(
|
||||||
"exists",
|
|
||||||
&webview,
|
&webview,
|
||||||
&global_scope,
|
&global_scope,
|
||||||
&command_scope,
|
&command_scope,
|
||||||
@@ -969,7 +901,6 @@ pub async fn size<R: Runtime>(
|
|||||||
options: Option<BaseOptions>,
|
options: Option<BaseOptions>,
|
||||||
) -> CommandResult<u64> {
|
) -> CommandResult<u64> {
|
||||||
let resolved_path = resolve_path(
|
let resolved_path = resolve_path(
|
||||||
"size",
|
|
||||||
&webview,
|
&webview,
|
||||||
&global_scope,
|
&global_scope,
|
||||||
&command_scope,
|
&command_scope,
|
||||||
@@ -1012,25 +943,16 @@ fn get_dir_size(path: &PathBuf) -> CommandResult<u64> {
|
|||||||
|
|
||||||
#[cfg(not(target_os = "android"))]
|
#[cfg(not(target_os = "android"))]
|
||||||
pub fn resolve_file<R: Runtime>(
|
pub fn resolve_file<R: Runtime>(
|
||||||
permission: &str,
|
|
||||||
webview: &Webview<R>,
|
webview: &Webview<R>,
|
||||||
global_scope: &GlobalScope<Entry>,
|
global_scope: &GlobalScope<Entry>,
|
||||||
command_scope: &CommandScope<Entry>,
|
command_scope: &CommandScope<Entry>,
|
||||||
path: SafeFilePath,
|
path: SafeFilePath,
|
||||||
open_options: OpenOptions,
|
open_options: OpenOptions,
|
||||||
) -> CommandResult<(File, PathBuf)> {
|
) -> CommandResult<(File, PathBuf)> {
|
||||||
resolve_file_in_fs(
|
resolve_file_in_fs(webview, global_scope, command_scope, path, open_options)
|
||||||
permission,
|
|
||||||
webview,
|
|
||||||
global_scope,
|
|
||||||
command_scope,
|
|
||||||
path,
|
|
||||||
open_options,
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn resolve_file_in_fs<R: Runtime>(
|
fn resolve_file_in_fs<R: Runtime>(
|
||||||
permission: &str,
|
|
||||||
webview: &Webview<R>,
|
webview: &Webview<R>,
|
||||||
global_scope: &GlobalScope<Entry>,
|
global_scope: &GlobalScope<Entry>,
|
||||||
command_scope: &CommandScope<Entry>,
|
command_scope: &CommandScope<Entry>,
|
||||||
@@ -1038,7 +960,6 @@ fn resolve_file_in_fs<R: Runtime>(
|
|||||||
open_options: OpenOptions,
|
open_options: OpenOptions,
|
||||||
) -> CommandResult<(File, PathBuf)> {
|
) -> CommandResult<(File, PathBuf)> {
|
||||||
let path = resolve_path(
|
let path = resolve_path(
|
||||||
permission,
|
|
||||||
webview,
|
webview,
|
||||||
global_scope,
|
global_scope,
|
||||||
command_scope,
|
command_scope,
|
||||||
@@ -1059,7 +980,6 @@ fn resolve_file_in_fs<R: Runtime>(
|
|||||||
|
|
||||||
#[cfg(target_os = "android")]
|
#[cfg(target_os = "android")]
|
||||||
pub fn resolve_file<R: Runtime>(
|
pub fn resolve_file<R: Runtime>(
|
||||||
permission: &str,
|
|
||||||
webview: &Webview<R>,
|
webview: &Webview<R>,
|
||||||
global_scope: &GlobalScope<Entry>,
|
global_scope: &GlobalScope<Entry>,
|
||||||
command_scope: &CommandScope<Entry>,
|
command_scope: &CommandScope<Entry>,
|
||||||
@@ -1077,7 +997,6 @@ pub fn resolve_file<R: Runtime>(
|
|||||||
Ok((file, path))
|
Ok((file, path))
|
||||||
}
|
}
|
||||||
SafeFilePath::Path(path) => resolve_file_in_fs(
|
SafeFilePath::Path(path) => resolve_file_in_fs(
|
||||||
permission,
|
|
||||||
webview,
|
webview,
|
||||||
global_scope,
|
global_scope,
|
||||||
command_scope,
|
command_scope,
|
||||||
@@ -1088,7 +1007,6 @@ pub fn resolve_file<R: Runtime>(
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn resolve_path<R: Runtime>(
|
pub fn resolve_path<R: Runtime>(
|
||||||
permission: &str,
|
|
||||||
webview: &Webview<R>,
|
webview: &Webview<R>,
|
||||||
global_scope: &GlobalScope<Entry>,
|
global_scope: &GlobalScope<Entry>,
|
||||||
command_scope: &CommandScope<Entry>,
|
command_scope: &CommandScope<Entry>,
|
||||||
@@ -1134,17 +1052,7 @@ pub fn resolve_path<R: Runtime>(
|
|||||||
if fs_scope.scope.is_allowed(&path) || scope.is_allowed(&path) {
|
if fs_scope.scope.is_allowed(&path) || scope.is_allowed(&path) {
|
||||||
Ok(path)
|
Ok(path)
|
||||||
} else {
|
} else {
|
||||||
#[cfg(not(debug_assertions))]
|
Err(CommandError::Plugin(Error::PathForbidden(path)))
|
||||||
return Err(CommandError::Plugin(Error::PathForbidden(path)));
|
|
||||||
|
|
||||||
#[cfg(debug_assertions)]
|
|
||||||
Err(
|
|
||||||
anyhow::anyhow!(
|
|
||||||
"forbidden path: {}, maybe it is not allowed on the scope for `allow-{permission}` permission in your capability file",
|
|
||||||
path.display()
|
|
||||||
)
|
|
||||||
)
|
|
||||||
.map_err(Into::into)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -89,7 +89,7 @@ impl<R: Runtime> Fs<R> {
|
|||||||
std::fs::File::from_raw_fd(fd)
|
std::fs::File::from_raw_fd(fd)
|
||||||
})
|
})
|
||||||
} else {
|
} else {
|
||||||
unimplemented!()
|
todo!()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -49,7 +49,6 @@ pub fn watch<R: Runtime>(
|
|||||||
.into_iter()
|
.into_iter()
|
||||||
.map(|path| {
|
.map(|path| {
|
||||||
resolve_path(
|
resolve_path(
|
||||||
"watch",
|
|
||||||
&webview,
|
&webview,
|
||||||
&global_scope,
|
&global_scope,
|
||||||
&command_scope,
|
&command_scope,
|
||||||
|
|||||||
@@ -1,14 +1,5 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## \[2.3.2]
|
|
||||||
|
|
||||||
- [`93426f85`](https://github.com/tauri-apps/plugins-workspace/commit/93426f85120f49beb9f40222bff45185a32d54a9) Fixed an issue that caused docs.rs builds to fail. No user facing changes.
|
|
||||||
|
|
||||||
## \[2.3.1]
|
|
||||||
|
|
||||||
- [`6c9b61fb`](https://github.com/tauri-apps/plugins-workspace/commit/6c9b61fb658145d13893626112fc489f7458aa17) ([#3039](https://github.com/tauri-apps/plugins-workspace/pull/3039) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) On Android, updated compileSdk to 36.
|
|
||||||
- [`e933acb0`](https://github.com/tauri-apps/plugins-workspace/commit/e933acb0044b4d49053eae6492b542351160e66a) ([#3010](https://github.com/tauri-apps/plugins-workspace/pull/3010) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) On Android, use the `timeout` value for `setMinUpdateIntervalMillis`, `setMaxUpdateDelayMillis` and `setIntervalMillis` instead of just `minUpdateInterval`.
|
|
||||||
|
|
||||||
## \[2.3.0]
|
## \[2.3.0]
|
||||||
|
|
||||||
- [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
|
- [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "tauri-plugin-geolocation"
|
name = "tauri-plugin-geolocation"
|
||||||
description = "Get and track the device's current position"
|
description = "Get and track the device's current position"
|
||||||
version = "2.3.2"
|
version = "2.3.0"
|
||||||
edition = { workspace = true }
|
edition = { workspace = true }
|
||||||
authors = { workspace = true }
|
authors = { workspace = true }
|
||||||
license = { workspace = true }
|
license = { workspace = true }
|
||||||
@@ -9,6 +9,8 @@ repository = { workspace = true }
|
|||||||
links = "tauri-plugin-geolocation"
|
links = "tauri-plugin-geolocation"
|
||||||
|
|
||||||
[package.metadata.docs.rs]
|
[package.metadata.docs.rs]
|
||||||
|
rustc-args = ["--cfg", "docsrs"]
|
||||||
|
rustdoc-args = ["--cfg", "docsrs"]
|
||||||
targets = ["x86_64-linux-android"]
|
targets = ["x86_64-linux-android"]
|
||||||
|
|
||||||
[package.metadata.platforms.support]
|
[package.metadata.platforms.support]
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ plugins {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = "app.tauri.geolocation"
|
namespace = "app.tauri.geolocation"
|
||||||
compileSdk = 36
|
compileSdk = 34
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdk = 24
|
minSdk = 24
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
consumerProguardFiles("consumer-rules.pro")
|
consumerProguardFiles("consumer-rules.pro")
|
||||||
|
|||||||
@@ -91,9 +91,11 @@ public class Geolocation(private val context: Context) {
|
|||||||
val lowPrio = if (networkEnabled) Priority.PRIORITY_BALANCED_POWER_ACCURACY else Priority.PRIORITY_LOW_POWER
|
val lowPrio = if (networkEnabled) Priority.PRIORITY_BALANCED_POWER_ACCURACY else Priority.PRIORITY_LOW_POWER
|
||||||
val prio = if (enableHighAccuracy) Priority.PRIORITY_HIGH_ACCURACY else lowPrio
|
val prio = if (enableHighAccuracy) Priority.PRIORITY_HIGH_ACCURACY else lowPrio
|
||||||
|
|
||||||
val locationRequest = LocationRequest.Builder(timeout)
|
Logger.error(prio.toString())
|
||||||
|
|
||||||
|
val locationRequest = LocationRequest.Builder(10000)
|
||||||
.setMaxUpdateDelayMillis(timeout)
|
.setMaxUpdateDelayMillis(timeout)
|
||||||
.setMinUpdateIntervalMillis(timeout)
|
.setMinUpdateIntervalMillis(5000)
|
||||||
.setPriority(prio)
|
.setPriority(prio)
|
||||||
.build()
|
.build()
|
||||||
|
|
||||||
@@ -143,4 +145,4 @@ public class Geolocation(private val context: Context) {
|
|||||||
|
|
||||||
return lastLoc
|
return lastLoc
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@tauri-apps/plugin-geolocation",
|
"name": "@tauri-apps/plugin-geolocation",
|
||||||
"version": "2.3.2",
|
"version": "2.3.0",
|
||||||
"license": "MIT OR Apache-2.0",
|
"license": "MIT OR Apache-2.0",
|
||||||
"authors": [
|
"authors": [
|
||||||
"Tauri Programme within The Commons Conservancy"
|
"Tauri Programme within The Commons Conservancy"
|
||||||
@@ -24,6 +24,6 @@
|
|||||||
"LICENSE"
|
"LICENSE"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tauri-apps/api": "^2.8.0"
|
"@tauri-apps/api": "^2.6.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,9 +1,5 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## \[2.3.1]
|
|
||||||
|
|
||||||
- [`93426f85`](https://github.com/tauri-apps/plugins-workspace/commit/93426f85120f49beb9f40222bff45185a32d54a9) Fixed an issue that caused docs.rs builds to fail. No user facing changes.
|
|
||||||
|
|
||||||
## \[2.3.0]
|
## \[2.3.0]
|
||||||
|
|
||||||
- [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
|
- [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "tauri-plugin-global-shortcut"
|
name = "tauri-plugin-global-shortcut"
|
||||||
version = "2.3.1"
|
version = "2.3.0"
|
||||||
description = "Register global hotkeys listeners on your Tauri application."
|
description = "Register global hotkeys listeners on your Tauri application."
|
||||||
edition = { workspace = true }
|
edition = { workspace = true }
|
||||||
authors = { workspace = true }
|
authors = { workspace = true }
|
||||||
@@ -9,6 +9,10 @@ rust-version = { workspace = true }
|
|||||||
repository = { workspace = true }
|
repository = { workspace = true }
|
||||||
links = "tauri-plugin-global-shortcut"
|
links = "tauri-plugin-global-shortcut"
|
||||||
|
|
||||||
|
[package.metadata.docs.rs]
|
||||||
|
rustc-args = ["--cfg", "docsrs"]
|
||||||
|
rustdoc-args = ["--cfg", "docsrs"]
|
||||||
|
|
||||||
[package.metadata.platforms.support]
|
[package.metadata.platforms.support]
|
||||||
windows = { level = "full", notes = "" }
|
windows = { level = "full", notes = "" }
|
||||||
linux = { level = "full", notes = "" }
|
linux = { level = "full", notes = "" }
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "@tauri-apps/plugin-global-shortcut",
|
"name": "@tauri-apps/plugin-global-shortcut",
|
||||||
"version": "2.3.1",
|
"version": "2.3.0",
|
||||||
"license": "MIT OR Apache-2.0",
|
"license": "MIT OR Apache-2.0",
|
||||||
"authors": [
|
"authors": [
|
||||||
"Tauri Programme within The Commons Conservancy"
|
"Tauri Programme within The Commons Conservancy"
|
||||||
@@ -24,6 +24,6 @@
|
|||||||
"LICENSE"
|
"LICENSE"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@tauri-apps/api": "^2.8.0"
|
"@tauri-apps/api": "^2.6.0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,13 +1,5 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
## \[2.3.2]
|
|
||||||
|
|
||||||
- [`93426f85`](https://github.com/tauri-apps/plugins-workspace/commit/93426f85120f49beb9f40222bff45185a32d54a9) Fixed an issue that caused docs.rs builds to fail. No user facing changes.
|
|
||||||
|
|
||||||
## \[2.3.1]
|
|
||||||
|
|
||||||
- [`6c9b61fb`](https://github.com/tauri-apps/plugins-workspace/commit/6c9b61fb658145d13893626112fc489f7458aa17) ([#3039](https://github.com/tauri-apps/plugins-workspace/pull/3039) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) On Android, updated compileSdk to 36.
|
|
||||||
|
|
||||||
## \[2.3.0]
|
## \[2.3.0]
|
||||||
|
|
||||||
- [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
|
- [`f209b2f2`](https://github.com/tauri-apps/plugins-workspace/commit/f209b2f23cb29133c97ad5961fb46ef794dbe063) ([#2804](https://github.com/tauri-apps/plugins-workspace/pull/2804) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Updated tauri to 2.6
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "tauri-plugin-haptics"
|
name = "tauri-plugin-haptics"
|
||||||
description = "Haptic feedback and vibrations on Android and iOS"
|
description = "Haptic feedback and vibrations on Android and iOS"
|
||||||
version = "2.3.2"
|
version = "2.3.0"
|
||||||
edition = { workspace = true }
|
edition = { workspace = true }
|
||||||
authors = { workspace = true }
|
authors = { workspace = true }
|
||||||
license = { workspace = true }
|
license = { workspace = true }
|
||||||
@@ -9,6 +9,8 @@ repository = { workspace = true }
|
|||||||
links = "tauri-plugin-haptics"
|
links = "tauri-plugin-haptics"
|
||||||
|
|
||||||
[package.metadata.docs.rs]
|
[package.metadata.docs.rs]
|
||||||
|
rustc-args = ["--cfg", "docsrs"]
|
||||||
|
rustdoc-args = ["--cfg", "docsrs"]
|
||||||
targets = ["x86_64-linux-android"]
|
targets = ["x86_64-linux-android"]
|
||||||
|
|
||||||
[package.metadata.platforms.support]
|
[package.metadata.platforms.support]
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ plugins {
|
|||||||
|
|
||||||
android {
|
android {
|
||||||
namespace = "app.tauri.haptics"
|
namespace = "app.tauri.haptics"
|
||||||
compileSdk = 36
|
compileSdk = 34
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
minSdk = 24
|
minSdk = 24
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
consumerProguardFiles("consumer-rules.pro")
|
consumerProguardFiles("consumer-rules.pro")
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user