From 4bd1f15bb983c9228f38e3630cf3315aedb86e93 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 28 Sep 2024 14:44:24 +0800 Subject: [PATCH 01/40] fix(deps): update tauri monorepo (#1846) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Cargo.lock | 210 +++--------------- Cargo.toml | 8 +- examples/api/package.json | 4 +- plugins/deep-link/examples/app/package.json | 4 +- .../examples/vanilla/package.json | 2 +- .../examples/AppSettingsManager/package.json | 2 +- .../websocket/examples/tauri-app/package.json | 2 +- pnpm-lock.yaml | 172 +++++++------- 8 files changed, 130 insertions(+), 274 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9c3f85dd..69d77592 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2439,19 +2439,6 @@ dependencies = [ "x11", ] -[[package]] -name = "generator" -version = "0.7.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cc16584ff22b460a382b7feec54b23d2908d858152e5739a120b949293bd74e" -dependencies = [ - "cc", - "libc", - "log", - "rustversion", - "windows 0.48.0", -] - [[package]] name = "generic-array" version = "0.14.7" @@ -3580,21 +3567,6 @@ dependencies = [ "value-bag", ] -[[package]] -name = "loom" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff50ecb28bb86013e935fb6683ab1f6d3a20016f123c76fd4c27470076ac30f5" -dependencies = [ - "cfg-if", - "generator", - "scoped-tls", - "serde", - "serde_json", - "tracing", - "tracing-subscriber", -] - [[package]] name = "loop9" version = "0.1.5" @@ -3652,15 +3624,6 @@ dependencies = [ "tendril", ] -[[package]] -name = "matchers" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558" -dependencies = [ - "regex-automata 0.1.10", -] - [[package]] name = "matches" version = "0.1.10" @@ -3808,16 +3771,17 @@ dependencies = [ [[package]] name = "muda" -version = "0.14.1" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba8ac4080fb1e097c2c22acae467e46e4da72d941f02e82b67a87a2a89fa38b1" +checksum = "b8123dfd4996055ac9b15a60ad263b44b01e539007523ad7a4a533a3d93b0591" dependencies = [ - "cocoa", "crossbeam-channel", "dpi", "gtk", "keyboard-types", - "objc", + "objc2", + "objc2-app-kit", + "objc2-foundation", "once_cell", "png", "serde", @@ -3971,16 +3935,6 @@ dependencies = [ "zbus", ] -[[package]] -name = "nu-ansi-term" -version = "0.46.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84" -dependencies = [ - "overload", - "winapi", -] - [[package]] name = "num-bigint" version = "0.4.6" @@ -4358,12 +4312,6 @@ dependencies = [ "windows-sys 0.59.0", ] -[[package]] -name = "overload" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39" - [[package]] name = "pango" version = "0.18.3" @@ -5166,17 +5114,8 @@ checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" dependencies = [ "aho-corasick", "memchr", - "regex-automata 0.4.7", - "regex-syntax 0.8.4", -] - -[[package]] -name = "regex-automata" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6c230d73fb8d8c1b9c0b3135c5142a8acee3a0558fb8db5cf1cb65f8d7862132" -dependencies = [ - "regex-syntax 0.6.29", + "regex-automata", + "regex-syntax", ] [[package]] @@ -5187,15 +5126,9 @@ checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" dependencies = [ "aho-corasick", "memchr", - "regex-syntax 0.8.4", + "regex-syntax", ] -[[package]] -name = "regex-syntax" -version = "0.6.29" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1" - [[package]] name = "regex-syntax" version = "0.8.4" @@ -5531,12 +5464,6 @@ dependencies = [ "untrusted", ] -[[package]] -name = "rustversion" -version = "1.0.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6" - [[package]] name = "rusty-fork" version = "0.3.0" @@ -5594,6 +5521,7 @@ dependencies = [ "serde", "serde_json", "url", + "uuid", ] [[package]] @@ -5873,15 +5801,6 @@ dependencies = [ "digest", ] -[[package]] -name = "sharded-slab" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6" -dependencies = [ - "lazy_static", -] - [[package]] name = "shared_child" version = "1.0.1" @@ -6297,15 +6216,6 @@ version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3" -[[package]] -name = "state" -version = "0.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b8c4a4445d81357df8b1a650d0d0d6fbbbfe99d064aa5e02f3e4022061476d8" -dependencies = [ - "loom", -] - [[package]] name = "static_assertions" version = "1.1.0" @@ -6518,9 +6428,9 @@ dependencies = [ [[package]] name = "tao" -version = "0.30.0" +version = "0.30.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a93f2c6b8fdaeb7f417bda89b5bc767999745c3052969664ae1fa65892deb7e" +checksum = "06e48d7c56b3f7425d061886e8ce3b6acfab1993682ed70bef50fd133d721ee6" dependencies = [ "bitflags 2.6.0", "cocoa", @@ -6591,9 +6501,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.0.0-rc.15" +version = "2.0.0-rc.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb3c3b1c7ac5b72d59da307b84af900a0098c74c9d7369f65018cd8ec0eb50fb" +checksum = "246bd333561c5601241b7a09f19957d5f659667f3c1191c869a066fb309e1841" dependencies = [ "anyhow", "bytes", @@ -6625,7 +6535,6 @@ dependencies = [ "serde_repr", "serialize-to-javascript", "specta", - "state", "swift-rs", "tauri-build", "tauri-macros", @@ -6646,9 +6555,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.0-rc.12" +version = "2.0.0-rc.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ff5713e81e02e0b99f5219b275abbd7d2c0cc0f30180e25b1b650e08feeac63" +checksum = "e5bc30f14b3c1548d75dfdf3e40bffe20a53bc4e3381e9bacc21dc765d701d0a" dependencies = [ "anyhow", "cargo_toml", @@ -6670,9 +6579,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-rc.12" +version = "2.0.0-rc.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5370f2591dcc93d4ff08d9dd168f5097f79b34e859883586a409c627544190e3" +checksum = "b1cfb6089cfc626b81bb8aa4692ede527732011dfd22486d8ac5bf299189841f" dependencies = [ "base64 0.22.1", "brotli", @@ -6697,9 +6606,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-rc.11" +version = "2.0.0-rc.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19442dc8ee002ab1926586f6aecb90114f3a1226766008b0c9ac2d9fec9eeb7e" +checksum = "1f04ed6fadd294ef8061137463fe31abccbb5fa61ff9946aab2896acd140cff1" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -6711,9 +6620,9 @@ dependencies = [ [[package]] name = "tauri-plugin" -version = "2.0.0-rc.12" +version = "2.0.0-rc.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5e3368e91a98aa55ea4e3e8ccff516bc1ed2f85872c335ec35e9b345469032e0" +checksum = "6de7ffe64afa61c4cc13d450d64643b8db6cbb177a802beb88bf595594505ddf" dependencies = [ "anyhow", "glob", @@ -7187,9 +7096,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.0.0-rc.12" +version = "2.0.0-rc.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5f38d8aaa1e81d20e8e208e3e317f81b59fb75c530fbae8a90e72d02001d687" +checksum = "8d9465366fd7f9e9c77385fa8b7cb583b060544e8800bd0309deb100008c312d" dependencies = [ "dpi", "gtk", @@ -7206,9 +7115,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.0.0-rc.13" +version = "2.0.0-rc.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1ef5171e14c8fe3b5a63e75004c20d057747bc3e7fdc5f8ded625f0b29f5c7" +checksum = "a03a49d6bcc0e65d64ea4420e2097270a25a9e1ff0fb2ece75e54fbbd54e45f7" dependencies = [ "gtk", "http", @@ -7232,9 +7141,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-rc.12" +version = "2.0.0-rc.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "31fe4c9148e1b35225e1c00753f24b517ce00041d02eb4b4d6fd10613a47736c" +checksum = "a271545e4c25b36b922d98cf7e0c1755f64e92355705f656893e352aef0331e3" dependencies = [ "aes-gcm", "brotli", @@ -7265,6 +7174,7 @@ dependencies = [ "toml 0.8.2", "url", "urlpattern", + "uuid", "walkdir", ] @@ -7348,16 +7258,6 @@ dependencies = [ "syn 2.0.77", ] -[[package]] -name = "thread_local" -version = "1.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b9ef9bad013ada3808854ceac7b46812a6465ba368859a37e2100283d2d719c" -dependencies = [ - "cfg-if", - "once_cell", -] - [[package]] name = "tiff" version = "0.9.1" @@ -7660,43 +7560,13 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54" dependencies = [ "once_cell", - "valuable", -] - -[[package]] -name = "tracing-log" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3" -dependencies = [ - "log", - "once_cell", - "tracing-core", -] - -[[package]] -name = "tracing-subscriber" -version = "0.3.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b" -dependencies = [ - "matchers", - "nu-ansi-term", - "once_cell", - "regex", - "sharded-slab", - "smallvec", - "thread_local", - "tracing", - "tracing-core", - "tracing-log", ] [[package]] name = "tray-icon" -version = "0.17.0" +version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "044d7738b3d50f288ddef035b793228740ad4d927f5466b0af55dc15e7e03cfe" +checksum = "533fc2d4105e0e3d96ce1c71f2d308c9fbbe2ef9c587cab63dd627ab5bde218f" dependencies = [ "core-graphics 0.24.0", "crossbeam-channel", @@ -7948,6 +7818,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "81dfa00651efa65069b0b6b651f4aaa31ba9e3c3ce0137aaad053604ee7e0314" dependencies = [ "getrandom 0.2.15", + "serde", ] [[package]] @@ -7961,12 +7832,6 @@ dependencies = [ "wasm-bindgen", ] -[[package]] -name = "valuable" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "830b7e5d4d90034032940e4ace0d9a9a057e7a45cd94e6c007832e39edb82f6d" - [[package]] name = "value-bag" version = "1.9.0" @@ -8394,15 +8259,6 @@ dependencies = [ "windows_x86_64_msvc 0.36.1", ] -[[package]] -name = "windows" -version = "0.48.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" -dependencies = [ - "windows-targets 0.48.5", -] - [[package]] name = "windows" version = "0.56.0" @@ -8843,9 +8699,9 @@ dependencies = [ [[package]] name = "wry" -version = "0.43.1" +version = "0.44.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4d715cf5fe88e9647f3d17b207b6d060d4a88e7171d4ccb2d2c657dd1d44728" +checksum = "440600584cfbd8b0d28eace95c1f2c253db05dae43780b79380aa1e868f04c73" dependencies = [ "base64 0.22.1", "block", diff --git a/Cargo.toml b/Cargo.toml index 95a89d36..40d983a4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,10 +11,10 @@ resolver = "2" [workspace.dependencies] serde = { version = "1", features = ["derive"] } log = "0.4" -tauri = { version = "2.0.0-rc.15", default-features = false } -tauri-build = "2.0.0-rc.12" -tauri-plugin = "2.0.0-rc.12" -tauri-utils = "2.0.0-rc.12" +tauri = { version = "2.0.0-rc.16", default-features = false } +tauri-build = "2.0.0-rc.13" +tauri-plugin = "2.0.0-rc.13" +tauri-utils = "2.0.0-rc.13" serde_json = "1" thiserror = "1" url = "2" diff --git a/examples/api/package.json b/examples/api/package.json index e3cf39bf..b8600e26 100644 --- a/examples/api/package.json +++ b/examples/api/package.json @@ -9,7 +9,7 @@ "serve": "vite preview" }, "dependencies": { - "@tauri-apps/api": "2.0.0-rc.5", + "@tauri-apps/api": "2.0.0-rc.6", "@tauri-apps/plugin-barcode-scanner": "2.0.0-rc.2", "@tauri-apps/plugin-biometric": "2.0.0-rc.1", "@tauri-apps/plugin-cli": "2.0.0-rc.1", @@ -33,7 +33,7 @@ "@iconify-json/codicon": "^1.1.37", "@iconify-json/ph": "^1.1.8", "@sveltejs/vite-plugin-svelte": "^3.0.1", - "@tauri-apps/cli": "2.0.0-rc.16", + "@tauri-apps/cli": "2.0.0-rc.17", "@unocss/extractor-svelte": "^0.62.0", "svelte": "^4.2.19", "unocss": "^0.62.0", diff --git a/plugins/deep-link/examples/app/package.json b/plugins/deep-link/examples/app/package.json index 145ade16..db2b47b6 100644 --- a/plugins/deep-link/examples/app/package.json +++ b/plugins/deep-link/examples/app/package.json @@ -10,11 +10,11 @@ "tauri": "tauri" }, "dependencies": { - "@tauri-apps/api": "2.0.0-rc.5", + "@tauri-apps/api": "2.0.0-rc.6", "@tauri-apps/plugin-deep-link": "2.0.0-rc.2" }, "devDependencies": { - "@tauri-apps/cli": "2.0.0-rc.16", + "@tauri-apps/cli": "2.0.0-rc.17", "typescript": "^5.2.2", "vite": "^5.4.7" } diff --git a/plugins/single-instance/examples/vanilla/package.json b/plugins/single-instance/examples/vanilla/package.json index 08f8da02..70506755 100644 --- a/plugins/single-instance/examples/vanilla/package.json +++ b/plugins/single-instance/examples/vanilla/package.json @@ -9,6 +9,6 @@ "author": "", "license": "MIT", "devDependencies": { - "@tauri-apps/cli": "2.0.0-rc.16" + "@tauri-apps/cli": "2.0.0-rc.17" } } diff --git a/plugins/store/examples/AppSettingsManager/package.json b/plugins/store/examples/AppSettingsManager/package.json index c242ba89..183de4d8 100644 --- a/plugins/store/examples/AppSettingsManager/package.json +++ b/plugins/store/examples/AppSettingsManager/package.json @@ -8,7 +8,7 @@ "tauri": "tauri" }, "devDependencies": { - "@tauri-apps/cli": "2.0.0-rc.16", + "@tauri-apps/cli": "2.0.0-rc.17", "vite": "^5.0.12", "typescript": "^5.4.7" } diff --git a/plugins/websocket/examples/tauri-app/package.json b/plugins/websocket/examples/tauri-app/package.json index 2ede55c3..d71974e5 100644 --- a/plugins/websocket/examples/tauri-app/package.json +++ b/plugins/websocket/examples/tauri-app/package.json @@ -9,7 +9,7 @@ "preview": "vite preview" }, "devDependencies": { - "@tauri-apps/cli": "2.0.0-rc.16", + "@tauri-apps/cli": "2.0.0-rc.17", "typescript": "^5.3.3", "vite": "^5.4.7" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6a6064f9..6b1595c6 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -58,8 +58,8 @@ importers: examples/api: dependencies: '@tauri-apps/api': - specifier: 2.0.0-rc.5 - version: 2.0.0-rc.5 + specifier: 2.0.0-rc.6 + version: 2.0.0-rc.6 '@tauri-apps/plugin-barcode-scanner': specifier: 2.0.0-rc.2 version: link:../../plugins/barcode-scanner @@ -125,8 +125,8 @@ importers: specifier: ^3.0.1 version: 3.1.2(svelte@4.2.19)(vite@5.4.7(terser@5.33.0)) '@tauri-apps/cli': - specifier: 2.0.0-rc.16 - version: 2.0.0-rc.16 + specifier: 2.0.0-rc.17 + version: 2.0.0-rc.17 '@unocss/extractor-svelte': specifier: ^0.62.0 version: 0.62.3 @@ -144,50 +144,50 @@ importers: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/barcode-scanner: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/biometric: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/cli: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/clipboard-manager: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/deep-link: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/deep-link/examples/app: dependencies: '@tauri-apps/api': - specifier: 2.0.0-rc.5 - version: 2.0.0-rc.5 + specifier: 2.0.0-rc.6 + version: 2.0.0-rc.6 '@tauri-apps/plugin-deep-link': specifier: 2.0.0-rc.2 version: link:../.. devDependencies: '@tauri-apps/cli': - specifier: 2.0.0-rc.16 - version: 2.0.0-rc.16 + specifier: 2.0.0-rc.17 + version: 2.0.0-rc.17 typescript: specifier: ^5.2.2 version: 5.6.2 @@ -199,103 +199,103 @@ importers: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/fs: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/geolocation: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/global-shortcut: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/haptics: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/http: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/log: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/nfc: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/notification: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/os: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/positioner: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/process: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/shell: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/single-instance/examples/vanilla: devDependencies: '@tauri-apps/cli': - specifier: 2.0.0-rc.16 - version: 2.0.0-rc.16 + specifier: 2.0.0-rc.17 + version: 2.0.0-rc.17 plugins/sql: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/store: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/store/examples/AppSettingsManager: devDependencies: '@tauri-apps/cli': - specifier: 2.0.0-rc.16 - version: 2.0.0-rc.16 + specifier: 2.0.0-rc.17 + version: 2.0.0-rc.17 typescript: specifier: ^5.4.7 version: 5.6.2 @@ -307,25 +307,25 @@ importers: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/updater: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/upload: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/websocket: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 plugins/websocket/examples/tauri-app: dependencies: @@ -334,8 +334,8 @@ importers: version: link:../.. devDependencies: '@tauri-apps/cli': - specifier: 2.0.0-rc.16 - version: 2.0.0-rc.16 + specifier: 2.0.0-rc.17 + version: 2.0.0-rc.17 typescript: specifier: ^5.3.3 version: 5.6.2 @@ -347,7 +347,7 @@ importers: dependencies: '@tauri-apps/api': specifier: ^2.0.0-rc.4 - version: 2.0.0-rc.5 + version: 2.0.0-rc.6 packages: @@ -1061,71 +1061,71 @@ packages: svelte: ^4.0.0 || ^5.0.0-next.0 vite: ^5.0.0 - '@tauri-apps/api@2.0.0-rc.5': - resolution: {integrity: sha512-JWs69pE9NsQdcqTpEVBepAZ08+jgQWuthIiTiaWRq/YlCLgnqq0KfC9sDem55uJ0YpgsytZuyj+m6b6q8oiD2g==} + '@tauri-apps/api@2.0.0-rc.6': + resolution: {integrity: sha512-oENxL0C5WqHNSXWjZEbjnzoBwFFyn8do5S0elOg0ME1cLvWJOAKmqdCnWPpAwtzHQZ+xAzMU0/k8nPpJq4OQYA==} - '@tauri-apps/cli-darwin-arm64@2.0.0-rc.16': - resolution: {integrity: sha512-lISZU4gG0c9PbY7h/j/gW7nJLxZEygNBrYEET6zN8R99Znf5rSO+CfjenaMcJUUj6yTAd8gzdakRpLqNSAWegA==} + '@tauri-apps/cli-darwin-arm64@2.0.0-rc.17': + resolution: {integrity: sha512-LXlLpavNfhvELPBcjCzQ9DOLx7rlAzZM4iltsaKawAewx30Q0EpIjK53Sg5AR3p5/KzNfCsTMjjpeUZg1AcFgw==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] - '@tauri-apps/cli-darwin-x64@2.0.0-rc.16': - resolution: {integrity: sha512-D9uxPCxpyYcTSQulJGFX3POAKPOJd8WcWHFH8x6YVM1cIx6EWRXIE1sZnPUOjFr7qCg+bSdYdr8/BFHcZGcApQ==} + '@tauri-apps/cli-darwin-x64@2.0.0-rc.17': + resolution: {integrity: sha512-86jlpD9DQEMdPCu+foqady2Kov3u151Pgs1uOdA3SQxXph4L31T7j26axIhADLYZH6T1be+lSVPm6+fp0iXGgw==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] - '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-rc.16': - resolution: {integrity: sha512-WsVdKm4D1I1XV8I9yRnmOINZRwwWfh6xcLV3m19+B9g6TohK8RkRxWfxvs3TLQlWOLQ6lo8BzS9rzXB+KtjDpg==} + '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-rc.17': + resolution: {integrity: sha512-ZFZeVBFdM9ogNebqzU3vo6f662YwmnE5XzeT6UEKUy+df49Fw2Npebmg0t/BPoF9e/nEgK1w1Jy68aK2JISscg==} engines: {node: '>= 10'} cpu: [arm] os: [linux] - '@tauri-apps/cli-linux-arm64-gnu@2.0.0-rc.16': - resolution: {integrity: sha512-2jpZDagNs6rrqposHJihHBayttgOl5aB2+bYiVEC6ye+haiFtmYmpdaPOaVIw+YVQs6lepf5PVrisCoU9DmYsg==} + '@tauri-apps/cli-linux-arm64-gnu@2.0.0-rc.17': + resolution: {integrity: sha512-GvO7BNJL6y8CumvaidJ+cEXn0KRaCzhmwtrMfTEl9jsqhGYvmNXuOlZR41hgoy6CQtUiu11ZGoBtU37/lxEKaQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-arm64-musl@2.0.0-rc.16': - resolution: {integrity: sha512-SNEDcB+sWOls/B0a+UpUHVa/oegvlXXKYWsTxuXtgWIr5VbWG7rXLZ3fZpLLP3SpRVGTGTnABcyqshFbWSqqKQ==} + '@tauri-apps/cli-linux-arm64-musl@2.0.0-rc.17': + resolution: {integrity: sha512-DypDS3rJjcKzpgZKqHsCrzVGDbjo17XcYNhAYd2VxvXmGVAq05eZ71jLYHSSofXTxbpLZMcGKaino0jKyX1mOA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-x64-gnu@2.0.0-rc.16': - resolution: {integrity: sha512-Zsq29MM1ooeH1+chQBa7ffDFnzAZebBBFdsvs4e05tS1H8gn4oKE+PSMn9p/okzVXykEk9ri2/n7BG1XFeifMA==} + '@tauri-apps/cli-linux-x64-gnu@2.0.0-rc.17': + resolution: {integrity: sha512-nKCAJtC4b9HnVpDsCVXASPEXOEIZb/HFmdRPuKiYXmpziL5OByCJLjhVx5EFhpVtqAg1isCmOutqKc8Nmw1QQQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-linux-x64-musl@2.0.0-rc.16': - resolution: {integrity: sha512-g+pwSuis2YMxhJJ/pJYwp/Nps5CWvlv/5MV5UfDvClkCkeAyzIqVX+HbBLPcs5S0CePUQNeP0j4d4jBWUqZZQg==} + '@tauri-apps/cli-linux-x64-musl@2.0.0-rc.17': + resolution: {integrity: sha512-cSi3M/hcNo+NubSKJG96Af6o6cL38RCvP0ImFiyIOU/adYmW0bQGWI4u/eL14IpdNCR1pbifgEcQL6dteyod0g==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-win32-arm64-msvc@2.0.0-rc.16': - resolution: {integrity: sha512-PpPqdMTwJSDAK4KnNjvh77ShSkY+7pih1f6e50EtXar8bjC17e3XcEqFhDNne5mxEVTLYhibs6p1JLPad0ZjRA==} + '@tauri-apps/cli-win32-arm64-msvc@2.0.0-rc.17': + resolution: {integrity: sha512-hMtNtm2zXvUwzzTEJIf/GQplWHNLEeAjiLGaX9sS2Me96X/OzU1PUXcWTYdjVA102cf6q//0/pgpPo/Yn480KA==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] - '@tauri-apps/cli-win32-ia32-msvc@2.0.0-rc.16': - resolution: {integrity: sha512-io2yIcEcG7YLP+9n13NbilB93SjcB7jIl8GbURC4XZT4/4t9D1PWHpJr5hySVsGRLCz5e8NzwC5RlnenNzmpPQ==} + '@tauri-apps/cli-win32-ia32-msvc@2.0.0-rc.17': + resolution: {integrity: sha512-XO+zgvYvpz65aYbXMyFhej4Td5sEK7bSLPr2+8BigiI7F4tHaS7KJpYVtJtjHQtAo6KBy/bT8P9VW6xM4G+YVA==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] - '@tauri-apps/cli-win32-x64-msvc@2.0.0-rc.16': - resolution: {integrity: sha512-Rfkmxe3k+cBVA/kVYt8O25QrQqWKJlH9AiH7Q3C6xBzzG9PCSRMBszCp+JhBF8jhVlwNmOBv6UG+lm85kspwGg==} + '@tauri-apps/cli-win32-x64-msvc@2.0.0-rc.17': + resolution: {integrity: sha512-sVV0o9careFJuL3fTtkp6ed8X4FGGfMyK1WbXR5ci4Z2dn94wIJuefzTnGaQnvur4PaEJQ9WmTlQ2Pe3UrokBQ==} engines: {node: '>= 10'} cpu: [x64] os: [win32] - '@tauri-apps/cli@2.0.0-rc.16': - resolution: {integrity: sha512-wdjZg/M3dcxiqgWG6VRnABpX0dYxRww93t0d1MYoZxFDrnyoUz5kYwFQ0v4J9u0qenEgskjoypvon7V/Nj9qrg==} + '@tauri-apps/cli@2.0.0-rc.17': + resolution: {integrity: sha512-7YQljT+izYmhLqsI5G2xg3AHBPx3gAHc+gB/s+NKqdSL4CuGImLiii8Rw/qBtuJpWFWLJiaGXnpra35zrSlknQ==} engines: {node: '>= 10'} hasBin: true @@ -3196,50 +3196,50 @@ snapshots: transitivePeerDependencies: - supports-color - '@tauri-apps/api@2.0.0-rc.5': {} + '@tauri-apps/api@2.0.0-rc.6': {} - '@tauri-apps/cli-darwin-arm64@2.0.0-rc.16': + '@tauri-apps/cli-darwin-arm64@2.0.0-rc.17': optional: true - '@tauri-apps/cli-darwin-x64@2.0.0-rc.16': + '@tauri-apps/cli-darwin-x64@2.0.0-rc.17': optional: true - '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-rc.16': + '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-rc.17': optional: true - '@tauri-apps/cli-linux-arm64-gnu@2.0.0-rc.16': + '@tauri-apps/cli-linux-arm64-gnu@2.0.0-rc.17': optional: true - '@tauri-apps/cli-linux-arm64-musl@2.0.0-rc.16': + '@tauri-apps/cli-linux-arm64-musl@2.0.0-rc.17': optional: true - '@tauri-apps/cli-linux-x64-gnu@2.0.0-rc.16': + '@tauri-apps/cli-linux-x64-gnu@2.0.0-rc.17': optional: true - '@tauri-apps/cli-linux-x64-musl@2.0.0-rc.16': + '@tauri-apps/cli-linux-x64-musl@2.0.0-rc.17': optional: true - '@tauri-apps/cli-win32-arm64-msvc@2.0.0-rc.16': + '@tauri-apps/cli-win32-arm64-msvc@2.0.0-rc.17': optional: true - '@tauri-apps/cli-win32-ia32-msvc@2.0.0-rc.16': + '@tauri-apps/cli-win32-ia32-msvc@2.0.0-rc.17': optional: true - '@tauri-apps/cli-win32-x64-msvc@2.0.0-rc.16': + '@tauri-apps/cli-win32-x64-msvc@2.0.0-rc.17': optional: true - '@tauri-apps/cli@2.0.0-rc.16': + '@tauri-apps/cli@2.0.0-rc.17': optionalDependencies: - '@tauri-apps/cli-darwin-arm64': 2.0.0-rc.16 - '@tauri-apps/cli-darwin-x64': 2.0.0-rc.16 - '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-rc.16 - '@tauri-apps/cli-linux-arm64-gnu': 2.0.0-rc.16 - '@tauri-apps/cli-linux-arm64-musl': 2.0.0-rc.16 - '@tauri-apps/cli-linux-x64-gnu': 2.0.0-rc.16 - '@tauri-apps/cli-linux-x64-musl': 2.0.0-rc.16 - '@tauri-apps/cli-win32-arm64-msvc': 2.0.0-rc.16 - '@tauri-apps/cli-win32-ia32-msvc': 2.0.0-rc.16 - '@tauri-apps/cli-win32-x64-msvc': 2.0.0-rc.16 + '@tauri-apps/cli-darwin-arm64': 2.0.0-rc.17 + '@tauri-apps/cli-darwin-x64': 2.0.0-rc.17 + '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-rc.17 + '@tauri-apps/cli-linux-arm64-gnu': 2.0.0-rc.17 + '@tauri-apps/cli-linux-arm64-musl': 2.0.0-rc.17 + '@tauri-apps/cli-linux-x64-gnu': 2.0.0-rc.17 + '@tauri-apps/cli-linux-x64-musl': 2.0.0-rc.17 + '@tauri-apps/cli-win32-arm64-msvc': 2.0.0-rc.17 + '@tauri-apps/cli-win32-ia32-msvc': 2.0.0-rc.17 + '@tauri-apps/cli-win32-x64-msvc': 2.0.0-rc.17 '@types/eslint@9.6.1': dependencies: From 34737186fe64a3643166fb28dbcd5b504bb757bf Mon Sep 17 00:00:00 2001 From: Tony <68118705+Legend-Master@users.noreply.github.com> Date: Sun, 29 Sep 2024 01:50:57 +0800 Subject: [PATCH 02/40] chore: re-generate reference.md (#1847) --- plugins/autostart/permissions/autogenerated/reference.md | 2 +- plugins/barcode-scanner/permissions/autogenerated/reference.md | 2 +- plugins/biometric/permissions/autogenerated/reference.md | 2 +- plugins/cli/permissions/autogenerated/reference.md | 2 +- .../clipboard-manager/permissions/autogenerated/reference.md | 2 +- plugins/deep-link/permissions/autogenerated/reference.md | 2 +- plugins/dialog/permissions/autogenerated/reference.md | 2 +- plugins/fs/permissions/autogenerated/reference.md | 2 +- plugins/geolocation/permissions/autogenerated/reference.md | 2 +- plugins/global-shortcut/permissions/autogenerated/reference.md | 2 +- plugins/haptics/permissions/autogenerated/reference.md | 2 +- plugins/http/permissions/autogenerated/reference.md | 2 +- plugins/log/permissions/autogenerated/reference.md | 2 +- plugins/nfc/permissions/autogenerated/reference.md | 2 +- plugins/notification/permissions/autogenerated/reference.md | 2 +- plugins/os/permissions/autogenerated/reference.md | 2 +- plugins/positioner/permissions/autogenerated/reference.md | 2 +- plugins/process/permissions/autogenerated/reference.md | 2 +- plugins/shell/permissions/autogenerated/reference.md | 2 +- plugins/sql/permissions/autogenerated/reference.md | 2 +- plugins/store/permissions/autogenerated/reference.md | 2 +- plugins/stronghold/permissions/autogenerated/reference.md | 2 +- plugins/updater/permissions/autogenerated/reference.md | 2 +- plugins/upload/permissions/autogenerated/reference.md | 2 +- plugins/websocket/permissions/autogenerated/reference.md | 2 +- plugins/window-state/permissions/autogenerated/reference.md | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) diff --git a/plugins/autostart/permissions/autogenerated/reference.md b/plugins/autostart/permissions/autogenerated/reference.md index b5e37ac1..6e40fdb7 100644 --- a/plugins/autostart/permissions/autogenerated/reference.md +++ b/plugins/autostart/permissions/autogenerated/reference.md @@ -15,7 +15,7 @@ disable the automatic start on boot. - `allow-disable` - `allow-is-enabled` -## Permission Table +## Permission Table diff --git a/plugins/barcode-scanner/permissions/autogenerated/reference.md b/plugins/barcode-scanner/permissions/autogenerated/reference.md index 6b8739c1..50cbcf99 100644 --- a/plugins/barcode-scanner/permissions/autogenerated/reference.md +++ b/plugins/barcode-scanner/permissions/autogenerated/reference.md @@ -16,7 +16,7 @@ It allows all barcode related features. - `allow-scan` - `allow-vibrate` -## Permission Table +## Permission Table
diff --git a/plugins/biometric/permissions/autogenerated/reference.md b/plugins/biometric/permissions/autogenerated/reference.md index 8b3b58c2..37a9fa07 100644 --- a/plugins/biometric/permissions/autogenerated/reference.md +++ b/plugins/biometric/permissions/autogenerated/reference.md @@ -12,7 +12,7 @@ It allows acccess to all biometric commands. - `allow-authenticate` - `allow-status` -## Permission Table +## Permission Table
diff --git a/plugins/cli/permissions/autogenerated/reference.md b/plugins/cli/permissions/autogenerated/reference.md index 48434cea..a920b749 100644 --- a/plugins/cli/permissions/autogenerated/reference.md +++ b/plugins/cli/permissions/autogenerated/reference.md @@ -4,7 +4,7 @@ Allows reading the CLI matches - `allow-cli-matches` -## Permission Table +## Permission Table
diff --git a/plugins/clipboard-manager/permissions/autogenerated/reference.md b/plugins/clipboard-manager/permissions/autogenerated/reference.md index 88c90e41..6b8bf14f 100644 --- a/plugins/clipboard-manager/permissions/autogenerated/reference.md +++ b/plugins/clipboard-manager/permissions/autogenerated/reference.md @@ -8,7 +8,7 @@ Clipboard interaction needs to be explicitly enabled. -## Permission Table +## Permission Table
diff --git a/plugins/deep-link/permissions/autogenerated/reference.md b/plugins/deep-link/permissions/autogenerated/reference.md index 460960c8..3b84f1c5 100644 --- a/plugins/deep-link/permissions/autogenerated/reference.md +++ b/plugins/deep-link/permissions/autogenerated/reference.md @@ -4,7 +4,7 @@ Allows reading the opened deep link via the get_current command - `allow-get-current` -## Permission Table +## Permission Table
diff --git a/plugins/dialog/permissions/autogenerated/reference.md b/plugins/dialog/permissions/autogenerated/reference.md index 325432e5..d93595d1 100644 --- a/plugins/dialog/permissions/autogenerated/reference.md +++ b/plugins/dialog/permissions/autogenerated/reference.md @@ -16,7 +16,7 @@ All dialog types are enabled. - `allow-save` - `allow-open` -## Permission Table +## Permission Table
diff --git a/plugins/fs/permissions/autogenerated/reference.md b/plugins/fs/permissions/autogenerated/reference.md index cc6477f1..79ec2f55 100644 --- a/plugins/fs/permissions/autogenerated/reference.md +++ b/plugins/fs/permissions/autogenerated/reference.md @@ -30,7 +30,7 @@ On Windows the webview data folder access is denied. - `read-app-specific-dirs-recursive` - `deny-default` -## Permission Table +## Permission Table
diff --git a/plugins/geolocation/permissions/autogenerated/reference.md b/plugins/geolocation/permissions/autogenerated/reference.md index e0417c80..71d81a72 100644 --- a/plugins/geolocation/permissions/autogenerated/reference.md +++ b/plugins/geolocation/permissions/autogenerated/reference.md @@ -1,5 +1,5 @@ -## Permission Table +## Permission Table
diff --git a/plugins/global-shortcut/permissions/autogenerated/reference.md b/plugins/global-shortcut/permissions/autogenerated/reference.md index 1c91743c..f8571c04 100644 --- a/plugins/global-shortcut/permissions/autogenerated/reference.md +++ b/plugins/global-shortcut/permissions/autogenerated/reference.md @@ -7,7 +7,7 @@ registered or unregistered. -## Permission Table +## Permission Table
diff --git a/plugins/haptics/permissions/autogenerated/reference.md b/plugins/haptics/permissions/autogenerated/reference.md index 36fbd7d3..c2d0dd5d 100644 --- a/plugins/haptics/permissions/autogenerated/reference.md +++ b/plugins/haptics/permissions/autogenerated/reference.md @@ -1,5 +1,5 @@ -## Permission Table +## Permission Table
diff --git a/plugins/http/permissions/autogenerated/reference.md b/plugins/http/permissions/autogenerated/reference.md index 85406618..4126f0b9 100644 --- a/plugins/http/permissions/autogenerated/reference.md +++ b/plugins/http/permissions/autogenerated/reference.md @@ -18,7 +18,7 @@ All fetch operations are enabled. - `allow-fetch-read-body` - `allow-fetch-send` -## Permission Table +## Permission Table
diff --git a/plugins/log/permissions/autogenerated/reference.md b/plugins/log/permissions/autogenerated/reference.md index f2cdf689..d59aefa0 100644 --- a/plugins/log/permissions/autogenerated/reference.md +++ b/plugins/log/permissions/autogenerated/reference.md @@ -4,7 +4,7 @@ Allows the log command - `allow-log` -## Permission Table +## Permission Table
diff --git a/plugins/nfc/permissions/autogenerated/reference.md b/plugins/nfc/permissions/autogenerated/reference.md index 8e4960fe..bf425832 100644 --- a/plugins/nfc/permissions/autogenerated/reference.md +++ b/plugins/nfc/permissions/autogenerated/reference.md @@ -14,7 +14,7 @@ Writing to tags needs to be manually enabled. - `allow-is-available` - `allow-scan` -## Permission Table +## Permission Table
diff --git a/plugins/notification/permissions/autogenerated/reference.md b/plugins/notification/permissions/autogenerated/reference.md index 9e26eb8b..b6130d60 100644 --- a/plugins/notification/permissions/autogenerated/reference.md +++ b/plugins/notification/permissions/autogenerated/reference.md @@ -26,7 +26,7 @@ It allows all notification related features. - `allow-create-channel` - `allow-permission-state` -## Permission Table +## Permission Table
diff --git a/plugins/os/permissions/autogenerated/reference.md b/plugins/os/permissions/autogenerated/reference.md index 1b49691b..88fcd6fa 100644 --- a/plugins/os/permissions/autogenerated/reference.md +++ b/plugins/os/permissions/autogenerated/reference.md @@ -18,7 +18,7 @@ All information except the host name are available. - `allow-platform` - `allow-version` -## Permission Table +## Permission Table
diff --git a/plugins/positioner/permissions/autogenerated/reference.md b/plugins/positioner/permissions/autogenerated/reference.md index ad160d1b..f2a92c66 100644 --- a/plugins/positioner/permissions/autogenerated/reference.md +++ b/plugins/positioner/permissions/autogenerated/reference.md @@ -4,7 +4,7 @@ Allows the move_window command - `allow-move-window` -## Permission Table +## Permission Table
diff --git a/plugins/process/permissions/autogenerated/reference.md b/plugins/process/permissions/autogenerated/reference.md index b0aecfa6..10b6a82b 100644 --- a/plugins/process/permissions/autogenerated/reference.md +++ b/plugins/process/permissions/autogenerated/reference.md @@ -12,7 +12,7 @@ the application. - `allow-exit` - `allow-restart` -## Permission Table +## Permission Table
diff --git a/plugins/shell/permissions/autogenerated/reference.md b/plugins/shell/permissions/autogenerated/reference.md index 80a5a4bd..d88bf2d5 100644 --- a/plugins/shell/permissions/autogenerated/reference.md +++ b/plugins/shell/permissions/autogenerated/reference.md @@ -12,7 +12,7 @@ scope pre-configured. It will allow opening `http(s)://`, - `allow-open` -## Permission Table +## Permission Table
diff --git a/plugins/sql/permissions/autogenerated/reference.md b/plugins/sql/permissions/autogenerated/reference.md index 4f3a32eb..5b887c94 100644 --- a/plugins/sql/permissions/autogenerated/reference.md +++ b/plugins/sql/permissions/autogenerated/reference.md @@ -16,7 +16,7 @@ Also allows to load or close a connection. - `allow-load` - `allow-select` -## Permission Table +## Permission Table
diff --git a/plugins/store/permissions/autogenerated/reference.md b/plugins/store/permissions/autogenerated/reference.md index 8dceebca..704d759d 100644 --- a/plugins/store/permissions/autogenerated/reference.md +++ b/plugins/store/permissions/autogenerated/reference.md @@ -22,7 +22,7 @@ All operations are enabled by default. - `allow-set` - `allow-values` -## Permission Table +## Permission Table
diff --git a/plugins/stronghold/permissions/autogenerated/reference.md b/plugins/stronghold/permissions/autogenerated/reference.md index 60aea74b..c07dc283 100644 --- a/plugins/stronghold/permissions/autogenerated/reference.md +++ b/plugins/stronghold/permissions/autogenerated/reference.md @@ -18,7 +18,7 @@ All non-destructive operations are enabled by default. - `allow-save-store-record` - `allow-save` -## Permission Table +## Permission Table
diff --git a/plugins/updater/permissions/autogenerated/reference.md b/plugins/updater/permissions/autogenerated/reference.md index 41f10869..06241af8 100644 --- a/plugins/updater/permissions/autogenerated/reference.md +++ b/plugins/updater/permissions/autogenerated/reference.md @@ -15,7 +15,7 @@ is enabled. - `allow-install` - `allow-download-and-install` -## Permission Table +## Permission Table
diff --git a/plugins/upload/permissions/autogenerated/reference.md b/plugins/upload/permissions/autogenerated/reference.md index 10a310cb..19dbe32f 100644 --- a/plugins/upload/permissions/autogenerated/reference.md +++ b/plugins/upload/permissions/autogenerated/reference.md @@ -12,7 +12,7 @@ All operations are enabled by default. - `allow-upload` - `allow-download` -## Permission Table +## Permission Table
diff --git a/plugins/websocket/permissions/autogenerated/reference.md b/plugins/websocket/permissions/autogenerated/reference.md index a1f05e8f..640c05a8 100644 --- a/plugins/websocket/permissions/autogenerated/reference.md +++ b/plugins/websocket/permissions/autogenerated/reference.md @@ -5,7 +5,7 @@ Allows connecting and sending data to a WebSocket server - `allow-connect` - `allow-send` -## Permission Table +## Permission Table
diff --git a/plugins/window-state/permissions/autogenerated/reference.md b/plugins/window-state/permissions/autogenerated/reference.md index 7329c2be..53d51ca6 100644 --- a/plugins/window-state/permissions/autogenerated/reference.md +++ b/plugins/window-state/permissions/autogenerated/reference.md @@ -13,7 +13,7 @@ All operations are enabled by default. - `allow-restore-state` - `allow-save-window-state` -## Permission Table +## Permission Table
From 34319bd977352dfeb9236bb2ac68f51a69ccc20d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 29 Sep 2024 16:18:56 +0800 Subject: [PATCH 03/40] chore(deps): update unocss monorepo to ^0.63.0 (#1848) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- examples/api/package.json | 4 +- pnpm-lock.yaml | 891 +++++++++----------------------------- 2 files changed, 202 insertions(+), 693 deletions(-) diff --git a/examples/api/package.json b/examples/api/package.json index b8600e26..f5426331 100644 --- a/examples/api/package.json +++ b/examples/api/package.json @@ -34,9 +34,9 @@ "@iconify-json/ph": "^1.1.8", "@sveltejs/vite-plugin-svelte": "^3.0.1", "@tauri-apps/cli": "2.0.0-rc.17", - "@unocss/extractor-svelte": "^0.62.0", + "@unocss/extractor-svelte": "^0.63.0", "svelte": "^4.2.19", - "unocss": "^0.62.0", + "unocss": "^0.63.0", "vite": "^5.4.7" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 6b1595c6..71669ddc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -32,10 +32,10 @@ importers: version: 0.12.3(mocha@10.7.3) eslint: specifier: 9.11.1 - version: 9.11.1(jiti@1.21.6) + version: 9.11.1(jiti@2.0.0) eslint-config-prettier: specifier: 9.1.0 - version: 9.1.0(eslint@9.11.1(jiti@1.21.6)) + version: 9.1.0(eslint@9.11.1(jiti@2.0.0)) eslint-plugin-security: specifier: 3.0.1 version: 3.0.1 @@ -53,7 +53,7 @@ importers: version: 5.6.2 typescript-eslint: specifier: 8.7.0 - version: 8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2) + version: 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) examples/api: dependencies: @@ -128,14 +128,14 @@ importers: specifier: 2.0.0-rc.17 version: 2.0.0-rc.17 '@unocss/extractor-svelte': - specifier: ^0.62.0 - version: 0.62.3 + specifier: ^0.63.0 + version: 0.63.0 svelte: specifier: ^4.2.19 version: 4.2.19 unocss: - specifier: ^0.62.0 - version: 0.62.3(postcss@8.4.45)(rollup@4.22.4)(vite@5.4.7(terser@5.33.0)) + specifier: ^0.63.0 + version: 0.63.0(postcss@8.4.45)(rollup@4.22.4)(vite@5.4.7(terser@5.33.0)) vite: specifier: ^5.4.7 version: 5.4.7(terser@5.33.0) @@ -361,139 +361,6 @@ packages: '@antfu/utils@0.7.10': resolution: {integrity: sha512-+562v9k4aI80m1+VuMHehNJWLOFjBnXn3tdOitzD0il5b7smkSBal4+a3oKiQTbrwMmN/TBUMDvbdoWDehgOww==} - '@babel/code-frame@7.24.7': - resolution: {integrity: sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==} - engines: {node: '>=6.9.0'} - - '@babel/compat-data@7.25.4': - resolution: {integrity: sha512-+LGRog6RAsCJrrrg/IO6LGmpphNe5DiK30dGjCoxxeGv49B10/3XYGxPsAwrDlMFcFEvdAUavDT8r9k/hSyQqQ==} - engines: {node: '>=6.9.0'} - - '@babel/core@7.25.2': - resolution: {integrity: sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==} - engines: {node: '>=6.9.0'} - - '@babel/generator@7.25.6': - resolution: {integrity: sha512-VPC82gr1seXOpkjAAKoLhP50vx4vGNlF4msF64dSFq1P8RfB+QAuJWGHPXXPc8QyfVWwwB/TNNU4+ayZmHNbZw==} - engines: {node: '>=6.9.0'} - - '@babel/helper-annotate-as-pure@7.24.7': - resolution: {integrity: sha512-BaDeOonYvhdKw+JoMVkAixAAJzG2jVPIwWoKBPdYuY9b452e2rPuI9QPYh3KpofZ3pW2akOmwZLOiOsHMiqRAg==} - engines: {node: '>=6.9.0'} - - '@babel/helper-compilation-targets@7.25.2': - resolution: {integrity: sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==} - engines: {node: '>=6.9.0'} - - '@babel/helper-create-class-features-plugin@7.25.4': - resolution: {integrity: sha512-ro/bFs3/84MDgDmMwbcHgDa8/E6J3QKNTk4xJJnVeFtGE+tL0K26E3pNxhYz2b67fJpt7Aphw5XcploKXuCvCQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - - '@babel/helper-member-expression-to-functions@7.24.8': - resolution: {integrity: sha512-LABppdt+Lp/RlBxqrh4qgf1oEH/WxdzQNDJIu5gC/W1GyvPVrOBiItmmM8wan2fm4oYqFuFfkXmlGpLQhPY8CA==} - engines: {node: '>=6.9.0'} - - '@babel/helper-module-imports@7.24.7': - resolution: {integrity: sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==} - engines: {node: '>=6.9.0'} - - '@babel/helper-module-transforms@7.25.2': - resolution: {integrity: sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - - '@babel/helper-optimise-call-expression@7.24.7': - resolution: {integrity: sha512-jKiTsW2xmWwxT1ixIdfXUZp+P5yURx2suzLZr5Hi64rURpDYdMW0pv+Uf17EYk2Rd428Lx4tLsnjGJzYKDM/6A==} - engines: {node: '>=6.9.0'} - - '@babel/helper-plugin-utils@7.24.8': - resolution: {integrity: sha512-FFWx5142D8h2Mgr/iPVGH5G7w6jDn4jUSpZTyDnQO0Yn7Ks2Kuz6Pci8H6MPCoUJegd/UZQ3tAvfLCxQSnWWwg==} - engines: {node: '>=6.9.0'} - - '@babel/helper-replace-supers@7.25.0': - resolution: {integrity: sha512-q688zIvQVYtZu+i2PsdIu/uWGRpfxzr5WESsfpShfZECkO+d2o+WROWezCi/Q6kJ0tfPa5+pUGUlfx2HhrA3Bg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0 - - '@babel/helper-simple-access@7.24.7': - resolution: {integrity: sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==} - engines: {node: '>=6.9.0'} - - '@babel/helper-skip-transparent-expression-wrappers@7.24.7': - resolution: {integrity: sha512-IO+DLT3LQUElMbpzlatRASEyQtfhSE0+m465v++3jyyXeBTBUjtVZg28/gHeV5mrTJqvEKhKroBGAvhW+qPHiQ==} - engines: {node: '>=6.9.0'} - - '@babel/helper-string-parser@7.24.8': - resolution: {integrity: sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==} - engines: {node: '>=6.9.0'} - - '@babel/helper-validator-identifier@7.24.7': - resolution: {integrity: sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==} - engines: {node: '>=6.9.0'} - - '@babel/helper-validator-option@7.24.8': - resolution: {integrity: sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==} - engines: {node: '>=6.9.0'} - - '@babel/helpers@7.25.6': - resolution: {integrity: sha512-Xg0tn4HcfTijTwfDwYlvVCl43V6h4KyVVX2aEm4qdO/PC6L2YvzLHFdmxhoeSA3eslcE6+ZVXHgWwopXYLNq4Q==} - engines: {node: '>=6.9.0'} - - '@babel/highlight@7.24.7': - resolution: {integrity: sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==} - engines: {node: '>=6.9.0'} - - '@babel/parser@7.25.6': - resolution: {integrity: sha512-trGdfBdbD0l1ZPmcJ83eNxB9rbEax4ALFTF7fN386TMYbeCQbyme5cOEXQhbGXKebwGaB/J52w1mrklMcbgy6Q==} - engines: {node: '>=6.0.0'} - hasBin: true - - '@babel/plugin-syntax-jsx@7.24.7': - resolution: {integrity: sha512-6ddciUPe/mpMnOKv/U+RSd2vvVy+Yw/JfBB0ZHYjEZt9NLHmCUylNYlsbqCCS1Bffjlb0fCwC9Vqz+sBz6PsiQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-syntax-typescript@7.25.4': - resolution: {integrity: sha512-uMOCoHVU52BsSWxPOMVv5qKRdeSlPuImUCB2dlPuBSU+W2/ROE7/Zg8F2Kepbk+8yBa68LlRKxO+xgEVWorsDg==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-modules-commonjs@7.24.8': - resolution: {integrity: sha512-WHsk9H8XxRs3JXKWFiqtQebdh9b/pTk4EgueygFzYlTKAg0Ud985mSevdNjdXdFBATSKVJGQXP1tv6aGbssLKA==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/plugin-transform-typescript@7.25.2': - resolution: {integrity: sha512-lBwRvjSmqiMYe/pS0+1gggjJleUJi7NzjvQ1Fkqtt69hBa/0t1YuW/MLQMAPixfwaQOHUXsd6jeU3Z+vdGv3+A==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/preset-typescript@7.24.7': - resolution: {integrity: sha512-SyXRe3OdWwIwalxDg5UtJnJQO+YPcTfwiIY2B0Xlddh9o7jpWLvv8X1RthIeDOxQ+O1ML5BLPCONToObyVQVuQ==} - engines: {node: '>=6.9.0'} - peerDependencies: - '@babel/core': ^7.0.0-0 - - '@babel/template@7.25.0': - resolution: {integrity: sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==} - engines: {node: '>=6.9.0'} - - '@babel/traverse@7.25.6': - resolution: {integrity: sha512-9Vrcx5ZW6UwK5tvqsj0nGpp/XzqthkT0dqIc9g1AdtygFToNtTF67XzYS//dm+SAK9cp3B9R4ZO/46p63SCjlQ==} - engines: {node: '>=6.9.0'} - - '@babel/types@7.25.6': - resolution: {integrity: sha512-/l42B1qxpG6RdfYf343Uw1vmDjeNhneUXtzhojE7pDgfpEypmRhI6j1kr17XCVv4Cgl9HdAiQY2x0GwKm7rWCw==} - engines: {node: '>=6.9.0'} - '@chainsafe/abort-controller@3.0.1': resolution: {integrity: sha512-oyq0qgFJDIIgLpyPwTv4j/sHX/MITatFzY3/b42VSldyZfnUC1lYBx5RwFvzBv1Sq4APOj2VCZO23pDRwy5kew==} engines: {node: '>=6.5'} @@ -887,8 +754,8 @@ packages: '@iconify/types@2.0.0': resolution: {integrity: sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==} - '@iconify/utils@2.1.32': - resolution: {integrity: sha512-LeifFZPPKu28O3AEDpYJNdEbvS4/ojAPyIW+pF/vUpJTYnbTiXUHkCh0bwgFRzKvdpb8H4Fbfd/742++MF4fPQ==} + '@iconify/utils@2.1.33': + resolution: {integrity: sha512-jP9h6v/g0BIZx0p7XGJJVtkVnydtbgTgt9mVNcGDYwaa7UhdHdI9dvoq+gKj9sijMSJKxUPEG2JyjsgXjxL7Kw==} '@jridgewell/gen-mapping@0.3.5': resolution: {integrity: sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==} @@ -1210,92 +1077,86 @@ packages: resolution: {integrity: sha512-b1tx0orFCCh/THWPQa2ZwWzvOeyzzp36vkJYOpVg0u8UVOIsfVrnuC9FqAw9gRKn+rG2VmWQ/zDJZzkxUnj/XQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@unocss/astro@0.62.3': - resolution: {integrity: sha512-C6ZdyLbLDS0LebwmgwVItLNAOSkL/tvVWNRd1i3Jy5uj1vPxlrw+3lIYiHjEofn0GFpBiwlv5+OCvO1Xpq5MqA==} + '@unocss/astro@0.63.0': + resolution: {integrity: sha512-ToF9X1uvm8CdxND+oVHrRPQyBsE5FZI1vz9lLVvqwzhOi9rfjGeoKeN7rV0njM2ohC+gbbPRDU9kKmZMnHLSzg==} peerDependencies: vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0 peerDependenciesMeta: vite: optional: true - '@unocss/cli@0.62.3': - resolution: {integrity: sha512-yEl1iNKkBVpo8+i8gzveM5/0/vOVe6m8+FmuSDuKeSPJnYMhI1mAn+OCKFb/I+qEeLbRPXebbJUUB1xZNzya+w==} + '@unocss/cli@0.63.0': + resolution: {integrity: sha512-nJuHLDxgxSYhPQ0OY5BIZ0XQJyphapAFHYNh1ahTfJRa6IBIcCZb/JZFHjczCCLSSp1PAO4SJBNEPjJxZWr3rQ==} engines: {node: '>=14'} hasBin: true - '@unocss/config@0.62.3': - resolution: {integrity: sha512-zYOvFE0HfGIbnP/AvsbAlJpPRx9CQyXzL11m/8zgsHW5SGlJIYxuTll83l/xu026G5mPiksy7quoEOEgCLslqw==} + '@unocss/config@0.63.0': + resolution: {integrity: sha512-rlhki3GA6pNX05sjDGJO4vTDonOfDngL9CJWEbn9hELgMZQ3+OAO4mePMA6OsYfMxYz5qpfDKwofkuV4CGNDKQ==} engines: {node: '>=14'} - '@unocss/core@0.62.3': - resolution: {integrity: sha512-Pfyrj8S7jq9K1QXD6Z5BCeiQavaHpbMN5q958/kmdbNGp57hOg1e346fMJAvgPjLBR+lE/hgZEsDrijtRiZXnw==} + '@unocss/core@0.63.0': + resolution: {integrity: sha512-ZGvmQ3CgGlGJy8TDYUCLRzgv+uyUj2nv0a5MsVvLAD1BKHN96YSt/zRdvRprKUkSzP0yLw44k3kv59md8Bn8xw==} - '@unocss/extractor-arbitrary-variants@0.62.3': - resolution: {integrity: sha512-9ZscWyXEwDZif+b56xZyJFHwJOjdMXmj+6x96jOsnRNBzwT9eW7YcGCErP1ih/q1S6KmuRrHM/JOXMBQ6H4qlw==} + '@unocss/extractor-arbitrary-variants@0.63.0': + resolution: {integrity: sha512-zHSpKnXU+So15VtJV8CZE+VV6zxeard+fi3bfepCAZFI/8vxU7aTrEPeXniF06eIQeJZTGVn/EaOw4AKiy1ZRA==} - '@unocss/extractor-svelte@0.62.3': - resolution: {integrity: sha512-0Ani/K5/2qdY5sbszkIVzbQMTfAVUi4bfpu2GCkdWTtedsl0zLyYIp+OjuXRswhslQQVKOh5WTrowbqTRp3EOQ==} + '@unocss/extractor-svelte@0.63.0': + resolution: {integrity: sha512-1cm/SI01uNaZsXJTDsB8pSTg/Rlpg7PKtG8/BSbHFvR7yiwQAstKaCGCPraHy/7wUgMMFMsP4Pj9yy+9HyU/Jw==} - '@unocss/inspector@0.62.3': - resolution: {integrity: sha512-nTSXOf7YimFPxEYJo5VfP5wlMgYOCjlv3c5Ub/0fynCJXZNb89SFeU05ABXkEgg/FfiobVBTscikLc6guW8eHQ==} + '@unocss/inspector@0.63.0': + resolution: {integrity: sha512-vcAHezenaP3TxiX7GBNyLFRNrhw8oZlz8xNDiuSR3QI6Z2gCrCxdEwblFdjJKhBcNWK79oXm2QCHzD3/Fb7xvg==} - '@unocss/postcss@0.62.3': - resolution: {integrity: sha512-CwL378ef0QazduXqlaGcWgKJAzemBUxdhapWWiRqI8sXC/eXht5xK6nS1JxqADDuxosgqsGdvcCGmP8ZFrEyiA==} + '@unocss/postcss@0.63.0': + resolution: {integrity: sha512-p0JvVJjOxi9O1dRfto6SOqFqV+aq0knqiTlyOmmINiwkcvXWYmFGXKTw6DTR8ACYF8MwpnACt81DF7yNqA5L3g==} engines: {node: '>=14'} peerDependencies: postcss: ^8.4.21 - '@unocss/preset-attributify@0.62.3': - resolution: {integrity: sha512-ORNwyLobGTwnn/tK5yHnMabdJU6Mr/C4LyFH7G8VSLit/aVS0fFa795kJXwxfbqQoQ7Gw0Zxs9oE5RXI0/0y7g==} + '@unocss/preset-attributify@0.63.0': + resolution: {integrity: sha512-9t9rlo7JIhd+SbjupYTwKmyPgqc9uFa6zuaq+ol5HdTdbnDvj9dUAJSEvQEzB0NebjIn+n94WpHhRTX8M6O2Lw==} - '@unocss/preset-icons@0.62.3': - resolution: {integrity: sha512-Ie+5RTyac1Q5CNB/s/4aB4VTHAQgQqsI5hshMNLkJ0Jj1lWxodUdEbCRKjXDalRjAXOS9vsLjfJ35ozJ1RSTIQ==} + '@unocss/preset-icons@0.63.0': + resolution: {integrity: sha512-MYxhrmyf+cneKp1mB35OCewlYSRuFhEb5cvNN0q/doAM18/beELPDTVLGiVzspin8de3fgiqy9XIQdEVgtujMQ==} - '@unocss/preset-mini@0.62.3': - resolution: {integrity: sha512-dn/8ubeW2ry/ZF3iKxdQHnS0l3EBibt0rIOE/XVwx24ub6pRzclU4r7xHnXeqvAFOO9PoiKDGgFR92m6R2MxyQ==} + '@unocss/preset-mini@0.63.0': + resolution: {integrity: sha512-lpGtqtXqr6yVLeWiQmY1lb7sJBcb2O3CuFduKlx7HZKZOJpnRtZoZeNRo1XYcH6BRPBxPgru/d/m43AGMnDqew==} - '@unocss/preset-tagify@0.62.3': - resolution: {integrity: sha512-8BpUCZ5sjOZOzBKtu7ecfhRggwwPF78IqeqeNjI+XYRs8r7TBBcUVeF6zUkwhlX/TbtREkw2OZj0Iusa9CBO+A==} + '@unocss/preset-tagify@0.63.0': + resolution: {integrity: sha512-RrXYruhvSqB4QaDTCHiRQUSfP2b1ie1eEhZ0HV9/WqCtgQjan1w9uV8bbA1TPXHLdMXWyt6tAoWUZPRdszBXZg==} - '@unocss/preset-typography@0.62.3': - resolution: {integrity: sha512-GjtDgQ1Jec/5RNmnyGMWMgyPdStWcFG/S+NUfOuroRsGSI8PDxihVOwFu5CwvOB2J2r6mRNLeUYMluE05jW3sw==} + '@unocss/preset-typography@0.63.0': + resolution: {integrity: sha512-4uhTRa2D6yB2sBjV3lksP/rpc2kq0p6v+yvpAvor73PADQCpLLMW+HPpS3YZe52nagHBf/LpY8gVNoGTIy/8FA==} - '@unocss/preset-uno@0.62.3': - resolution: {integrity: sha512-RlsrMlpEzoZqB0lr5VvlkHGpEgr0Vp6z4Q/7DjW5t7mi20Z2i8olaLGWM0TO1wKoRi8bxc6HP0RHUS7pHtZxBA==} + '@unocss/preset-uno@0.63.0': + resolution: {integrity: sha512-rXBz83FQG/FynPMhYQ5xlQ5ai9clYqmlubvDQR/UvEtuQWL0wIK2NiBFBGosn4Q0ukT0GrwOIicV8aizHu2tAg==} - '@unocss/preset-web-fonts@0.62.3': - resolution: {integrity: sha512-rGEouncGFwcUY1cjkQ/ZoSmEzOeSi3Yk4YAfHGyS0ff5zKuTDWZgivB8hh/mTtvRzZunIL+FW1+1z5G9rUwjgQ==} + '@unocss/preset-web-fonts@0.63.0': + resolution: {integrity: sha512-0ybW2EG6fAtK0XrB82wNK7ETiE12+ctfRxqWnKgLxpcYHIYVS0m8bRWgBWpJ+1l9I0fWilyB622rg6qIBHHU3g==} - '@unocss/preset-wind@0.62.3': - resolution: {integrity: sha512-6+VNce1he1U5EXKlXRwTIPn8KeK6bZ2jAEgcCxk8mFy8SzOlLeYzXCI9lcdiWRTjIeIiK5iSaUqmsQFtKdTyQg==} + '@unocss/preset-wind@0.63.0': + resolution: {integrity: sha512-TVgFdxiIm4BfGLBE/4XqpeD2a+yMlrgTRY12WMEjj8DduNbuyuE+mnvaN7iY5+/DMIsng+eKyM3gamJew2r30w==} - '@unocss/reset@0.62.3': - resolution: {integrity: sha512-XVKPkbm8y9SGzRaG3x+HygGZURm50MvKLVHXsbxi67RbIir9Ouyt9hQTV6Xs3RicRZFWOpJx3wMRb8iKUOe5Zw==} + '@unocss/reset@0.63.0': + resolution: {integrity: sha512-QAAXxITLSWaNNK2+Mn1m2IeaCqrS3U9dszId2GVaiTHVe30M7vpMZQ6NrJI7xcD7DZ0kuh48BoZl5ttuiJkeww==} - '@unocss/rule-utils@0.62.3': - resolution: {integrity: sha512-qI37jHH//XzyR5Y2aN3Kpo4lQrQO+CaiXpqPSwMLYh2bIypc2RQVpqGVtU736x0eA6IIx41XEkKzUW+VtvJvmg==} + '@unocss/rule-utils@0.63.0': + resolution: {integrity: sha512-OKA2LzSPUXsYtfzx2G8Mw7/IhIOYxJNprBg7QwRF0e3eVmo87Ae1G5m9cghBLh7h7Ur1SgG5PCNhI0dZg6f7XA==} engines: {node: '>=14'} - '@unocss/scope@0.62.3': - resolution: {integrity: sha512-TJGmFfsMrTo8DBJ7CJupIqObpgij+w4jCHMBf1uu0/9jbm63dH6WGcrl3zf5mm6UBTeLmB0RwJ8K4hs7LtrBDQ==} - - '@unocss/transformer-attributify-jsx-babel@0.62.3': - resolution: {integrity: sha512-3yFZPSoN8VLiAGUAFIyfDRv9HQYTKFGKawDdMM9ATZmSEYOecJnYjS2HayT1P9kzGwBwuKoFjcX50JH1PuNokg==} + '@unocss/transformer-attributify-jsx@0.63.0': + resolution: {integrity: sha512-+U+udpaRoUn5gXlejmT6h5l6ZcPr/8QCj4edCURyTOUZYrOd8siZzjDRisXP5/fskm4UqEgdlx97Qar97O6CYQ==} - '@unocss/transformer-attributify-jsx@0.62.3': - resolution: {integrity: sha512-AutidZj26QW1vLQzuW/aQigC/5ZnIeqGYIBeb/O+FKKt0bU411tHrHnA1iV4CoxIdWJTkw2sGAl6z6YvwAYG6w==} + '@unocss/transformer-compile-class@0.63.0': + resolution: {integrity: sha512-bCapGembNCy9xY8CJxCretx/lj7mTyhnoO79CkTxckHlnUGEgNj9gbvtLkXCPJAfRLmBWMtgeMdUivG5+auq1A==} - '@unocss/transformer-compile-class@0.62.3': - resolution: {integrity: sha512-1hf+99wJXzQXQPz9xR0AiTB3vBXT5RiEyugIX95HFx7EvSE/P17RP90yKEKZtDZRUwGiz2vIyySlxcKTFak9Vg==} + '@unocss/transformer-directives@0.63.0': + resolution: {integrity: sha512-+qWfNKrOSuuaAfM5RSyqeCNy2s3nIct5knwlkzg/cYTT9UiKyIALeJY/k+plVM99WlGDNh/k6otNkNv5N/Z6wg==} - '@unocss/transformer-directives@0.62.3': - resolution: {integrity: sha512-HqHwFOA7DfxD/A1ROZIp8Dr8iZcE0z4w3VQtViWPQ89Fqmb7p2wCPGekk+8yW5PAltpynvHE4ahJEto5xjdg6w==} + '@unocss/transformer-variant-group@0.63.0': + resolution: {integrity: sha512-JNTqxogGDd+XpbP3oRUulNEaY1H+42+4KXQxlfxllikgqe28QHorhBbM/4ObCw085tKhrM+oDH391KF+VUNkhQ==} - '@unocss/transformer-variant-group@0.62.3': - resolution: {integrity: sha512-oNX1SdfWemz0GWGSXACu8NevM0t2l44j2ancnooNkNz3l1+z1nbn4vFwfsJCOqOaoVm4ZqxaiQ8HIx81ZSiU1A==} - - '@unocss/vite@0.62.3': - resolution: {integrity: sha512-RrqF6Go8s0BGpwRfkOiLuO+n3CUE/CXxGqb0ipbUARhmNWJlekE3YPfayqImSEnCcImpaPgtVGv6Y0u3kLGG/w==} + '@unocss/vite@0.63.0': + resolution: {integrity: sha512-7UH36o7UEwMbrifuvTj6wOPJZ3DNK21HO+ACOlFaM9HGVmlEUEuzC5fRVid0Q/zRlo0URaI/82TkvEh3sUU8Zg==} peerDependencies: vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0 @@ -1329,10 +1190,6 @@ packages: resolution: {integrity: sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==} engines: {node: '>=8'} - ansi-styles@3.2.1: - resolution: {integrity: sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==} - engines: {node: '>=4'} - ansi-styles@4.3.0: resolution: {integrity: sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==} engines: {node: '>=8'} @@ -1385,11 +1242,6 @@ packages: browser-stdout@1.3.1: resolution: {integrity: sha512-qhAVI1+Av2X7qelOfAIYwXONood6XlZE/fXaBSmW/T5SzLAmCgzi+eiWE7fUvbHaeNBQH13UftjpXxsfLkMpgw==} - browserslist@4.23.3: - resolution: {integrity: sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==} - engines: {node: ^6 || ^7 || ^8 || ^9 || ^10 || ^11 || ^12 || >=13.7} - hasBin: true - buffer-from@1.1.2: resolution: {integrity: sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==} @@ -1414,13 +1266,6 @@ packages: resolution: {integrity: sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==} engines: {node: '>=10'} - caniuse-lite@1.0.30001659: - resolution: {integrity: sha512-Qxxyfv3RdHAfJcXelgf0hU4DFUVXBGTjqrBUZLUh8AtlGnsDo+CnncYtTd95+ZKfnANUOzxyIQCuU/UeBZBYoA==} - - chalk@2.4.2: - resolution: {integrity: sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==} - engines: {node: '>=4'} - chalk@4.1.2: resolution: {integrity: sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==} engines: {node: '>=10'} @@ -1448,16 +1293,10 @@ packages: code-red@1.0.4: resolution: {integrity: sha512-7qJWqItLA8/VPVlKJlFXU+NBlo/qyfs39aJcuMT/2ere32ZqvF5OSxgdM5xOfJJ7O429gg2HM47y8v9P+9wrNw==} - color-convert@1.9.3: - resolution: {integrity: sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==} - color-convert@2.0.1: resolution: {integrity: sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==} engines: {node: '>=7.0.0'} - color-name@1.1.3: - resolution: {integrity: sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==} - color-name@1.1.4: resolution: {integrity: sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==} @@ -1477,9 +1316,6 @@ packages: resolution: {integrity: sha512-I5qxpzLv+sJhTVEoLYNcTW+bThDCPsit0vLNKShZx6rLtpilNpmmeTPaeqJb9ZE9dV3DGaeby6Vuhrw38WjeyQ==} engines: {node: ^14.18.0 || >=16.10.0} - convert-source-map@2.0.0: - resolution: {integrity: sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==} - covector@0.12.3: resolution: {integrity: sha512-9LNME5eb4/KMdWD2jyJ4XX6CvD45xsF9hmxTQWAoDSuDGKdyh98wzUupz4BrJ9iviR8R9pI3D6Mozv13UX0g+A==} engines: {node: '>=18'} @@ -1496,6 +1332,10 @@ packages: resolution: {integrity: sha512-6Fv1DV/TYw//QF5IzQdqsNDjx/wc8TrMBZsqjL9eW01tWb7R7k/mq+/VXfJCl7SoD5emsJop9cOByJZfs8hYIw==} engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0} + css-tree@3.0.0: + resolution: {integrity: sha512-o88DVQ6GzsABn1+6+zo2ct801dBO5OASVyxbbvA2W20ue2puSh/VOuqUj90eUeMSX/xqGqBmOKiRQN7tJOuBXw==} + engines: {node: ^10 || ^12.20.0 || ^14.13.0 || >=15.0.0} + ctrlc-windows@2.1.0: resolution: {integrity: sha512-OrX5KI+K+2NMN91QIhYZdW7VDO2YsSdTZW494pA7Nvw/wBdU2hz+MGP006bR978zOTrG6Q8EIeJvLJmLqc6MsQ==} @@ -1543,9 +1383,6 @@ packages: effection@2.0.8: resolution: {integrity: sha512-/v7cbPIXGGylInQgHHjJutzqUn6VIfcP13hh2X0hXf04wwAlSI+lVjUBKpr5TX3+v9dXV/JLHO/pqQ9Cp1QAnQ==} - electron-to-chromium@1.5.18: - resolution: {integrity: sha512-1OfuVACu+zKlmjsNdcJuVQuVE61sZOLbNM4JAQ1Rvh6EOj0/EUKhMJjRH73InPlXSh8HIJk1cVZ8pyOV/FMdUQ==} - emoji-regex@8.0.0: resolution: {integrity: sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==} @@ -1563,10 +1400,6 @@ packages: resolution: {integrity: sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==} engines: {node: '>=6'} - escape-string-regexp@1.0.5: - resolution: {integrity: sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==} - engines: {node: '>=0.8.0'} - escape-string-regexp@4.0.0: resolution: {integrity: sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==} engines: {node: '>=10'} @@ -1709,10 +1542,6 @@ packages: function-bind@1.1.2: resolution: {integrity: sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==} - gensync@1.0.0-beta.2: - resolution: {integrity: sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==} - engines: {node: '>=6.9.0'} - get-caller-file@2.0.5: resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} engines: {node: 6.* || 8.* || >= 10.*} @@ -1733,10 +1562,6 @@ packages: engines: {node: '>=12'} deprecated: Glob versions prior to v9 are no longer supported - globals@11.12.0: - resolution: {integrity: sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==} - engines: {node: '>=4'} - globals@14.0.0: resolution: {integrity: sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==} engines: {node: '>=18'} @@ -1752,10 +1577,6 @@ packages: resolution: {integrity: sha512-ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q==} engines: {node: '>=10'} - has-flag@3.0.0: - resolution: {integrity: sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==} - engines: {node: '>=4'} - has-flag@4.0.0: resolution: {integrity: sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==} engines: {node: '>=8'} @@ -1779,8 +1600,8 @@ packages: resolution: {integrity: sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==} engines: {node: '>=6'} - importx@0.4.4: - resolution: {integrity: sha512-Lo1pukzAREqrBnnHC+tj+lreMTAvyxtkKsMxLY8H15M/bvLl54p3YuoTI70Tz7Il0AsgSlD7Lrk/FaApRcBL7w==} + importx@0.5.0: + resolution: {integrity: sha512-qROz3rSOjQYclmEQAajH9RhBuqpAGHM+5CNd9fk+TsF4JKmQsAI1egafW8XZZv8vARCo4nAmmt5d0eI2B8GUsA==} imurmurhash@0.1.4: resolution: {integrity: sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==} @@ -1854,26 +1675,14 @@ packages: isexe@2.0.0: resolution: {integrity: sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==} - jiti@1.21.6: - resolution: {integrity: sha512-2yTgeWTWzMWkHu6Jp9NKgePDaYHbntiwvYuuJLbbN9vl7DC9DvXKOB2BC3ZZ92D3cvV/aflH0osDfwpHepQ53w==} + jiti@2.0.0: + resolution: {integrity: sha512-CJ7e7Abb779OTRv3lomfp7Mns/Sy1+U4pcAx5VbjxCZD5ZM/VJaXPpPjNKjtSvWQy/H86E49REXR34dl1JEz9w==} hasBin: true - jiti@2.0.0-beta.3: - resolution: {integrity: sha512-pmfRbVRs/7khFrSAYnSiJ8C0D5GvzkE4Ey2pAvUcJsw1ly/p+7ut27jbJrjY79BpAJQJ4gXYFtK6d1Aub+9baQ==} - hasBin: true - - js-tokens@4.0.0: - resolution: {integrity: sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==} - js-yaml@4.1.0: resolution: {integrity: sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==} hasBin: true - jsesc@2.5.2: - resolution: {integrity: sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==} - engines: {node: '>=4'} - hasBin: true - json-buffer@3.0.1: resolution: {integrity: sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==} @@ -1883,11 +1692,6 @@ packages: json-stable-stringify-without-jsonify@1.0.1: resolution: {integrity: sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==} - json5@2.2.3: - resolution: {integrity: sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==} - engines: {node: '>=6'} - hasBin: true - keyv@4.5.4: resolution: {integrity: sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==} @@ -1930,9 +1734,6 @@ packages: longest-streak@2.0.4: resolution: {integrity: sha512-vM6rUVCVUJJt33bnmHiZEvr7wPT78ztX7rojL+LW51bHtLh6HTjx84LA5W4+oa6aKEJA7jJu5LR6vQRBpA5DVg==} - lru-cache@5.1.1: - resolution: {integrity: sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==} - magic-string@0.30.11: resolution: {integrity: sha512-+Wri9p0QHMy+545hKww7YAu5NyzF8iomPL/RQazugQ9+Ez4Ic3mERMd8ZTX5rfK944j+560ZJi8iAwgak1Ac7A==} @@ -1951,6 +1752,9 @@ packages: mdn-data@2.0.30: resolution: {integrity: sha512-GaqWWShW4kv/G9IEucWScBx9G1/vsFZZJUO+tD26M8J8z3Kw5RDQjaoZe03YAClgeS/SWPOcb4nkFBTEi5DUEA==} + mdn-data@2.10.0: + resolution: {integrity: sha512-qq7C3EtK3yJXMwz1zAab65pjl+UhohqMOctTgcqjLOWABqmwj+me02LSsCuEUxnst9X1lCBpoE0WArGKgdGDzw==} + merge2@1.4.1: resolution: {integrity: sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==} engines: {node: '>= 8'} @@ -2011,15 +1815,12 @@ packages: encoding: optional: true - node-releases@2.0.18: - resolution: {integrity: sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==} - normalize-path@3.0.0: resolution: {integrity: sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==} engines: {node: '>=0.10.0'} - ofetch@1.3.4: - resolution: {integrity: sha512-KLIET85ik3vhEfS+3fDlc/BAZiAp+43QEC/yCo5zkNoY2YaKvNkOaFr/6wCFgFH1kuYQM5pMNi0Tg8koiIemtw==} + ofetch@1.4.0: + resolution: {integrity: sha512-MuHgsEhU6zGeX+EMh+8mSMrYTnsqJQQrpM00Q6QHMKNqQ0bKy0B43tk8tL1wg+CnsSTy1kg4Ir2T5Ig6rD+dfQ==} on-exit-leak-free@2.1.2: resolution: {integrity: sha512-0eJJY6hXLGf1udHwfNftBqH+g73EU4B504nZeKpz1sYRKafAghwxEJunB2O7rDZkL4PGfsMVnTXZ2EjibbqcsA==} @@ -2267,10 +2068,6 @@ packages: resolution: {integrity: sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==} engines: {node: '>=8'} - supports-color@5.5.0: - resolution: {integrity: sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==} - engines: {node: '>=4'} - supports-color@7.2.0: resolution: {integrity: sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==} engines: {node: '>=8'} @@ -2311,10 +2108,6 @@ packages: resolution: {integrity: sha512-NbBoFBpqfcgd1tCiO8Lkfdk+xrA7mlLR9zgvZcZWQQwU63XAfUePyd6wZBaU93Hqw347lHnwFzttAkemHzzz4g==} engines: {node: '>=12.0.0'} - to-fast-properties@2.0.0: - resolution: {integrity: sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==} - engines: {node: '>=4'} - to-regex-range@5.0.1: resolution: {integrity: sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==} engines: {node: '>=8.0'} @@ -2338,8 +2131,8 @@ packages: tslib@2.7.0: resolution: {integrity: sha512-gLXCKdN1/j47AiHiOkJN69hJmcbGTHI0ImLmbYLHykhgeN0jVGola9yVjFgzCUklsZQMW55o+dW7IXv3RCXDzA==} - tsx@4.19.0: - resolution: {integrity: sha512-bV30kM7bsLZKZIOCHeMNVMJ32/LuJzLVajkQI/qf92J2Qr08ueLQvW00PUZGiuLPP760UINwupgUj8qrSCPUKg==} + tsx@4.19.1: + resolution: {integrity: sha512-0flMz1lh74BR4wOvBjuh9olbnwqCPc35OOlfyzHba0Dc+QNUeWX/Gq2YTbnwcWPO3BMd8fkzRVrHcsR+a7z7rA==} engines: {node: '>=18.0.0'} hasBin: true @@ -2368,8 +2161,8 @@ packages: ufo@1.5.4: resolution: {integrity: sha512-UsUk3byDzKd04EyoZ7U4DOlxQaD14JUKQl6/P7wiX4FNvUfm3XL246n9W5AmqwW5RSFJ27NAuM0iLscAOYUiGQ==} - unconfig@0.5.5: - resolution: {integrity: sha512-VQZ5PT9HDX+qag0XdgQi8tJepPhXiR/yVOkn707gJDKo31lGjRilPREiQJ9Z6zd/Ugpv6ZvO5VxVIcatldYcNQ==} + unconfig@0.6.0: + resolution: {integrity: sha512-4C67J0nIF2QwSXty2kW3zZx1pMZ3iXabylvJWWgHybWVUcMf9pxwsngoQt0gC+AVstRywFqrRBp3qOXJayhpOw==} unified@9.2.2: resolution: {integrity: sha512-Sg7j110mtefBD+qunSLO1lqOEKdrwBFBrR6Qd8f4uwkhWNlbkaqwHse6e7QvD3AP/MNoJdEDLaf8OxYyoWgorQ==} @@ -2377,11 +2170,11 @@ packages: unist-util-stringify-position@2.0.3: resolution: {integrity: sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==} - unocss@0.62.3: - resolution: {integrity: sha512-CLS6+JIlBobe/iPTz07pehyGDP8VqGJsiE+ZZ3Xkgib3hw76nCqAQF/4mJ8jVoV4C8KvGyVxmHaSSCFOkWmmZg==} + unocss@0.63.0: + resolution: {integrity: sha512-+C+qsKMDL2GyhY4/Dz3BrQcf/1yf1oRyej7ItW4Y7l1sIS1Zcsp9772IUlzuTEnLQQQOdOJVm99OB4TWnGndeg==} engines: {node: '>=14'} peerDependencies: - '@unocss/webpack': 0.62.3 + '@unocss/webpack': 0.63.0 vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0 peerDependenciesMeta: '@unocss/webpack': @@ -2389,12 +2182,6 @@ packages: vite: optional: true - update-browserslist-db@1.1.0: - resolution: {integrity: sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==} - hasBin: true - peerDependencies: - browserslist: '>= 4.21.0' - uri-js@4.4.1: resolution: {integrity: sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==} @@ -2472,9 +2259,6 @@ packages: resolution: {integrity: sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==} engines: {node: '>=10'} - yallist@3.1.1: - resolution: {integrity: sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==} - yargs-parser@20.2.9: resolution: {integrity: sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==} engines: {node: '>=10'} @@ -2525,205 +2309,6 @@ snapshots: '@antfu/utils@0.7.10': {} - '@babel/code-frame@7.24.7': - dependencies: - '@babel/highlight': 7.24.7 - picocolors: 1.1.0 - - '@babel/compat-data@7.25.4': {} - - '@babel/core@7.25.2': - dependencies: - '@ampproject/remapping': 2.3.0 - '@babel/code-frame': 7.24.7 - '@babel/generator': 7.25.6 - '@babel/helper-compilation-targets': 7.25.2 - '@babel/helper-module-transforms': 7.25.2(@babel/core@7.25.2) - '@babel/helpers': 7.25.6 - '@babel/parser': 7.25.6 - '@babel/template': 7.25.0 - '@babel/traverse': 7.25.6 - '@babel/types': 7.25.6 - convert-source-map: 2.0.0 - debug: 4.3.7(supports-color@8.1.1) - gensync: 1.0.0-beta.2 - json5: 2.2.3 - semver: 7.6.3 - transitivePeerDependencies: - - supports-color - - '@babel/generator@7.25.6': - dependencies: - '@babel/types': 7.25.6 - '@jridgewell/gen-mapping': 0.3.5 - '@jridgewell/trace-mapping': 0.3.25 - jsesc: 2.5.2 - - '@babel/helper-annotate-as-pure@7.24.7': - dependencies: - '@babel/types': 7.25.6 - - '@babel/helper-compilation-targets@7.25.2': - dependencies: - '@babel/compat-data': 7.25.4 - '@babel/helper-validator-option': 7.24.8 - browserslist: 4.23.3 - lru-cache: 5.1.1 - semver: 7.6.3 - - '@babel/helper-create-class-features-plugin@7.25.4(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-annotate-as-pure': 7.24.7 - '@babel/helper-member-expression-to-functions': 7.24.8 - '@babel/helper-optimise-call-expression': 7.24.7 - '@babel/helper-replace-supers': 7.25.0(@babel/core@7.25.2) - '@babel/helper-skip-transparent-expression-wrappers': 7.24.7 - '@babel/traverse': 7.25.6 - semver: 7.6.3 - transitivePeerDependencies: - - supports-color - - '@babel/helper-member-expression-to-functions@7.24.8': - dependencies: - '@babel/traverse': 7.25.6 - '@babel/types': 7.25.6 - transitivePeerDependencies: - - supports-color - - '@babel/helper-module-imports@7.24.7': - dependencies: - '@babel/traverse': 7.25.6 - '@babel/types': 7.25.6 - transitivePeerDependencies: - - supports-color - - '@babel/helper-module-transforms@7.25.2(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-module-imports': 7.24.7 - '@babel/helper-simple-access': 7.24.7 - '@babel/helper-validator-identifier': 7.24.7 - '@babel/traverse': 7.25.6 - transitivePeerDependencies: - - supports-color - - '@babel/helper-optimise-call-expression@7.24.7': - dependencies: - '@babel/types': 7.25.6 - - '@babel/helper-plugin-utils@7.24.8': {} - - '@babel/helper-replace-supers@7.25.0(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-member-expression-to-functions': 7.24.8 - '@babel/helper-optimise-call-expression': 7.24.7 - '@babel/traverse': 7.25.6 - transitivePeerDependencies: - - supports-color - - '@babel/helper-simple-access@7.24.7': - dependencies: - '@babel/traverse': 7.25.6 - '@babel/types': 7.25.6 - transitivePeerDependencies: - - supports-color - - '@babel/helper-skip-transparent-expression-wrappers@7.24.7': - dependencies: - '@babel/traverse': 7.25.6 - '@babel/types': 7.25.6 - transitivePeerDependencies: - - supports-color - - '@babel/helper-string-parser@7.24.8': {} - - '@babel/helper-validator-identifier@7.24.7': {} - - '@babel/helper-validator-option@7.24.8': {} - - '@babel/helpers@7.25.6': - dependencies: - '@babel/template': 7.25.0 - '@babel/types': 7.25.6 - - '@babel/highlight@7.24.7': - dependencies: - '@babel/helper-validator-identifier': 7.24.7 - chalk: 2.4.2 - js-tokens: 4.0.0 - picocolors: 1.1.0 - - '@babel/parser@7.25.6': - dependencies: - '@babel/types': 7.25.6 - - '@babel/plugin-syntax-jsx@7.24.7(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - - '@babel/plugin-syntax-typescript@7.25.4(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - - '@babel/plugin-transform-modules-commonjs@7.24.8(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-module-transforms': 7.25.2(@babel/core@7.25.2) - '@babel/helper-plugin-utils': 7.24.8 - '@babel/helper-simple-access': 7.24.7 - transitivePeerDependencies: - - supports-color - - '@babel/plugin-transform-typescript@7.25.2(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-annotate-as-pure': 7.24.7 - '@babel/helper-create-class-features-plugin': 7.25.4(@babel/core@7.25.2) - '@babel/helper-plugin-utils': 7.24.8 - '@babel/helper-skip-transparent-expression-wrappers': 7.24.7 - '@babel/plugin-syntax-typescript': 7.25.4(@babel/core@7.25.2) - transitivePeerDependencies: - - supports-color - - '@babel/preset-typescript@7.24.7(@babel/core@7.25.2)': - dependencies: - '@babel/core': 7.25.2 - '@babel/helper-plugin-utils': 7.24.8 - '@babel/helper-validator-option': 7.24.8 - '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.25.2) - '@babel/plugin-transform-modules-commonjs': 7.24.8(@babel/core@7.25.2) - '@babel/plugin-transform-typescript': 7.25.2(@babel/core@7.25.2) - transitivePeerDependencies: - - supports-color - - '@babel/template@7.25.0': - dependencies: - '@babel/code-frame': 7.24.7 - '@babel/parser': 7.25.6 - '@babel/types': 7.25.6 - - '@babel/traverse@7.25.6': - dependencies: - '@babel/code-frame': 7.24.7 - '@babel/generator': 7.25.6 - '@babel/parser': 7.25.6 - '@babel/template': 7.25.0 - '@babel/types': 7.25.6 - debug: 4.3.7(supports-color@8.1.1) - globals: 11.12.0 - transitivePeerDependencies: - - supports-color - - '@babel/types@7.25.6': - dependencies: - '@babel/helper-string-parser': 7.24.8 - '@babel/helper-validator-identifier': 7.24.7 - to-fast-properties: 2.0.0 - '@chainsafe/abort-controller@3.0.1': dependencies: event-target-shim: 5.0.1 @@ -2989,9 +2574,9 @@ snapshots: '@esbuild/win32-x64@0.23.1': optional: true - '@eslint-community/eslint-utils@4.4.0(eslint@9.11.1(jiti@1.21.6))': + '@eslint-community/eslint-utils@4.4.0(eslint@9.11.1(jiti@2.0.0))': dependencies: - eslint: 9.11.1(jiti@1.21.6) + eslint: 9.11.1(jiti@2.0.0) eslint-visitor-keys: 3.4.3 '@eslint-community/regexpp@4.11.1': {} @@ -3042,7 +2627,7 @@ snapshots: '@iconify/types@2.0.0': {} - '@iconify/utils@2.1.32': + '@iconify/utils@2.1.33': dependencies: '@antfu/install-pkg': 0.4.1 '@antfu/utils': 0.7.10 @@ -3264,15 +2849,15 @@ snapshots: '@types/unist@2.0.11': {} - '@typescript-eslint/eslint-plugin@8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2)': + '@typescript-eslint/eslint-plugin@8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2))(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': dependencies: '@eslint-community/regexpp': 4.11.1 - '@typescript-eslint/parser': 8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2) + '@typescript-eslint/parser': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) '@typescript-eslint/scope-manager': 8.7.0 - '@typescript-eslint/type-utils': 8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2) - '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2) + '@typescript-eslint/type-utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) '@typescript-eslint/visitor-keys': 8.7.0 - eslint: 9.11.1(jiti@1.21.6) + eslint: 9.11.1(jiti@2.0.0) graphemer: 1.4.0 ignore: 5.3.2 natural-compare: 1.4.0 @@ -3282,14 +2867,14 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2)': + '@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': dependencies: '@typescript-eslint/scope-manager': 8.7.0 '@typescript-eslint/types': 8.7.0 '@typescript-eslint/typescript-estree': 8.7.0(typescript@5.6.2) '@typescript-eslint/visitor-keys': 8.7.0 debug: 4.3.7(supports-color@8.1.1) - eslint: 9.11.1(jiti@1.21.6) + eslint: 9.11.1(jiti@2.0.0) optionalDependencies: typescript: 5.6.2 transitivePeerDependencies: @@ -3300,10 +2885,10 @@ snapshots: '@typescript-eslint/types': 8.7.0 '@typescript-eslint/visitor-keys': 8.7.0 - '@typescript-eslint/type-utils@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2)': + '@typescript-eslint/type-utils@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': dependencies: '@typescript-eslint/typescript-estree': 8.7.0(typescript@5.6.2) - '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2) + '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) debug: 4.3.7(supports-color@8.1.1) ts-api-utils: 1.3.0(typescript@5.6.2) optionalDependencies: @@ -3329,13 +2914,13 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2)': + '@typescript-eslint/utils@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@1.21.6)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@2.0.0)) '@typescript-eslint/scope-manager': 8.7.0 '@typescript-eslint/types': 8.7.0 '@typescript-eslint/typescript-estree': 8.7.0(typescript@5.6.2) - eslint: 9.11.1(jiti@1.21.6) + eslint: 9.11.1(jiti@2.0.0) transitivePeerDependencies: - supports-color - typescript @@ -3345,24 +2930,24 @@ snapshots: '@typescript-eslint/types': 8.7.0 eslint-visitor-keys: 3.4.3 - '@unocss/astro@0.62.3(rollup@4.22.4)(vite@5.4.7(terser@5.33.0))': + '@unocss/astro@0.63.0(rollup@4.22.4)(vite@5.4.7(terser@5.33.0))': dependencies: - '@unocss/core': 0.62.3 - '@unocss/reset': 0.62.3 - '@unocss/vite': 0.62.3(rollup@4.22.4)(vite@5.4.7(terser@5.33.0)) + '@unocss/core': 0.63.0 + '@unocss/reset': 0.63.0 + '@unocss/vite': 0.63.0(rollup@4.22.4)(vite@5.4.7(terser@5.33.0)) optionalDependencies: vite: 5.4.7(terser@5.33.0) transitivePeerDependencies: - rollup - supports-color - '@unocss/cli@0.62.3(rollup@4.22.4)': + '@unocss/cli@0.63.0(rollup@4.22.4)': dependencies: '@ampproject/remapping': 2.3.0 '@rollup/pluginutils': 5.1.2(rollup@4.22.4) - '@unocss/config': 0.62.3 - '@unocss/core': 0.62.3 - '@unocss/preset-uno': 0.62.3 + '@unocss/config': 0.63.0 + '@unocss/core': 0.63.0 + '@unocss/preset-uno': 0.63.0 cac: 6.7.14 chokidar: 3.6.0 colorette: 2.0.20 @@ -3375,130 +2960,116 @@ snapshots: - rollup - supports-color - '@unocss/config@0.62.3': + '@unocss/config@0.63.0': dependencies: - '@unocss/core': 0.62.3 - unconfig: 0.5.5 + '@unocss/core': 0.63.0 + unconfig: 0.6.0 transitivePeerDependencies: - supports-color - '@unocss/core@0.62.3': {} + '@unocss/core@0.63.0': {} - '@unocss/extractor-arbitrary-variants@0.62.3': + '@unocss/extractor-arbitrary-variants@0.63.0': dependencies: - '@unocss/core': 0.62.3 + '@unocss/core': 0.63.0 - '@unocss/extractor-svelte@0.62.3': {} + '@unocss/extractor-svelte@0.63.0': {} - '@unocss/inspector@0.62.3': + '@unocss/inspector@0.63.0': dependencies: - '@unocss/core': 0.62.3 - '@unocss/rule-utils': 0.62.3 + '@unocss/core': 0.63.0 + '@unocss/rule-utils': 0.63.0 gzip-size: 6.0.0 sirv: 2.0.4 - '@unocss/postcss@0.62.3(postcss@8.4.45)': + '@unocss/postcss@0.63.0(postcss@8.4.45)': dependencies: - '@unocss/config': 0.62.3 - '@unocss/core': 0.62.3 - '@unocss/rule-utils': 0.62.3 - css-tree: 2.3.1 - magic-string: 0.30.11 + '@unocss/config': 0.63.0 + '@unocss/core': 0.63.0 + '@unocss/rule-utils': 0.63.0 + css-tree: 3.0.0 postcss: 8.4.45 tinyglobby: 0.2.6 transitivePeerDependencies: - supports-color - '@unocss/preset-attributify@0.62.3': + '@unocss/preset-attributify@0.63.0': dependencies: - '@unocss/core': 0.62.3 + '@unocss/core': 0.63.0 - '@unocss/preset-icons@0.62.3': + '@unocss/preset-icons@0.63.0': dependencies: - '@iconify/utils': 2.1.32 - '@unocss/core': 0.62.3 - ofetch: 1.3.4 + '@iconify/utils': 2.1.33 + '@unocss/core': 0.63.0 + ofetch: 1.4.0 transitivePeerDependencies: - supports-color - '@unocss/preset-mini@0.62.3': + '@unocss/preset-mini@0.63.0': dependencies: - '@unocss/core': 0.62.3 - '@unocss/extractor-arbitrary-variants': 0.62.3 - '@unocss/rule-utils': 0.62.3 + '@unocss/core': 0.63.0 + '@unocss/extractor-arbitrary-variants': 0.63.0 + '@unocss/rule-utils': 0.63.0 - '@unocss/preset-tagify@0.62.3': + '@unocss/preset-tagify@0.63.0': dependencies: - '@unocss/core': 0.62.3 + '@unocss/core': 0.63.0 - '@unocss/preset-typography@0.62.3': + '@unocss/preset-typography@0.63.0': dependencies: - '@unocss/core': 0.62.3 - '@unocss/preset-mini': 0.62.3 + '@unocss/core': 0.63.0 + '@unocss/preset-mini': 0.63.0 - '@unocss/preset-uno@0.62.3': + '@unocss/preset-uno@0.63.0': dependencies: - '@unocss/core': 0.62.3 - '@unocss/preset-mini': 0.62.3 - '@unocss/preset-wind': 0.62.3 - '@unocss/rule-utils': 0.62.3 + '@unocss/core': 0.63.0 + '@unocss/preset-mini': 0.63.0 + '@unocss/preset-wind': 0.63.0 + '@unocss/rule-utils': 0.63.0 - '@unocss/preset-web-fonts@0.62.3': + '@unocss/preset-web-fonts@0.63.0': dependencies: - '@unocss/core': 0.62.3 - ofetch: 1.3.4 + '@unocss/core': 0.63.0 + ofetch: 1.4.0 - '@unocss/preset-wind@0.62.3': + '@unocss/preset-wind@0.63.0': dependencies: - '@unocss/core': 0.62.3 - '@unocss/preset-mini': 0.62.3 - '@unocss/rule-utils': 0.62.3 + '@unocss/core': 0.63.0 + '@unocss/preset-mini': 0.63.0 + '@unocss/rule-utils': 0.63.0 - '@unocss/reset@0.62.3': {} + '@unocss/reset@0.63.0': {} - '@unocss/rule-utils@0.62.3': + '@unocss/rule-utils@0.63.0': dependencies: - '@unocss/core': 0.62.3 + '@unocss/core': 0.63.0 magic-string: 0.30.11 - '@unocss/scope@0.62.3': {} - - '@unocss/transformer-attributify-jsx-babel@0.62.3': - dependencies: - '@babel/core': 7.25.2 - '@babel/plugin-syntax-jsx': 7.24.7(@babel/core@7.25.2) - '@babel/preset-typescript': 7.24.7(@babel/core@7.25.2) - '@unocss/core': 0.62.3 - transitivePeerDependencies: - - supports-color - - '@unocss/transformer-attributify-jsx@0.62.3': + '@unocss/transformer-attributify-jsx@0.63.0': dependencies: - '@unocss/core': 0.62.3 + '@unocss/core': 0.63.0 - '@unocss/transformer-compile-class@0.62.3': + '@unocss/transformer-compile-class@0.63.0': dependencies: - '@unocss/core': 0.62.3 + '@unocss/core': 0.63.0 - '@unocss/transformer-directives@0.62.3': + '@unocss/transformer-directives@0.63.0': dependencies: - '@unocss/core': 0.62.3 - '@unocss/rule-utils': 0.62.3 - css-tree: 2.3.1 + '@unocss/core': 0.63.0 + '@unocss/rule-utils': 0.63.0 + css-tree: 3.0.0 - '@unocss/transformer-variant-group@0.62.3': + '@unocss/transformer-variant-group@0.63.0': dependencies: - '@unocss/core': 0.62.3 + '@unocss/core': 0.63.0 - '@unocss/vite@0.62.3(rollup@4.22.4)(vite@5.4.7(terser@5.33.0))': + '@unocss/vite@0.63.0(rollup@4.22.4)(vite@5.4.7(terser@5.33.0))': dependencies: '@ampproject/remapping': 2.3.0 '@rollup/pluginutils': 5.1.2(rollup@4.22.4) - '@unocss/config': 0.62.3 - '@unocss/core': 0.62.3 - '@unocss/inspector': 0.62.3 - '@unocss/scope': 0.62.3 - '@unocss/transformer-directives': 0.62.3 + '@unocss/config': 0.63.0 + '@unocss/core': 0.63.0 + '@unocss/inspector': 0.63.0 chokidar: 3.6.0 magic-string: 0.30.11 tinyglobby: 0.2.6 @@ -3532,10 +3103,6 @@ snapshots: ansi-regex@5.0.1: {} - ansi-styles@3.2.1: - dependencies: - color-convert: 1.9.3 - ansi-styles@4.3.0: dependencies: color-convert: 2.0.1 @@ -3580,13 +3147,6 @@ snapshots: browser-stdout@1.3.1: {} - browserslist@4.23.3: - dependencies: - caniuse-lite: 1.0.30001659 - electron-to-chromium: 1.5.18 - node-releases: 2.0.18 - update-browserslist-db: 1.1.0(browserslist@4.23.3) - buffer-from@1.1.2: {} buffer@6.0.3: @@ -3605,14 +3165,6 @@ snapshots: camelcase@6.3.0: {} - caniuse-lite@1.0.30001659: {} - - chalk@2.4.2: - dependencies: - ansi-styles: 3.2.1 - escape-string-regexp: 1.0.5 - supports-color: 5.5.0 - chalk@4.1.2: dependencies: ansi-styles: 4.3.0 @@ -3656,16 +3208,10 @@ snapshots: estree-walker: 3.0.3 periscopic: 3.1.0 - color-convert@1.9.3: - dependencies: - color-name: 1.1.3 - color-convert@2.0.1: dependencies: color-name: 1.1.4 - color-name@1.1.3: {} - color-name@1.1.4: {} colorette@2.0.20: {} @@ -3678,8 +3224,6 @@ snapshots: consola@3.2.3: {} - convert-source-map@2.0.0: {} - covector@0.12.3(mocha@10.7.3): dependencies: '@clack/prompts': 0.7.0 @@ -3718,6 +3262,11 @@ snapshots: mdn-data: 2.0.30 source-map-js: 1.2.1 + css-tree@3.0.0: + dependencies: + mdn-data: 2.10.0 + source-map-js: 1.2.1 + ctrlc-windows@2.1.0: {} debug@4.3.7(supports-color@8.1.1): @@ -3759,8 +3308,6 @@ snapshots: - encoding - mocha - electron-to-chromium@1.5.18: {} - emoji-regex@8.0.0: {} esbuild@0.21.5: @@ -3818,13 +3365,11 @@ snapshots: escalade@3.2.0: {} - escape-string-regexp@1.0.5: {} - escape-string-regexp@4.0.0: {} - eslint-config-prettier@9.1.0(eslint@9.11.1(jiti@1.21.6)): + eslint-config-prettier@9.1.0(eslint@9.11.1(jiti@2.0.0)): dependencies: - eslint: 9.11.1(jiti@1.21.6) + eslint: 9.11.1(jiti@2.0.0) eslint-plugin-security@3.0.1: dependencies: @@ -3839,9 +3384,9 @@ snapshots: eslint-visitor-keys@4.0.0: {} - eslint@9.11.1(jiti@1.21.6): + eslint@9.11.1(jiti@2.0.0): dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@1.21.6)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@2.0.0)) '@eslint-community/regexpp': 4.11.1 '@eslint/config-array': 0.18.0 '@eslint/core': 0.6.0 @@ -3879,7 +3424,7 @@ snapshots: strip-ansi: 6.0.1 text-table: 0.2.0 optionalDependencies: - jiti: 1.21.6 + jiti: 2.0.0 transitivePeerDependencies: - supports-color @@ -3972,8 +3517,6 @@ snapshots: function-bind@1.1.2: {} - gensync@1.0.0-beta.2: {} - get-caller-file@2.0.5: {} get-tsconfig@4.8.0: @@ -3996,8 +3539,6 @@ snapshots: minimatch: 5.1.6 once: 1.4.0 - globals@11.12.0: {} - globals@14.0.0: {} globby@11.1.0: @@ -4015,8 +3556,6 @@ snapshots: dependencies: duplexer: 0.1.2 - has-flag@3.0.0: {} - has-flag@4.0.0: {} hasown@2.0.2: @@ -4034,15 +3573,14 @@ snapshots: parent-module: 1.0.1 resolve-from: 4.0.0 - importx@0.4.4: + importx@0.5.0: dependencies: bundle-require: 5.0.0(esbuild@0.23.1) debug: 4.3.7(supports-color@8.1.1) esbuild: 0.23.1 - jiti: 2.0.0-beta.3 - jiti-v1: jiti@1.21.6 + jiti: 2.0.0 pathe: 1.1.2 - tsx: 4.19.0 + tsx: 4.19.1 transitivePeerDependencies: - supports-color @@ -4100,26 +3638,18 @@ snapshots: isexe@2.0.0: {} - jiti@1.21.6: {} - - jiti@2.0.0-beta.3: {} - - js-tokens@4.0.0: {} + jiti@2.0.0: {} js-yaml@4.1.0: dependencies: argparse: 2.0.1 - jsesc@2.5.2: {} - json-buffer@3.0.1: {} json-schema-traverse@0.4.1: {} json-stable-stringify-without-jsonify@1.0.1: {} - json5@2.2.3: {} - keyv@4.5.4: dependencies: json-buffer: 3.0.1 @@ -4157,10 +3687,6 @@ snapshots: longest-streak@2.0.4: {} - lru-cache@5.1.1: - dependencies: - yallist: 3.1.1 - magic-string@0.30.11: dependencies: '@jridgewell/sourcemap-codec': 1.5.0 @@ -4192,6 +3718,8 @@ snapshots: mdn-data@2.0.30: {} + mdn-data@2.10.0: {} + merge2@1.4.1: {} micromark-extension-frontmatter@0.2.2: @@ -4266,11 +3794,9 @@ snapshots: dependencies: whatwg-url: 5.0.0 - node-releases@2.0.18: {} - normalize-path@3.0.0: {} - ofetch@1.3.4: + ofetch@1.4.0: dependencies: destr: 2.0.3 node-fetch-native: 1.6.4 @@ -4531,10 +4057,6 @@ snapshots: strip-json-comments@3.1.1: {} - supports-color@5.5.0: - dependencies: - has-flag: 3.0.0 - supports-color@7.2.0: dependencies: has-flag: 4.0.0 @@ -4586,8 +4108,6 @@ snapshots: fdir: 6.3.0(picomatch@4.0.2) picomatch: 4.0.2 - to-fast-properties@2.0.0: {} - to-regex-range@5.0.1: dependencies: is-number: 7.0.0 @@ -4604,7 +4124,7 @@ snapshots: tslib@2.7.0: {} - tsx@4.19.0: + tsx@4.19.1: dependencies: esbuild: 0.23.1 get-tsconfig: 4.8.0 @@ -4617,11 +4137,11 @@ snapshots: type-fest@0.7.1: {} - typescript-eslint@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2): + typescript-eslint@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2): dependencies: - '@typescript-eslint/eslint-plugin': 8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2))(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2) - '@typescript-eslint/parser': 8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2) - '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@1.21.6))(typescript@5.6.2) + '@typescript-eslint/eslint-plugin': 8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2))(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/parser': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) optionalDependencies: typescript: 5.6.2 transitivePeerDependencies: @@ -4632,11 +4152,11 @@ snapshots: ufo@1.5.4: {} - unconfig@0.5.5: + unconfig@0.6.0: dependencies: '@antfu/utils': 0.7.10 defu: 6.1.4 - importx: 0.4.4 + importx: 0.5.0 transitivePeerDependencies: - supports-color @@ -4654,28 +4174,25 @@ snapshots: dependencies: '@types/unist': 2.0.11 - unocss@0.62.3(postcss@8.4.45)(rollup@4.22.4)(vite@5.4.7(terser@5.33.0)): - dependencies: - '@unocss/astro': 0.62.3(rollup@4.22.4)(vite@5.4.7(terser@5.33.0)) - '@unocss/cli': 0.62.3(rollup@4.22.4) - '@unocss/core': 0.62.3 - '@unocss/extractor-arbitrary-variants': 0.62.3 - '@unocss/postcss': 0.62.3(postcss@8.4.45) - '@unocss/preset-attributify': 0.62.3 - '@unocss/preset-icons': 0.62.3 - '@unocss/preset-mini': 0.62.3 - '@unocss/preset-tagify': 0.62.3 - '@unocss/preset-typography': 0.62.3 - '@unocss/preset-uno': 0.62.3 - '@unocss/preset-web-fonts': 0.62.3 - '@unocss/preset-wind': 0.62.3 - '@unocss/reset': 0.62.3 - '@unocss/transformer-attributify-jsx': 0.62.3 - '@unocss/transformer-attributify-jsx-babel': 0.62.3 - '@unocss/transformer-compile-class': 0.62.3 - '@unocss/transformer-directives': 0.62.3 - '@unocss/transformer-variant-group': 0.62.3 - '@unocss/vite': 0.62.3(rollup@4.22.4)(vite@5.4.7(terser@5.33.0)) + unocss@0.63.0(postcss@8.4.45)(rollup@4.22.4)(vite@5.4.7(terser@5.33.0)): + dependencies: + '@unocss/astro': 0.63.0(rollup@4.22.4)(vite@5.4.7(terser@5.33.0)) + '@unocss/cli': 0.63.0(rollup@4.22.4) + '@unocss/core': 0.63.0 + '@unocss/postcss': 0.63.0(postcss@8.4.45) + '@unocss/preset-attributify': 0.63.0 + '@unocss/preset-icons': 0.63.0 + '@unocss/preset-mini': 0.63.0 + '@unocss/preset-tagify': 0.63.0 + '@unocss/preset-typography': 0.63.0 + '@unocss/preset-uno': 0.63.0 + '@unocss/preset-web-fonts': 0.63.0 + '@unocss/preset-wind': 0.63.0 + '@unocss/transformer-attributify-jsx': 0.63.0 + '@unocss/transformer-compile-class': 0.63.0 + '@unocss/transformer-directives': 0.63.0 + '@unocss/transformer-variant-group': 0.63.0 + '@unocss/vite': 0.63.0(rollup@4.22.4)(vite@5.4.7(terser@5.33.0)) optionalDependencies: vite: 5.4.7(terser@5.33.0) transitivePeerDependencies: @@ -4683,12 +4200,6 @@ snapshots: - rollup - supports-color - update-browserslist-db@1.1.0(browserslist@4.23.3): - dependencies: - browserslist: 4.23.3 - escalade: 3.2.0 - picocolors: 1.1.0 - uri-js@4.4.1: dependencies: punycode: 2.3.1 @@ -4743,8 +4254,6 @@ snapshots: y18n@5.0.8: {} - yallist@3.1.1: {} - yargs-parser@20.2.9: {} yargs-parser@21.1.1: {} From f930505de47491fa1b13862540f97397bc3ee8c9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 30 Sep 2024 10:19:10 +0800 Subject: [PATCH 04/40] chore(deps): lock file maintenance (#1852) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Cargo.lock | 314 ++++++++++++++++++--------------------- pnpm-lock.yaml | 391 ++++++++++++++++++++++++------------------------- 2 files changed, 336 insertions(+), 369 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 69d77592..0d4b1212 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -318,7 +318,7 @@ checksum = "0ae92a5119aa49cdbcf6b9f893fe4e1d98b04ccbf82ee0584ad948a44a734dea" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -489,7 +489,7 @@ checksum = "3b43422f69d8ff38f95f1b2bb76517c91589a924d1559a0e935d7c8ce0274c11" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -518,13 +518,13 @@ checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de" [[package]] name = "async-trait" -version = "0.1.82" +version = "0.1.83" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a27b8a3a6e1a44fa4c8baf1f653e4172e81486d4941f2237e20dc2d0cf4ddff1" +checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -578,9 +578,9 @@ dependencies = [ [[package]] name = "autocfg" -version = "1.3.0" +version = "1.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0" +checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "av1-grain" @@ -682,9 +682,9 @@ dependencies = [ [[package]] name = "bitstream-io" -version = "2.3.0" +version = "2.5.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" +checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452" [[package]] name = "bitvec" @@ -784,7 +784,7 @@ dependencies = [ "proc-macro-crate 2.0.2", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "syn_derive", ] @@ -874,9 +874,9 @@ checksum = "8f1fe948ff07f4bd06c30984e69f5b4899c516a3ef74f34df92a2df2ab535495" [[package]] name = "bytes" -version = "1.7.1" +version = "1.7.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50" +checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3" dependencies = [ "serde", ] @@ -950,9 +950,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.1.19" +version = "1.1.22" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d74707dde2ba56f86ae90effb3b43ddd369504387e718014de010cec7959800" +checksum = "9540e661f81799159abee814118cc139a2004b3a3aa3ea37724a1b66530b90e0" dependencies = [ "jobserver", "libc", @@ -1060,18 +1060,18 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.17" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e5a21b8495e732f1b3c364c9949b201ca7bae518c502c80256c96ad79eaf6ac" +checksum = "b0956a43b323ac1afaffc053ed5c4b7c1f1800bacd1683c353aabbb752515dd3" dependencies = [ "clap_builder", ] [[package]] name = "clap_builder" -version = "4.5.17" +version = "4.5.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8cf2dd12af7a047ad9d6da2b6b249759a22a7abc0f474c1dae1777afa4b21a73" +checksum = "4d72166dd41634086d5803a47eb71ae740e61d84709c36f3c34110173db3961b" dependencies = [ "anstream", "anstyle", @@ -1470,7 +1470,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13b588ba4ac1a99f7f2964d24b3d896ddc6bf847ee3855dbd4366f058cfcd331" dependencies = [ "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1480,7 +1480,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edb49164822f3ee45b17acd4a208cfc1251410cf0cad9a833234c9890774dd9f" dependencies = [ "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1516,7 +1516,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1540,7 +1540,7 @@ dependencies = [ "proc-macro2", "quote", "strsim", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1551,7 +1551,7 @@ checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806" dependencies = [ "darling_core", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1626,7 +1626,7 @@ checksum = "67e77553c4162a157adbf834ebae5b415acbecbeafc7a74b0e886657506a7611" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1639,7 +1639,7 @@ dependencies = [ "proc-macro2", "quote", "rustc_version", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1730,7 +1730,7 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1739,7 +1739,7 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "330c60081dcc4c72131f8eb70510f1ac07223e5d4163db481a04a0befcffa412" dependencies = [ - "libloading", + "libloading 0.8.5", ] [[package]] @@ -1762,7 +1762,7 @@ checksum = "f2b99bf03862d7f545ebc28ddd33a665b50865f4dfd84031a393823879bd4c54" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -1890,9 +1890,9 @@ dependencies = [ [[package]] name = "embed-resource" -version = "2.4.3" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4edcacde9351c33139a41e3c97eb2334351a81a2791bebb0b243df837128f602" +checksum = "f4e24052d7be71f0efb50c201557f6fe7d237cfd5a64fd5bcd7fd8fe32dbbffa" dependencies = [ "cc", "memchr", @@ -1941,7 +1941,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2042,9 +2042,9 @@ checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6" [[package]] name = "fdeflate" -version = "0.3.4" +version = "0.3.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4f9bfee30e4dedf0ab8b422f03af778d9612b63f502710fc500a334ebe2de645" +checksum = "d8090f921a24b04994d9929e204f50b498a33ea6ba559ffaa05e04f7ee7fb5ab" dependencies = [ "simd-adler32", ] @@ -2108,9 +2108,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.33" +version = "1.0.34" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "324a1be68054ef05ad64b861cc9eaf1d623d2d8cb25b4bf2cb9cdd902b4bf253" +checksum = "a1b589b4dc103969ad3cf85c950899926ec64300a1a46d76c03a6072957036f0" dependencies = [ "crc32fast", "miniz_oxide 0.8.0", @@ -2169,7 +2169,7 @@ checksum = "1a5c6c585bc94aaf2c7b51dd4c2ba22680844aba4c687be581871a6f518c5742" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2298,7 +2298,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2586,7 +2586,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2693,7 +2693,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -2934,9 +2934,9 @@ dependencies = [ [[package]] name = "hyper-util" -version = "0.1.8" +version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da62f120a8a37763efb0cf8fdf264b884c7b8b9ac8660b900c8661030c00e6ba" +checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b" dependencies = [ "bytes", "futures-channel", @@ -2947,16 +2947,15 @@ dependencies = [ "pin-project-lite", "socket2", "tokio", - "tower", "tower-service", "tracing", ] [[package]] name = "iana-time-zone" -version = "0.1.60" +version = "0.1.61" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141" +checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220" dependencies = [ "android_system_properties", "core-foundation-sys", @@ -3128,7 +3127,7 @@ checksum = "c34819042dc3d3971c46c2190835914dfbe0c3c13f61449b2997f4e9722dfa60" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -3346,9 +3345,9 @@ dependencies = [ [[package]] name = "k256" -version = "0.13.3" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b" +checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b" dependencies = [ "cfg-if", "ecdsa", @@ -3436,15 +3435,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6e9ec52138abedcc58dc17a7c6c0c00a2bdb4f3427c7f63fa97fd0d859155caf" dependencies = [ "gtk-sys", - "libloading", + "libloading 0.7.4", "once_cell", ] [[package]] name = "libc" -version = "0.2.158" +version = "0.2.159" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8adc4bb1803a324070e64a98ae98f38934d91957a99cfb3a43dcbc01bc56439" +checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5" [[package]] name = "libflate" @@ -3491,6 +3490,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "libloading" +version = "0.8.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4" +dependencies = [ + "cfg-if", + "windows-targets 0.52.6", +] + [[package]] name = "libm" version = "0.2.8" @@ -3510,9 +3519,9 @@ dependencies = [ [[package]] name = "libsodium-sys-stable" -version = "1.21.1" +version = "1.21.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fd1882b85f01cdd4021c0664fd897710a04c5d01b593a5a70e1b0baa999c1f8" +checksum = "42631d334de875c636a1aae7adb515653ac2e771e5a2ce74b1053f5a4412df3a" dependencies = [ "cc", "libc", @@ -3637,7 +3646,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" dependencies = [ "cfg-if", - "rayon", ] [[package]] @@ -3709,7 +3717,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08" dependencies = [ "adler", - "simd-adler32", ] [[package]] @@ -3719,6 +3726,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1" dependencies = [ "adler2", + "simd-adler32", ] [[package]] @@ -3976,7 +3984,7 @@ checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4038,7 +4046,7 @@ dependencies = [ "proc-macro-crate 2.0.2", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4190,9 +4198,12 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.20.0" +version = "1.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ea5043e58958ee56f3e15a90aee535795cd7dfd319846288d93c5b57d85cbe" +checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1" +dependencies = [ + "portable-atomic", +] [[package]] name = "opaque-debug" @@ -4234,7 +4245,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4507,7 +4518,7 @@ dependencies = [ "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4537,26 +4548,6 @@ dependencies = [ "siphasher", ] -[[package]] -name = "pin-project" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6bf43b791c5b9e34c3d182969b4abb522f9343702850a2e57f460d00d09b4b3" -dependencies = [ - "pin-project-internal", -] - -[[package]] -name = "pin-project-internal" -version = "1.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965" -dependencies = [ - "proc-macro2", - "quote", - "syn 2.0.77", -] - [[package]] name = "pin-project-lite" version = "0.2.14" @@ -4603,9 +4594,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.30" +version = "0.3.31" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2" [[package]] name = "plist" @@ -4622,15 +4613,15 @@ dependencies = [ [[package]] name = "png" -version = "0.17.13" +version = "0.17.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06e4b0d3d1312775e782c86c91a111aa1f910cbb65e1337f9975b5f9a554b5e1" +checksum = "52f9d46a34a05a6a57566bc2bfae066ef07585a6e3fa30fbbdff5936380623f0" dependencies = [ "bitflags 1.3.2", "crc32fast", "fdeflate", "flate2", - "miniz_oxide 0.7.4", + "miniz_oxide 0.8.0", ] [[package]] @@ -4671,6 +4662,12 @@ dependencies = [ "universal-hash", ] +[[package]] +name = "portable-atomic" +version = "1.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2" + [[package]] name = "powerfmt" version = "0.2.0" @@ -4767,7 +4764,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8021cf59c8ec9c432cfc2526ac6b8aa508ecaf29cd415f271b8406c1b851c3fd" dependencies = [ "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -4847,9 +4844,9 @@ dependencies = [ [[package]] name = "quick-xml" -version = "0.36.1" +version = "0.36.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96a05e2e8efddfa51a84ca47cec303fac86c8541b686d37cac5efc0e094417bc" +checksum = "f7649a7b4df05aed9ea7ec6f628c67c9953a43869b8bc50929569b2999d443fe" dependencies = [ "memchr", ] @@ -5035,17 +5032,15 @@ dependencies = [ [[package]] name = "ravif" -version = "0.11.6" +version = "0.11.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85be49d628515bb99a01c44200009f0a4167c252f036445b975b35daf952258c" +checksum = "a8f0bfd976333248de2078d350bfdf182ff96e168a24d23d2436cef320dd4bdd" dependencies = [ "avif-serialize", - "bitstream-io", "imgref", "loop9", "quick-error 2.0.1", "rav1e", - "rayon", "rgb", ] @@ -5088,9 +5083,9 @@ dependencies = [ [[package]] name = "redox_syscall" -version = "0.5.4" +version = "0.5.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0884ad60e090bf1345b93da0a5de8923c93884cd03f40dfcfddd3b4bee661853" +checksum = "355ae415ccd3a04315d3f8246e86d67689ea74d88d915576e1589a351062a13b" dependencies = [ "bitflags 2.6.0", ] @@ -5108,9 +5103,9 @@ dependencies = [ [[package]] name = "regex" -version = "1.10.6" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4219d74c6b67a3654a9fbebc4b419e22126d13d2f3c4a07ee0cb61ff79a79619" +checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8" dependencies = [ "aho-corasick", "memchr", @@ -5120,9 +5115,9 @@ dependencies = [ [[package]] name = "regex-automata" -version = "0.4.7" +version = "0.4.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df" +checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3" dependencies = [ "aho-corasick", "memchr", @@ -5131,9 +5126,9 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.4" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b" +checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c" [[package]] name = "rend" @@ -5449,9 +5444,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.9.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "0e696e35370c65c9c541198af4543ccd580cf17fc25d8e05c5a242b202488c55" [[package]] name = "rustls-webpki" @@ -5533,7 +5528,7 @@ dependencies = [ "proc-macro2", "quote", "serde_derive_internals", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5594,9 +5589,9 @@ dependencies = [ [[package]] name = "security-framework-sys" -version = "2.11.1" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75da29fe9b9b08fe9d6b22b5b4bcbc75d8db3aa31e639aa56bb62e9d46bfceaf" +checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6" dependencies = [ "core-foundation-sys", "libc", @@ -5659,7 +5654,7 @@ checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5670,7 +5665,7 @@ checksum = "18d26a20a969b9e3fdf2fc2d9f21eda6c40e2de84c9408bb5d3b05d499aae711" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5693,14 +5688,14 @@ checksum = "6c64451ba24fc7a6a2d60fc75dd9c83c90903b19028d4eff35e88fc1e86564e9" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] name = "serde_spanned" -version = "0.6.7" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb5b1b31579f3811bf615c144393417496f152e12ac8b7663bf664f4a815306d" +checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1" dependencies = [ "serde", ] @@ -5744,7 +5739,7 @@ dependencies = [ "darling", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -5853,9 +5848,9 @@ dependencies = [ [[package]] name = "simdutf8" -version = "0.1.4" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f27f6278552951f1f2b8cf9da965d10969b2efdea95a6ec47987ab46edfe263a" +checksum = "e3a9fe34e3e7a50316060351f37187a3f546bce95496156754b601a5fa71b76e" [[package]] name = "similar" @@ -5977,7 +5972,7 @@ dependencies = [ "Inflector", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6075,7 +6070,7 @@ dependencies = [ "quote", "sqlx-core", "sqlx-macros-core", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6098,7 +6093,7 @@ dependencies = [ "sqlx-mysql", "sqlx-postgres", "sqlx-sqlite", - "syn 2.0.77", + "syn 2.0.79", "tempfile", "tokio", "url", @@ -6353,9 +6348,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.77" +version = "2.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9f35bcdf61fd8e7be6caf75f429fdca8beb3ed76584befb503b1569faee373ed" +checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590" dependencies = [ "proc-macro2", "quote", @@ -6371,7 +6366,7 @@ dependencies = [ "proc-macro-error", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6473,7 +6468,7 @@ checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -6484,9 +6479,9 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369" [[package]] name = "tar" -version = "0.4.41" +version = "0.4.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb797dad5fb5b76fcf519e702f4a589483b5ef06567f160c392832c1f5e44909" +checksum = "4ff6c40d3aedb5e06b57c6f669ad17ab063dd1e63d977c6a88e7f4dfa4f04020" dependencies = [ "filetime", "libc", @@ -6595,7 +6590,7 @@ dependencies = [ "serde", "serde_json", "sha2", - "syn 2.0.77", + "syn 2.0.79", "tauri-utils", "thiserror", "time", @@ -6613,7 +6608,7 @@ dependencies = [ "heck 0.5.0", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "tauri-codegen", "tauri-utils", ] @@ -7201,9 +7196,9 @@ dependencies = [ [[package]] name = "tempfile" -version = "3.12.0" +version = "3.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "04cbcdd0c794ebb0d4cf35e88edd2f7d2c4c3e9a5a6dab322839b321c6a87a64" +checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b" dependencies = [ "cfg-if", "fastrand", @@ -7240,22 +7235,22 @@ checksum = "8eaa81235c7058867fa8c0e7314f33dcce9c215f535d1913822a2b3f5e289f3c" [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -7365,7 +7360,7 @@ checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -7503,27 +7498,6 @@ dependencies = [ "winnow", ] -[[package]] -name = "tower" -version = "0.4.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c" -dependencies = [ - "futures-core", - "futures-util", - "pin-project", - "pin-project-lite", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - [[package]] name = "tower-service" version = "0.3.3" @@ -7550,7 +7524,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -7703,9 +7677,9 @@ checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe" [[package]] name = "unicode-normalization" -version = "0.1.23" +version = "0.1.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5" +checksum = "5033c97c4262335cded6d6fc3e5c18ab755e1a3dc96376350f3d8e9f009ad956" dependencies = [ "tinyvec", ] @@ -7944,7 +7918,7 @@ dependencies = [ "once_cell", "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-shared", ] @@ -7978,7 +7952,7 @@ checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", "wasm-bindgen-backend", "wasm-bindgen-shared", ] @@ -7991,9 +7965,9 @@ checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484" [[package]] name = "wasm-streams" -version = "0.4.0" +version = "0.4.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b65dc4c90b63b118468cf747d8bf3566c1913ef60be765b5730ead9e0a3ba129" +checksum = "4e072d4e72f700fb3443d8fe94a39315df013eef1104903cdb0a2abd322bbecd" dependencies = [ "futures-util", "js-sys", @@ -8047,7 +8021,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "597f2001b2e5fc1121e3d5b9791d3e78f05ba6bfa4641053846248e3a13661c3" dependencies = [ "proc-macro2", - "quick-xml 0.36.1", + "quick-xml 0.36.2", "quote", ] @@ -8118,9 +8092,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.5" +version = "0.26.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bd24728e5af82c6c4ec1b66ac4844bdf8156257fccda846ec58b42cd0cdbe6a" +checksum = "841c67bff177718f1d4dfefde8d8f0e78f9b6589319ba88312f567fc5841a958" dependencies = [ "rustls-pki-types", ] @@ -8161,7 +8135,7 @@ checksum = "1d228f15bba3b9d56dde8bddbee66fa24545bd17b48d5128ccf4a8742b18e431" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -8321,7 +8295,7 @@ checksum = "f6fc35f58ecd95a9b71c4f2329b911016e6bec66b3f2e6a4aad86bd2e99e2f9b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -8332,7 +8306,7 @@ checksum = "2bbd5b46c938e506ecbce286b6628a02171d56153ba733b6c741fc627ec9579b" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -8343,7 +8317,7 @@ checksum = "08990546bf4edef8f431fa6326e032865f27138718c587dc21bc0265bbcb57cc" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -8354,7 +8328,7 @@ checksum = "053c4c462dc91d3b1504c6fe5a726dd15e216ba718e84a0e46a88fbe5ded3515" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -8899,7 +8873,7 @@ checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] @@ -8920,7 +8894,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69" dependencies = [ "proc-macro2", "quote", - "syn 2.0.77", + "syn 2.0.79", ] [[package]] diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 71669ddc..7480d338 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -117,28 +117,28 @@ importers: devDependencies: '@iconify-json/codicon': specifier: ^1.1.37 - version: 1.2.0 + version: 1.2.2 '@iconify-json/ph': specifier: ^1.1.8 version: 1.2.0 '@sveltejs/vite-plugin-svelte': specifier: ^3.0.1 - version: 3.1.2(svelte@4.2.19)(vite@5.4.7(terser@5.33.0)) + version: 3.1.2(svelte@4.2.19)(vite@5.4.8(terser@5.34.1)) '@tauri-apps/cli': specifier: 2.0.0-rc.17 version: 2.0.0-rc.17 '@unocss/extractor-svelte': specifier: ^0.63.0 - version: 0.63.0 + version: 0.63.1 svelte: specifier: ^4.2.19 version: 4.2.19 unocss: specifier: ^0.63.0 - version: 0.63.0(postcss@8.4.45)(rollup@4.22.4)(vite@5.4.7(terser@5.33.0)) + version: 0.63.1(postcss@8.4.47)(rollup@4.22.4)(vite@5.4.8(terser@5.34.1)) vite: specifier: ^5.4.7 - version: 5.4.7(terser@5.33.0) + version: 5.4.8(terser@5.34.1) plugins/autostart: dependencies: @@ -193,7 +193,7 @@ importers: version: 5.6.2 vite: specifier: ^5.4.7 - version: 5.4.7(terser@5.33.0) + version: 5.4.8(terser@5.34.1) plugins/dialog: dependencies: @@ -301,7 +301,7 @@ importers: version: 5.6.2 vite: specifier: ^5.0.12 - version: 5.4.7(terser@5.33.0) + version: 5.4.8(terser@5.34.1) plugins/stronghold: dependencies: @@ -341,7 +341,7 @@ importers: version: 5.6.2 vite: specifier: ^5.4.7 - version: 5.4.7(terser@5.33.0) + version: 5.4.8(terser@5.34.1) plugins/window-state: dependencies: @@ -745,8 +745,8 @@ packages: resolution: {integrity: sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==} engines: {node: '>=18.18'} - '@iconify-json/codicon@1.2.0': - resolution: {integrity: sha512-KkqHpVq1guUqKgnhsG8xK+l3rX6sBc+CKB6icQKfabRpqCEpJWmG83IrZkCcD0A7CTghRRSwtrMPqpEvY8EwkA==} + '@iconify-json/codicon@1.2.2': + resolution: {integrity: sha512-ZO63Qy0e+/VBESGHE3CZEE2EFpzlBOTPSiMtIDQc1qIGvh6HpYVRNpEGuawF91oEws7PLuUifCIZL5NpYpKloA==} '@iconify-json/ph@1.2.0': resolution: {integrity: sha512-013eLpgTmX1lACOuDnkuhC7gRHyYj9w/j8SyDmlyUYvsKQrwdRsv1otcXtwH3DevuDAzSkreeeRsCeez+gTyVA==} @@ -790,8 +790,8 @@ packages: resolution: {integrity: sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==} engines: {node: '>= 8'} - '@polka/url@1.0.0-next.25': - resolution: {integrity: sha512-j7P6Rgr3mmtdkeDGTe0E/aYyWEWVtc5yFXtHCRHs28/jptDEWfaVOc5T7cblqy1XKPPfCxJc/8DwQ5YgLOZOVQ==} + '@polka/url@1.0.0-next.28': + resolution: {integrity: sha512-8LduaNlMZGwdZ6qWrKlfa+2M4gahzFkprZiAt2TF8uS0qQgBizKXpXURqvTJ4WtmupWxaLqjRb2UCTe72mu+Aw==} '@rollup/plugin-node-resolve@15.3.0': resolution: {integrity: sha512-9eO5McEICxMzJpDW9OnMYSv4Sta3hmt7VtBFz5zR9273suNOydOyq/FrGeGy+KsTRFm8w0SLVhzig2ILFT63Ag==} @@ -1077,86 +1077,86 @@ packages: resolution: {integrity: sha512-b1tx0orFCCh/THWPQa2ZwWzvOeyzzp36vkJYOpVg0u8UVOIsfVrnuC9FqAw9gRKn+rG2VmWQ/zDJZzkxUnj/XQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@unocss/astro@0.63.0': - resolution: {integrity: sha512-ToF9X1uvm8CdxND+oVHrRPQyBsE5FZI1vz9lLVvqwzhOi9rfjGeoKeN7rV0njM2ohC+gbbPRDU9kKmZMnHLSzg==} + '@unocss/astro@0.63.1': + resolution: {integrity: sha512-TJISaUIMNPQH0MY0R7f14DO3HF4Z5H3seZazojhbLCOA7gDFV0WpSP84sdx9PsP1fpyYuNsxW9xrwA13bDaJYw==} peerDependencies: vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0 peerDependenciesMeta: vite: optional: true - '@unocss/cli@0.63.0': - resolution: {integrity: sha512-nJuHLDxgxSYhPQ0OY5BIZ0XQJyphapAFHYNh1ahTfJRa6IBIcCZb/JZFHjczCCLSSp1PAO4SJBNEPjJxZWr3rQ==} + '@unocss/cli@0.63.1': + resolution: {integrity: sha512-DH9JZBL/CecAr7HWXinUSXEnDIVcOkHn4GYuaL4Zn33ZIV9ni20/lHhxJwbnEgv1eCIa3XTAMLCOU9uhpdTKCQ==} engines: {node: '>=14'} hasBin: true - '@unocss/config@0.63.0': - resolution: {integrity: sha512-rlhki3GA6pNX05sjDGJO4vTDonOfDngL9CJWEbn9hELgMZQ3+OAO4mePMA6OsYfMxYz5qpfDKwofkuV4CGNDKQ==} + '@unocss/config@0.63.1': + resolution: {integrity: sha512-9n1VDQ3xMpRIdzqvyUhWHA2ur5CWH0Oezw6Rbg/75bk86pD3yMrD8JkP4wK9wgq1pNNEpygmE7jFbDe29r8vVw==} engines: {node: '>=14'} - '@unocss/core@0.63.0': - resolution: {integrity: sha512-ZGvmQ3CgGlGJy8TDYUCLRzgv+uyUj2nv0a5MsVvLAD1BKHN96YSt/zRdvRprKUkSzP0yLw44k3kv59md8Bn8xw==} + '@unocss/core@0.63.1': + resolution: {integrity: sha512-scg53c6vw8cRsX4DbUO+MlTXicA9GWztm6PW0lsisJxXrdbQQCd+J+PIhrxLUExxeNqxTKsL3Msy9bwJU5uUsQ==} - '@unocss/extractor-arbitrary-variants@0.63.0': - resolution: {integrity: sha512-zHSpKnXU+So15VtJV8CZE+VV6zxeard+fi3bfepCAZFI/8vxU7aTrEPeXniF06eIQeJZTGVn/EaOw4AKiy1ZRA==} + '@unocss/extractor-arbitrary-variants@0.63.1': + resolution: {integrity: sha512-yqHDUgFCR4R2HMuD2k4dVkkdT2uOa/gUDIY6xoseOx1r98Fxlyvdr0UnLOaWsSSzpSGm7SS7XtafGa24IgJRUQ==} - '@unocss/extractor-svelte@0.63.0': - resolution: {integrity: sha512-1cm/SI01uNaZsXJTDsB8pSTg/Rlpg7PKtG8/BSbHFvR7yiwQAstKaCGCPraHy/7wUgMMFMsP4Pj9yy+9HyU/Jw==} + '@unocss/extractor-svelte@0.63.1': + resolution: {integrity: sha512-kqf+3ghZIc/hBT3W6nrvWEBMbAleJIGI4A1GW+K+dovP68T4gFxp7D077VtuC69dZp1foV4HM17QHmphZq1Oiw==} - '@unocss/inspector@0.63.0': - resolution: {integrity: sha512-vcAHezenaP3TxiX7GBNyLFRNrhw8oZlz8xNDiuSR3QI6Z2gCrCxdEwblFdjJKhBcNWK79oXm2QCHzD3/Fb7xvg==} + '@unocss/inspector@0.63.1': + resolution: {integrity: sha512-RO5DWZcnQ964ppaWskECSsx2b6I+dAH6A4YQIZEavG0ykHWwa//TquaY2HJH6OJoI7hKEnrFIFtlwzV5nWoYMw==} - '@unocss/postcss@0.63.0': - resolution: {integrity: sha512-p0JvVJjOxi9O1dRfto6SOqFqV+aq0knqiTlyOmmINiwkcvXWYmFGXKTw6DTR8ACYF8MwpnACt81DF7yNqA5L3g==} + '@unocss/postcss@0.63.1': + resolution: {integrity: sha512-ZHBy2swGg2zifQ6YEfctagIi+jZrLW/uBHqIkRIQYZyBQjw1GSqx+OSrq81LYIREBSQG7G90Nn1CXu8muttgzg==} engines: {node: '>=14'} peerDependencies: postcss: ^8.4.21 - '@unocss/preset-attributify@0.63.0': - resolution: {integrity: sha512-9t9rlo7JIhd+SbjupYTwKmyPgqc9uFa6zuaq+ol5HdTdbnDvj9dUAJSEvQEzB0NebjIn+n94WpHhRTX8M6O2Lw==} + '@unocss/preset-attributify@0.63.1': + resolution: {integrity: sha512-K6IaQ6cUQNWDp6JmAJ8dh17c/iPc9Ssgz6C9qayWwIJCZA3023EXfoXI0a0csnJyRHJALIw2sSZAvlmRudln1A==} - '@unocss/preset-icons@0.63.0': - resolution: {integrity: sha512-MYxhrmyf+cneKp1mB35OCewlYSRuFhEb5cvNN0q/doAM18/beELPDTVLGiVzspin8de3fgiqy9XIQdEVgtujMQ==} + '@unocss/preset-icons@0.63.1': + resolution: {integrity: sha512-ucCLrlQ6DsFzqSu/Cmqo3q/F/ybV+2P/TQflHS9Oo8wtOETxTT0aPEEEd/sj1SPTU9uUbLEeS6TaRD6MrwLcrw==} - '@unocss/preset-mini@0.63.0': - resolution: {integrity: sha512-lpGtqtXqr6yVLeWiQmY1lb7sJBcb2O3CuFduKlx7HZKZOJpnRtZoZeNRo1XYcH6BRPBxPgru/d/m43AGMnDqew==} + '@unocss/preset-mini@0.63.1': + resolution: {integrity: sha512-8NW3hK5fp+glBI2v1/3utp+Gv0yXoVTX66531BDDXxivsCJBNRTh40TP8hXSbtDne615UGrykIjyadsUHCRK5Q==} - '@unocss/preset-tagify@0.63.0': - resolution: {integrity: sha512-RrXYruhvSqB4QaDTCHiRQUSfP2b1ie1eEhZ0HV9/WqCtgQjan1w9uV8bbA1TPXHLdMXWyt6tAoWUZPRdszBXZg==} + '@unocss/preset-tagify@0.63.1': + resolution: {integrity: sha512-GlhWsdD3pYvtMePVNWMOjkQGSp4XKJcfS65spUOZv03h6xrKuCCnJNsawYqbnpTzUOAL29pG/X8Quse00weRjQ==} - '@unocss/preset-typography@0.63.0': - resolution: {integrity: sha512-4uhTRa2D6yB2sBjV3lksP/rpc2kq0p6v+yvpAvor73PADQCpLLMW+HPpS3YZe52nagHBf/LpY8gVNoGTIy/8FA==} + '@unocss/preset-typography@0.63.1': + resolution: {integrity: sha512-NfC0qQmCeA68F0JeVMKNpCqZhh0X3+1ouEjlRrFGzmIZt5lxWuTFgGroyp5rXv++iubm3CMoW1bMnp8CsyUUYw==} - '@unocss/preset-uno@0.63.0': - resolution: {integrity: sha512-rXBz83FQG/FynPMhYQ5xlQ5ai9clYqmlubvDQR/UvEtuQWL0wIK2NiBFBGosn4Q0ukT0GrwOIicV8aizHu2tAg==} + '@unocss/preset-uno@0.63.1': + resolution: {integrity: sha512-L7ptI/kI48+miTv5y7vNE1igw8/ThkWPFICMuhQksQS4QuuysuzO/IjfD5QwPy8Awr9HgSYZLqf5Jaax63HJ5w==} - '@unocss/preset-web-fonts@0.63.0': - resolution: {integrity: sha512-0ybW2EG6fAtK0XrB82wNK7ETiE12+ctfRxqWnKgLxpcYHIYVS0m8bRWgBWpJ+1l9I0fWilyB622rg6qIBHHU3g==} + '@unocss/preset-web-fonts@0.63.1': + resolution: {integrity: sha512-55DkFZ2/hLYp5cDvxQWElnPgnKj9AjoC/hTgC6JlKjzaafaqKh5Bt45rDKOPiXe2cPMN7A9gURgBgFyARX4nBw==} - '@unocss/preset-wind@0.63.0': - resolution: {integrity: sha512-TVgFdxiIm4BfGLBE/4XqpeD2a+yMlrgTRY12WMEjj8DduNbuyuE+mnvaN7iY5+/DMIsng+eKyM3gamJew2r30w==} + '@unocss/preset-wind@0.63.1': + resolution: {integrity: sha512-L/Pyz55NC55K2+zJX9b3cC23tMZzh/a2jUUfoiJAHudsSPjAvP/PJ31Nc+27FFMbqZXhGQ50CBq8geq51O4PKQ==} - '@unocss/reset@0.63.0': - resolution: {integrity: sha512-QAAXxITLSWaNNK2+Mn1m2IeaCqrS3U9dszId2GVaiTHVe30M7vpMZQ6NrJI7xcD7DZ0kuh48BoZl5ttuiJkeww==} + '@unocss/reset@0.63.1': + resolution: {integrity: sha512-gjSF0LeWwkNCYZ4Z/AnQXGCIOPUGL5Ll1IIDfwnKZeFGCj9QmcV1hki4xf/7N8mNHhfP0nYdJpdAfiznhKdkwQ==} - '@unocss/rule-utils@0.63.0': - resolution: {integrity: sha512-OKA2LzSPUXsYtfzx2G8Mw7/IhIOYxJNprBg7QwRF0e3eVmo87Ae1G5m9cghBLh7h7Ur1SgG5PCNhI0dZg6f7XA==} + '@unocss/rule-utils@0.63.1': + resolution: {integrity: sha512-z7WQ8lKq7p6sS/6Yl1pStcA2WyxxD7H1i86iXa2orWayW8KtrIJbdCXFYEsj3sOkMKLqpG5w65P+103dO2jUhQ==} engines: {node: '>=14'} - '@unocss/transformer-attributify-jsx@0.63.0': - resolution: {integrity: sha512-+U+udpaRoUn5gXlejmT6h5l6ZcPr/8QCj4edCURyTOUZYrOd8siZzjDRisXP5/fskm4UqEgdlx97Qar97O6CYQ==} + '@unocss/transformer-attributify-jsx@0.63.1': + resolution: {integrity: sha512-c92pv9x6AZ3Zfw5ledP6rzTudWUvVY5HrVSaG3GxO2ofyCFEdHyJ1qLTK7omwnTJZ3rMJ3QplIrPJka1Ftasuw==} - '@unocss/transformer-compile-class@0.63.0': - resolution: {integrity: sha512-bCapGembNCy9xY8CJxCretx/lj7mTyhnoO79CkTxckHlnUGEgNj9gbvtLkXCPJAfRLmBWMtgeMdUivG5+auq1A==} + '@unocss/transformer-compile-class@0.63.1': + resolution: {integrity: sha512-OV8nQJf+OEIoqHSsFQPjP/ocOxQc2nnMirB+J7D5e32SqU4Zg4GPWag3E+Pcb4InwZ/OUTPPdecKSPNHgT3CTQ==} - '@unocss/transformer-directives@0.63.0': - resolution: {integrity: sha512-+qWfNKrOSuuaAfM5RSyqeCNy2s3nIct5knwlkzg/cYTT9UiKyIALeJY/k+plVM99WlGDNh/k6otNkNv5N/Z6wg==} + '@unocss/transformer-directives@0.63.1': + resolution: {integrity: sha512-mWVcQqVXj5OtUzfwc9B2/CRPYVHqkoj+AFfhU8RZ6e1nPgDKtR9JLt0jypTvv/PMo56vPJUTbpBBvXU+vvQwQA==} - '@unocss/transformer-variant-group@0.63.0': - resolution: {integrity: sha512-JNTqxogGDd+XpbP3oRUulNEaY1H+42+4KXQxlfxllikgqe28QHorhBbM/4ObCw085tKhrM+oDH391KF+VUNkhQ==} + '@unocss/transformer-variant-group@0.63.1': + resolution: {integrity: sha512-Awk9FDpvZM8m9YY46MThYYZ81fY6HVs4pOX22xcbw06J2l8z3WyG5iHIzx0f8vCTNwTekDuxD6vV3UlQKoI+0w==} - '@unocss/vite@0.63.0': - resolution: {integrity: sha512-7UH36o7UEwMbrifuvTj6wOPJZ3DNK21HO+ACOlFaM9HGVmlEUEuzC5fRVid0Q/zRlo0URaI/82TkvEh3sUU8Zg==} + '@unocss/vite@0.63.1': + resolution: {integrity: sha512-MUi4gtGYPahDeabXfxq25J9YRUksJPLB+xsU2zn7Rb4ai0wBdi6SsZsjjeHhx7RZEXjse9UG3FGZP6Xhe6erUQ==} peerDependencies: vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0 @@ -1201,8 +1201,9 @@ packages: argparse@2.0.1: resolution: {integrity: sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==} - aria-query@5.3.0: - resolution: {integrity: sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==} + aria-query@5.3.2: + resolution: {integrity: sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==} + engines: {node: '>= 0.4'} array-union@2.1.0: resolution: {integrity: sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==} @@ -1362,10 +1363,6 @@ packages: defu@6.1.4: resolution: {integrity: sha512-mEQCMmwJu317oSz8CwdIOdwf3xMif1ttiM8LTufzc3g6kR+9Pe236twL8j3IYT1F7GfRgGcW6MWxzZjLIkuHIg==} - dequal@2.0.3: - resolution: {integrity: sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==} - engines: {node: '>=6'} - destr@2.0.3: resolution: {integrity: sha512-2N3BOUU4gYMpTP24s5rF5iP7BDr7uNTCs4ozw3kf/eKfvWSIu93GEBi5m427YoyJoeOzQ5smuu4nNAPGb8idSQ==} @@ -1414,16 +1411,16 @@ packages: resolution: {integrity: sha512-XjVGBhtDZJfyuhIxnQ/WMm385RbX3DBu7H1J7HNNhmB2tnGxMeqVSnYv79oAj992ayvIBZghsymwkYFS6cGH4Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - eslint-scope@8.0.2: - resolution: {integrity: sha512-6E4xmrTw5wtxnLA5wYL3WDfhZ/1bUBGOXV0zQvVRDOtrR8D0p6W7fs3JweNYhwRYeGvd/1CKX2se0/2s7Q/nJA==} + eslint-scope@8.1.0: + resolution: {integrity: sha512-14dSvlhaVhKKsa9Fx1l8A17s7ah7Ef7wCakJ10LYk6+GYmP9yDti2oq2SEwcyndt6knfcZyhyxwY3i9yL78EQw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} eslint-visitor-keys@3.4.3: resolution: {integrity: sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==} engines: {node: ^12.22.0 || ^14.17.0 || >=16.0.0} - eslint-visitor-keys@4.0.0: - resolution: {integrity: sha512-OtIRv/2GyiF6o/d8K7MYKKbXrOUBIK6SfkIRM4Z0dY3w+LiQ0vy3F57m0Z71bjbyeiWFiHJ8brqnmE6H6/jEuw==} + eslint-visitor-keys@4.1.0: + resolution: {integrity: sha512-Q7lok0mqMUSf5a/AdAZkA5a/gHcO6snwQClVNNvFKCAVlxXucdU8pKydU5ZVZjBx5xr37vGbFFWtLQYreLzrZg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} eslint@9.11.1: @@ -1436,8 +1433,8 @@ packages: jiti: optional: true - espree@10.1.0: - resolution: {integrity: sha512-M1M6CpiE6ffoigIOWYO9UDP8TMUw9kqb21tf+08IgDYjCsOvCuDt4jQcZmoYxx+w7zlKw9/N0KXfto+I8/FrXA==} + espree@10.2.0: + resolution: {integrity: sha512-upbkBJbckcCNBDBDXEbuhjbP68n+scUd3k/U2EkyM9nw+I/jPiL4cLF/Al06CF96wRltFda16sxDFrxsI1v0/g==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} esquery@1.6.0: @@ -1546,8 +1543,8 @@ packages: resolution: {integrity: sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==} engines: {node: 6.* || 8.* || >= 10.*} - get-tsconfig@4.8.0: - resolution: {integrity: sha512-Pgba6TExTZ0FJAn1qkJAjIeKoDJ3CsI2ChuLohJnZl/tTU8MVrq3b+2t5UOPfRa4RMsorClBjJALkJUMjG1PAw==} + get-tsconfig@4.8.1: + resolution: {integrity: sha512-k9PN+cFBmaLWtVz29SkUoqU5O0slLuHJXt/2P+tMVFT+phsSGXGkp9t3rQIqdz0e+06EHNGs3oM6ZX1s2zHxRg==} glob-parent@5.1.2: resolution: {integrity: sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==} @@ -1899,8 +1896,8 @@ packages: pkg-types@1.2.0: resolution: {integrity: sha512-+ifYuSSqOQ8CqP4MbZA5hDpb97n3E8SVWdJe+Wms9kj745lmd3b7EZJiqvmLwAlmRfjrI7Hi5z3kdBJ93lFNPA==} - postcss@8.4.45: - resolution: {integrity: sha512-7KTLTdzdZZYscUc65XmjFiB73vBhBfbPztCYdUNvlaso9PrzjzcmjqBPR0lNGkcVlcO4BjiO5rK/qNz+XAen1Q==} + postcss@8.4.47: + resolution: {integrity: sha512-56rxCq7G/XfB4EkXq9Egn5GCqugWvDFjafDOThIdMBsI15iqPqR5r15TfSr1YPYeEI19YeaXMCbY6u88Y76GLQ==} engines: {node: ^10 || ^12 || >=14} prelude-ls@1.2.1: @@ -2090,8 +2087,8 @@ packages: resolution: {integrity: sha512-IY1rnGr6izd10B0A8LqsBfmlT5OILVuZ7XsI0vdGPEvuonFV7NYEUK4dAkm9Zg2q0Um92kYjTpS1CAP3Nh/KWw==} engines: {node: '>=16'} - terser@5.33.0: - resolution: {integrity: sha512-JuPVaB7s1gdFKPKTelwUyRq5Sid2A3Gko2S0PncwdBq7kN9Ti9HPWDQ06MPsEDGsZeVESjKEnyGy68quBk1w6g==} + terser@5.34.1: + resolution: {integrity: sha512-FsJZ7iZLd/BXkz+4xrRTGJ26o/6VTjQytUk8b8OxkwcD2I+79VPJlz7qss1+zE7h8GNIScFqXcDyJ/KqBYZFVA==} engines: {node: '>=10'} hasBin: true @@ -2170,11 +2167,11 @@ packages: unist-util-stringify-position@2.0.3: resolution: {integrity: sha512-3faScn5I+hy9VleOq/qNbAd6pAx7iH5jYBMS9I1HgQVijz/4mv5Bvw5iw1sC/90CODiKo81G/ps8AJrISn687g==} - unocss@0.63.0: - resolution: {integrity: sha512-+C+qsKMDL2GyhY4/Dz3BrQcf/1yf1oRyej7ItW4Y7l1sIS1Zcsp9772IUlzuTEnLQQQOdOJVm99OB4TWnGndeg==} + unocss@0.63.1: + resolution: {integrity: sha512-fVZOT+RCL43yK9enRVVClgh5RT9av8mE6P665cZH+F17hVqDO56q7J7HUqGh9/+zO+omkhYJwUQX4hTPE8J/9g==} engines: {node: '>=14'} peerDependencies: - '@unocss/webpack': 0.63.0 + '@unocss/webpack': 0.63.1 vite: ^2.9.0 || ^3.0.0-0 || ^4.0.0 || ^5.0.0-0 peerDependenciesMeta: '@unocss/webpack': @@ -2191,8 +2188,8 @@ packages: vfile@4.2.1: resolution: {integrity: sha512-O6AE4OskCG5S1emQ/4gl8zK586RqA3srz3nfK/Viy0UPToBc5Trp9BVFb1u0CjsKrAWwnpr4ifM/KBXPWwJbCA==} - vite@5.4.7: - resolution: {integrity: sha512-5l2zxqMEPVENgvzTuBpHer2awaetimj2BGkhBPdnwKbPNOlHsODU+oiazEZzLK7KhAnOrO+XGYJYn4ZlUhDtDQ==} + vite@5.4.8: + resolution: {integrity: sha512-FqrItQ4DT1NC4zCUqMB4c4AZORMKIa0m8/URVCZ77OZ/QSNeJ54bU1vrFADbDsuwfIPcgknRkmqakQcgnL4GiQ==} engines: {node: ^18.0.0 || >=20.0.0} hasBin: true peerDependencies: @@ -2595,7 +2592,7 @@ snapshots: dependencies: ajv: 6.12.6 debug: 4.3.7(supports-color@8.1.1) - espree: 10.1.0 + espree: 10.2.0 globals: 14.0.0 ignore: 5.3.2 import-fresh: 3.3.0 @@ -2617,7 +2614,7 @@ snapshots: '@humanwhocodes/retry@0.3.0': {} - '@iconify-json/codicon@1.2.0': + '@iconify-json/codicon@1.2.2': dependencies: '@iconify/types': 2.0.0 @@ -2673,7 +2670,7 @@ snapshots: '@nodelib/fs.scandir': 2.1.5 fastq: 1.17.1 - '@polka/url@1.0.0-next.25': {} + '@polka/url@1.0.0-next.28': {} '@rollup/plugin-node-resolve@15.3.0(rollup@4.22.4)': dependencies: @@ -2689,7 +2686,7 @@ snapshots: dependencies: serialize-javascript: 6.0.2 smob: 1.5.0 - terser: 5.33.0 + terser: 5.34.1 optionalDependencies: rollup: 4.22.4 @@ -2758,26 +2755,26 @@ snapshots: '@rollup/rollup-win32-x64-msvc@4.22.4': optional: true - '@sveltejs/vite-plugin-svelte-inspector@2.1.0(@sveltejs/vite-plugin-svelte@3.1.2(svelte@4.2.19)(vite@5.4.7(terser@5.33.0)))(svelte@4.2.19)(vite@5.4.7(terser@5.33.0))': + '@sveltejs/vite-plugin-svelte-inspector@2.1.0(@sveltejs/vite-plugin-svelte@3.1.2(svelte@4.2.19)(vite@5.4.8(terser@5.34.1)))(svelte@4.2.19)(vite@5.4.8(terser@5.34.1))': dependencies: - '@sveltejs/vite-plugin-svelte': 3.1.2(svelte@4.2.19)(vite@5.4.7(terser@5.33.0)) + '@sveltejs/vite-plugin-svelte': 3.1.2(svelte@4.2.19)(vite@5.4.8(terser@5.34.1)) debug: 4.3.7(supports-color@8.1.1) svelte: 4.2.19 - vite: 5.4.7(terser@5.33.0) + vite: 5.4.8(terser@5.34.1) transitivePeerDependencies: - supports-color - '@sveltejs/vite-plugin-svelte@3.1.2(svelte@4.2.19)(vite@5.4.7(terser@5.33.0))': + '@sveltejs/vite-plugin-svelte@3.1.2(svelte@4.2.19)(vite@5.4.8(terser@5.34.1))': dependencies: - '@sveltejs/vite-plugin-svelte-inspector': 2.1.0(@sveltejs/vite-plugin-svelte@3.1.2(svelte@4.2.19)(vite@5.4.7(terser@5.33.0)))(svelte@4.2.19)(vite@5.4.7(terser@5.33.0)) + '@sveltejs/vite-plugin-svelte-inspector': 2.1.0(@sveltejs/vite-plugin-svelte@3.1.2(svelte@4.2.19)(vite@5.4.8(terser@5.34.1)))(svelte@4.2.19)(vite@5.4.8(terser@5.34.1)) debug: 4.3.7(supports-color@8.1.1) deepmerge: 4.3.1 kleur: 4.1.5 magic-string: 0.30.11 svelte: 4.2.19 svelte-hmr: 0.16.0(svelte@4.2.19) - vite: 5.4.7(terser@5.33.0) - vitefu: 0.2.5(vite@5.4.7(terser@5.33.0)) + vite: 5.4.8(terser@5.34.1) + vitefu: 0.2.5(vite@5.4.8(terser@5.34.1)) transitivePeerDependencies: - supports-color @@ -2930,24 +2927,24 @@ snapshots: '@typescript-eslint/types': 8.7.0 eslint-visitor-keys: 3.4.3 - '@unocss/astro@0.63.0(rollup@4.22.4)(vite@5.4.7(terser@5.33.0))': + '@unocss/astro@0.63.1(rollup@4.22.4)(vite@5.4.8(terser@5.34.1))': dependencies: - '@unocss/core': 0.63.0 - '@unocss/reset': 0.63.0 - '@unocss/vite': 0.63.0(rollup@4.22.4)(vite@5.4.7(terser@5.33.0)) + '@unocss/core': 0.63.1 + '@unocss/reset': 0.63.1 + '@unocss/vite': 0.63.1(rollup@4.22.4)(vite@5.4.8(terser@5.34.1)) optionalDependencies: - vite: 5.4.7(terser@5.33.0) + vite: 5.4.8(terser@5.34.1) transitivePeerDependencies: - rollup - supports-color - '@unocss/cli@0.63.0(rollup@4.22.4)': + '@unocss/cli@0.63.1(rollup@4.22.4)': dependencies: '@ampproject/remapping': 2.3.0 '@rollup/pluginutils': 5.1.2(rollup@4.22.4) - '@unocss/config': 0.63.0 - '@unocss/core': 0.63.0 - '@unocss/preset-uno': 0.63.0 + '@unocss/config': 0.63.1 + '@unocss/core': 0.63.1 + '@unocss/preset-uno': 0.63.1 cac: 6.7.14 chokidar: 3.6.0 colorette: 2.0.20 @@ -2960,120 +2957,120 @@ snapshots: - rollup - supports-color - '@unocss/config@0.63.0': + '@unocss/config@0.63.1': dependencies: - '@unocss/core': 0.63.0 + '@unocss/core': 0.63.1 unconfig: 0.6.0 transitivePeerDependencies: - supports-color - '@unocss/core@0.63.0': {} + '@unocss/core@0.63.1': {} - '@unocss/extractor-arbitrary-variants@0.63.0': + '@unocss/extractor-arbitrary-variants@0.63.1': dependencies: - '@unocss/core': 0.63.0 + '@unocss/core': 0.63.1 - '@unocss/extractor-svelte@0.63.0': {} + '@unocss/extractor-svelte@0.63.1': {} - '@unocss/inspector@0.63.0': + '@unocss/inspector@0.63.1': dependencies: - '@unocss/core': 0.63.0 - '@unocss/rule-utils': 0.63.0 + '@unocss/core': 0.63.1 + '@unocss/rule-utils': 0.63.1 gzip-size: 6.0.0 sirv: 2.0.4 - '@unocss/postcss@0.63.0(postcss@8.4.45)': + '@unocss/postcss@0.63.1(postcss@8.4.47)': dependencies: - '@unocss/config': 0.63.0 - '@unocss/core': 0.63.0 - '@unocss/rule-utils': 0.63.0 + '@unocss/config': 0.63.1 + '@unocss/core': 0.63.1 + '@unocss/rule-utils': 0.63.1 css-tree: 3.0.0 - postcss: 8.4.45 + postcss: 8.4.47 tinyglobby: 0.2.6 transitivePeerDependencies: - supports-color - '@unocss/preset-attributify@0.63.0': + '@unocss/preset-attributify@0.63.1': dependencies: - '@unocss/core': 0.63.0 + '@unocss/core': 0.63.1 - '@unocss/preset-icons@0.63.0': + '@unocss/preset-icons@0.63.1': dependencies: '@iconify/utils': 2.1.33 - '@unocss/core': 0.63.0 + '@unocss/core': 0.63.1 ofetch: 1.4.0 transitivePeerDependencies: - supports-color - '@unocss/preset-mini@0.63.0': + '@unocss/preset-mini@0.63.1': dependencies: - '@unocss/core': 0.63.0 - '@unocss/extractor-arbitrary-variants': 0.63.0 - '@unocss/rule-utils': 0.63.0 + '@unocss/core': 0.63.1 + '@unocss/extractor-arbitrary-variants': 0.63.1 + '@unocss/rule-utils': 0.63.1 - '@unocss/preset-tagify@0.63.0': + '@unocss/preset-tagify@0.63.1': dependencies: - '@unocss/core': 0.63.0 + '@unocss/core': 0.63.1 - '@unocss/preset-typography@0.63.0': + '@unocss/preset-typography@0.63.1': dependencies: - '@unocss/core': 0.63.0 - '@unocss/preset-mini': 0.63.0 + '@unocss/core': 0.63.1 + '@unocss/preset-mini': 0.63.1 - '@unocss/preset-uno@0.63.0': + '@unocss/preset-uno@0.63.1': dependencies: - '@unocss/core': 0.63.0 - '@unocss/preset-mini': 0.63.0 - '@unocss/preset-wind': 0.63.0 - '@unocss/rule-utils': 0.63.0 + '@unocss/core': 0.63.1 + '@unocss/preset-mini': 0.63.1 + '@unocss/preset-wind': 0.63.1 + '@unocss/rule-utils': 0.63.1 - '@unocss/preset-web-fonts@0.63.0': + '@unocss/preset-web-fonts@0.63.1': dependencies: - '@unocss/core': 0.63.0 + '@unocss/core': 0.63.1 ofetch: 1.4.0 - '@unocss/preset-wind@0.63.0': + '@unocss/preset-wind@0.63.1': dependencies: - '@unocss/core': 0.63.0 - '@unocss/preset-mini': 0.63.0 - '@unocss/rule-utils': 0.63.0 + '@unocss/core': 0.63.1 + '@unocss/preset-mini': 0.63.1 + '@unocss/rule-utils': 0.63.1 - '@unocss/reset@0.63.0': {} + '@unocss/reset@0.63.1': {} - '@unocss/rule-utils@0.63.0': + '@unocss/rule-utils@0.63.1': dependencies: - '@unocss/core': 0.63.0 + '@unocss/core': 0.63.1 magic-string: 0.30.11 - '@unocss/transformer-attributify-jsx@0.63.0': + '@unocss/transformer-attributify-jsx@0.63.1': dependencies: - '@unocss/core': 0.63.0 + '@unocss/core': 0.63.1 - '@unocss/transformer-compile-class@0.63.0': + '@unocss/transformer-compile-class@0.63.1': dependencies: - '@unocss/core': 0.63.0 + '@unocss/core': 0.63.1 - '@unocss/transformer-directives@0.63.0': + '@unocss/transformer-directives@0.63.1': dependencies: - '@unocss/core': 0.63.0 - '@unocss/rule-utils': 0.63.0 + '@unocss/core': 0.63.1 + '@unocss/rule-utils': 0.63.1 css-tree: 3.0.0 - '@unocss/transformer-variant-group@0.63.0': + '@unocss/transformer-variant-group@0.63.1': dependencies: - '@unocss/core': 0.63.0 + '@unocss/core': 0.63.1 - '@unocss/vite@0.63.0(rollup@4.22.4)(vite@5.4.7(terser@5.33.0))': + '@unocss/vite@0.63.1(rollup@4.22.4)(vite@5.4.8(terser@5.34.1))': dependencies: '@ampproject/remapping': 2.3.0 '@rollup/pluginutils': 5.1.2(rollup@4.22.4) - '@unocss/config': 0.63.0 - '@unocss/core': 0.63.0 - '@unocss/inspector': 0.63.0 + '@unocss/config': 0.63.1 + '@unocss/core': 0.63.1 + '@unocss/inspector': 0.63.1 chokidar: 3.6.0 magic-string: 0.30.11 tinyglobby: 0.2.6 - vite: 5.4.7(terser@5.33.0) + vite: 5.4.8(terser@5.34.1) transitivePeerDependencies: - rollup - supports-color @@ -3114,9 +3111,7 @@ snapshots: argparse@2.0.1: {} - aria-query@5.3.0: - dependencies: - dequal: 2.0.3 + aria-query@5.3.2: {} array-union@2.1.0: {} @@ -3283,8 +3278,6 @@ snapshots: defu@6.1.4: {} - dequal@2.0.3: {} - destr@2.0.3: {} diff@5.2.0: {} @@ -3375,14 +3368,14 @@ snapshots: dependencies: safe-regex: 2.1.1 - eslint-scope@8.0.2: + eslint-scope@8.1.0: dependencies: esrecurse: 4.3.0 estraverse: 5.3.0 eslint-visitor-keys@3.4.3: {} - eslint-visitor-keys@4.0.0: {} + eslint-visitor-keys@4.1.0: {} eslint@9.11.1(jiti@2.0.0): dependencies: @@ -3403,9 +3396,9 @@ snapshots: cross-spawn: 7.0.3 debug: 4.3.7(supports-color@8.1.1) escape-string-regexp: 4.0.0 - eslint-scope: 8.0.2 - eslint-visitor-keys: 4.0.0 - espree: 10.1.0 + eslint-scope: 8.1.0 + eslint-visitor-keys: 4.1.0 + espree: 10.2.0 esquery: 1.6.0 esutils: 2.0.3 fast-deep-equal: 3.1.3 @@ -3428,11 +3421,11 @@ snapshots: transitivePeerDependencies: - supports-color - espree@10.1.0: + espree@10.2.0: dependencies: acorn: 8.12.1 acorn-jsx: 5.3.2(acorn@8.12.1) - eslint-visitor-keys: 4.0.0 + eslint-visitor-keys: 4.1.0 esquery@1.6.0: dependencies: @@ -3519,7 +3512,7 @@ snapshots: get-caller-file@2.0.5: {} - get-tsconfig@4.8.0: + get-tsconfig@4.8.1: dependencies: resolve-pkg-maps: 1.0.0 @@ -3891,7 +3884,7 @@ snapshots: mlly: 1.7.1 pathe: 1.1.2 - postcss@8.4.45: + postcss@8.4.47: dependencies: nanoid: 3.3.7 picocolors: 1.1.0 @@ -4012,7 +4005,7 @@ snapshots: sirv@2.0.4: dependencies: - '@polka/url': 1.0.0-next.25 + '@polka/url': 1.0.0-next.28 mrmime: 2.0.0 totalist: 3.0.1 @@ -4078,7 +4071,7 @@ snapshots: '@jridgewell/trace-mapping': 0.3.25 '@types/estree': 1.0.6 acorn: 8.12.1 - aria-query: 5.3.0 + aria-query: 5.3.2 axobject-query: 4.1.0 code-red: 1.0.4 css-tree: 2.3.1 @@ -4088,7 +4081,7 @@ snapshots: magic-string: 0.30.11 periscopic: 3.1.0 - terser@5.33.0: + terser@5.34.1: dependencies: '@jridgewell/source-map': 0.3.6 acorn: 8.12.1 @@ -4127,7 +4120,7 @@ snapshots: tsx@4.19.1: dependencies: esbuild: 0.23.1 - get-tsconfig: 4.8.0 + get-tsconfig: 4.8.1 optionalDependencies: fsevents: 2.3.3 @@ -4174,27 +4167,27 @@ snapshots: dependencies: '@types/unist': 2.0.11 - unocss@0.63.0(postcss@8.4.45)(rollup@4.22.4)(vite@5.4.7(terser@5.33.0)): - dependencies: - '@unocss/astro': 0.63.0(rollup@4.22.4)(vite@5.4.7(terser@5.33.0)) - '@unocss/cli': 0.63.0(rollup@4.22.4) - '@unocss/core': 0.63.0 - '@unocss/postcss': 0.63.0(postcss@8.4.45) - '@unocss/preset-attributify': 0.63.0 - '@unocss/preset-icons': 0.63.0 - '@unocss/preset-mini': 0.63.0 - '@unocss/preset-tagify': 0.63.0 - '@unocss/preset-typography': 0.63.0 - '@unocss/preset-uno': 0.63.0 - '@unocss/preset-web-fonts': 0.63.0 - '@unocss/preset-wind': 0.63.0 - '@unocss/transformer-attributify-jsx': 0.63.0 - '@unocss/transformer-compile-class': 0.63.0 - '@unocss/transformer-directives': 0.63.0 - '@unocss/transformer-variant-group': 0.63.0 - '@unocss/vite': 0.63.0(rollup@4.22.4)(vite@5.4.7(terser@5.33.0)) + unocss@0.63.1(postcss@8.4.47)(rollup@4.22.4)(vite@5.4.8(terser@5.34.1)): + dependencies: + '@unocss/astro': 0.63.1(rollup@4.22.4)(vite@5.4.8(terser@5.34.1)) + '@unocss/cli': 0.63.1(rollup@4.22.4) + '@unocss/core': 0.63.1 + '@unocss/postcss': 0.63.1(postcss@8.4.47) + '@unocss/preset-attributify': 0.63.1 + '@unocss/preset-icons': 0.63.1 + '@unocss/preset-mini': 0.63.1 + '@unocss/preset-tagify': 0.63.1 + '@unocss/preset-typography': 0.63.1 + '@unocss/preset-uno': 0.63.1 + '@unocss/preset-web-fonts': 0.63.1 + '@unocss/preset-wind': 0.63.1 + '@unocss/transformer-attributify-jsx': 0.63.1 + '@unocss/transformer-compile-class': 0.63.1 + '@unocss/transformer-directives': 0.63.1 + '@unocss/transformer-variant-group': 0.63.1 + '@unocss/vite': 0.63.1(rollup@4.22.4)(vite@5.4.8(terser@5.34.1)) optionalDependencies: - vite: 5.4.7(terser@5.33.0) + vite: 5.4.8(terser@5.34.1) transitivePeerDependencies: - postcss - rollup @@ -4216,18 +4209,18 @@ snapshots: unist-util-stringify-position: 2.0.3 vfile-message: 2.0.4 - vite@5.4.7(terser@5.33.0): + vite@5.4.8(terser@5.34.1): dependencies: esbuild: 0.21.5 - postcss: 8.4.45 + postcss: 8.4.47 rollup: 4.22.4 optionalDependencies: fsevents: 2.3.3 - terser: 5.33.0 + terser: 5.34.1 - vitefu@0.2.5(vite@5.4.7(terser@5.33.0)): + vitefu@0.2.5(vite@5.4.8(terser@5.34.1)): optionalDependencies: - vite: 5.4.7(terser@5.33.0) + vite: 5.4.8(terser@5.34.1) webidl-conversions@3.0.1: {} From 3b2bd3065d516735b33519df014a81b0d481c7a8 Mon Sep 17 00:00:00 2001 From: Tillmann <28728469+tweidinger@users.noreply.github.com> Date: Mon, 30 Sep 2024 21:11:44 +0900 Subject: [PATCH 05/40] fix sql heading --- plugins/sql/permissions/default.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/sql/permissions/default.toml b/plugins/sql/permissions/default.toml index efac5433..eb5fa555 100644 --- a/plugins/sql/permissions/default.toml +++ b/plugins/sql/permissions/default.toml @@ -2,7 +2,7 @@ [default] description = """ -# Tauri SQL Default Permissions +### Default Permissions This permission set configures what kind of database operations are available from the sql plugin. From 04459afbb67aafa5cd57e6a148c2beb0a8d3e04a Mon Sep 17 00:00:00 2001 From: Tony <68118705+Legend-Master@users.noreply.github.com> Date: Tue, 1 Oct 2024 20:34:20 +0800 Subject: [PATCH 06/40] refactor(dialog)!: use enum instead of label for buttons (#1842) * refactor(dialog)!: use enum instead of label * Add change file * Fix doc comment typo * Move ok and cancel to lib.rs --- .changes/native-dialog-button-text.md | 5 +++ plugins/dialog/src/commands.rs | 47 +++++++++++++++--------- plugins/dialog/src/desktop.rs | 34 ++++++++++-------- plugins/dialog/src/lib.rs | 51 ++++++++++++++------------- plugins/dialog/src/models.rs | 15 ++++++++ 5 files changed, 95 insertions(+), 57 deletions(-) create mode 100644 .changes/native-dialog-button-text.md diff --git a/.changes/native-dialog-button-text.md b/.changes/native-dialog-button-text.md new file mode 100644 index 00000000..5440cea1 --- /dev/null +++ b/.changes/native-dialog-button-text.md @@ -0,0 +1,5 @@ +--- +"dialog": patch:breaking +--- + +Changed `MessageDialogBuilder::ok_button_label` and `MessageDialogBuilder::cancel_button_label` to `MessageDialogBuilder::buttons` which takes an enum now diff --git a/plugins/dialog/src/commands.rs b/plugins/dialog/src/commands.rs index 9173e83e..8690a8b0 100644 --- a/plugins/dialog/src/commands.rs +++ b/plugins/dialog/src/commands.rs @@ -8,7 +8,10 @@ use serde::{Deserialize, Serialize}; use tauri::{command, Manager, Runtime, State, Window}; use tauri_plugin_fs::FsExt; -use crate::{Dialog, FileDialogBuilder, FilePath, MessageDialogKind, Result}; +use crate::{ + Dialog, FileDialogBuilder, FilePath, MessageDialogButtons, MessageDialogKind, Result, CANCEL, + OK, +}; #[derive(Serialize)] #[serde(untagged)] @@ -244,11 +247,12 @@ fn message_dialog( title: Option, message: String, kind: Option, - ok_button_label: Option, - cancel_button_label: Option, + buttons: MessageDialogButtons, ) -> bool { let mut builder = dialog.message(message); + builder = builder.buttons(buttons); + if let Some(title) = title { builder = builder.title(title); } @@ -262,14 +266,6 @@ fn message_dialog( builder = builder.kind(kind); } - if let Some(ok) = ok_button_label { - builder = builder.ok_button_label(ok); - } - - if let Some(cancel) = cancel_button_label { - builder = builder.cancel_button_label(cancel); - } - builder.blocking_show() } @@ -288,8 +284,11 @@ pub(crate) async fn message( title, message, kind, - ok_button_label, - None, + if let Some(ok_button_label) = ok_button_label { + MessageDialogButtons::OkCustom(ok_button_label) + } else { + MessageDialogButtons::Ok + }, )) } @@ -309,8 +308,7 @@ pub(crate) async fn ask( title, message, kind, - Some(ok_button_label.unwrap_or_else(|| "Yes".into())), - Some(cancel_button_label.unwrap_or_else(|| "No".into())), + get_ok_cancel_type(ok_button_label, cancel_button_label), )) } @@ -330,7 +328,22 @@ pub(crate) async fn confirm( title, message, kind, - Some(ok_button_label.unwrap_or_else(|| "Ok".into())), - Some(cancel_button_label.unwrap_or_else(|| "Cancel".into())), + get_ok_cancel_type(ok_button_label, cancel_button_label), )) } + +fn get_ok_cancel_type( + ok_button_label: Option, + cancel_button_label: Option, +) -> MessageDialogButtons { + if let Some(ok_button_label) = ok_button_label { + MessageDialogButtons::OkCancelCustom( + ok_button_label, + cancel_button_label.unwrap_or(CANCEL.to_string()), + ) + } else if let Some(cancel_button_label) = cancel_button_label { + MessageDialogButtons::OkCancelCustom(OK.to_string(), cancel_button_label) + } else { + MessageDialogButtons::OkCancel + } +} diff --git a/plugins/dialog/src/desktop.rs b/plugins/dialog/src/desktop.rs index be19b49a..d30f6bfe 100644 --- a/plugins/dialog/src/desktop.rs +++ b/plugins/dialog/src/desktop.rs @@ -13,9 +13,7 @@ use rfd::{AsyncFileDialog, AsyncMessageDialog}; use serde::de::DeserializeOwned; use tauri::{plugin::PluginApi, AppHandle, Runtime}; -use crate::{models::*, FileDialogBuilder, FilePath, MessageDialogBuilder}; - -const OK: &str = "Ok"; +use crate::{models::*, FileDialogBuilder, FilePath, MessageDialogBuilder, OK}; pub fn init( app: &AppHandle, @@ -109,22 +107,24 @@ impl From> for AsyncFileDialog { } } +impl From for rfd::MessageButtons { + fn from(value: MessageDialogButtons) -> Self { + match value { + MessageDialogButtons::Ok => Self::Ok, + MessageDialogButtons::OkCancel => Self::OkCancel, + MessageDialogButtons::OkCustom(ok) => Self::OkCustom(ok), + MessageDialogButtons::OkCancelCustom(ok, cancel) => Self::OkCancelCustom(ok, cancel), + } + } +} + impl From> for AsyncMessageDialog { fn from(d: MessageDialogBuilder) -> Self { let mut dialog = AsyncMessageDialog::new() .set_title(&d.title) .set_description(&d.message) - .set_level(d.kind.into()); - - let buttons = match (d.ok_button_label, d.cancel_button_label) { - (Some(ok), Some(cancel)) => Some(rfd::MessageButtons::OkCancelCustom(ok, cancel)), - (Some(ok), None) => Some(rfd::MessageButtons::OkCustom(ok)), - (None, Some(cancel)) => Some(rfd::MessageButtons::OkCancelCustom(OK.into(), cancel)), - (None, None) => None, - }; - if let Some(buttons) = buttons { - dialog = dialog.set_buttons(buttons); - } + .set_level(d.kind.into()) + .set_buttons(d.buttons.into()); if let Some(parent) = d.parent { dialog = dialog.set_parent(&parent); @@ -213,7 +213,11 @@ pub fn show_message_dialog( ) { use rfd::MessageDialogResult; - let ok_label = dialog.ok_button_label.clone(); + 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, diff --git a/plugins/dialog/src/lib.rs b/plugins/dialog/src/lib.rs index 5f2b35b0..a7538e1b 100644 --- a/plugins/dialog/src/lib.rs +++ b/plugins/dialog/src/lib.rs @@ -41,6 +41,9 @@ use desktop::*; #[cfg(mobile)] use mobile::*; +pub(crate) const OK: &str = "Ok"; +pub(crate) const CANCEL: &str = "Cancel"; + macro_rules! blocking_fn { ($self:ident, $fn:ident) => {{ let (tx, rx) = sync_channel(0); @@ -89,14 +92,13 @@ impl Dialog { /// - Ask dialog: /// /// ``` - /// use tauri_plugin_dialog::DialogExt; + /// use tauri_plugin_dialog::{DialogExt, MessageDialogButtons}; /// /// tauri::Builder::default() /// .setup(|app| { /// app.dialog() /// .message("Are you sure?") - /// .ok_button_label("Yes") - /// .cancel_button_label("No") + /// .buttons(MessageDialogButtons::OkCancelCustom("Yes", "No")) /// .show(|yes| { /// println!("user said {}", if yes { "yes" } else { "no" }); /// }); @@ -107,13 +109,13 @@ impl Dialog { /// - Message dialog with OK button: /// /// ``` - /// use tauri_plugin_dialog::DialogExt; + /// use tauri_plugin_dialog::{DialogExt, MessageDialogButtons}; /// /// tauri::Builder::default() /// .setup(|app| { /// app.dialog() /// .message("Job completed successfully") - /// .ok_button_label("Ok") + /// .buttons(MessageDialogButtons::Ok) /// .show(|_| { /// println!("dialog closed"); /// }); @@ -129,7 +131,7 @@ impl Dialog { /// but note that it cannot be executed on the main thread as it will freeze your application. /// /// ``` - /// use tauri_plugin_dialog::DialogExt; + /// use tauri_plugin_dialog::{DialogExt, MessageDialogButtons}; /// /// tauri::Builder::default() /// .setup(|app| { @@ -137,8 +139,7 @@ impl Dialog { /// std::thread::spawn(move || { /// let yes = handle.dialog() /// .message("Are you sure?") - /// .ok_button_label("Yes") - /// .cancel_button_label("No") + /// .buttons(MessageDialogButtons::OkCancelCustom("Yes", "No")) /// .blocking_show(); /// }); /// @@ -196,8 +197,7 @@ pub struct MessageDialogBuilder { pub(crate) title: String, pub(crate) message: String, pub(crate) kind: MessageDialogKind, - pub(crate) ok_button_label: Option, - pub(crate) cancel_button_label: Option, + pub(crate) buttons: MessageDialogButtons, #[cfg(desktop)] pub(crate) parent: Option, } @@ -210,8 +210,8 @@ pub(crate) struct MessageDialogPayload<'a> { title: &'a String, message: &'a String, kind: &'a MessageDialogKind, - ok_button_label: &'a Option, - cancel_button_label: &'a Option, + ok_button_label: Option<&'a str>, + cancel_button_label: Option<&'a str>, } // raw window handle :( @@ -225,8 +225,7 @@ impl MessageDialogBuilder { title: title.into(), message: message.into(), kind: Default::default(), - ok_button_label: None, - cancel_button_label: None, + buttons: Default::default(), #[cfg(desktop)] parent: None, } @@ -234,12 +233,20 @@ impl MessageDialogBuilder { #[cfg(mobile)] pub(crate) fn payload(&self) -> MessageDialogPayload<'_> { + let (ok_button_label, cancel_button_label) = match &self.buttons { + MessageDialogButtons::Ok => (Some(OK), None), + MessageDialogButtons::OkCancel => (Some(OK), Some(CANCEL)), + MessageDialogButtons::OkCustom(ok) => (Some(ok.as_str()), Some(CANCEL)), + MessageDialogButtons::OkCancelCustom(ok, cancel) => { + (Some(ok.as_str()), Some(cancel.as_str())) + } + }; MessageDialogPayload { title: &self.title, message: &self.message, kind: &self.kind, - ok_button_label: &self.ok_button_label, - cancel_button_label: &self.cancel_button_label, + ok_button_label, + cancel_button_label, } } @@ -266,15 +273,9 @@ impl MessageDialogBuilder { self } - /// Sets the label for the OK button. - pub fn ok_button_label(mut self, label: impl Into) -> Self { - self.ok_button_label.replace(label.into()); - self - } - - /// Sets the label for the Cancel button. - pub fn cancel_button_label(mut self, label: impl Into) -> Self { - self.cancel_button_label.replace(label.into()); + /// Sets the dialog buttons. + pub fn buttons(mut self, buttons: MessageDialogButtons) -> Self { + self.buttons = buttons; self } diff --git a/plugins/dialog/src/models.rs b/plugins/dialog/src/models.rs index fa9224e1..3f9eb6c1 100644 --- a/plugins/dialog/src/models.rs +++ b/plugins/dialog/src/models.rs @@ -49,3 +49,18 @@ impl Serialize for MessageDialogKind { } } } + +/// Set of button that will be displayed on the dialog +#[non_exhaustive] +#[derive(Debug, Default, Clone)] +pub enum MessageDialogButtons { + #[default] + /// A single `Ok` button with OS default dialog text + Ok, + /// 2 buttons `Ok` and `Cancel` with OS default dialog texts + OkCancel, + /// A single `Ok` button with custom text + OkCustom(String), + /// 2 buttons `Ok` and `Cancel` with custom texts + OkCancelCustom(String, String), +} From 68579934c93f6ed2edbc97474560d6a8a00e8f70 Mon Sep 17 00:00:00 2001 From: Amr Bashir Date: Tue, 1 Oct 2024 15:35:13 +0300 Subject: [PATCH 07/40] fix(cli): expose hidden structs (#1856) closes #1843 --- .changes/cli-hidden-structs.md | 5 +++++ plugins/cli/src/error.rs | 2 ++ plugins/cli/src/lib.rs | 5 +++-- plugins/sql/permissions/autogenerated/reference.md | 2 +- plugins/sql/permissions/schemas/schema.json | 2 +- 5 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 .changes/cli-hidden-structs.md diff --git a/.changes/cli-hidden-structs.md b/.changes/cli-hidden-structs.md new file mode 100644 index 00000000..61619a05 --- /dev/null +++ b/.changes/cli-hidden-structs.md @@ -0,0 +1,5 @@ +--- +"cli": patch +--- + +Expose `Matches`, `SubcommandMatches` and `ArgData` structs. \ No newline at end of file diff --git a/plugins/cli/src/error.rs b/plugins/cli/src/error.rs index b4bd2872..2b5e1602 100644 --- a/plugins/cli/src/error.rs +++ b/plugins/cli/src/error.rs @@ -18,3 +18,5 @@ impl Serialize for Error { serializer.serialize_str(self.to_string().as_ref()) } } + +pub type Result = std::result::Result; diff --git a/plugins/cli/src/lib.rs b/plugins/cli/src/lib.rs index 0e65409e..38f64f83 100644 --- a/plugins/cli/src/lib.rs +++ b/plugins/cli/src/lib.rs @@ -23,8 +23,9 @@ mod error; mod parser; use config::{Arg, Config}; -pub use error::Error; -type Result = std::result::Result; + +pub use error::{Error, Result}; +pub use parser::{ArgData, Matches, SubcommandMatches}; pub struct Cli(PluginApi); diff --git a/plugins/sql/permissions/autogenerated/reference.md b/plugins/sql/permissions/autogenerated/reference.md index 5b887c94..2a70f7b3 100644 --- a/plugins/sql/permissions/autogenerated/reference.md +++ b/plugins/sql/permissions/autogenerated/reference.md @@ -1,6 +1,6 @@ ## Default Permission -# Tauri SQL Default Permissions +### Default Permissions This permission set configures what kind of database operations are available from the sql plugin. diff --git a/plugins/sql/permissions/schemas/schema.json b/plugins/sql/permissions/schemas/schema.json index e14f5cea..e3add537 100644 --- a/plugins/sql/permissions/schemas/schema.json +++ b/plugins/sql/permissions/schemas/schema.json @@ -335,7 +335,7 @@ "const": "deny-select" }, { - "description": "# Tauri SQL Default Permissions\n\nThis permission set configures what kind of\ndatabase operations are available from the sql plugin.\n\n### Granted Permissions\n\nAll reading related operations are enabled.\nAlso allows to load or close a connection.\n\n", + "description": "### Default Permissions\n\nThis permission set configures what kind of\ndatabase operations are available from the sql plugin.\n\n### Granted Permissions\n\nAll reading related operations are enabled.\nAlso allows to load or close a connection.\n\n", "type": "string", "const": "default" } From 30bcf5dcc22e1bb1fb983a8d2887edc39404e6df Mon Sep 17 00:00:00 2001 From: Fabian-Lars Date: Tue, 1 Oct 2024 14:47:08 +0200 Subject: [PATCH 08/40] refactor(sql): Allow multiple drivers at the same time (#1838) * refactor(sql): Allow multiple drivers at the same time * fmt * remove default feature comment [skip ci] * what was that doing there [skip ci] * disable public methods for now --- .changes/feat-multiple-sql-backends.md | 5 + .github/workflows/lint-rust.yml | 10 +- .github/workflows/test-rust.yml | 14 +- plugins/localhost/src/lib.rs | 2 +- plugins/sql/Cargo.toml | 1 + plugins/sql/src/commands.rs | 82 ++++++ plugins/sql/src/decode/mod.rs | 15 +- plugins/sql/src/error.rs | 28 ++ plugins/sql/src/lib.rs | 180 +++++++++++-- plugins/sql/src/plugin.rs | 343 ------------------------- plugins/sql/src/wrapper.rs | 328 +++++++++++++++++++++++ 11 files changed, 615 insertions(+), 393 deletions(-) create mode 100644 .changes/feat-multiple-sql-backends.md create mode 100644 plugins/sql/src/commands.rs create mode 100644 plugins/sql/src/error.rs delete mode 100644 plugins/sql/src/plugin.rs create mode 100644 plugins/sql/src/wrapper.rs diff --git a/.changes/feat-multiple-sql-backends.md b/.changes/feat-multiple-sql-backends.md new file mode 100644 index 00000000..65b8fe86 --- /dev/null +++ b/.changes/feat-multiple-sql-backends.md @@ -0,0 +1,5 @@ +--- +sql: patch +--- + +It is now possible to enable multiple SQL backends at the same time. There will be no compile error anymore if no backends are enabled! diff --git a/.github/workflows/lint-rust.yml b/.github/workflows/lint-rust.yml index 74d9d766..39cc37fe 100644 --- a/.github/workflows/lint-rust.yml +++ b/.github/workflows/lint-rust.yml @@ -148,13 +148,7 @@ jobs: - uses: Swatinem/rust-cache@v2 - name: clippy ${{ matrix.package }} - if: matrix.package != 'tauri-plugin-sql' run: cargo clippy --package ${{ matrix.package }} --all-targets -- -D warnings - - name: clippy ${{ matrix.package }} mysql - if: matrix.package == 'tauri-plugin-sql' - run: cargo clippy --package ${{ matrix.package }} --all-targets --no-default-features --features mysql -- -D warnings - - - name: clippy ${{ matrix.package }} postgres - if: matrix.package == 'tauri-plugin-sql' - run: cargo clippy --package ${{ matrix.package }} --all-targets --no-default-features --features postgres -- -D warnings + - name: clippy ${{ matrix.package }} --all-features + run: cargo clippy --package ${{ matrix.package }} --all-targets --all-features -- -D warnings diff --git a/.github/workflows/test-rust.yml b/.github/workflows/test-rust.yml index 75b1e55f..34af5e2c 100644 --- a/.github/workflows/test-rust.yml +++ b/.github/workflows/test-rust.yml @@ -215,21 +215,9 @@ jobs: run: cargo +stable install cross --git https://github.com/cross-rs/cross - name: test ${{ matrix.package }} - if: matrix.package != 'tauri-plugin-sql' && matrix.package != 'tauri-plugin-http' + if: matrix.package != 'tauri-plugin-http' run: ${{ matrix.platform.runner }} ${{ matrix.platform.command }} --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets --all-features - name: test ${{ matrix.package }} if: matrix.package == 'tauri-plugin-http' run: ${{ matrix.platform.runner }} ${{ matrix.platform.command }} --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets - - - name: test ${{ matrix.package }} sqlite - if: matrix.package == 'tauri-plugin-sql' - run: ${{ matrix.platform.runner }} ${{ matrix.platform.command }} --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets --features sqlite - - - name: test ${{ matrix.package }} mysql - if: matrix.package == 'tauri-plugin-sql' - run: ${{ matrix.platform.runner }} ${{ matrix.platform.command }} --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets --features mysql - - - name: test ${{ matrix.package }} postgres - if: matrix.package == 'tauri-plugin-sql' - run: ${{ matrix.platform.runner }} ${{ matrix.platform.command }} --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets --features postgres diff --git a/plugins/localhost/src/lib.rs b/plugins/localhost/src/lib.rs index f5f99fe4..a0c4c794 100644 --- a/plugins/localhost/src/lib.rs +++ b/plugins/localhost/src/lib.rs @@ -74,7 +74,7 @@ impl Builder { let asset_resolver = app.asset_resolver(); std::thread::spawn(move || { let server = - Server::http(&format!("localhost:{port}")).expect("Unable to spawn server"); + Server::http(format!("localhost:{port}")).expect("Unable to spawn server"); for req in server.incoming_requests() { let path = req .url() diff --git a/plugins/sql/Cargo.toml b/plugins/sql/Cargo.toml index bfcfc99e..4f4db76f 100644 --- a/plugins/sql/Cargo.toml +++ b/plugins/sql/Cargo.toml @@ -40,3 +40,4 @@ indexmap = { version = "2", features = ["serde"] } sqlite = ["sqlx/sqlite", "sqlx/runtime-tokio"] mysql = ["sqlx/mysql", "sqlx/runtime-tokio-rustls"] postgres = ["sqlx/postgres", "sqlx/runtime-tokio-rustls"] +# TODO: bundled-cipher etc diff --git a/plugins/sql/src/commands.rs b/plugins/sql/src/commands.rs new file mode 100644 index 00000000..8cd90e9c --- /dev/null +++ b/plugins/sql/src/commands.rs @@ -0,0 +1,82 @@ +// Copyright 2019-2023 Tauri Programme within The Commons Conservancy +// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: MIT + +use indexmap::IndexMap; +use serde_json::Value as JsonValue; +use sqlx::migrate::Migrator; +use tauri::{command, AppHandle, Runtime, State}; + +use crate::{DbInstances, DbPool, Error, LastInsertId, Migrations}; + +#[command] +pub(crate) async fn load( + app: AppHandle, + db_instances: State<'_, DbInstances>, + migrations: State<'_, Migrations>, + db: String, +) -> Result { + let pool = DbPool::connect(&db, &app).await?; + + if let Some(migrations) = migrations.0.lock().await.remove(&db) { + let migrator = Migrator::new(migrations).await?; + pool.migrate(&migrator).await?; + } + + db_instances.0.lock().await.insert(db.clone(), pool); + + Ok(db) +} + +/// Allows the database connection(s) to be closed; if no database +/// name is passed in then _all_ database connection pools will be +/// shut down. +#[command] +pub(crate) async fn close( + db_instances: State<'_, DbInstances>, + db: Option, +) -> Result { + let mut instances = db_instances.0.lock().await; + + let pools = if let Some(db) = db { + vec![db] + } else { + instances.keys().cloned().collect() + }; + + for pool in pools { + let db = instances + .get_mut(&pool) + .ok_or(Error::DatabaseNotLoaded(pool))?; + db.close().await; + } + + Ok(true) +} + +/// Execute a command against the database +#[command] +pub(crate) async fn execute( + db_instances: State<'_, DbInstances>, + db: String, + query: String, + values: Vec, +) -> Result<(u64, LastInsertId), crate::Error> { + let mut instances = db_instances.0.lock().await; + + let db = instances.get_mut(&db).ok_or(Error::DatabaseNotLoaded(db))?; + db.execute(query, values).await +} + +#[command] +pub(crate) async fn select( + db_instances: State<'_, DbInstances>, + db: String, + query: String, + values: Vec, +) -> Result>, crate::Error> { + let mut instances = db_instances.0.lock().await; + + let db = instances.get_mut(&db).ok_or(Error::DatabaseNotLoaded(db))?; + db.select(query, values).await +} diff --git a/plugins/sql/src/decode/mod.rs b/plugins/sql/src/decode/mod.rs index 50fb3c78..0a2d2cdd 100644 --- a/plugins/sql/src/decode/mod.rs +++ b/plugins/sql/src/decode/mod.rs @@ -3,17 +3,8 @@ // SPDX-License-Identifier: MIT #[cfg(feature = "mysql")] -mod mysql; +pub(crate) mod mysql; #[cfg(feature = "postgres")] -mod postgres; +pub(crate) mod postgres; #[cfg(feature = "sqlite")] -mod sqlite; - -#[cfg(feature = "mysql")] -pub(crate) use mysql::to_json; - -#[cfg(feature = "postgres")] -pub(crate) use postgres::to_json; - -#[cfg(feature = "sqlite")] -pub(crate) use sqlite::to_json; +pub(crate) mod sqlite; diff --git a/plugins/sql/src/error.rs b/plugins/sql/src/error.rs new file mode 100644 index 00000000..5ac845b8 --- /dev/null +++ b/plugins/sql/src/error.rs @@ -0,0 +1,28 @@ +// Copyright 2019-2023 Tauri Programme within The Commons Conservancy +// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: MIT + +use serde::{Serialize, Serializer}; + +#[derive(Debug, thiserror::Error)] +pub enum Error { + #[error(transparent)] + Sql(#[from] sqlx::Error), + #[error(transparent)] + Migration(#[from] sqlx::migrate::MigrateError), + #[error("invalid connection url: {0}")] + InvalidDbUrl(String), + #[error("database {0} not loaded")] + DatabaseNotLoaded(String), + #[error("unsupported datatype: {0}")] + UnsupportedDatatype(String), +} + +impl Serialize for Error { + fn serialize(&self, serializer: S) -> std::result::Result + where + S: Serializer, + { + serializer.serialize_str(self.to_string().as_ref()) + } +} diff --git a/plugins/sql/src/lib.rs b/plugins/sql/src/lib.rs index f25ede21..ec9362bf 100644 --- a/plugins/sql/src/lib.rs +++ b/plugins/sql/src/lib.rs @@ -11,20 +11,168 @@ html_favicon_url = "https://github.com/tauri-apps/tauri/raw/dev/app-icon.png" )] -#[cfg(any( - all(feature = "sqlite", feature = "mysql"), - all(feature = "sqlite", feature = "postgres"), - all(feature = "mysql", feature = "postgres") -))] -compile_error!( - "Only one database driver can be enabled. Set the feature flag for the driver of your choice." -); - -#[cfg(not(any(feature = "sqlite", feature = "mysql", feature = "postgres")))] -compile_error!( - "Database driver not defined. Please set the feature flag for the driver of your choice." -); - +mod commands; mod decode; -mod plugin; -pub use plugin::*; +mod error; +mod wrapper; + +pub use error::Error; +pub use wrapper::DbPool; + +use futures_core::future::BoxFuture; +use serde::{Deserialize, Serialize}; +use sqlx::{ + error::BoxDynError, + migrate::{Migration as SqlxMigration, MigrationSource, MigrationType, Migrator}, +}; +use tauri::{ + plugin::{Builder as PluginBuilder, TauriPlugin}, + Manager, RunEvent, Runtime, +}; +use tokio::sync::Mutex; + +use std::collections::HashMap; + +#[derive(Default)] +pub struct DbInstances(pub Mutex>); + +#[derive(Serialize)] +#[serde(untagged)] +pub(crate) enum LastInsertId { + #[cfg(feature = "sqlite")] + Sqlite(i64), + #[cfg(feature = "mysql")] + MySql(u64), + #[cfg(feature = "postgres")] + Postgres(()), + #[cfg(not(any(feature = "sqlite", feature = "mysql", feature = "postgres")))] + None, +} + +struct Migrations(Mutex>); + +#[derive(Default, Clone, Deserialize)] +pub struct PluginConfig { + #[serde(default)] + preload: Vec, +} + +#[derive(Debug)] +pub enum MigrationKind { + Up, + Down, +} + +impl From for MigrationType { + fn from(kind: MigrationKind) -> Self { + match kind { + MigrationKind::Up => Self::ReversibleUp, + MigrationKind::Down => Self::ReversibleDown, + } + } +} + +/// A migration definition. +#[derive(Debug)] +pub struct Migration { + pub version: i64, + pub description: &'static str, + pub sql: &'static str, + pub kind: MigrationKind, +} + +#[derive(Debug)] +struct MigrationList(Vec); + +impl MigrationSource<'static> for MigrationList { + fn resolve(self) -> BoxFuture<'static, std::result::Result, BoxDynError>> { + Box::pin(async move { + let mut migrations = Vec::new(); + for migration in self.0 { + if matches!(migration.kind, MigrationKind::Up) { + migrations.push(SqlxMigration::new( + migration.version, + migration.description.into(), + migration.kind.into(), + migration.sql.into(), + false, + )); + } + } + Ok(migrations) + }) + } +} + +/// Tauri SQL plugin builder. +#[derive(Default)] +pub struct Builder { + migrations: Option>, +} + +impl Builder { + pub fn new() -> Self { + #[cfg(not(any(feature = "sqlite", feature = "mysql", feature = "postgres")))] + eprintln!("No sql driver enabled. Please set at least one of the \"sqlite\", \"mysql\", \"postgres\" feature flags."); + + Self::default() + } + + /// Add migrations to a database. + #[must_use] + pub fn add_migrations(mut self, db_url: &str, migrations: Vec) -> Self { + self.migrations + .get_or_insert(Default::default()) + .insert(db_url.to_string(), MigrationList(migrations)); + self + } + + pub fn build(mut self) -> TauriPlugin> { + PluginBuilder::>::new("sql") + .invoke_handler(tauri::generate_handler![ + commands::load, + commands::execute, + commands::select, + commands::close + ]) + .setup(|app, api| { + let config = api.config().clone().unwrap_or_default(); + + tauri::async_runtime::block_on(async move { + let instances = DbInstances::default(); + let mut lock = instances.0.lock().await; + + for db in config.preload { + let pool = DbPool::connect(&db, app).await?; + + if let Some(migrations) = self.migrations.as_mut().unwrap().remove(&db) { + let migrator = Migrator::new(migrations).await?; + pool.migrate(&migrator).await?; + } + + lock.insert(db, pool); + } + drop(lock); + + app.manage(instances); + app.manage(Migrations(Mutex::new( + self.migrations.take().unwrap_or_default(), + ))); + + Ok(()) + }) + }) + .on_event(|app, event| { + if let RunEvent::Exit = event { + tauri::async_runtime::block_on(async move { + let instances = &*app.state::(); + let instances = instances.0.lock().await; + for value in instances.values() { + value.close().await; + } + }); + } + }) + .build() + } +} diff --git a/plugins/sql/src/plugin.rs b/plugins/sql/src/plugin.rs deleted file mode 100644 index 63f8e183..00000000 --- a/plugins/sql/src/plugin.rs +++ /dev/null @@ -1,343 +0,0 @@ -// Copyright 2019-2023 Tauri Programme within The Commons Conservancy -// SPDX-License-Identifier: Apache-2.0 -// SPDX-License-Identifier: MIT - -use futures_core::future::BoxFuture; -use serde::{ser::Serializer, Deserialize, Serialize}; -use serde_json::Value as JsonValue; -use sqlx::{ - error::BoxDynError, - migrate::{ - MigrateDatabase, Migration as SqlxMigration, MigrationSource, MigrationType, Migrator, - }, - Column, Pool, Row, -}; -use tauri::{ - command, - plugin::{Builder as PluginBuilder, TauriPlugin}, - AppHandle, Manager, RunEvent, Runtime, State, -}; -use tokio::sync::Mutex; - -use indexmap::IndexMap; -use std::collections::HashMap; - -#[cfg(feature = "sqlite")] -use std::{fs::create_dir_all, path::PathBuf}; - -#[cfg(feature = "sqlite")] -type Db = sqlx::sqlite::Sqlite; -#[cfg(feature = "mysql")] -type Db = sqlx::mysql::MySql; -#[cfg(feature = "postgres")] -type Db = sqlx::postgres::Postgres; - -#[cfg(feature = "sqlite")] -type LastInsertId = i64; -#[cfg(not(feature = "sqlite"))] -type LastInsertId = u64; - -#[derive(Debug, thiserror::Error)] -pub enum Error { - #[error(transparent)] - Sql(#[from] sqlx::Error), - #[error(transparent)] - Migration(#[from] sqlx::migrate::MigrateError), - #[error("database {0} not loaded")] - DatabaseNotLoaded(String), - #[error("unsupported datatype: {0}")] - UnsupportedDatatype(String), -} - -impl Serialize for Error { - fn serialize(&self, serializer: S) -> std::result::Result - where - S: Serializer, - { - serializer.serialize_str(self.to_string().as_ref()) - } -} - -type Result = std::result::Result; - -#[cfg(feature = "sqlite")] -/// Resolves the App's **file path** from the `AppHandle` context -/// object -fn app_path(app: &AppHandle) -> PathBuf { - app.path().app_config_dir().expect("No App path was found!") -} - -#[cfg(feature = "sqlite")] -/// Maps the user supplied DB connection string to a connection string -/// with a fully qualified file path to the App's designed "app_path" -fn path_mapper(mut app_path: PathBuf, connection_string: &str) -> String { - app_path.push( - connection_string - .split_once(':') - .expect("Couldn't parse the connection string for DB!") - .1, - ); - - format!( - "sqlite:{}", - app_path - .to_str() - .expect("Problem creating fully qualified path to Database file!") - ) -} - -#[derive(Default)] -pub struct DbInstances(pub Mutex>>); - -struct Migrations(Mutex>); - -#[derive(Default, Clone, Deserialize)] -pub struct PluginConfig { - #[serde(default)] - preload: Vec, -} - -#[derive(Debug)] -pub enum MigrationKind { - Up, - Down, -} - -impl From for MigrationType { - fn from(kind: MigrationKind) -> Self { - match kind { - MigrationKind::Up => Self::ReversibleUp, - MigrationKind::Down => Self::ReversibleDown, - } - } -} - -/// A migration definition. -#[derive(Debug)] -pub struct Migration { - pub version: i64, - pub description: &'static str, - pub sql: &'static str, - pub kind: MigrationKind, -} - -#[derive(Debug)] -struct MigrationList(Vec); - -impl MigrationSource<'static> for MigrationList { - fn resolve(self) -> BoxFuture<'static, std::result::Result, BoxDynError>> { - Box::pin(async move { - let mut migrations = Vec::new(); - for migration in self.0 { - if matches!(migration.kind, MigrationKind::Up) { - migrations.push(SqlxMigration::new( - migration.version, - migration.description.into(), - migration.kind.into(), - migration.sql.into(), - false, - )); - } - } - Ok(migrations) - }) - } -} - -#[command] -async fn load( - #[allow(unused_variables)] app: AppHandle, - db_instances: State<'_, DbInstances>, - migrations: State<'_, Migrations>, - db: String, -) -> Result { - #[cfg(feature = "sqlite")] - let fqdb = path_mapper(app_path(&app), &db); - #[cfg(not(feature = "sqlite"))] - let fqdb = db.clone(); - - #[cfg(feature = "sqlite")] - create_dir_all(app_path(&app)).expect("Problem creating App directory!"); - - if !Db::database_exists(&fqdb).await.unwrap_or(false) { - Db::create_database(&fqdb).await?; - } - let pool = Pool::connect(&fqdb).await?; - - if let Some(migrations) = migrations.0.lock().await.remove(&db) { - let migrator = Migrator::new(migrations).await?; - migrator.run(&pool).await?; - } - - db_instances.0.lock().await.insert(db.clone(), pool); - Ok(db) -} - -/// Allows the database connection(s) to be closed; if no database -/// name is passed in then _all_ database connection pools will be -/// shut down. -#[command] -async fn close(db_instances: State<'_, DbInstances>, db: Option) -> Result { - let mut instances = db_instances.0.lock().await; - - let pools = if let Some(db) = db { - vec![db] - } else { - instances.keys().cloned().collect() - }; - - for pool in pools { - let db = instances - .get_mut(&pool) // - .ok_or(Error::DatabaseNotLoaded(pool))?; - db.close().await; - } - - Ok(true) -} - -/// Execute a command against the database -#[command] -async fn execute( - db_instances: State<'_, DbInstances>, - db: String, - query: String, - values: Vec, -) -> Result<(u64, LastInsertId)> { - let mut instances = db_instances.0.lock().await; - - let db = instances.get_mut(&db).ok_or(Error::DatabaseNotLoaded(db))?; - let mut query = sqlx::query(&query); - for value in values { - if value.is_null() { - query = query.bind(None::); - } else if value.is_string() { - query = query.bind(value.as_str().unwrap().to_owned()) - } else if let Some(number) = value.as_number() { - query = query.bind(number.as_f64().unwrap_or_default()) - } else { - query = query.bind(value); - } - } - let result = query.execute(&*db).await?; - #[cfg(feature = "sqlite")] - let r = Ok((result.rows_affected(), result.last_insert_rowid())); - #[cfg(feature = "mysql")] - let r = Ok((result.rows_affected(), result.last_insert_id())); - #[cfg(feature = "postgres")] - let r = Ok((result.rows_affected(), 0)); - r -} - -#[command] -async fn select( - db_instances: State<'_, DbInstances>, - db: String, - query: String, - values: Vec, -) -> Result>> { - let mut instances = db_instances.0.lock().await; - let db = instances.get_mut(&db).ok_or(Error::DatabaseNotLoaded(db))?; - let mut query = sqlx::query(&query); - for value in values { - if value.is_null() { - query = query.bind(None::); - } else if value.is_string() { - query = query.bind(value.as_str().unwrap().to_owned()) - } else if let Some(number) = value.as_number() { - query = query.bind(number.as_f64().unwrap_or_default()) - } else { - query = query.bind(value); - } - } - let rows = query.fetch_all(&*db).await?; - let mut values = Vec::new(); - for row in rows { - let mut value = IndexMap::default(); - for (i, column) in row.columns().iter().enumerate() { - let v = row.try_get_raw(i)?; - - let v = crate::decode::to_json(v)?; - - value.insert(column.name().to_string(), v); - } - - values.push(value); - } - - Ok(values) -} - -/// Tauri SQL plugin builder. -#[derive(Default)] -pub struct Builder { - migrations: Option>, -} - -impl Builder { - pub fn new() -> Self { - Self::default() - } - - /// Add migrations to a database. - #[must_use] - pub fn add_migrations(mut self, db_url: &str, migrations: Vec) -> Self { - self.migrations - .get_or_insert(Default::default()) - .insert(db_url.to_string(), MigrationList(migrations)); - self - } - - pub fn build(mut self) -> TauriPlugin> { - PluginBuilder::>::new("sql") - .invoke_handler(tauri::generate_handler![load, execute, select, close]) - .setup(|app, api| { - let config = api.config().clone().unwrap_or_default(); - - #[cfg(feature = "sqlite")] - create_dir_all(app_path(app)).expect("problems creating App directory!"); - - tauri::async_runtime::block_on(async move { - let instances = DbInstances::default(); - let mut lock = instances.0.lock().await; - for db in config.preload { - #[cfg(feature = "sqlite")] - let fqdb = path_mapper(app_path(app), &db); - #[cfg(not(feature = "sqlite"))] - let fqdb = db.clone(); - - if !Db::database_exists(&fqdb).await.unwrap_or(false) { - Db::create_database(&fqdb).await?; - } - let pool = Pool::connect(&fqdb).await?; - - if let Some(migrations) = self.migrations.as_mut().unwrap().remove(&db) { - let migrator = Migrator::new(migrations).await?; - migrator.run(&pool).await?; - } - lock.insert(db, pool); - } - drop(lock); - - app.manage(instances); - app.manage(Migrations(Mutex::new( - self.migrations.take().unwrap_or_default(), - ))); - - Ok(()) - }) - }) - .on_event(|app, event| { - if let RunEvent::Exit = event { - tauri::async_runtime::block_on(async move { - let instances = &*app.state::(); - let instances = instances.0.lock().await; - for value in instances.values() { - value.close().await; - } - }); - } - }) - .build() - } -} diff --git a/plugins/sql/src/wrapper.rs b/plugins/sql/src/wrapper.rs new file mode 100644 index 00000000..90631dac --- /dev/null +++ b/plugins/sql/src/wrapper.rs @@ -0,0 +1,328 @@ +// Copyright 2019-2023 Tauri Programme within The Commons Conservancy +// SPDX-License-Identifier: Apache-2.0 +// SPDX-License-Identifier: MIT + +#[cfg(feature = "sqlite")] +use std::fs::create_dir_all; + +use indexmap::IndexMap; +use serde_json::Value as JsonValue; +#[cfg(any(feature = "sqlite", feature = "mysql", feature = "postgres"))] +use sqlx::{migrate::MigrateDatabase, Column, Executor, Pool, Row}; +#[cfg(any(feature = "sqlite", feature = "mysql", feature = "postgres"))] +use tauri::Manager; +use tauri::{AppHandle, Runtime}; + +#[cfg(feature = "mysql")] +use sqlx::MySql; +#[cfg(feature = "postgres")] +use sqlx::Postgres; +#[cfg(feature = "sqlite")] +use sqlx::Sqlite; + +use crate::LastInsertId; + +pub enum DbPool { + #[cfg(feature = "sqlite")] + Sqlite(Pool), + #[cfg(feature = "mysql")] + MySql(Pool), + #[cfg(feature = "postgres")] + Postgres(Pool), + #[cfg(not(any(feature = "sqlite", feature = "mysql", feature = "postgres")))] + None, +} + +// public methods +/* impl DbPool { + /// Get the inner Sqlite Pool. Returns None for MySql and Postgres pools. + #[cfg(feature = "sqlite")] + pub fn sqlite(&self) -> Option<&Pool> { + match self { + DbPool::Sqlite(pool) => Some(pool), + _ => None, + } + } + + /// Get the inner MySql Pool. Returns None for Sqlite and Postgres pools. + #[cfg(feature = "mysql")] + pub fn mysql(&self) -> Option<&Pool> { + match self { + DbPool::MySql(pool) => Some(pool), + _ => None, + } + } + + /// Get the inner Postgres Pool. Returns None for MySql and Sqlite pools. + #[cfg(feature = "postgres")] + pub fn postgres(&self) -> Option<&Pool> { + match self { + DbPool::Postgres(pool) => Some(pool), + _ => None, + } + } +} */ + +// private methods +impl DbPool { + pub(crate) async fn connect( + conn_url: &str, + _app: &AppHandle, + ) -> Result { + match conn_url + .split_once(':') + .ok_or_else(|| crate::Error::InvalidDbUrl(conn_url.to_string()))? + .0 + { + #[cfg(feature = "sqlite")] + "sqlite" => { + let app_path = _app + .path() + .app_config_dir() + .expect("No App config path was found!"); + + create_dir_all(&app_path).expect("Couldn't create app config dir"); + + let conn_url = &path_mapper(app_path, conn_url); + + if !Sqlite::database_exists(conn_url).await.unwrap_or(false) { + Sqlite::create_database(conn_url).await?; + } + Ok(Self::Sqlite(Pool::connect(conn_url).await?)) + } + #[cfg(feature = "mysql")] + "mysql" => { + if !MySql::database_exists(conn_url).await.unwrap_or(false) { + MySql::create_database(conn_url).await?; + } + Ok(Self::MySql(Pool::connect(conn_url).await?)) + } + #[cfg(feature = "postgres")] + "postgres" => { + if !Postgres::database_exists(conn_url).await.unwrap_or(false) { + Postgres::create_database(conn_url).await?; + } + Ok(Self::Postgres(Pool::connect(conn_url).await?)) + } + _ => Err(crate::Error::InvalidDbUrl(conn_url.to_string())), + } + } + + pub(crate) async fn migrate( + &self, + _migrator: &sqlx::migrate::Migrator, + ) -> Result<(), crate::Error> { + match self { + #[cfg(feature = "sqlite")] + DbPool::Sqlite(pool) => _migrator.run(pool).await?, + #[cfg(feature = "mysql")] + DbPool::MySql(pool) => _migrator.run(pool).await?, + #[cfg(feature = "postgres")] + DbPool::Postgres(pool) => _migrator.run(pool).await?, + #[cfg(not(any(feature = "sqlite", feature = "mysql", feature = "postgres")))] + DbPool::None => (), + } + Ok(()) + } + + pub(crate) async fn close(&self) { + match self { + #[cfg(feature = "sqlite")] + DbPool::Sqlite(pool) => pool.close().await, + #[cfg(feature = "mysql")] + DbPool::MySql(pool) => pool.close().await, + #[cfg(feature = "postgres")] + DbPool::Postgres(pool) => pool.close().await, + #[cfg(not(any(feature = "sqlite", feature = "mysql", feature = "postgres")))] + DbPool::None => (), + } + } + + pub(crate) async fn execute( + &self, + _query: String, + _values: Vec, + ) -> Result<(u64, LastInsertId), crate::Error> { + Ok(match self { + #[cfg(feature = "sqlite")] + DbPool::Sqlite(pool) => { + let mut query = sqlx::query(&_query); + for value in _values { + if value.is_null() { + query = query.bind(None::); + } else if value.is_string() { + query = query.bind(value.as_str().unwrap().to_owned()) + } else if let Some(number) = value.as_number() { + query = query.bind(number.as_f64().unwrap_or_default()) + } else { + query = query.bind(value); + } + } + let result = pool.execute(query).await?; + ( + result.rows_affected(), + LastInsertId::Sqlite(result.last_insert_rowid()), + ) + } + #[cfg(feature = "mysql")] + DbPool::MySql(pool) => { + let mut query = sqlx::query(&_query); + for value in _values { + if value.is_null() { + query = query.bind(None::); + } else if value.is_string() { + query = query.bind(value.as_str().unwrap().to_owned()) + } else if let Some(number) = value.as_number() { + query = query.bind(number.as_f64().unwrap_or_default()) + } else { + query = query.bind(value); + } + } + let result = pool.execute(query).await?; + ( + result.rows_affected(), + LastInsertId::MySql(result.last_insert_id()), + ) + } + #[cfg(feature = "postgres")] + DbPool::Postgres(pool) => { + let mut query = sqlx::query(&_query); + for value in _values { + if value.is_null() { + query = query.bind(None::); + } else if value.is_string() { + query = query.bind(value.as_str().unwrap().to_owned()) + } else if let Some(number) = value.as_number() { + query = query.bind(number.as_f64().unwrap_or_default()) + } else { + query = query.bind(value); + } + } + let result = pool.execute(query).await?; + (result.rows_affected(), LastInsertId::Postgres(())) + } + #[cfg(not(any(feature = "sqlite", feature = "mysql", feature = "postgres")))] + DbPool::None => (0, LastInsertId::None), + }) + } + + pub(crate) async fn select( + &self, + _query: String, + _values: Vec, + ) -> Result>, crate::Error> { + Ok(match self { + #[cfg(feature = "sqlite")] + DbPool::Sqlite(pool) => { + let mut query = sqlx::query(&_query); + for value in _values { + if value.is_null() { + query = query.bind(None::); + } else if value.is_string() { + query = query.bind(value.as_str().unwrap().to_owned()) + } else if let Some(number) = value.as_number() { + query = query.bind(number.as_f64().unwrap_or_default()) + } else { + query = query.bind(value); + } + } + let rows = pool.fetch_all(query).await?; + let mut values = Vec::new(); + for row in rows { + let mut value = IndexMap::default(); + for (i, column) in row.columns().iter().enumerate() { + let v = row.try_get_raw(i)?; + + let v = crate::decode::sqlite::to_json(v)?; + + value.insert(column.name().to_string(), v); + } + + values.push(value); + } + values + } + #[cfg(feature = "mysql")] + DbPool::MySql(pool) => { + let mut query = sqlx::query(&_query); + for value in _values { + if value.is_null() { + query = query.bind(None::); + } else if value.is_string() { + query = query.bind(value.as_str().unwrap().to_owned()) + } else if let Some(number) = value.as_number() { + query = query.bind(number.as_f64().unwrap_or_default()) + } else { + query = query.bind(value); + } + } + let rows = pool.fetch_all(query).await?; + let mut values = Vec::new(); + for row in rows { + let mut value = IndexMap::default(); + for (i, column) in row.columns().iter().enumerate() { + let v = row.try_get_raw(i)?; + + let v = crate::decode::mysql::to_json(v)?; + + value.insert(column.name().to_string(), v); + } + + values.push(value); + } + values + } + #[cfg(feature = "postgres")] + DbPool::Postgres(pool) => { + let mut query = sqlx::query(&_query); + for value in _values { + if value.is_null() { + query = query.bind(None::); + } else if value.is_string() { + query = query.bind(value.as_str().unwrap().to_owned()) + } else if let Some(number) = value.as_number() { + query = query.bind(number.as_f64().unwrap_or_default()) + } else { + query = query.bind(value); + } + } + let rows = pool.fetch_all(query).await?; + let mut values = Vec::new(); + for row in rows { + let mut value = IndexMap::default(); + for (i, column) in row.columns().iter().enumerate() { + let v = row.try_get_raw(i)?; + + let v = crate::decode::postgres::to_json(v)?; + + value.insert(column.name().to_string(), v); + } + + values.push(value); + } + values + } + #[cfg(not(any(feature = "sqlite", feature = "mysql", feature = "postgres")))] + DbPool::None => Vec::new(), + }) + } +} + +#[cfg(feature = "sqlite")] +/// Maps the user supplied DB connection string to a connection string +/// with a fully qualified file path to the App's designed "app_path" +fn path_mapper(mut app_path: std::path::PathBuf, connection_string: &str) -> String { + app_path.push( + connection_string + .split_once(':') + .expect("Couldn't parse the connection string for DB!") + .1, + ); + + format!( + "sqlite:{}", + app_path + .to_str() + .expect("Problem creating fully qualified path to Database file!") + ) +} From 2f7e32b5e07454d6c0cf3ab03f8af8da74c4a8a7 Mon Sep 17 00:00:00 2001 From: Jacob Bolda Date: Tue, 1 Oct 2024 08:15:22 -0500 Subject: [PATCH 09/40] [positioner] handleIconState in JS (#1822) * [positioner] handleIconState in JS * update readme * fix change file version * fixes --------- Co-authored-by: Lucas Nogueira --- .changes/positioner-v2-handleIconState.md | 6 ++++ plugins/barcode-scanner/api-iife.js | 2 +- plugins/positioner/README.md | 35 +++++++++++++++++++ plugins/positioner/api-iife.js | 2 +- plugins/positioner/guest-js/index.ts | 12 +++++++ .../commands/set_tray_icon_state.toml | 8 +++++ .../permissions/autogenerated/reference.md | 14 ++++++++ plugins/positioner/permissions/default.toml | 2 +- .../permissions/schemas/schema.json | 5 +++ plugins/positioner/src/lib.rs | 21 +++++++++-- plugins/window-state/api-iife.js | 2 +- 11 files changed, 103 insertions(+), 6 deletions(-) create mode 100644 .changes/positioner-v2-handleIconState.md create mode 100644 plugins/positioner/permissions/autogenerated/commands/set_tray_icon_state.toml diff --git a/.changes/positioner-v2-handleIconState.md b/.changes/positioner-v2-handleIconState.md new file mode 100644 index 00000000..e43c84d8 --- /dev/null +++ b/.changes/positioner-v2-handleIconState.md @@ -0,0 +1,6 @@ +--- +"positioner": patch +"positioner-js": patch +--- + +`handleIconState` function for use in JavaScript event handlers. This allows one to update the TrayIcon state through JavaScript and fully create and handle the TrayIcon without requiring Rust (and the side-effect of creating a TrayIcon). diff --git a/plugins/barcode-scanner/api-iife.js b/plugins/barcode-scanner/api-iife.js index cd6f1193..620b59a7 100644 --- a/plugins/barcode-scanner/api-iife.js +++ b/plugins/barcode-scanner/api-iife.js @@ -1 +1 @@ -if("__TAURI__"in window){var __TAURI_PLUGIN_BARCODE_SCANNER__=function(n){"use strict";async function e(n,e={},r){return window.__TAURI_INTERNALS__.invoke(n,e,r)}var r;return"function"==typeof SuppressedError&&SuppressedError,n.Format=void 0,(r=n.Format||(n.Format={})).QRCode="QR_CODE",r.UPC_A="UPC_A",r.UPC_E="UPC_E",r.EAN8="EAN_8",r.EAN13="EAN_13",r.Code39="CODE_39",r.Code93="CODE_93",r.Code128="CODE_128",r.Codabar="CODABAR",r.ITF="ITF",r.Aztec="AZTEC",r.DataMatrix="DATA_MATRIX",r.PDF417="PDF_417",n.cancel=async function(){await e("plugin:barcode-scanner|cancel")},n.checkPermissions=async function(){return await async function(n){return e(`plugin:${n}|request_permissions`)}("barcode-scanner").then((n=>n.camera))},n.openAppSettings=async function(){await e("plugin:barcode-scanner|open_app_settings")},n.requestPermissions=async function(){return await async function(n){return e(`plugin:${n}|check_permissions`)}("barcode-scanner").then((n=>n.camera))},n.scan=async function(n){return await e("plugin:barcode-scanner|scan",{...n})},n}({});Object.defineProperty(window.__TAURI__,"barcodeScanner",{value:__TAURI_PLUGIN_BARCODE_SCANNER__})} +if("__TAURI__"in window){var __TAURI_PLUGIN_BARCODE_SCANNER__=function(n){"use strict";async function e(n,e={},r){return window.__TAURI_INTERNALS__.invoke(n,e,r)}var r;return"function"==typeof SuppressedError&&SuppressedError,n.Format=void 0,(r=n.Format||(n.Format={})).QRCode="QR_CODE",r.UPC_A="UPC_A",r.UPC_E="UPC_E",r.EAN8="EAN_8",r.EAN13="EAN_13",r.Code39="CODE_39",r.Code93="CODE_93",r.Code128="CODE_128",r.Codabar="CODABAR",r.ITF="ITF",r.Aztec="AZTEC",r.DataMatrix="DATA_MATRIX",r.PDF417="PDF_417",n.cancel=async function(){await e("plugin:barcode-scanner|cancel")},n.checkPermissions=async function(){return await async function(n){return e(`plugin:${n}|check_permissions`)}("barcode-scanner").then((n=>n.camera))},n.openAppSettings=async function(){await e("plugin:barcode-scanner|open_app_settings")},n.requestPermissions=async function(){return await async function(n){return e(`plugin:${n}|request_permissions`)}("barcode-scanner").then((n=>n.camera))},n.scan=async function(n){return await e("plugin:barcode-scanner|scan",{...n})},n}({});Object.defineProperty(window.__TAURI__,"barcodeScanner",{value:__TAURI_PLUGIN_BARCODE_SCANNER__})} diff --git a/plugins/positioner/README.md b/plugins/positioner/README.md index db9bab5a..3c8ac1d9 100644 --- a/plugins/positioner/README.md +++ b/plugins/positioner/README.md @@ -58,6 +58,7 @@ fn main() { .plugin(tauri_plugin_positioner::init()) // This is required to get tray-relative positions to work .setup(|app| { + // note that this will create a new TrayIcon TrayIconBuilder::new() .on_tray_icon_event(|app, event| { tauri_plugin_positioner::on_tray_event(app.app_handle(), &event); @@ -70,6 +71,40 @@ fn main() { } ``` +Alternatively, you may handle the tray events through JavaScript. Register the plugin as previously noted. + +```rust +fn main() { + tauri::Builder::default() + .plugin(tauri_plugin_positioner::init()) + .run(tauri::generate_context!()) + .expect("error while running tauri application"); +} +``` + +And in JavaScript, the `action` passed to the TrayIcon should include the handler. + +```javascript +import { + moveWindow, + Position, + handleIconState, +} from "@tauri-apps/plugin-positioner"; + +const action = async (event: TrayIconEvent) => { + // add the handle in the action to update the state + await handleIconState(event); + if ("click" in event) { + const { click } = event; + // note this option requires enabling the `tray-icon` + // feature in the Cargo.toml + await moveWindow(Position.TrayLeft); + } +}; + +const tray = await TrayIcon.new({ id: "main", action }); +``` + Afterwards all the plugin's APIs are available through the JavaScript guest bindings: ```javascript diff --git a/plugins/positioner/api-iife.js b/plugins/positioner/api-iife.js index d0c8ba69..5504ebe8 100644 --- a/plugins/positioner/api-iife.js +++ b/plugins/positioner/api-iife.js @@ -1 +1 @@ -if("__TAURI__"in window){var __TAURI_PLUGIN_POSITIONER__=function(t){"use strict";var o;return"function"==typeof SuppressedError&&SuppressedError,t.Position=void 0,(o=t.Position||(t.Position={}))[o.TopLeft=0]="TopLeft",o[o.TopRight=1]="TopRight",o[o.BottomLeft=2]="BottomLeft",o[o.BottomRight=3]="BottomRight",o[o.TopCenter=4]="TopCenter",o[o.BottomCenter=5]="BottomCenter",o[o.LeftCenter=6]="LeftCenter",o[o.RightCenter=7]="RightCenter",o[o.Center=8]="Center",o[o.TrayLeft=9]="TrayLeft",o[o.TrayBottomLeft=10]="TrayBottomLeft",o[o.TrayRight=11]="TrayRight",o[o.TrayBottomRight=12]="TrayBottomRight",o[o.TrayCenter=13]="TrayCenter",o[o.TrayBottomCenter=14]="TrayBottomCenter",t.moveWindow=async function(t){await async function(t,o={},e){return window.__TAURI_INTERNALS__.invoke(t,o,e)}("plugin:positioner|move_window",{position:t})},t}({});Object.defineProperty(window.__TAURI__,"positioner",{value:__TAURI_PLUGIN_POSITIONER__})} +if("__TAURI__"in window){var __TAURI_PLUGIN_POSITIONER__=function(t){"use strict";async function o(t,o={},e){return window.__TAURI_INTERNALS__.invoke(t,o,e)}var e;return"function"==typeof SuppressedError&&SuppressedError,t.Position=void 0,(e=t.Position||(t.Position={}))[e.TopLeft=0]="TopLeft",e[e.TopRight=1]="TopRight",e[e.BottomLeft=2]="BottomLeft",e[e.BottomRight=3]="BottomRight",e[e.TopCenter=4]="TopCenter",e[e.BottomCenter=5]="BottomCenter",e[e.LeftCenter=6]="LeftCenter",e[e.RightCenter=7]="RightCenter",e[e.Center=8]="Center",e[e.TrayLeft=9]="TrayLeft",e[e.TrayBottomLeft=10]="TrayBottomLeft",e[e.TrayRight=11]="TrayRight",e[e.TrayBottomRight=12]="TrayBottomRight",e[e.TrayCenter=13]="TrayCenter",e[e.TrayBottomCenter=14]="TrayBottomCenter",t.handleIconState=async function(t){await async function(t){await o("plugin:positioner|set_tray_icon_state",{position:t.position,size:t.size})}(t.rect)},t.moveWindow=async function(t){await o("plugin:positioner|move_window",{position:t})},t}({});Object.defineProperty(window.__TAURI__,"positioner",{value:__TAURI_PLUGIN_POSITIONER__})} diff --git a/plugins/positioner/guest-js/index.ts b/plugins/positioner/guest-js/index.ts index 449e3298..319f80db 100644 --- a/plugins/positioner/guest-js/index.ts +++ b/plugins/positioner/guest-js/index.ts @@ -4,6 +4,7 @@ // SPDX-License-Identifier: MIT import { invoke } from '@tauri-apps/api/core' +import type { TrayIconEvent } from '@tauri-apps/api/tray' /** * Well known window positions. @@ -37,3 +38,14 @@ export async function moveWindow(to: Position): Promise { position: to }) } + +export async function handleIconState(event: TrayIconEvent): Promise { + await invokeSetTrayIconState(event.rect) +} + +async function invokeSetTrayIconState(rect: TrayIconEvent['rect']) { + await invoke('plugin:positioner|set_tray_icon_state', { + position: rect.position, + size: rect.size + }) +} diff --git a/plugins/positioner/permissions/autogenerated/commands/set_tray_icon_state.toml b/plugins/positioner/permissions/autogenerated/commands/set_tray_icon_state.toml new file mode 100644 index 00000000..dcc8fa56 --- /dev/null +++ b/plugins/positioner/permissions/autogenerated/commands/set_tray_icon_state.toml @@ -0,0 +1,8 @@ +# Automatically generated - DO NOT EDIT! + +"$schema" = "../../schemas/schema.json" + +[[permission]] +identifier = "allow-set-tray-icon-state" +description = "Enables the set_tray_icon_state to handle events and set the TrayIcon state." +commands.allow = ["set_tray_icon_state"] diff --git a/plugins/positioner/permissions/autogenerated/reference.md b/plugins/positioner/permissions/autogenerated/reference.md index f2a92c66..324e4e56 100644 --- a/plugins/positioner/permissions/autogenerated/reference.md +++ b/plugins/positioner/permissions/autogenerated/reference.md @@ -3,6 +3,7 @@ Allows the move_window command - `allow-move-window` +- `set-tray-icon-state` ## Permission Table @@ -36,6 +37,19 @@ Enables the move_window command without any pre-configured scope. Denies the move_window command without any pre-configured scope. + + + + + +
+ +`positioner:allow-set-tray-icon-state` + + + +Enables the set_tray_icon_state to handle events and set the TrayIcon state. +
diff --git a/plugins/positioner/permissions/default.toml b/plugins/positioner/permissions/default.toml index b0b3b3e2..8492711c 100644 --- a/plugins/positioner/permissions/default.toml +++ b/plugins/positioner/permissions/default.toml @@ -1,4 +1,4 @@ "$schema" = "schemas/schema.json" [default] description = "Allows the move_window command" -permissions = ["allow-move-window"] +permissions = ["allow-move-window", "set-tray-icon-state"] diff --git a/plugins/positioner/permissions/schemas/schema.json b/plugins/positioner/permissions/schemas/schema.json index f5514887..5bddddde 100644 --- a/plugins/positioner/permissions/schemas/schema.json +++ b/plugins/positioner/permissions/schemas/schema.json @@ -304,6 +304,11 @@ "type": "string", "const": "deny-move-window" }, + { + "description": "Enables the set_tray_icon_state to handle events and set the TrayIcon state.", + "type": "string", + "const": "allow-set-tray-icon-state" + }, { "description": "Allows the move_window command", "type": "string", diff --git a/plugins/positioner/src/lib.rs b/plugins/positioner/src/lib.rs index 96c243e5..81bfaef8 100644 --- a/plugins/positioner/src/lib.rs +++ b/plugins/positioner/src/lib.rs @@ -63,10 +63,27 @@ async fn move_window(window: tauri::Window, position: Position) - window.move_window(position) } +#[cfg(feature = "tray-icon")] +#[tauri::command] +fn set_tray_icon_state( + app: AppHandle, + position: PhysicalPosition, + size: PhysicalSize, +) { + app.state::() + .0 + .lock() + .unwrap() + .replace((position, size)); +} + /// The Tauri plugin that exposes [`WindowExt::move_window`] to the webview. pub fn init() -> TauriPlugin { - let plugin = - plugin::Builder::new("positioner").invoke_handler(tauri::generate_handler![move_window]); + let plugin = plugin::Builder::new("positioner").invoke_handler(tauri::generate_handler![ + move_window, + #[cfg(feature = "tray-icon")] + set_tray_icon_state + ]); #[cfg(feature = "tray-icon")] let plugin = plugin.setup(|app_handle, _api| { diff --git a/plugins/window-state/api-iife.js b/plugins/window-state/api-iife.js index 7f36809b..de6e9613 100644 --- a/plugins/window-state/api-iife.js +++ b/plugins/window-state/api-iife.js @@ -1 +1 @@ -if("__TAURI__"in window){var __TAURI_PLUGIN_WINDOW_STATE__=function(e){"use strict";var t,i,n,a;function l(e,t=!1){return window.__TAURI_INTERNALS__.transformCallback(e,t)}async function s(e,t={},i){return window.__TAURI_INTERNALS__.invoke(e,t,i)}"function"==typeof SuppressedError&&SuppressedError;class r{get rid(){return function(e,t,i,n){if("a"===i&&!n)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof t?e!==t||!n:!t.has(e))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===i?n:"a"===i?n.call(e):n?n.value:t.get(e)}(this,t,"f")}constructor(e){t.set(this,void 0),function(e,t,i,n,a){if("function"==typeof t?e!==t||!a:!t.has(e))throw new TypeError("Cannot write private member to an object whose class did not declare it");t.set(e,i)}(this,t,e)}async close(){return s("plugin:resources|close",{rid:this.rid})}}t=new WeakMap;class o{constructor(e,t){this.type="Logical",this.width=e,this.height=t}}class u{constructor(e,t){this.type="Physical",this.width=e,this.height=t}toLogical(e){return new o(this.width/e,this.height/e)}}class c{constructor(e,t){this.type="Logical",this.x=e,this.y=t}}class d{constructor(e,t){this.type="Physical",this.x=e,this.y=t}toLogical(e){return new c(this.x/e,this.y/e)}}async function w(e,t){await s("plugin:event|unlisten",{event:e,eventId:t})}async function h(e,t,i){var n;const a="string"==typeof(null==i?void 0:i.target)?{kind:"AnyLabel",label:i.target}:null!==(n=null==i?void 0:i.target)&&void 0!==n?n:{kind:"Any"};return s("plugin:event|listen",{event:e,target:a,handler:l(t)}).then((t=>async()=>w(e,t)))}!function(e){e.WINDOW_RESIZED="tauri://resize",e.WINDOW_MOVED="tauri://move",e.WINDOW_CLOSE_REQUESTED="tauri://close-requested",e.WINDOW_DESTROYED="tauri://destroyed",e.WINDOW_FOCUS="tauri://focus",e.WINDOW_BLUR="tauri://blur",e.WINDOW_SCALE_FACTOR_CHANGED="tauri://scale-change",e.WINDOW_THEME_CHANGED="tauri://theme-changed",e.WINDOW_CREATED="tauri://window-created",e.WEBVIEW_CREATED="tauri://webview-created",e.DRAG_ENTER="tauri://drag-enter",e.DRAG_OVER="tauri://drag-over",e.DRAG_DROP="tauri://drag-drop",e.DRAG_LEAVE="tauri://drag-leave"}(i||(i={}));class b extends r{constructor(e){super(e)}static async new(e,t,i){return s("plugin:image|new",{rgba:p(e),width:t,height:i}).then((e=>new b(e)))}static async fromBytes(e){return s("plugin:image|from_bytes",{bytes:p(e)}).then((e=>new b(e)))}static async fromPath(e){return s("plugin:image|from_path",{path:e}).then((e=>new b(e)))}async rgba(){return s("plugin:image|rgba",{rid:this.rid}).then((e=>new Uint8Array(e)))}async size(){return s("plugin:image|size",{rid:this.rid})}}function p(e){return null==e?null:"string"==typeof e?e:e instanceof b?e.rid:e}!function(e){e[e.Critical=1]="Critical",e[e.Informational=2]="Informational"}(n||(n={}));class y{constructor(e){this._preventDefault=!1,this.event=e.event,this.id=e.id}preventDefault(){this._preventDefault=!0}isPreventDefault(){return this._preventDefault}}function g(){return new v(window.__TAURI_INTERNALS__.metadata.currentWindow.label,{skip:!0})}async function _(){return s("plugin:window|get_all_windows").then((e=>e.map((e=>new v(e,{skip:!0})))))}!function(e){e.None="none",e.Normal="normal",e.Indeterminate="indeterminate",e.Paused="paused",e.Error="error"}(a||(a={}));const m=["tauri://created","tauri://error"];class v{constructor(e,t={}){var i;this.label=e,this.listeners=Object.create(null),(null==t?void 0:t.skip)||s("plugin:window|create",{options:{...t,parent:"string"==typeof t.parent?t.parent:null===(i=t.parent)||void 0===i?void 0:i.label,label:e}}).then((async()=>this.emit("tauri://created"))).catch((async e=>this.emit("tauri://error",e)))}static async getByLabel(e){var t;return null!==(t=(await _()).find((t=>t.label===e)))&&void 0!==t?t:null}static getCurrent(){return g()}static async getAll(){return _()}static async getFocusedWindow(){for(const e of await _())if(await e.isFocused())return e;return null}async listen(e,t){return this._handleTauriEvent(e,t)?()=>{const i=this.listeners[e];i.splice(i.indexOf(t),1)}:h(e,t,{target:{kind:"Window",label:this.label}})}async once(e,t){return this._handleTauriEvent(e,t)?()=>{const i=this.listeners[e];i.splice(i.indexOf(t),1)}:async function(e,t,i){return h(e,(i=>{w(e,i.id),t(i)}),i)}(e,t,{target:{kind:"Window",label:this.label}})}async emit(e,t){if(!m.includes(e))return async function(e,t){await s("plugin:event|emit",{event:e,payload:t})}(e,t);for(const i of this.listeners[e]||[])i({event:e,id:-1,payload:t})}async emitTo(e,t,i){if(!m.includes(t))return async function(e,t,i){const n="string"==typeof e?{kind:"AnyLabel",label:e}:e;await s("plugin:event|emit_to",{target:n,event:t,payload:i})}(e,t,i);for(const e of this.listeners[t]||[])e({event:t,id:-1,payload:i})}_handleTauriEvent(e,t){return!!m.includes(e)&&(e in this.listeners?this.listeners[e].push(t):this.listeners[e]=[t],!0)}async scaleFactor(){return s("plugin:window|scale_factor",{label:this.label})}async innerPosition(){return s("plugin:window|inner_position",{label:this.label}).then((({x:e,y:t})=>new d(e,t)))}async outerPosition(){return s("plugin:window|outer_position",{label:this.label}).then((({x:e,y:t})=>new d(e,t)))}async innerSize(){return s("plugin:window|inner_size",{label:this.label}).then((({width:e,height:t})=>new u(e,t)))}async outerSize(){return s("plugin:window|outer_size",{label:this.label}).then((({width:e,height:t})=>new u(e,t)))}async isFullscreen(){return s("plugin:window|is_fullscreen",{label:this.label})}async isMinimized(){return s("plugin:window|is_minimized",{label:this.label})}async isMaximized(){return s("plugin:window|is_maximized",{label:this.label})}async isFocused(){return s("plugin:window|is_focused",{label:this.label})}async isDecorated(){return s("plugin:window|is_decorated",{label:this.label})}async isResizable(){return s("plugin:window|is_resizable",{label:this.label})}async isMaximizable(){return s("plugin:window|is_maximizable",{label:this.label})}async isMinimizable(){return s("plugin:window|is_minimizable",{label:this.label})}async isClosable(){return s("plugin:window|is_closable",{label:this.label})}async isVisible(){return s("plugin:window|is_visible",{label:this.label})}async title(){return s("plugin:window|title",{label:this.label})}async theme(){return s("plugin:window|theme",{label:this.label})}async center(){return s("plugin:window|center",{label:this.label})}async requestUserAttention(e){let t=null;return e&&(t=e===n.Critical?{type:"Critical"}:{type:"Informational"}),s("plugin:window|request_user_attention",{label:this.label,value:t})}async setResizable(e){return s("plugin:window|set_resizable",{label:this.label,value:e})}async setMaximizable(e){return s("plugin:window|set_maximizable",{label:this.label,value:e})}async setMinimizable(e){return s("plugin:window|set_minimizable",{label:this.label,value:e})}async setClosable(e){return s("plugin:window|set_closable",{label:this.label,value:e})}async setTitle(e){return s("plugin:window|set_title",{label:this.label,value:e})}async maximize(){return s("plugin:window|maximize",{label:this.label})}async unmaximize(){return s("plugin:window|unmaximize",{label:this.label})}async toggleMaximize(){return s("plugin:window|toggle_maximize",{label:this.label})}async minimize(){return s("plugin:window|minimize",{label:this.label})}async unminimize(){return s("plugin:window|unminimize",{label:this.label})}async show(){return s("plugin:window|show",{label:this.label})}async hide(){return s("plugin:window|hide",{label:this.label})}async close(){return s("plugin:window|close",{label:this.label})}async destroy(){return s("plugin:window|destroy",{label:this.label})}async setDecorations(e){return s("plugin:window|set_decorations",{label:this.label,value:e})}async setShadow(e){return s("plugin:window|set_shadow",{label:this.label,value:e})}async setEffects(e){return s("plugin:window|set_effects",{label:this.label,value:e})}async clearEffects(){return s("plugin:window|set_effects",{label:this.label,value:null})}async setAlwaysOnTop(e){return s("plugin:window|set_always_on_top",{label:this.label,value:e})}async setAlwaysOnBottom(e){return s("plugin:window|set_always_on_bottom",{label:this.label,value:e})}async setContentProtected(e){return s("plugin:window|set_content_protected",{label:this.label,value:e})}async setSize(e){if(!e||"Logical"!==e.type&&"Physical"!==e.type)throw new Error("the `size` argument must be either a LogicalSize or a PhysicalSize instance");const t={};return t[`${e.type}`]={width:e.width,height:e.height},s("plugin:window|set_size",{label:this.label,value:t})}async setMinSize(e){if(e&&"Logical"!==e.type&&"Physical"!==e.type)throw new Error("the `size` argument must be either a LogicalSize or a PhysicalSize instance");let t=null;return e&&(t={},t[`${e.type}`]={width:e.width,height:e.height}),s("plugin:window|set_min_size",{label:this.label,value:t})}async setMaxSize(e){if(e&&"Logical"!==e.type&&"Physical"!==e.type)throw new Error("the `size` argument must be either a LogicalSize or a PhysicalSize instance");let t=null;return e&&(t={},t[`${e.type}`]={width:e.width,height:e.height}),s("plugin:window|set_max_size",{label:this.label,value:t})}async setSizeConstraints(e){function t(e){return e?{Logical:e}:null}return s("plugin:window|set_size_constraints",{label:this.label,value:{minWidth:t(null==e?void 0:e.minWidth),minHeight:t(null==e?void 0:e.minHeight),maxWidth:t(null==e?void 0:e.maxWidth),maxHeight:t(null==e?void 0:e.maxHeight)}})}async setPosition(e){if(!e||"Logical"!==e.type&&"Physical"!==e.type)throw new Error("the `position` argument must be either a LogicalPosition or a PhysicalPosition instance");const t={};return t[`${e.type}`]={x:e.x,y:e.y},s("plugin:window|set_position",{label:this.label,value:t})}async setFullscreen(e){return s("plugin:window|set_fullscreen",{label:this.label,value:e})}async setFocus(){return s("plugin:window|set_focus",{label:this.label})}async setIcon(e){return s("plugin:window|set_icon",{label:this.label,value:p(e)})}async setSkipTaskbar(e){return s("plugin:window|set_skip_taskbar",{label:this.label,value:e})}async setCursorGrab(e){return s("plugin:window|set_cursor_grab",{label:this.label,value:e})}async setCursorVisible(e){return s("plugin:window|set_cursor_visible",{label:this.label,value:e})}async setCursorIcon(e){return s("plugin:window|set_cursor_icon",{label:this.label,value:e})}async setCursorPosition(e){if(!e||"Logical"!==e.type&&"Physical"!==e.type)throw new Error("the `position` argument must be either a LogicalPosition or a PhysicalPosition instance");const t={};return t[`${e.type}`]={x:e.x,y:e.y},s("plugin:window|set_cursor_position",{label:this.label,value:t})}async setIgnoreCursorEvents(e){return s("plugin:window|set_ignore_cursor_events",{label:this.label,value:e})}async startDragging(){return s("plugin:window|start_dragging",{label:this.label})}async startResizeDragging(e){return s("plugin:window|start_resize_dragging",{label:this.label,value:e})}async setProgressBar(e){return s("plugin:window|set_progress_bar",{label:this.label,value:e})}async setVisibleOnAllWorkspaces(e){return s("plugin:window|set_visible_on_all_workspaces",{label:this.label,value:e})}async setTitleBarStyle(e){return s("plugin:window|set_title_bar_style",{label:this.label,value:e})}async onResized(e){return this.listen(i.WINDOW_RESIZED,(t=>{var i;t.payload=(i=t.payload,new u(i.width,i.height)),e(t)}))}async onMoved(e){return this.listen(i.WINDOW_MOVED,(t=>{t.payload=I(t.payload),e(t)}))}async onCloseRequested(e){return this.listen(i.WINDOW_CLOSE_REQUESTED,(async t=>{const i=new y(t);await e(i),i.isPreventDefault()||await this.destroy()}))}async onDragDropEvent(e){const t=await this.listen(i.DRAG_ENTER,(t=>{e({...t,payload:{type:"enter",paths:t.payload.paths,position:I(t.payload.position)}})})),n=await this.listen(i.DRAG_OVER,(t=>{e({...t,payload:{type:"over",position:I(t.payload.position)}})})),a=await this.listen(i.DRAG_DROP,(t=>{e({...t,payload:{type:"drop",paths:t.payload.paths,position:I(t.payload.position)}})})),l=await this.listen(i.DRAG_LEAVE,(t=>{e({...t,payload:{type:"leave"}})}));return()=>{t(),a(),n(),l()}}async onFocusChanged(e){const t=await this.listen(i.WINDOW_FOCUS,(t=>{e({...t,payload:!0})})),n=await this.listen(i.WINDOW_BLUR,(t=>{e({...t,payload:!1})}));return()=>{t(),n()}}async onScaleChanged(e){return this.listen(i.WINDOW_SCALE_FACTOR_CHANGED,e)}async onThemeChanged(e){return this.listen(i.WINDOW_THEME_CHANGED,e)}}var f,E,D;function I(e){return new d(e.x,e.y)}async function S(e,t){await s("plugin:window-state|restore_state",{label:e,flags:t})}return function(e){e.AppearanceBased="appearanceBased",e.Light="light",e.Dark="dark",e.MediumLight="mediumLight",e.UltraDark="ultraDark",e.Titlebar="titlebar",e.Selection="selection",e.Menu="menu",e.Popover="popover",e.Sidebar="sidebar",e.HeaderView="headerView",e.Sheet="sheet",e.WindowBackground="windowBackground",e.HudWindow="hudWindow",e.FullScreenUI="fullScreenUI",e.Tooltip="tooltip",e.ContentBackground="contentBackground",e.UnderWindowBackground="underWindowBackground",e.UnderPageBackground="underPageBackground",e.Mica="mica",e.Blur="blur",e.Acrylic="acrylic",e.Tabbed="tabbed",e.TabbedDark="tabbedDark",e.TabbedLight="tabbedLight"}(f||(f={})),function(e){e.FollowsWindowActiveState="followsWindowActiveState",e.Active="active",e.Inactive="inactive"}(E||(E={})),e.StateFlags=void 0,(D=e.StateFlags||(e.StateFlags={}))[D.SIZE=1]="SIZE",D[D.POSITION=2]="POSITION",D[D.MAXIMIZED=4]="MAXIMIZED",D[D.VISIBLE=8]="VISIBLE",D[D.DECORATIONS=16]="DECORATIONS",D[D.FULLSCREEN=32]="FULLSCREEN",D[D.ALL=63]="ALL",e.filename=async function(){return await s("plugin:window-state|filename")},e.restoreState=S,e.restoreStateCurrent=async function(e){await S(g().label,e)},e.saveWindowState=async function(e){await s("plugin:window-state|save_window_state",{flags:e})},e}({});Object.defineProperty(window.__TAURI__,"windowState",{value:__TAURI_PLUGIN_WINDOW_STATE__})} +if("__TAURI__"in window){var __TAURI_PLUGIN_WINDOW_STATE__=function(e){"use strict";var t,i,n,a;function l(e,t=!1){return window.__TAURI_INTERNALS__.transformCallback(e,t)}async function s(e,t={},i){return window.__TAURI_INTERNALS__.invoke(e,t,i)}"function"==typeof SuppressedError&&SuppressedError;class r{get rid(){return function(e,t,i,n){if("a"===i&&!n)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof t?e!==t||!n:!t.has(e))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===i?n:"a"===i?n.call(e):n?n.value:t.get(e)}(this,t,"f")}constructor(e){t.set(this,void 0),function(e,t,i,n,a){if("function"==typeof t?e!==t||!a:!t.has(e))throw new TypeError("Cannot write private member to an object whose class did not declare it");t.set(e,i)}(this,t,e)}async close(){return s("plugin:resources|close",{rid:this.rid})}}t=new WeakMap;class o{constructor(e,t){this.type="Logical",this.width=e,this.height=t}toPhysical(e){return new u(this.width*e,this.height*e)}}class u{constructor(e,t){this.type="Physical",this.width=e,this.height=t}toLogical(e){return new o(this.width/e,this.height/e)}}class c{constructor(e,t){this.type="Logical",this.x=e,this.y=t}toPhysical(e){return new d(this.x*e,this.x*e)}}class d{constructor(e,t){this.type="Physical",this.x=e,this.y=t}toLogical(e){return new c(this.x/e,this.y/e)}}async function h(e,t){await s("plugin:event|unlisten",{event:e,eventId:t})}async function w(e,t,i){var n;const a="string"==typeof(null==i?void 0:i.target)?{kind:"AnyLabel",label:i.target}:null!==(n=null==i?void 0:i.target)&&void 0!==n?n:{kind:"Any"};return s("plugin:event|listen",{event:e,target:a,handler:l(t)}).then((t=>async()=>h(e,t)))}!function(e){e.WINDOW_RESIZED="tauri://resize",e.WINDOW_MOVED="tauri://move",e.WINDOW_CLOSE_REQUESTED="tauri://close-requested",e.WINDOW_DESTROYED="tauri://destroyed",e.WINDOW_FOCUS="tauri://focus",e.WINDOW_BLUR="tauri://blur",e.WINDOW_SCALE_FACTOR_CHANGED="tauri://scale-change",e.WINDOW_THEME_CHANGED="tauri://theme-changed",e.WINDOW_CREATED="tauri://window-created",e.WEBVIEW_CREATED="tauri://webview-created",e.DRAG_ENTER="tauri://drag-enter",e.DRAG_OVER="tauri://drag-over",e.DRAG_DROP="tauri://drag-drop",e.DRAG_LEAVE="tauri://drag-leave"}(i||(i={}));class b extends r{constructor(e){super(e)}static async new(e,t,i){return s("plugin:image|new",{rgba:y(e),width:t,height:i}).then((e=>new b(e)))}static async fromBytes(e){return s("plugin:image|from_bytes",{bytes:y(e)}).then((e=>new b(e)))}static async fromPath(e){return s("plugin:image|from_path",{path:e}).then((e=>new b(e)))}async rgba(){return s("plugin:image|rgba",{rid:this.rid}).then((e=>new Uint8Array(e)))}async size(){return s("plugin:image|size",{rid:this.rid})}}function y(e){return null==e?null:"string"==typeof e?e:e instanceof b?e.rid:e}!function(e){e[e.Critical=1]="Critical",e[e.Informational=2]="Informational"}(n||(n={}));class p{constructor(e){this._preventDefault=!1,this.event=e.event,this.id=e.id}preventDefault(){this._preventDefault=!0}isPreventDefault(){return this._preventDefault}}function g(){return new v(window.__TAURI_INTERNALS__.metadata.currentWindow.label,{skip:!0})}async function _(){return s("plugin:window|get_all_windows").then((e=>e.map((e=>new v(e,{skip:!0})))))}!function(e){e.None="none",e.Normal="normal",e.Indeterminate="indeterminate",e.Paused="paused",e.Error="error"}(a||(a={}));const m=["tauri://created","tauri://error"];class v{constructor(e,t={}){var i;this.label=e,this.listeners=Object.create(null),(null==t?void 0:t.skip)||s("plugin:window|create",{options:{...t,parent:"string"==typeof t.parent?t.parent:null===(i=t.parent)||void 0===i?void 0:i.label,label:e}}).then((async()=>this.emit("tauri://created"))).catch((async e=>this.emit("tauri://error",e)))}static async getByLabel(e){var t;return null!==(t=(await _()).find((t=>t.label===e)))&&void 0!==t?t:null}static getCurrent(){return g()}static async getAll(){return _()}static async getFocusedWindow(){for(const e of await _())if(await e.isFocused())return e;return null}async listen(e,t){return this._handleTauriEvent(e,t)?()=>{const i=this.listeners[e];i.splice(i.indexOf(t),1)}:w(e,t,{target:{kind:"Window",label:this.label}})}async once(e,t){return this._handleTauriEvent(e,t)?()=>{const i=this.listeners[e];i.splice(i.indexOf(t),1)}:async function(e,t,i){return w(e,(i=>{h(e,i.id),t(i)}),i)}(e,t,{target:{kind:"Window",label:this.label}})}async emit(e,t){if(!m.includes(e))return async function(e,t){await s("plugin:event|emit",{event:e,payload:t})}(e,t);for(const i of this.listeners[e]||[])i({event:e,id:-1,payload:t})}async emitTo(e,t,i){if(!m.includes(t))return async function(e,t,i){const n="string"==typeof e?{kind:"AnyLabel",label:e}:e;await s("plugin:event|emit_to",{target:n,event:t,payload:i})}(e,t,i);for(const e of this.listeners[t]||[])e({event:t,id:-1,payload:i})}_handleTauriEvent(e,t){return!!m.includes(e)&&(e in this.listeners?this.listeners[e].push(t):this.listeners[e]=[t],!0)}async scaleFactor(){return s("plugin:window|scale_factor",{label:this.label})}async innerPosition(){return s("plugin:window|inner_position",{label:this.label}).then((({x:e,y:t})=>new d(e,t)))}async outerPosition(){return s("plugin:window|outer_position",{label:this.label}).then((({x:e,y:t})=>new d(e,t)))}async innerSize(){return s("plugin:window|inner_size",{label:this.label}).then((({width:e,height:t})=>new u(e,t)))}async outerSize(){return s("plugin:window|outer_size",{label:this.label}).then((({width:e,height:t})=>new u(e,t)))}async isFullscreen(){return s("plugin:window|is_fullscreen",{label:this.label})}async isMinimized(){return s("plugin:window|is_minimized",{label:this.label})}async isMaximized(){return s("plugin:window|is_maximized",{label:this.label})}async isFocused(){return s("plugin:window|is_focused",{label:this.label})}async isDecorated(){return s("plugin:window|is_decorated",{label:this.label})}async isResizable(){return s("plugin:window|is_resizable",{label:this.label})}async isMaximizable(){return s("plugin:window|is_maximizable",{label:this.label})}async isMinimizable(){return s("plugin:window|is_minimizable",{label:this.label})}async isClosable(){return s("plugin:window|is_closable",{label:this.label})}async isVisible(){return s("plugin:window|is_visible",{label:this.label})}async title(){return s("plugin:window|title",{label:this.label})}async theme(){return s("plugin:window|theme",{label:this.label})}async center(){return s("plugin:window|center",{label:this.label})}async requestUserAttention(e){let t=null;return e&&(t=e===n.Critical?{type:"Critical"}:{type:"Informational"}),s("plugin:window|request_user_attention",{label:this.label,value:t})}async setResizable(e){return s("plugin:window|set_resizable",{label:this.label,value:e})}async setEnabled(e){return s("plugin:window|set_enabled",{label:this.label,value:e})}async isEnabled(){return s("plugin:window|is_enabled",{label:this.label})}async setMaximizable(e){return s("plugin:window|set_maximizable",{label:this.label,value:e})}async setMinimizable(e){return s("plugin:window|set_minimizable",{label:this.label,value:e})}async setClosable(e){return s("plugin:window|set_closable",{label:this.label,value:e})}async setTitle(e){return s("plugin:window|set_title",{label:this.label,value:e})}async maximize(){return s("plugin:window|maximize",{label:this.label})}async unmaximize(){return s("plugin:window|unmaximize",{label:this.label})}async toggleMaximize(){return s("plugin:window|toggle_maximize",{label:this.label})}async minimize(){return s("plugin:window|minimize",{label:this.label})}async unminimize(){return s("plugin:window|unminimize",{label:this.label})}async show(){return s("plugin:window|show",{label:this.label})}async hide(){return s("plugin:window|hide",{label:this.label})}async close(){return s("plugin:window|close",{label:this.label})}async destroy(){return s("plugin:window|destroy",{label:this.label})}async setDecorations(e){return s("plugin:window|set_decorations",{label:this.label,value:e})}async setShadow(e){return s("plugin:window|set_shadow",{label:this.label,value:e})}async setEffects(e){return s("plugin:window|set_effects",{label:this.label,value:e})}async clearEffects(){return s("plugin:window|set_effects",{label:this.label,value:null})}async setAlwaysOnTop(e){return s("plugin:window|set_always_on_top",{label:this.label,value:e})}async setAlwaysOnBottom(e){return s("plugin:window|set_always_on_bottom",{label:this.label,value:e})}async setContentProtected(e){return s("plugin:window|set_content_protected",{label:this.label,value:e})}async setSize(e){if(!e||"Logical"!==e.type&&"Physical"!==e.type)throw new Error("the `size` argument must be either a LogicalSize or a PhysicalSize instance");const t={};return t[`${e.type}`]={width:e.width,height:e.height},s("plugin:window|set_size",{label:this.label,value:t})}async setMinSize(e){if(e&&"Logical"!==e.type&&"Physical"!==e.type)throw new Error("the `size` argument must be either a LogicalSize or a PhysicalSize instance");let t=null;return e&&(t={},t[`${e.type}`]={width:e.width,height:e.height}),s("plugin:window|set_min_size",{label:this.label,value:t})}async setMaxSize(e){if(e&&"Logical"!==e.type&&"Physical"!==e.type)throw new Error("the `size` argument must be either a LogicalSize or a PhysicalSize instance");let t=null;return e&&(t={},t[`${e.type}`]={width:e.width,height:e.height}),s("plugin:window|set_max_size",{label:this.label,value:t})}async setSizeConstraints(e){function t(e){return e?{Logical:e}:null}return s("plugin:window|set_size_constraints",{label:this.label,value:{minWidth:t(null==e?void 0:e.minWidth),minHeight:t(null==e?void 0:e.minHeight),maxWidth:t(null==e?void 0:e.maxWidth),maxHeight:t(null==e?void 0:e.maxHeight)}})}async setPosition(e){if(!e||"Logical"!==e.type&&"Physical"!==e.type)throw new Error("the `position` argument must be either a LogicalPosition or a PhysicalPosition instance");const t={};return t[`${e.type}`]={x:e.x,y:e.y},s("plugin:window|set_position",{label:this.label,value:t})}async setFullscreen(e){return s("plugin:window|set_fullscreen",{label:this.label,value:e})}async setFocus(){return s("plugin:window|set_focus",{label:this.label})}async setIcon(e){return s("plugin:window|set_icon",{label:this.label,value:y(e)})}async setSkipTaskbar(e){return s("plugin:window|set_skip_taskbar",{label:this.label,value:e})}async setCursorGrab(e){return s("plugin:window|set_cursor_grab",{label:this.label,value:e})}async setCursorVisible(e){return s("plugin:window|set_cursor_visible",{label:this.label,value:e})}async setCursorIcon(e){return s("plugin:window|set_cursor_icon",{label:this.label,value:e})}async setCursorPosition(e){if(!e||"Logical"!==e.type&&"Physical"!==e.type)throw new Error("the `position` argument must be either a LogicalPosition or a PhysicalPosition instance");const t={};return t[`${e.type}`]={x:e.x,y:e.y},s("plugin:window|set_cursor_position",{label:this.label,value:t})}async setIgnoreCursorEvents(e){return s("plugin:window|set_ignore_cursor_events",{label:this.label,value:e})}async startDragging(){return s("plugin:window|start_dragging",{label:this.label})}async startResizeDragging(e){return s("plugin:window|start_resize_dragging",{label:this.label,value:e})}async setProgressBar(e){return s("plugin:window|set_progress_bar",{label:this.label,value:e})}async setVisibleOnAllWorkspaces(e){return s("plugin:window|set_visible_on_all_workspaces",{label:this.label,value:e})}async setTitleBarStyle(e){return s("plugin:window|set_title_bar_style",{label:this.label,value:e})}async setTheme(e){return s("plugin:window|set_theme",{label:this.label,value:e})}async onResized(e){return this.listen(i.WINDOW_RESIZED,(t=>{var i;t.payload=(i=t.payload,new u(i.width,i.height)),e(t)}))}async onMoved(e){return this.listen(i.WINDOW_MOVED,(t=>{t.payload=I(t.payload),e(t)}))}async onCloseRequested(e){return this.listen(i.WINDOW_CLOSE_REQUESTED,(async t=>{const i=new p(t);await e(i),i.isPreventDefault()||await this.destroy()}))}async onDragDropEvent(e){const t=await this.listen(i.DRAG_ENTER,(t=>{e({...t,payload:{type:"enter",paths:t.payload.paths,position:I(t.payload.position)}})})),n=await this.listen(i.DRAG_OVER,(t=>{e({...t,payload:{type:"over",position:I(t.payload.position)}})})),a=await this.listen(i.DRAG_DROP,(t=>{e({...t,payload:{type:"drop",paths:t.payload.paths,position:I(t.payload.position)}})})),l=await this.listen(i.DRAG_LEAVE,(t=>{e({...t,payload:{type:"leave"}})}));return()=>{t(),a(),n(),l()}}async onFocusChanged(e){const t=await this.listen(i.WINDOW_FOCUS,(t=>{e({...t,payload:!0})})),n=await this.listen(i.WINDOW_BLUR,(t=>{e({...t,payload:!1})}));return()=>{t(),n()}}async onScaleChanged(e){return this.listen(i.WINDOW_SCALE_FACTOR_CHANGED,e)}async onThemeChanged(e){return this.listen(i.WINDOW_THEME_CHANGED,e)}}var f,E,D;function I(e){return new d(e.x,e.y)}async function S(e,t){await s("plugin:window-state|restore_state",{label:e,flags:t})}return function(e){e.AppearanceBased="appearanceBased",e.Light="light",e.Dark="dark",e.MediumLight="mediumLight",e.UltraDark="ultraDark",e.Titlebar="titlebar",e.Selection="selection",e.Menu="menu",e.Popover="popover",e.Sidebar="sidebar",e.HeaderView="headerView",e.Sheet="sheet",e.WindowBackground="windowBackground",e.HudWindow="hudWindow",e.FullScreenUI="fullScreenUI",e.Tooltip="tooltip",e.ContentBackground="contentBackground",e.UnderWindowBackground="underWindowBackground",e.UnderPageBackground="underPageBackground",e.Mica="mica",e.Blur="blur",e.Acrylic="acrylic",e.Tabbed="tabbed",e.TabbedDark="tabbedDark",e.TabbedLight="tabbedLight"}(f||(f={})),function(e){e.FollowsWindowActiveState="followsWindowActiveState",e.Active="active",e.Inactive="inactive"}(E||(E={})),e.StateFlags=void 0,(D=e.StateFlags||(e.StateFlags={}))[D.SIZE=1]="SIZE",D[D.POSITION=2]="POSITION",D[D.MAXIMIZED=4]="MAXIMIZED",D[D.VISIBLE=8]="VISIBLE",D[D.DECORATIONS=16]="DECORATIONS",D[D.FULLSCREEN=32]="FULLSCREEN",D[D.ALL=63]="ALL",e.filename=async function(){return await s("plugin:window-state|filename")},e.restoreState=S,e.restoreStateCurrent=async function(e){await S(g().label,e)},e.saveWindowState=async function(e){await s("plugin:window-state|save_window_state",{flags:e})},e}({});Object.defineProperty(window.__TAURI__,"windowState",{value:__TAURI_PLUGIN_WINDOW_STATE__})} From 44273b988957a254eff715d6be7547d2ace882e1 Mon Sep 17 00:00:00 2001 From: Amr Bashir Date: Tue, 1 Oct 2024 16:16:14 +0300 Subject: [PATCH 10/40] fix(shell): fix schema requiring `sidecar` property even though it is optional (#1839) * fix(shell): fix schema requiring `sidecar` property even though it is optional * fix clippy * make `cmd` and `sidecar` exclusive * make args optional * cleanup --------- Co-authored-by: Lucas Nogueira --- .changes/shell-schema-required-sidcar.md | 6 + plugins/fs/build.rs | 18 +- plugins/fs/src/scope.rs | 3 +- plugins/http/build.rs | 27 ++- plugins/http/src/scope.rs | 14 +- plugins/shell/Cargo.toml | 1 - plugins/shell/build.rs | 160 +++++++++++++++++- plugins/shell/src/scope_entry.rs | 81 ++------- .../updater/tests/app-updater/tests/update.rs | 2 +- .../tests/updater-migration/tests/update.rs | 2 +- 10 files changed, 213 insertions(+), 101 deletions(-) create mode 100644 .changes/shell-schema-required-sidcar.md diff --git a/.changes/shell-schema-required-sidcar.md b/.changes/shell-schema-required-sidcar.md new file mode 100644 index 00000000..7e48f653 --- /dev/null +++ b/.changes/shell-schema-required-sidcar.md @@ -0,0 +1,6 @@ +--- +"shell": "patch" +--- + +Fix the plugin schema requiring to set `sidecar` property when it is in fact optional. + diff --git a/plugins/fs/build.rs b/plugins/fs/build.rs index 5a641eb6..cb9d00da 100644 --- a/plugins/fs/build.rs +++ b/plugins/fs/build.rs @@ -24,14 +24,16 @@ enum FsScopeEntry { }, } -// Ensure scope entry is kept up to date -impl From for scope::EntryRaw { - fn from(value: FsScopeEntry) -> Self { - match value { - FsScopeEntry::Value(path) => scope::EntryRaw::Value(path), - FsScopeEntry::Object { path } => scope::EntryRaw::Object { path }, - } - } +// Ensure `FsScopeEntry` and `scope::EntryRaw` is kept in sync +fn _f() { + match scope::EntryRaw::Value(PathBuf::new()) { + scope::EntryRaw::Value(path) => FsScopeEntry::Value(path), + scope::EntryRaw::Object { path } => FsScopeEntry::Object { path }, + }; + match FsScopeEntry::Value(PathBuf::new()) { + FsScopeEntry::Value(path) => scope::EntryRaw::Value(path), + FsScopeEntry::Object { path } => scope::EntryRaw::Object { path }, + }; } const BASE_DIR_VARS: &[&str] = &[ diff --git a/plugins/fs/src/scope.rs b/plugins/fs/src/scope.rs index fd94b0eb..e8361d51 100644 --- a/plugins/fs/src/scope.rs +++ b/plugins/fs/src/scope.rs @@ -13,10 +13,9 @@ use std::{ use serde::Deserialize; -#[doc(hidden)] #[derive(Deserialize)] #[serde(untagged)] -pub enum EntryRaw { +pub(crate) enum EntryRaw { Value(PathBuf), Object { path: PathBuf }, } diff --git a/plugins/http/build.rs b/plugins/http/build.rs index 5f12208d..a4b802ad 100644 --- a/plugins/http/build.rs +++ b/plugins/http/build.rs @@ -47,23 +47,16 @@ enum HttpScopeEntry { }, } -// Ensure scope entry is kept up to date -impl From for scope::Entry { - fn from(value: HttpScopeEntry) -> Self { - let url = match value { - HttpScopeEntry::Value(url) => url, - HttpScopeEntry::Object { url } => url, - }; - - scope::Entry { - url: urlpattern::UrlPattern::parse( - urlpattern::UrlPatternInit::parse_constructor_string::(&url, None) - .unwrap(), - Default::default(), - ) - .unwrap(), - } - } +// Ensure `HttpScopeEntry` and `scope::EntryRaw` is kept in sync +fn _f() { + match scope::EntryRaw::Value(String::new()) { + scope::EntryRaw::Value(url) => HttpScopeEntry::Value(url), + scope::EntryRaw::Object { url } => HttpScopeEntry::Object { url }, + }; + match HttpScopeEntry::Value(String::new()) { + HttpScopeEntry::Value(url) => scope::EntryRaw::Value(url), + HttpScopeEntry::Object { url } => scope::EntryRaw::Object { url }, + }; } fn main() { diff --git a/plugins/http/src/scope.rs b/plugins/http/src/scope.rs index b84831de..2123f215 100644 --- a/plugins/http/src/scope.rs +++ b/plugins/http/src/scope.rs @@ -33,18 +33,18 @@ fn parse_url_pattern(s: &str) -> Result { UrlPattern::parse(init, Default::default()) } +#[derive(Deserialize)] +#[serde(untagged)] +pub(crate) enum EntryRaw { + Value(String), + Object { url: String }, +} + impl<'de> Deserialize<'de> for Entry { fn deserialize(deserializer: D) -> std::result::Result where D: Deserializer<'de>, { - #[derive(Deserialize)] - #[serde(untagged)] - enum EntryRaw { - Value(String), - Object { url: String }, - } - EntryRaw::deserialize(deserializer).and_then(|raw| { let url = match raw { EntryRaw::Value(url) => url, diff --git a/plugins/shell/Cargo.toml b/plugins/shell/Cargo.toml index 62a3fd9e..a045f0c2 100644 --- a/plugins/shell/Cargo.toml +++ b/plugins/shell/Cargo.toml @@ -27,7 +27,6 @@ serde = { workspace = true } [dependencies] serde = { workspace = true } -schemars = { workspace = true } serde_json = { workspace = true } tauri = { workspace = true } tokio = { version = "1", features = ["time"] } diff --git a/plugins/shell/build.rs b/plugins/shell/build.rs index fbfbb470..a4a74a99 100644 --- a/plugins/shell/build.rs +++ b/plugins/shell/build.rs @@ -2,15 +2,173 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: MIT +use std::path::PathBuf; + +use schemars::JsonSchema; + #[path = "src/scope_entry.rs"] mod scope_entry; +/// A command argument allowed to be executed by the webview API. +#[derive(Debug, PartialEq, Eq, Clone, Hash, schemars::JsonSchema)] +#[serde(untagged, deny_unknown_fields)] +#[non_exhaustive] +pub enum ShellScopeEntryAllowedArg { + /// A non-configurable argument that is passed to the command in the order it was specified. + Fixed(String), + + /// A variable that is set while calling the command from the webview API. + /// + Var { + /// [regex] validator to require passed values to conform to an expected input. + /// + /// This will require the argument value passed to this variable to match the `validator` regex + /// before it will be executed. + /// + /// The regex string is by default surrounded by `^...$` to match the full string. + /// For example the `https?://\w+` regex would be registered as `^https?://\w+$`. + /// + /// [regex]: + validator: String, + + /// Marks the validator as a raw regex, meaning the plugin should not make any modification at runtime. + /// + /// This means the regex will not match on the entire string by default, which might + /// be exploited if your regex allow unexpected input to be considered valid. + /// When using this option, make sure your regex is correct. + #[serde(default)] + raw: bool, + }, +} + +/// A set of command arguments allowed to be executed by the webview API. +/// +/// A value of `true` will allow any arguments to be passed to the command. `false` will disable all +/// arguments. A list of [`ShellScopeEntryAllowedArg`] will set those arguments as the only valid arguments to +/// be passed to the attached command configuration. +#[derive(Debug, PartialEq, Eq, Clone, Hash, JsonSchema)] +#[serde(untagged, deny_unknown_fields)] +#[non_exhaustive] +pub enum ShellScopeEntryAllowedArgs { + /// Use a simple boolean to allow all or disable all arguments to this command configuration. + Flag(bool), + + /// A specific set of [`ShellScopeEntryAllowedArg`] that are valid to call for the command configuration. + List(Vec), +} + +impl Default for ShellScopeEntryAllowedArgs { + fn default() -> Self { + Self::Flag(false) + } +} + +/// Shell scope entry. +#[derive(JsonSchema)] +#[serde(untagged, deny_unknown_fields)] +#[allow(unused)] +pub(crate) enum ShellScopeEntry { + Command { + /// The name for this allowed shell command configuration. + /// + /// This name will be used inside of the webview API to call this command along with + /// any specified arguments. + name: String, + /// The command name. + /// It can start with a variable that resolves to a system base directory. + /// The variables are: `$AUDIO`, `$CACHE`, `$CONFIG`, `$DATA`, `$LOCALDATA`, `$DESKTOP`, + /// `$DOCUMENT`, `$DOWNLOAD`, `$EXE`, `$FONT`, `$HOME`, `$PICTURE`, `$PUBLIC`, `$RUNTIME`, + /// `$TEMPLATE`, `$VIDEO`, `$RESOURCE`, `$LOG`, `$TEMP`, `$APPCONFIG`, `$APPDATA`, + /// `$APPLOCALDATA`, `$APPCACHE`, `$APPLOG`. + // use default just so the schema doesn't flag it as required + #[serde(rename = "cmd")] + command: PathBuf, + /// The allowed arguments for the command execution. + #[serde(default)] + args: ShellScopeEntryAllowedArgs, + }, + Sidecar { + /// The name for this allowed shell command configuration. + /// + /// This name will be used inside of the webview API to call this command along with + /// any specified arguments. + name: String, + /// The allowed arguments for the command execution. + #[serde(default)] + args: ShellScopeEntryAllowedArgs, + /// If this command is a sidecar command. + sidecar: bool, + }, +} + +// Ensure `ShellScopeEntry` and `scope_entry::EntryRaw` +// and `ShellScopeEntryAllowedArg` and `ShellAllowedArg` +// and `ShellScopeEntryAllowedArgs` and `ShellAllowedArgs` +// are kept in sync +#[allow(clippy::unnecessary_operation)] +fn _f() { + match (ShellScopeEntry::Sidecar { + name: String::new(), + args: ShellScopeEntryAllowedArgs::Flag(false), + sidecar: true, + }) { + ShellScopeEntry::Command { + name, + command, + args, + } => scope_entry::EntryRaw { + name, + command: Some(command), + args: match args { + ShellScopeEntryAllowedArgs::Flag(flag) => scope_entry::ShellAllowedArgs::Flag(flag), + ShellScopeEntryAllowedArgs::List(vec) => scope_entry::ShellAllowedArgs::List( + vec.into_iter() + .map(|s| match s { + ShellScopeEntryAllowedArg::Fixed(fixed) => { + scope_entry::ShellAllowedArg::Fixed(fixed) + } + ShellScopeEntryAllowedArg::Var { validator, raw } => { + scope_entry::ShellAllowedArg::Var { validator, raw } + } + }) + .collect(), + ), + }, + sidecar: false, + }, + ShellScopeEntry::Sidecar { + name, + args, + sidecar, + } => scope_entry::EntryRaw { + name, + command: None, + args: match args { + ShellScopeEntryAllowedArgs::Flag(flag) => scope_entry::ShellAllowedArgs::Flag(flag), + ShellScopeEntryAllowedArgs::List(vec) => scope_entry::ShellAllowedArgs::List( + vec.into_iter() + .map(|s| match s { + ShellScopeEntryAllowedArg::Fixed(fixed) => { + scope_entry::ShellAllowedArg::Fixed(fixed) + } + ShellScopeEntryAllowedArg::Var { validator, raw } => { + scope_entry::ShellAllowedArg::Var { validator, raw } + } + }) + .collect(), + ), + }, + sidecar, + }, + }; +} + const COMMANDS: &[&str] = &["execute", "spawn", "stdin_write", "kill", "open"]; fn main() { tauri_plugin::Builder::new(COMMANDS) .global_api_script_path("./api-iife.js") - .global_scope_schema(schemars::schema_for!(scope_entry::Entry)) + .global_scope_schema(schemars::schema_for!(ShellScopeEntry)) .android_path("android") .ios_path("ios") .build(); diff --git a/plugins/shell/src/scope_entry.rs b/plugins/shell/src/scope_entry.rs index a2fb6136..59839178 100644 --- a/plugins/shell/src/scope_entry.rs +++ b/plugins/shell/src/scope_entry.rs @@ -7,29 +7,23 @@ use serde::{de::Error as DeError, Deserialize, Deserializer}; use std::path::PathBuf; /// A command allowed to be executed by the webview API. -#[derive(Debug, Clone, PartialEq, Eq, Hash, schemars::JsonSchema)] -pub struct Entry { - /// The name for this allowed shell command configuration. - /// - /// This name will be used inside of the webview API to call this command along with - /// any specified arguments. - pub name: String, +#[derive(Debug, Clone, PartialEq, Eq, Hash)] +pub(crate) struct Entry { + pub(crate) name: String, + pub(crate) command: PathBuf, + pub(crate) args: ShellAllowedArgs, + pub(crate) sidecar: bool, +} - /// The command name. - /// It can start with a variable that resolves to a system base directory. - /// The variables are: `$AUDIO`, `$CACHE`, `$CONFIG`, `$DATA`, `$LOCALDATA`, `$DESKTOP`, - /// `$DOCUMENT`, `$DOWNLOAD`, `$EXE`, `$FONT`, `$HOME`, `$PICTURE`, `$PUBLIC`, `$RUNTIME`, - /// `$TEMPLATE`, `$VIDEO`, `$RESOURCE`, `$LOG`, `$TEMP`, `$APPCONFIG`, `$APPDATA`, - /// `$APPLOCALDATA`, `$APPCACHE`, `$APPLOG`. - // use default just so the schema doesn't flag it as required +#[derive(Deserialize)] +pub(crate) struct EntryRaw { + pub(crate) name: String, #[serde(rename = "cmd")] - pub command: PathBuf, - - /// The allowed arguments for the command execution. - pub args: ShellAllowedArgs, - - /// If this command is a sidecar command. - pub sidecar: bool, + pub(crate) command: Option, + #[serde(default)] + pub(crate) args: ShellAllowedArgs, + #[serde(default)] + pub(crate) sidecar: bool, } impl<'de> Deserialize<'de> for Entry { @@ -37,18 +31,7 @@ impl<'de> Deserialize<'de> for Entry { where D: Deserializer<'de>, { - #[derive(Deserialize)] - struct InnerEntry { - name: String, - #[serde(rename = "cmd")] - command: Option, - #[serde(default)] - args: ShellAllowedArgs, - #[serde(default)] - sidecar: bool, - } - - let config = InnerEntry::deserialize(deserializer)?; + let config = EntryRaw::deserialize(deserializer)?; if !config.sidecar && config.command.is_none() { return Err(DeError::custom( @@ -65,19 +48,11 @@ impl<'de> Deserialize<'de> for Entry { } } -/// A set of command arguments allowed to be executed by the webview API. -/// -/// A value of `true` will allow any arguments to be passed to the command. `false` will disable all -/// arguments. A list of [`ShellAllowedArg`] will set those arguments as the only valid arguments to -/// be passed to the attached command configuration. -#[derive(Debug, PartialEq, Eq, Clone, Hash, Deserialize, schemars::JsonSchema)] +#[derive(Debug, PartialEq, Eq, Clone, Hash, Deserialize)] #[serde(untagged, deny_unknown_fields)] #[non_exhaustive] pub enum ShellAllowedArgs { - /// Use a simple boolean to allow all or disable all arguments to this command configuration. Flag(bool), - - /// A specific set of [`ShellAllowedArg`] that are valid to call for the command configuration. List(Vec), } @@ -87,33 +62,13 @@ impl Default for ShellAllowedArgs { } } -/// A command argument allowed to be executed by the webview API. -#[derive(Debug, PartialEq, Eq, Clone, Hash, Deserialize, schemars::JsonSchema)] +#[derive(Debug, PartialEq, Eq, Clone, Hash, Deserialize)] #[serde(untagged, deny_unknown_fields)] #[non_exhaustive] pub enum ShellAllowedArg { - /// A non-configurable argument that is passed to the command in the order it was specified. Fixed(String), - - /// A variable that is set while calling the command from the webview API. - /// Var { - /// [regex] validator to require passed values to conform to an expected input. - /// - /// This will require the argument value passed to this variable to match the `validator` regex - /// before it will be executed. - /// - /// The regex string is by default surrounded by `^...$` to match the full string. - /// For example the `https?://\w+` regex would be registered as `^https?://\w+$`. - /// - /// [regex]: validator: String, - - /// Marks the validator as a raw regex, meaning the plugin should not make any modification at runtime. - /// - /// This means the regex will not match on the entire string by default, which might - /// be exploited if your regex allow unexpected input to be considered valid. - /// When using this option, make sure your regex is correct. #[serde(default)] raw: bool, }, diff --git a/plugins/updater/tests/app-updater/tests/update.rs b/plugins/updater/tests/app-updater/tests/update.rs index 985a4c4a..230ab376 100644 --- a/plugins/updater/tests/app-updater/tests/update.rs +++ b/plugins/updater/tests/app-updater/tests/update.rs @@ -221,7 +221,7 @@ fn update_app() { let updater_extension = if let Some(updater_zip_ext) = updater_zip_ext { format!("{bundle_updater_ext}.{updater_zip_ext}") } else { - format!("{bundle_updater_ext}") + bundle_updater_ext }; let signature_extension = format!("{updater_extension}.sig"); let signature_path = out_bundle_path.with_extension(signature_extension); diff --git a/plugins/updater/tests/updater-migration/tests/update.rs b/plugins/updater/tests/updater-migration/tests/update.rs index 3b5cb779..56cb2d30 100644 --- a/plugins/updater/tests/updater-migration/tests/update.rs +++ b/plugins/updater/tests/updater-migration/tests/update.rs @@ -413,7 +413,7 @@ fn update_app() { ), 2 => ( v2_config.version, - Box::new(|| v2::bundle_paths(&root_dir, &v2_config.version)) + Box::new(|| v2::bundle_paths(&root_dir, v2_config.version)) as Box Vec<(BundleTarget, PathBuf)>>, "-v2", ), From f12d35609ab84f536c0f087665fdc1f978af3093 Mon Sep 17 00:00:00 2001 From: Tony <68118705+Legend-Master@users.noreply.github.com> Date: Wed, 2 Oct 2024 02:10:40 +0800 Subject: [PATCH 11/40] feat(store)!: fully rework and add auto save (#1550) * Add auto save to store plugin * Put jsdoc at constructor instead of class level * Clippy * Use enum instead of bool * Some(AutoSaveMessage::Cancel) | None * from_millis * u64 * Add change file * Rename to emit_on_change * should use Duration in `with_store` * Add breaking change notice to change file * Emit change event for inserts by reset * Update readme example * Update example * Remove extra line * Make description clear it only works with managed * Fix links in docstring * Fix doc string closing * get_mut * Proof of concept * fmt * Load store on create * cargo fmt * Fix merge conflits * Format * small cleanup * update docs, use `impl Into` * fix doctests, further simplification of api * add store options --------- Co-authored-by: Tillmann <28728469+tweidinger@users.noreply.github.com> Co-authored-by: Lucas Nogueira --- .changes/store-api-refactor.md | 5 + .changes/store-auto-save.md | 7 + Cargo.lock | 1 + plugins/store/Cargo.toml | 4 + plugins/store/README.md | 8 +- plugins/store/api-iife.js | 2 +- plugins/store/build.rs | 13 +- .../src-tauri/src/app/settings.rs | 5 +- .../AppSettingsManager/src-tauri/src/main.rs | 28 +- plugins/store/guest-js/index.ts | 76 ++-- .../autogenerated/commands/create_store.toml | 13 + .../permissions/autogenerated/reference.md | 27 ++ plugins/store/permissions/default.toml | 1 + plugins/store/permissions/schemas/schema.json | 10 + plugins/store/src/lib.rs | 362 ++++++++-------- plugins/store/src/store.rs | 404 +++++++++++++----- 16 files changed, 603 insertions(+), 363 deletions(-) create mode 100644 .changes/store-api-refactor.md create mode 100644 .changes/store-auto-save.md create mode 100644 plugins/store/permissions/autogenerated/commands/create_store.toml diff --git a/.changes/store-api-refactor.md b/.changes/store-api-refactor.md new file mode 100644 index 00000000..ed049eb1 --- /dev/null +++ b/.changes/store-api-refactor.md @@ -0,0 +1,5 @@ +--- +"store-js": patch +--- + +**Breaking change**: Removed the `Store` constructor and added the `createStore` API. diff --git a/.changes/store-auto-save.md b/.changes/store-auto-save.md new file mode 100644 index 00000000..4babad27 --- /dev/null +++ b/.changes/store-auto-save.md @@ -0,0 +1,7 @@ +--- +"store": patch +--- + +Add a setting `auto_save` to enable a store to debounce save on modification (on calls like set, clear, delete, reset) + +**Breaking change**: Removed the `with_store` API and added `StoreExt::store_builder`. diff --git a/Cargo.lock b/Cargo.lock index 0d4b1212..8afbabde 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6990,6 +6990,7 @@ dependencies = [ "tauri", "tauri-plugin", "thiserror", + "tokio", ] [[package]] diff --git a/plugins/store/Cargo.toml b/plugins/store/Cargo.toml index 0300b35f..c2f8ddd9 100644 --- a/plugins/store/Cargo.toml +++ b/plugins/store/Cargo.toml @@ -30,6 +30,10 @@ tauri = { workspace = true } log = { workspace = true } thiserror = { workspace = true } dunce = { workspace = true } +tokio = { version = "1", features = ["sync", "time", "macros"] } [target.'cfg(target_os = "ios")'.dependencies] tauri = { workspace = true, features = ["wry"] } + +[dev-dependencies] +tauri = { workspace = true, features = ["wry"] } diff --git a/plugins/store/README.md b/plugins/store/README.md index be6fdfae..f7d65a0f 100644 --- a/plugins/store/README.md +++ b/plugins/store/README.md @@ -149,12 +149,10 @@ As you may have noticed, the `Store` crated above isn't accessible to the fronte ```rust use tauri::Wry; -use tauri_plugin_store::with_store; +use tauri_plugin_store::StoreExt; -let stores = app.state::>(); -let path = PathBuf::from("app_data.bin"); - -with_store(app_handle, stores, path, |store| store.insert("a".to_string(), json!("b"))) +let store = app.store_builder("app_data.bin").build(); +store.insert("key", "value"); ``` ## Contributing diff --git a/plugins/store/api-iife.js b/plugins/store/api-iife.js index 9bd5a3f4..77295d7f 100644 --- a/plugins/store/api-iife.js +++ b/plugins/store/api-iife.js @@ -1 +1 @@ -if("__TAURI__"in window){var __TAURI_PLUGIN_STORE__=function(t){"use strict";function a(t,a=!1){return window.__TAURI_INTERNALS__.transformCallback(t,a)}async function e(t,a={},e){return window.__TAURI_INTERNALS__.invoke(t,a,e)}var n;async function r(t,n,r){const i={kind:"Any"};return e("plugin:event|listen",{event:t,target:i,handler:a(n)}).then((a=>async()=>async function(t,a){await e("plugin:event|unlisten",{event:t,eventId:a})}(t,a)))}"function"==typeof SuppressedError&&SuppressedError,function(t){t.WINDOW_RESIZED="tauri://resize",t.WINDOW_MOVED="tauri://move",t.WINDOW_CLOSE_REQUESTED="tauri://close-requested",t.WINDOW_DESTROYED="tauri://destroyed",t.WINDOW_FOCUS="tauri://focus",t.WINDOW_BLUR="tauri://blur",t.WINDOW_SCALE_FACTOR_CHANGED="tauri://scale-change",t.WINDOW_THEME_CHANGED="tauri://theme-changed",t.WINDOW_CREATED="tauri://window-created",t.WEBVIEW_CREATED="tauri://webview-created",t.DRAG_ENTER="tauri://drag-enter",t.DRAG_OVER="tauri://drag-over",t.DRAG_DROP="tauri://drag-drop",t.DRAG_LEAVE="tauri://drag-leave"}(n||(n={}));return t.Store=class{constructor(t){this.path=t}async set(t,a){await e("plugin:store|set",{path:this.path,key:t,value:a})}async get(t){return await e("plugin:store|get",{path:this.path,key:t})}async has(t){return await e("plugin:store|has",{path:this.path,key:t})}async delete(t){return await e("plugin:store|delete",{path:this.path,key:t})}async clear(){await e("plugin:store|clear",{path:this.path})}async reset(){await e("plugin:store|reset",{path:this.path})}async keys(){return await e("plugin:store|keys",{path:this.path})}async values(){return await e("plugin:store|values",{path:this.path})}async entries(){return await e("plugin:store|entries",{path:this.path})}async length(){return await e("plugin:store|length",{path:this.path})}async load(){await e("plugin:store|load",{path:this.path})}async save(){await e("plugin:store|save",{path:this.path})}async onKeyChange(t,a){return await r("store://change",(e=>{e.payload.path===this.path&&e.payload.key===t&&a(e.payload.value)}))}async onChange(t){return await r("store://change",(a=>{a.payload.path===this.path&&t(a.payload.key,a.payload.value)}))}},t}({});Object.defineProperty(window.__TAURI__,"store",{value:__TAURI_PLUGIN_STORE__})} +if("__TAURI__"in window){var __TAURI_PLUGIN_STORE__=function(e){"use strict";var t,r;function a(e,t=!1){return window.__TAURI_INTERNALS__.transformCallback(e,t)}async function i(e,t={},r){return window.__TAURI_INTERNALS__.invoke(e,t,r)}"function"==typeof SuppressedError&&SuppressedError;class n{get rid(){return function(e,t,r,a){if("a"===r&&!a)throw new TypeError("Private accessor was defined without a getter");if("function"==typeof t?e!==t||!a:!t.has(e))throw new TypeError("Cannot read private member from an object whose class did not declare it");return"m"===r?a:"a"===r?a.call(e):a?a.value:t.get(e)}(this,t,"f")}constructor(e){t.set(this,void 0),function(e,t,r,a,i){if("function"==typeof t?e!==t||!i:!t.has(e))throw new TypeError("Cannot write private member to an object whose class did not declare it");t.set(e,r)}(this,t,e)}async close(){return i("plugin:resources|close",{rid:this.rid})}}async function s(e,t,r){const n={kind:"Any"};return i("plugin:event|listen",{event:e,target:n,handler:a(t)}).then((t=>async()=>async function(e,t){await i("plugin:event|unlisten",{event:e,eventId:t})}(e,t)))}t=new WeakMap,function(e){e.WINDOW_RESIZED="tauri://resize",e.WINDOW_MOVED="tauri://move",e.WINDOW_CLOSE_REQUESTED="tauri://close-requested",e.WINDOW_DESTROYED="tauri://destroyed",e.WINDOW_FOCUS="tauri://focus",e.WINDOW_BLUR="tauri://blur",e.WINDOW_SCALE_FACTOR_CHANGED="tauri://scale-change",e.WINDOW_THEME_CHANGED="tauri://theme-changed",e.WINDOW_CREATED="tauri://window-created",e.WEBVIEW_CREATED="tauri://webview-created",e.DRAG_ENTER="tauri://drag-enter",e.DRAG_OVER="tauri://drag-over",e.DRAG_DROP="tauri://drag-drop",e.DRAG_LEAVE="tauri://drag-leave"}(r||(r={}));class o extends n{constructor(e,t){super(e),this.path=t}async set(e,t){await i("plugin:store|set",{rid:this.rid,key:e,value:t})}async get(e){return await i("plugin:store|get",{rid:this.rid,key:e})}async has(e){return await i("plugin:store|has",{rid:this.rid,key:e})}async delete(e){return await i("plugin:store|delete",{rid:this.rid,key:e})}async clear(){await i("plugin:store|clear",{rid:this.rid})}async reset(){await i("plugin:store|reset",{rid:this.rid})}async keys(){return await i("plugin:store|keys",{rid:this.rid})}async values(){return await i("plugin:store|values",{rid:this.rid})}async entries(){return await i("plugin:store|entries",{rid:this.rid})}async length(){return await i("plugin:store|length",{rid:this.rid})}async load(){await i("plugin:store|load",{rid:this.rid})}async save(){await i("plugin:store|save",{rid:this.rid})}async onKeyChange(e,t){return await s("store://change",(r=>{r.payload.path===this.path&&r.payload.key===e&&t(r.payload.value)}))}async onChange(e){return await s("store://change",(t=>{t.payload.path===this.path&&e(t.payload.key,t.payload.value)}))}}return e.Store=o,e.createStore=async function(e,t){const r=await i("plugin:store|create_store",{path:e,...t});return new o(r,e)},e}({});Object.defineProperty(window.__TAURI__,"store",{value:__TAURI_PLUGIN_STORE__})} diff --git a/plugins/store/build.rs b/plugins/store/build.rs index 7b54fe42..3c9fee01 100644 --- a/plugins/store/build.rs +++ b/plugins/store/build.rs @@ -3,7 +3,18 @@ // SPDX-License-Identifier: MIT const COMMANDS: &[&str] = &[ - "set", "get", "has", "delete", "clear", "reset", "keys", "values", "length", "entries", "load", + "create_store", + "set", + "get", + "has", + "delete", + "clear", + "reset", + "keys", + "values", + "length", + "entries", + "load", "save", ]; diff --git a/plugins/store/examples/AppSettingsManager/src-tauri/src/app/settings.rs b/plugins/store/examples/AppSettingsManager/src-tauri/src/app/settings.rs index 5fc281b2..30514a00 100644 --- a/plugins/store/examples/AppSettingsManager/src-tauri/src/app/settings.rs +++ b/plugins/store/examples/AppSettingsManager/src-tauri/src/app/settings.rs @@ -21,9 +21,8 @@ impl AppSettings { let theme = store .get("appSettings.theme") - .and_then(|v| v.as_str()) - .map(|s| s.to_string()) - .unwrap_or_else(|| "dark".to_string()); + .and_then(|v| v.as_str().map(String::from)) + .unwrap_or_else(|| "dark".to_owned()); Ok(AppSettings { launch_at_login, diff --git a/plugins/store/examples/AppSettingsManager/src-tauri/src/main.rs b/plugins/store/examples/AppSettingsManager/src-tauri/src/main.rs index 5926713e..0dd4e0bc 100644 --- a/plugins/store/examples/AppSettingsManager/src-tauri/src/main.rs +++ b/plugins/store/examples/AppSettingsManager/src-tauri/src/main.rs @@ -5,17 +5,24 @@ // Prevents additional console window on Windows in release, DO NOT REMOVE!! #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")] -use tauri_plugin_store::StoreBuilder; +use std::time::Duration; + +use serde_json::json; +use tauri_plugin_store::StoreExt; mod app; use app::settings::AppSettings; fn main() { tauri::Builder::default() - .plugin(tauri_plugin_store::Builder::default().build()) + .plugin(tauri_plugin_store::Builder::new().build()) .setup(|app| { // Init store and load it from disk - let mut store = StoreBuilder::new("settings.json").build(app.handle().clone()); + let store = app + .handle() + .store_builder("settings.json") + .auto_save(Duration::from_millis(100)) + .build(); // If there are no saved settings yet, this will return an error so we ignore the return value. let _ = store.load(); @@ -27,17 +34,20 @@ fn main() { let theme = app_settings.theme; let launch_at_login = app_settings.launch_at_login; - println!("theme {}", theme); - println!("launch_at_login {}", launch_at_login); - - Ok(()) + println!("theme {theme}"); + println!("launch_at_login {launch_at_login}"); + store.set( + "appSettings", + json!({ "theme": theme, "launchAtLogin": launch_at_login }), + ); } Err(err) => { - eprintln!("Error loading settings: {}", err); + eprintln!("Error loading settings: {err}"); // Handle the error case if needed - Err(err) // Convert the error to a Box and return Err(err) here + return Err(err); // Convert the error to a Box and return Err(err) here } } + Ok(()) }) .run(tauri::generate_context!()) .expect("error while running tauri application"); diff --git a/plugins/store/guest-js/index.ts b/plugins/store/guest-js/index.ts index dce545ac..259b0662 100644 --- a/plugins/store/guest-js/index.ts +++ b/plugins/store/guest-js/index.ts @@ -4,7 +4,7 @@ import { listen, type UnlistenFn } from '@tauri-apps/api/event' -import { invoke } from '@tauri-apps/api/core' +import { invoke, Resource } from '@tauri-apps/api/core' interface ChangePayload { path: string @@ -13,12 +13,36 @@ interface ChangePayload { } /** - * A key-value store persisted by the backend layer. + * Options to create a store */ -export class Store { - path: string - constructor(path: string) { - this.path = path +export type StoreOptions = { + /** + * Auto save on modification with debounce duration in milliseconds + */ + autoSave?: boolean +} + +/** + * @param path: Path to save the store in `app_data_dir` + * @param options: Store configuration options + */ +export async function createStore(path: string, options?: StoreOptions) { + const resourceId = await invoke('plugin:store|create_store', { + path, + ...options + }) + return new Store(resourceId, path) +} + +/** + * A lazy loaded key-value store persisted by the backend layer. + */ +export class Store extends Resource { + constructor( + rid: number, + private readonly path: string + ) { + super(rid) } /** @@ -30,7 +54,7 @@ export class Store { */ async set(key: string, value: unknown): Promise { await invoke('plugin:store|set', { - path: this.path, + rid: this.rid, key, value }) @@ -44,7 +68,7 @@ export class Store { */ async get(key: string): Promise { return await invoke('plugin:store|get', { - path: this.path, + rid: this.rid, key }) } @@ -57,7 +81,7 @@ export class Store { */ async has(key: string): Promise { return await invoke('plugin:store|has', { - path: this.path, + rid: this.rid, key }) } @@ -70,7 +94,7 @@ export class Store { */ async delete(key: string): Promise { return await invoke('plugin:store|delete', { - path: this.path, + rid: this.rid, key }) } @@ -82,9 +106,7 @@ export class Store { * @returns */ async clear(): Promise { - await invoke('plugin:store|clear', { - path: this.path - }) + await invoke('plugin:store|clear', { rid: this.rid }) } /** @@ -94,9 +116,7 @@ export class Store { * @returns */ async reset(): Promise { - await invoke('plugin:store|reset', { - path: this.path - }) + await invoke('plugin:store|reset', { rid: this.rid }) } /** @@ -105,9 +125,7 @@ export class Store { * @returns */ async keys(): Promise { - return await invoke('plugin:store|keys', { - path: this.path - }) + return await invoke('plugin:store|keys', { rid: this.rid }) } /** @@ -116,9 +134,7 @@ export class Store { * @returns */ async values(): Promise { - return await invoke('plugin:store|values', { - path: this.path - }) + return await invoke('plugin:store|values', { rid: this.rid }) } /** @@ -127,9 +143,7 @@ export class Store { * @returns */ async entries(): Promise> { - return await invoke('plugin:store|entries', { - path: this.path - }) + return await invoke('plugin:store|entries', { rid: this.rid }) } /** @@ -138,9 +152,7 @@ export class Store { * @returns */ async length(): Promise { - return await invoke('plugin:store|length', { - path: this.path - }) + return await invoke('plugin:store|length', { rid: this.rid }) } /** @@ -152,9 +164,7 @@ export class Store { * @returns */ async load(): Promise { - await invoke('plugin:store|load', { - path: this.path - }) + await invoke('plugin:store|load', { rid: this.rid }) } /** @@ -165,9 +175,7 @@ export class Store { * @returns */ async save(): Promise { - await invoke('plugin:store|save', { - path: this.path - }) + await invoke('plugin:store|save', { rid: this.rid }) } /** diff --git a/plugins/store/permissions/autogenerated/commands/create_store.toml b/plugins/store/permissions/autogenerated/commands/create_store.toml new file mode 100644 index 00000000..cde71c24 --- /dev/null +++ b/plugins/store/permissions/autogenerated/commands/create_store.toml @@ -0,0 +1,13 @@ +# Automatically generated - DO NOT EDIT! + +"$schema" = "../../schemas/schema.json" + +[[permission]] +identifier = "allow-create-store" +description = "Enables the create_store command without any pre-configured scope." +commands.allow = ["create_store"] + +[[permission]] +identifier = "deny-create-store" +description = "Denies the create_store command without any pre-configured scope." +commands.deny = ["create_store"] diff --git a/plugins/store/permissions/autogenerated/reference.md b/plugins/store/permissions/autogenerated/reference.md index 704d759d..4e9bf2cc 100644 --- a/plugins/store/permissions/autogenerated/reference.md +++ b/plugins/store/permissions/autogenerated/reference.md @@ -9,6 +9,7 @@ All operations are enabled by default. +- `allow-create-store` - `allow-clear` - `allow-delete` - `allow-entries` @@ -60,6 +61,32 @@ Denies the clear command without any pre-configured scope. +`store:allow-create-store` + + + + +Enables the create_store command without any pre-configured scope. + + + + + + + +`store:deny-create-store` + + + + +Denies the create_store command without any pre-configured scope. + + + + + + + `store:allow-delete` diff --git a/plugins/store/permissions/default.toml b/plugins/store/permissions/default.toml index d2369b27..bf888679 100644 --- a/plugins/store/permissions/default.toml +++ b/plugins/store/permissions/default.toml @@ -11,6 +11,7 @@ All operations are enabled by default. """ permissions = [ + "allow-create-store", "allow-clear", "allow-delete", "allow-entries", diff --git a/plugins/store/permissions/schemas/schema.json b/plugins/store/permissions/schemas/schema.json index 56bced91..6ebf788e 100644 --- a/plugins/store/permissions/schemas/schema.json +++ b/plugins/store/permissions/schemas/schema.json @@ -304,6 +304,16 @@ "type": "string", "const": "deny-clear" }, + { + "description": "Enables the create_store command without any pre-configured scope.", + "type": "string", + "const": "allow-create-store" + }, + { + "description": "Denies the create_store command without any pre-configured scope.", + "type": "string", + "const": "deny-create-store" + }, { "description": "Enables the delete command without any pre-configured scope.", "type": "string", diff --git a/plugins/store/src/lib.rs b/plugins/store/src/lib.rs index fa331eb5..b05bf4b4 100644 --- a/plugins/store/src/lib.rs +++ b/plugins/store/src/lib.rs @@ -18,12 +18,13 @@ pub use serde_json::Value as JsonValue; use std::{ collections::HashMap, path::{Path, PathBuf}, - sync::Mutex, + sync::{Mutex, Weak}, + time::Duration, }; -pub use store::{Store, StoreBuilder}; +pub use store::{Store, StoreBuilder, StoreInner}; use tauri::{ plugin::{self, TauriPlugin}, - AppHandle, Manager, RunEvent, Runtime, State, + AppHandle, Manager, ResourceId, RunEvent, Runtime, Webview, }; mod error; @@ -37,177 +38,138 @@ struct ChangePayload<'a> { } pub struct StoreCollection { - stores: Mutex>>, - frozen: bool, + stores: Mutex>>>>, + // frozen: bool, } -pub fn with_store) -> Result>( +#[tauri::command] +async fn create_store( app: AppHandle, - collection: State<'_, StoreCollection>, - path: impl AsRef, - f: F, -) -> Result { - let mut stores = collection.stores.lock().expect("mutex poisoned"); - - let path = path.as_ref(); - if !stores.contains_key(path) { - if collection.frozen { - return Err(Error::NotFound(path.to_path_buf())); - } - - #[allow(unused_mut)] - let mut builder = StoreBuilder::new(path); - - let mut store = builder.build(app); - - // ignore loading errors, just use the default - if let Err(err) = store.load() { - warn!( - "Failed to load store {:?} from disk: {}. Falling back to default values.", - path, err - ); - } - stores.insert(path.to_path_buf(), store); + webview: Webview, + path: PathBuf, + auto_save: Option, +) -> Result { + let mut builder = app.store_builder(path); + if let Some(auto_save) = auto_save { + builder = builder.auto_save(Duration::from_millis(auto_save)); } - - f(stores - .get_mut(path) - .expect("failed to retrieve store. This is a bug!")) + let store = builder.build(); + Ok(webview.resources_table().add(store)) } #[tauri::command] async fn set( - app: AppHandle, - stores: State<'_, StoreCollection>, - path: PathBuf, + webview: Webview, + rid: ResourceId, key: String, value: JsonValue, ) -> Result<()> { - with_store(app, stores, path, |store| store.insert(key, value)) + let store = webview.resources_table().get::>(rid)?; + store.set(key, value); + Ok(()) } #[tauri::command] async fn get( - app: AppHandle, - stores: State<'_, StoreCollection>, - path: PathBuf, + webview: Webview, + rid: ResourceId, key: String, ) -> Result> { - with_store(app, stores, path, |store| Ok(store.get(key).cloned())) + let store = webview.resources_table().get::>(rid)?; + Ok(store.get(key)) } #[tauri::command] -async fn has( - app: AppHandle, - stores: State<'_, StoreCollection>, - path: PathBuf, - key: String, -) -> Result { - with_store(app, stores, path, |store| Ok(store.has(key))) +async fn has(webview: Webview, rid: ResourceId, key: String) -> Result { + let store = webview.resources_table().get::>(rid)?; + Ok(store.has(key)) } #[tauri::command] -async fn delete( - app: AppHandle, - stores: State<'_, StoreCollection>, - path: PathBuf, - key: String, -) -> Result { - with_store(app, stores, path, |store| store.delete(key)) +async fn delete(webview: Webview, rid: ResourceId, key: String) -> Result { + let store = webview.resources_table().get::>(rid)?; + Ok(store.delete(key)) } #[tauri::command] -async fn clear( - app: AppHandle, - stores: State<'_, StoreCollection>, - path: PathBuf, -) -> Result<()> { - with_store(app, stores, path, |store| store.clear()) +async fn clear(webview: Webview, rid: ResourceId) -> Result<()> { + let store = webview.resources_table().get::>(rid)?; + store.clear(); + Ok(()) } #[tauri::command] -async fn reset( - app: AppHandle, - collection: State<'_, StoreCollection>, - path: PathBuf, -) -> Result<()> { - with_store(app, collection, path, |store| store.reset()) +async fn reset(webview: Webview, rid: ResourceId) -> Result<()> { + let store = webview.resources_table().get::>(rid)?; + store.reset(); + Ok(()) } #[tauri::command] -async fn keys( - app: AppHandle, - stores: State<'_, StoreCollection>, - path: PathBuf, -) -> Result> { - with_store(app, stores, path, |store| { - Ok(store.keys().cloned().collect()) - }) +async fn keys(webview: Webview, rid: ResourceId) -> Result> { + let store = webview.resources_table().get::>(rid)?; + Ok(store.keys()) } #[tauri::command] -async fn values( - app: AppHandle, - stores: State<'_, StoreCollection>, - path: PathBuf, -) -> Result> { - with_store(app, stores, path, |store| { - Ok(store.values().cloned().collect()) - }) +async fn values(webview: Webview, rid: ResourceId) -> Result> { + let store = webview.resources_table().get::>(rid)?; + Ok(store.values()) } #[tauri::command] async fn entries( - app: AppHandle, - stores: State<'_, StoreCollection>, - path: PathBuf, + webview: Webview, + rid: ResourceId, ) -> Result> { - with_store(app, stores, path, |store| { - Ok(store - .entries() - .map(|(k, v)| (k.to_owned(), v.to_owned())) - .collect()) - }) + let store = webview.resources_table().get::>(rid)?; + Ok(store.entries()) } #[tauri::command] -async fn length( - app: AppHandle, - stores: State<'_, StoreCollection>, - path: PathBuf, -) -> Result { - with_store(app, stores, path, |store| Ok(store.len())) +async fn length(webview: Webview, rid: ResourceId) -> Result { + let store = webview.resources_table().get::>(rid)?; + Ok(store.length()) } #[tauri::command] -async fn load( - app: AppHandle, - stores: State<'_, StoreCollection>, - path: PathBuf, -) -> Result<()> { - with_store(app, stores, path, |store| store.load()) +async fn load(webview: Webview, rid: ResourceId) -> Result<()> { + let store = webview.resources_table().get::>(rid)?; + store.load() } #[tauri::command] -async fn save( - app: AppHandle, - stores: State<'_, StoreCollection>, - path: PathBuf, -) -> Result<()> { - with_store(app, stores, path, |store| store.save()) +async fn save(webview: Webview, rid: ResourceId) -> Result<()> { + let store = webview.resources_table().get::>(rid)?; + store.save() +} + +pub trait StoreExt { + fn store(&self, path: impl AsRef) -> Store; + fn store_builder(&self, path: impl AsRef) -> StoreBuilder; +} + +impl> StoreExt for T { + fn store(&self, path: impl AsRef) -> Store { + StoreBuilder::new(self.app_handle(), path).build() + } + + fn store_builder(&self, path: impl AsRef) -> StoreBuilder { + StoreBuilder::new(self.app_handle(), path) + } } // #[derive(Default)] pub struct Builder { stores: HashMap>, - frozen: bool, + // frozen: bool, } impl Default for Builder { fn default() -> Self { Self { stores: Default::default(), - frozen: false, + // frozen: false, } } } @@ -217,114 +179,126 @@ impl Builder { Self::default() } - /// Registers a store with the plugin. - /// - /// # Examples - /// - /// ``` - /// use tauri_plugin_store::{StoreBuilder, Builder}; - /// - /// tauri::Builder::default() - /// .setup(|app| { - /// let store = StoreBuilder::new("store.bin").build(app.handle().clone()); - /// let builder = Builder::default().store(store); - /// Ok(()) - /// }); - /// ``` - pub fn store(mut self, store: Store) -> Self { - self.stores.insert(store.path.clone(), store); - self - } - - /// Registers multiple stores with the plugin. - /// - /// # Examples - /// - /// ``` - /// use tauri_plugin_store::{StoreBuilder, Builder}; - /// - /// tauri::Builder::default() - /// .setup(|app| { - /// let store = StoreBuilder::new("store.bin").build(app.handle().clone()); - /// let builder = Builder::default().stores([store]); - /// Ok(()) - /// }); - /// ``` - pub fn stores>>(mut self, stores: T) -> Self { - self.stores = stores - .into_iter() - .map(|store| (store.path.clone(), store)) - .collect(); - self - } - - /// Freezes the collection. - /// - /// This causes requests for plugins that haven't been registered to fail - /// - /// # Examples - /// - /// ``` - /// use tauri_plugin_store::{StoreBuilder, Builder}; - /// - /// tauri::Builder::default() - /// .setup(|app| { - /// let store = StoreBuilder::new("store.bin").build(app.handle().clone()); - /// app.handle().plugin(Builder::default().freeze().build()); - /// Ok(()) - /// }); - /// ``` - pub fn freeze(mut self) -> Self { - self.frozen = true; - self - } + // /// Registers a store with the plugin. + // /// + // /// # Examples + // /// + // /// ``` + // /// use tauri_plugin_store::{StoreBuilder, Builder}; + // /// + // /// tauri::Builder::default() + // /// .setup(|app| { + // /// let store = StoreBuilder::new("store.bin").build(app.handle().clone()); + // /// let builder = Builder::default().store(store); + // /// Ok(()) + // /// }); + // /// ``` + // pub fn store(mut self, store: Store) -> Self { + // self.stores.insert(store.path.clone(), store); + // self + // } + + // /// Registers multiple stores with the plugin. + // /// + // /// # Examples + // /// + // /// ``` + // /// use tauri_plugin_store::{StoreBuilder, Builder}; + // /// + // /// tauri::Builder::default() + // /// .setup(|app| { + // /// let store = StoreBuilder::new("store.bin").build(app.handle().clone()); + // /// let builder = Builder::default().stores([store]); + // /// Ok(()) + // /// }); + // /// ``` + // pub fn stores>>(mut self, stores: T) -> Self { + // self.stores = stores + // .into_iter() + // .map(|store| (store.path.clone(), store)) + // .collect(); + // self + // } + + // /// Freezes the collection. + // /// + // /// This causes requests for plugins that haven't been registered to fail + // /// + // /// # Examples + // /// + // /// ``` + // /// use tauri_plugin_store::{StoreBuilder, Builder}; + // /// + // /// tauri::Builder::default() + // /// .setup(|app| { + // /// let store = StoreBuilder::new("store.bin").build(app.handle().clone()); + // /// app.handle().plugin(Builder::default().freeze().build()); + // /// Ok(()) + // /// }); + // /// ``` + // pub fn freeze(mut self) -> Self { + // self.frozen = true; + // self + // } /// Builds the plugin. /// /// # Examples /// /// ``` - /// use tauri_plugin_store::{StoreBuilder, Builder}; - /// /// tauri::Builder::default() + /// .plugin(tauri_plugin_store::Builder::default().build()) /// .setup(|app| { - /// let store = StoreBuilder::new("store.bin").build(app.handle().clone()); - /// app.handle().plugin(Builder::default().build()); + /// let store = tauri_plugin_store::StoreBuilder::new(app, "store.bin").build(); /// Ok(()) /// }); /// ``` pub fn build(mut self) -> TauriPlugin { plugin::Builder::new("store") .invoke_handler(tauri::generate_handler![ - set, get, has, delete, clear, reset, keys, values, length, entries, load, save + create_store, + set, + get, + has, + delete, + clear, + reset, + keys, + values, + length, + entries, + load, + save ]) .setup(move |app_handle, _api| { for (path, store) in self.stores.iter_mut() { // ignore loading errors, just use the default if let Err(err) = store.load() { warn!( - "Failed to load store {:?} from disk: {}. Falling back to default values.", - path, err - ); + "Failed to load store {path:?} from disk: {err}. Falling back to default values." + ); } } - app_handle.manage(StoreCollection { - stores: Mutex::new(self.stores), - frozen: self.frozen, + app_handle.manage(StoreCollection:: { + stores: Mutex::new(HashMap::new()), + // frozen: self.frozen, }); Ok(()) }) - .on_event(|app_handle, event| { + .on_event(|_app_handle, event| { if let RunEvent::Exit = event { - let collection = app_handle.state::>(); - - for store in collection.stores.lock().expect("mutex poisoned").values() { - if let Err(err) = store.save() { - eprintln!("failed to save store {:?} with error {:?}", store.path, err); - } - } + // let collection = app_handle.state::>(); + + // for store in collection.stores.lock().expect("mutex poisoned").values_mut() { + // if let Some(sender) = store.auto_save_debounce_sender.take() { + // let _ = sender.send(AutoSaveMessage::Cancel); + // } + // if let Err(err) = store.save() { + // eprintln!("failed to save store {:?} with error {:?}", store.path, err); + // } + // } } }) .build() diff --git a/plugins/store/src/store.rs b/plugins/store/src/store.rs index 08184439..b18d0027 100644 --- a/plugins/store/src/store.rs +++ b/plugins/store/src/store.rs @@ -2,19 +2,26 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: MIT -use crate::{ChangePayload, Error}; +use crate::{ChangePayload, StoreCollection}; use serde_json::Value as JsonValue; use std::{ collections::HashMap, fs::{create_dir_all, read, File}, io::Write, path::{Path, PathBuf}, + sync::{Arc, Mutex}, + time::Duration, +}; +use tauri::{AppHandle, Emitter, Manager, Resource, Runtime}; +use tokio::{ + select, + sync::mpsc::{unbounded_channel, UnboundedSender}, + time::sleep, }; -use tauri::{AppHandle, Emitter, Manager, Runtime}; type SerializeFn = fn(&HashMap) -> Result, Box>; -type DeserializeFn = +pub(crate) type DeserializeFn = fn(&[u8]) -> Result, Box>; fn default_serialize( @@ -30,35 +37,38 @@ fn default_deserialize( } /// Builds a [`Store`] -pub struct StoreBuilder { +pub struct StoreBuilder { + app: AppHandle, path: PathBuf, defaults: Option>, cache: HashMap, serialize: SerializeFn, deserialize: DeserializeFn, + auto_save: Option, } -impl StoreBuilder { +impl StoreBuilder { /// Creates a new [`StoreBuilder`]. /// /// # Examples /// ``` - /// # fn main() -> Result<(), Box> { - /// use tauri_plugin_store::StoreBuilder; - /// - /// let builder = StoreBuilder::::new("store.bin"); - /// - /// # Ok(()) - /// # } + /// tauri::Builder::default() + /// .plugin(tauri_plugin_store::Builder::default().build()) + /// .setup(|app| { + /// let builder = tauri_plugin_store::StoreBuilder::new(app, "store.bin"); + /// Ok(()) + /// }); /// ``` - pub fn new>(path: P) -> Self { + pub fn new, P: AsRef>(manager: &M, path: P) -> Self { Self { + app: manager.app_handle().clone(), // Since Store.path is only exposed to the user in emit calls we may as well simplify it here already. path: dunce::simplified(path.as_ref()).to_path_buf(), defaults: None, cache: Default::default(), serialize: default_serialize, deserialize: default_deserialize, + auto_save: None, } } @@ -66,19 +76,18 @@ impl StoreBuilder { /// /// # Examples /// ``` - /// # fn main() -> Result<(), Box> { - /// use tauri_plugin_store::StoreBuilder; - /// use std::collections::HashMap; - /// - /// let mut defaults = HashMap::new(); - /// - /// defaults.insert("foo".to_string(), "bar".into()); - /// - /// let builder = StoreBuilder::::new("store.bin") - /// .defaults(defaults); + /// tauri::Builder::default() + /// .plugin(tauri_plugin_store::Builder::default().build()) + /// .setup(|app| { + /// let mut defaults = std::collections::HashMap::new(); + /// defaults.insert("foo".to_string(), "bar".into()); /// - /// # Ok(()) - /// # } + /// let store = tauri_plugin_store::StoreBuilder::new(app, "store.bin") + /// .defaults(defaults) + /// .build(); + /// Ok(()) + /// }); + /// ``` pub fn defaults(mut self, defaults: HashMap) -> Self { self.cache.clone_from(&defaults); self.defaults = Some(defaults); @@ -89,15 +98,18 @@ impl StoreBuilder { /// /// # Examples /// ``` - /// # fn main() -> Result<(), Box> { - /// use tauri_plugin_store::StoreBuilder; - /// - /// let builder = StoreBuilder::::new("store.bin") - /// .default("foo".to_string(), "bar".into()); - /// - /// # Ok(()) - /// # } - pub fn default(mut self, key: String, value: JsonValue) -> Self { + /// tauri::Builder::default() + /// .plugin(tauri_plugin_store::Builder::default().build()) + /// .setup(|app| { + /// let store = tauri_plugin_store::StoreBuilder::new(app, "store.bin") + /// .default("foo".to_string(), "bar") + /// .build(); + /// Ok(()) + /// }); + /// ``` + pub fn default(mut self, key: impl Into, value: impl Into) -> Self { + let key = key.into(); + let value = value.into(); self.cache.insert(key.clone(), value.clone()); self.defaults .get_or_insert(HashMap::new()) @@ -109,14 +121,15 @@ impl StoreBuilder { /// /// # Examples /// ``` - /// # fn main() -> Result<(), Box> { - /// use tauri_plugin_store::StoreBuilder; - /// - /// let builder = StoreBuilder::::new("store.json") - /// .serialize(|cache| serde_json::to_vec(&cache).map_err(Into::into)); - /// - /// # Ok(()) - /// # } + /// tauri::Builder::default() + /// .plugin(tauri_plugin_store::Builder::default().build()) + /// .setup(|app| { + /// let store = tauri_plugin_store::StoreBuilder::new(app, "store.json") + /// .serialize(|cache| serde_json::to_vec(&cache).map_err(Into::into)) + /// .build(); + /// Ok(()) + /// }); + /// ``` pub fn serialize(mut self, serialize: SerializeFn) -> Self { self.serialize = serialize; self @@ -126,53 +139,102 @@ impl StoreBuilder { /// /// # Examples /// ``` - /// # fn main() -> Result<(), Box> { - /// use tauri_plugin_store::StoreBuilder; - /// - /// let builder = StoreBuilder::::new("store.json") - /// .deserialize(|bytes| serde_json::from_slice(&bytes).map_err(Into::into)); - /// - /// # Ok(()) - /// # } + /// tauri::Builder::default() + /// .plugin(tauri_plugin_store::Builder::default().build()) + /// .setup(|app| { + /// let store = tauri_plugin_store::StoreBuilder::new(app, "store.json") + /// .deserialize(|bytes| serde_json::from_slice(&bytes).map_err(Into::into)) + /// .build(); + /// Ok(()) + /// }); + /// ``` pub fn deserialize(mut self, deserialize: DeserializeFn) -> Self { self.deserialize = deserialize; self } + /// Auto save on modified with a debounce duration + /// + /// Note: only works if this store is managed by the plugin (e.g. made using [`crate::with_store`] or inserted into [`crate::Builder`]) + /// + /// # Examples + /// ``` + /// + /// tauri::Builder::default() + /// .plugin(tauri_plugin_store::Builder::default().build()) + /// .setup(|app| { + /// let store = tauri_plugin_store::StoreBuilder::new(app, "store.json") + /// .auto_save(std::time::Duration::from_millis(100)) + /// .build(); + /// Ok(()) + /// }); + /// ``` + pub fn auto_save(mut self, debounce_duration: Duration) -> Self { + self.auto_save = Some(debounce_duration); + self + } + /// Builds the [`Store`]. /// /// # Examples /// ``` /// tauri::Builder::default() + /// .plugin(tauri_plugin_store::Builder::default().build()) /// .setup(|app| { - /// let store = tauri_plugin_store::StoreBuilder::new("store.json").build(app.handle().clone()); + /// let store = tauri_plugin_store::StoreBuilder::new(app, "store.json").build(); /// Ok(()) /// }); /// ``` - pub fn build(self, app: AppHandle) -> Store { + pub fn build(self) -> Store { + let collection = self.app.state::>(); + let mut stores = collection.stores.lock().unwrap(); + let store = stores + .get(&self.path) + .and_then(|store| store.upgrade()) + .unwrap_or_else(|| { + let mut store = StoreInner::new(self.app.clone(), self.path.clone()); + let _ = store.load(self.deserialize); + let store = Arc::new(Mutex::new(store)); + stores.insert( + self.path.clone(), + Arc::>>::downgrade(&store), + ); + store + }); + drop(stores); Store { - app, - path: self.path, defaults: self.defaults, - cache: self.cache, serialize: self.serialize, deserialize: self.deserialize, + auto_save: self.auto_save, + auto_save_debounce_sender: Arc::new(Mutex::new(None)), + store, } } } +pub(crate) enum AutoSaveMessage { + Reset, + Cancel, +} + #[derive(Clone)] -pub struct Store { +pub struct StoreInner { pub(crate) app: AppHandle, pub(crate) path: PathBuf, - defaults: Option>, pub(crate) cache: HashMap, - pub(crate) serialize: SerializeFn, - pub(crate) deserialize: DeserializeFn, } -impl Store { - pub fn save(&self) -> Result<(), Error> { +impl StoreInner { + pub fn new(app: AppHandle, path: PathBuf) -> Self { + Self { + app, + path, + cache: HashMap::new(), + } + } + + pub fn save(&self, serialize_fn: SerializeFn) -> crate::Result<()> { let app_dir = self .app .path() @@ -182,7 +244,7 @@ impl Store { create_dir_all(store_path.parent().expect("invalid store path"))?; - let bytes = (self.serialize)(&self.cache).map_err(Error::Serialize)?; + let bytes = serialize_fn(&self.cache).map_err(crate::Error::Serialize)?; let mut f = File::create(&store_path)?; f.write_all(&bytes)?; @@ -190,7 +252,7 @@ impl Store { } /// Update the store from the on-disk state - pub fn load(&mut self) -> Result<(), Error> { + pub fn load(&mut self, deserialize_fn: DeserializeFn) -> crate::Result<()> { let app_dir = self .app .path() @@ -201,23 +263,16 @@ impl Store { let bytes = read(store_path)?; self.cache - .extend((self.deserialize)(&bytes).map_err(Error::Deserialize)?); + .extend(deserialize_fn(&bytes).map_err(crate::Error::Deserialize)?); Ok(()) } - pub fn insert(&mut self, key: String, value: JsonValue) -> Result<(), Error> { + pub fn insert(&mut self, key: impl Into, value: impl Into) { + let key = key.into(); + let value = value.into(); self.cache.insert(key.clone(), value.clone()); - self.app.emit( - "store://change", - ChangePayload { - path: &self.path, - key: &key, - value: &value, - }, - )?; - - Ok(()) + let _ = self.emit_change_event(&key, &value); } pub fn get(&self, key: impl AsRef) -> Option<&JsonValue> { @@ -228,57 +283,36 @@ impl Store { self.cache.contains_key(key.as_ref()) } - pub fn delete(&mut self, key: impl AsRef) -> Result { + pub fn delete(&mut self, key: impl AsRef) -> bool { let flag = self.cache.remove(key.as_ref()).is_some(); if flag { - self.app.emit( - "store://change", - ChangePayload { - path: &self.path, - key: key.as_ref(), - value: &JsonValue::Null, - }, - )?; + let _ = self.emit_change_event(key.as_ref(), &JsonValue::Null); } - Ok(flag) + flag } - pub fn clear(&mut self) -> Result<(), Error> { + pub fn clear(&mut self) { let keys: Vec = self.cache.keys().cloned().collect(); self.cache.clear(); - for key in keys { - self.app.emit( - "store://change", - ChangePayload { - path: &self.path, - key: &key, - value: &JsonValue::Null, - }, - )?; + for key in &keys { + let _ = self.emit_change_event(key, &JsonValue::Null); } - Ok(()) } - pub fn reset(&mut self) -> Result<(), Error> { - let has_defaults = self.defaults.is_some(); - - if has_defaults { - if let Some(defaults) = &self.defaults { - for (key, value) in &self.cache { - if defaults.get(key) != Some(value) { - let _ = self.app.emit( - "store://change", - ChangePayload { - path: &self.path, - key, - value: defaults.get(key).unwrap_or(&JsonValue::Null), - }, - ); - } + pub fn reset(&mut self, defaults: &Option>) { + if let Some(defaults) = &defaults { + for (key, value) in &self.cache { + if defaults.get(key) != Some(value) { + let _ = + self.emit_change_event(key, defaults.get(key).unwrap_or(&JsonValue::Null)); } - self.cache.clone_from(defaults); } - Ok(()) + for (key, value) in defaults { + if !self.cache.contains_key(key) { + let _ = self.emit_change_event(key, value); + } + } + self.cache.clone_from(defaults); } else { self.clear() } @@ -303,14 +337,152 @@ impl Store { pub fn is_empty(&self) -> bool { self.cache.is_empty() } + + fn emit_change_event(&self, key: &str, value: &JsonValue) -> crate::Result<()> { + self.app.emit( + "store://change", + ChangePayload { + path: &self.path, + key, + value, + }, + )?; + Ok(()) + } } -impl std::fmt::Debug for Store { +impl std::fmt::Debug for StoreInner { fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { f.debug_struct("Store") .field("path", &self.path) - .field("defaults", &self.defaults) .field("cache", &self.cache) .finish() } } + +pub struct Store { + defaults: Option>, + serialize: SerializeFn, + deserialize: DeserializeFn, + auto_save: Option, + auto_save_debounce_sender: Arc>>>, + store: Arc>>, +} + +impl Resource for Store {} + +impl Store { + pub fn with_store( + &self, + f: impl FnOnce(&mut StoreInner) -> crate::Result, + ) -> crate::Result { + let mut store = self.store.lock().unwrap(); + f(&mut store) + } + + pub fn set(&self, key: impl Into, value: impl Into) { + self.store.lock().unwrap().insert(key.into(), value.into()); + let _ = self.trigger_auto_save(); + } + + pub fn get(&self, key: impl AsRef) -> Option { + self.store.lock().unwrap().get(key).cloned() + } + + pub fn has(&self, key: impl AsRef) -> bool { + self.store.lock().unwrap().has(key) + } + + pub fn delete(&self, key: impl AsRef) -> bool { + let deleted = self.store.lock().unwrap().delete(key); + if deleted { + let _ = self.trigger_auto_save(); + } + deleted + } + + pub fn clear(&self) { + self.store.lock().unwrap().clear(); + let _ = self.trigger_auto_save(); + } + + pub fn reset(&self) { + self.store.lock().unwrap().reset(&self.defaults); + let _ = self.trigger_auto_save(); + } + + pub fn keys(&self) -> Vec { + self.store.lock().unwrap().keys().cloned().collect() + } + + pub fn values(&self) -> Vec { + self.store.lock().unwrap().values().cloned().collect() + } + + pub fn entries(&self) -> Vec<(String, JsonValue)> { + self.store + .lock() + .unwrap() + .entries() + .map(|(k, v)| (k.to_owned(), v.to_owned())) + .collect() + } + + pub fn length(&self) -> usize { + self.store.lock().unwrap().len() + } + + pub fn load(&self) -> crate::Result<()> { + self.store.lock().unwrap().load(self.deserialize) + } + + pub fn save(&self) -> crate::Result<()> { + self.store.lock().unwrap().save(self.serialize) + } + + fn trigger_auto_save(&self) -> crate::Result<()> { + let Some(auto_save_delay) = self.auto_save else { + return Ok(()); + }; + if auto_save_delay.is_zero() { + return self.save(); + } + let mut auto_save_debounce_sender = self.auto_save_debounce_sender.lock().unwrap(); + if let Some(ref sender) = *auto_save_debounce_sender { + let _ = sender.send(AutoSaveMessage::Reset); + return Ok(()); + } + let (sender, mut receiver) = unbounded_channel(); + auto_save_debounce_sender.replace(sender); + drop(auto_save_debounce_sender); + let store = self.store.clone(); + let serialize_fn = self.serialize; + let auto_save_debounce_sender = self.auto_save_debounce_sender.clone(); + tauri::async_runtime::spawn(async move { + loop { + select! { + should_cancel = receiver.recv() => { + if matches!(should_cancel, Some(AutoSaveMessage::Cancel) | None) { + return; + } + } + _ = sleep(auto_save_delay) => { + let _ = store.lock().unwrap().save(serialize_fn); + auto_save_debounce_sender.lock().unwrap().take(); + return; + } + }; + } + }); + Ok(()) + } +} + +impl Drop for Store { + fn drop(&mut self) { + let auto_save_debounce_sender = self.auto_save_debounce_sender.lock().unwrap(); + if let Some(ref sender) = *auto_save_debounce_sender { + let _ = sender.send(AutoSaveMessage::Cancel); + } + } +} From 7e5e34420b3facabb81d53ec40435007518da5b5 Mon Sep 17 00:00:00 2001 From: Tony <68118705+Legend-Master@users.noreply.github.com> Date: Wed, 2 Oct 2024 10:13:20 +0800 Subject: [PATCH 12/40] Cancel auto save on save (#1859) --- plugins/store/src/store.rs | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/plugins/store/src/store.rs b/plugins/store/src/store.rs index b18d0027..d610525d 100644 --- a/plugins/store/src/store.rs +++ b/plugins/store/src/store.rs @@ -437,6 +437,9 @@ impl Store { } pub fn save(&self) -> crate::Result<()> { + if let Some(sender) = self.auto_save_debounce_sender.lock().unwrap().take() { + let _ = sender.send(AutoSaveMessage::Cancel); + } self.store.lock().unwrap().save(self.serialize) } @@ -467,8 +470,8 @@ impl Store { } } _ = sleep(auto_save_delay) => { - let _ = store.lock().unwrap().save(serialize_fn); auto_save_debounce_sender.lock().unwrap().take(); + let _ = store.lock().unwrap().save(serialize_fn); return; } }; @@ -477,12 +480,3 @@ impl Store { Ok(()) } } - -impl Drop for Store { - fn drop(&mut self) { - let auto_save_debounce_sender = self.auto_save_debounce_sender.lock().unwrap(); - if let Some(ref sender) = *auto_save_debounce_sender { - let _ = sender.send(AutoSaveMessage::Cancel); - } - } -} From fb62d03f739004138ea5172f9adb512018e76fa8 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 07:02:42 -0300 Subject: [PATCH 13/40] publish new versions (#1807) Co-authored-by: lucasfernog --- .changes/pre.json | 13 +++++++++++++ Cargo.lock | 26 +++++++++++++------------- examples/api/CHANGELOG.md | 6 ++++++ examples/api/package.json | 4 ++-- examples/api/src-tauri/CHANGELOG.md | 12 ++++++++++++ examples/api/src-tauri/Cargo.toml | 16 ++++++++-------- plugins/cli/CHANGELOG.md | 4 ++++ plugins/cli/Cargo.toml | 2 +- plugins/deep-link/CHANGELOG.md | 4 ++++ plugins/deep-link/Cargo.toml | 2 +- plugins/dialog/CHANGELOG.md | 12 ++++++++++++ plugins/dialog/Cargo.toml | 4 ++-- plugins/fs/CHANGELOG.md | 4 ++++ plugins/fs/Cargo.toml | 2 +- plugins/http/CHANGELOG.md | 6 ++++++ plugins/http/Cargo.toml | 4 ++-- plugins/persisted-scope/CHANGELOG.md | 6 ++++++ plugins/persisted-scope/Cargo.toml | 4 ++-- plugins/positioner/CHANGELOG.md | 4 ++++ plugins/positioner/Cargo.toml | 2 +- plugins/positioner/package.json | 2 +- plugins/shell/CHANGELOG.md | 4 ++++ plugins/shell/Cargo.toml | 2 +- plugins/single-instance/CHANGELOG.md | 6 ++++++ plugins/single-instance/Cargo.toml | 4 ++-- plugins/sql/CHANGELOG.md | 4 ++++ plugins/sql/Cargo.toml | 2 +- plugins/store/CHANGELOG.md | 8 +++++++- plugins/store/Cargo.toml | 2 +- plugins/store/package.json | 2 +- plugins/updater/CHANGELOG.md | 6 ++++++ plugins/updater/Cargo.toml | 2 +- pnpm-lock.yaml | 2 +- 33 files changed, 140 insertions(+), 43 deletions(-) diff --git a/.changes/pre.json b/.changes/pre.json index 72d4ed59..922d3c45 100644 --- a/.changes/pre.json +++ b/.changes/pre.json @@ -4,18 +4,23 @@ ".changes/android-dialog-save.md", ".changes/barcode-dependencies.md", ".changes/barcode-scanner-validate-plist.md", + ".changes/cli-hidden-structs.md", ".changes/consolidate-permission-state.md", ".changes/deep-link-event.md", ".changes/deep-link-get-current-desktop.md", ".changes/deep-link-on-new-url.md", ".changes/deep-link-register-all.md", + ".changes/deep-link-space-in-path.md", ".changes/dialog-asset-scope.md", ".changes/dialog-file-response-non-exhaustive.md", ".changes/dialog-return-path.md", + ".changes/dialog-rfd-015.md", + ".changes/feat-multiple-sql-backends.md", ".changes/fix-barcodae-scanner-imports.md", ".changes/fix-clipboard-warnings-sdk.md", ".changes/fix-deep-link-config.md", ".changes/fix-fs-app-scopes.md", + ".changes/fix-fs-scope-unknown-path.md", ".changes/fix-fs-write-file-android.md", ".changes/fix-http-plugin-abort.md", ".changes/fix-ios-file-dialog-default-mode.md", @@ -37,17 +42,22 @@ ".changes/haptics-release.md", ".changes/iife-varname-spacing.md", ".changes/ios-dialog-save.md", + ".changes/native-dialog-button-text.md", ".changes/notification-body-optional-ios.md", ".changes/notification-permission-type-change.md", + ".changes/positioner-v2-handleIconState.md", ".changes/rc.md", ".changes/remove-target-sdk.md", ".changes/resolve-content-uris.md", ".changes/shell-open-regex-match-string.md", ".changes/shell-regex-match-string.md", + ".changes/shell-schema-required-sidcar.md", ".changes/single-instance-deep-link.md", ".changes/single-instance-optional-deep-link.md", ".changes/single-instance-windows-sys.0.59.md", ".changes/sql-uuid-type.md", + ".changes/store-api-refactor.md", + ".changes/store-auto-save.md", ".changes/store-remove-mobile-plugin.md", ".changes/swift-build-older-versions.md", ".changes/tauri-rc-8.md", @@ -55,6 +65,9 @@ ".changes/update-geolocation-api.md", ".changes/update-tauri-rc-12.md", ".changes/update-tauri-rc-3.md", + ".changes/updater-endpoint-version-encoded.md", + ".changes/updater-endpoints-result.md", + ".changes/updater-insecure-transport-protocol.md", ".changes/updater-js-headers-download-crate.md", ".changes/updater-js-headers-download.md", ".changes/window-state-physical-size.md" diff --git a/Cargo.lock b/Cargo.lock index 8afbabde..214a2b8d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -218,7 +218,7 @@ checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "api" -version = "2.0.0-rc.7" +version = "2.0.0-rc.8" dependencies = [ "log", "serde", @@ -6670,7 +6670,7 @@ dependencies = [ [[package]] name = "tauri-plugin-cli" -version = "2.0.0-rc.1" +version = "2.0.0-rc.2" dependencies = [ "clap", "log", @@ -6697,7 +6697,7 @@ dependencies = [ [[package]] name = "tauri-plugin-deep-link" -version = "2.0.0-rc.6" +version = "2.0.0-rc.7" dependencies = [ "dunce", "log", @@ -6715,7 +6715,7 @@ dependencies = [ [[package]] name = "tauri-plugin-dialog" -version = "2.0.0-rc.7" +version = "2.0.0-rc.8" dependencies = [ "log", "raw-window-handle", @@ -6731,7 +6731,7 @@ dependencies = [ [[package]] name = "tauri-plugin-fs" -version = "2.0.0-rc.5" +version = "2.0.0-rc.6" dependencies = [ "anyhow", "dunce", @@ -6791,7 +6791,7 @@ dependencies = [ [[package]] name = "tauri-plugin-http" -version = "2.0.0-rc.5" +version = "2.0.0-rc.6" dependencies = [ "data-url", "http", @@ -6895,7 +6895,7 @@ dependencies = [ [[package]] name = "tauri-plugin-persisted-scope" -version = "2.0.0-rc.5" +version = "2.0.0-rc.6" dependencies = [ "aho-corasick", "bincode", @@ -6909,7 +6909,7 @@ dependencies = [ [[package]] name = "tauri-plugin-positioner" -version = "2.0.0-rc.1" +version = "2.0.0-rc.2" dependencies = [ "log", "serde", @@ -6930,7 +6930,7 @@ dependencies = [ [[package]] name = "tauri-plugin-shell" -version = "2.0.0-rc.3" +version = "2.0.0-rc.4" dependencies = [ "encoding_rs", "log", @@ -6949,7 +6949,7 @@ dependencies = [ [[package]] name = "tauri-plugin-single-instance" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" dependencies = [ "log", "semver", @@ -6964,7 +6964,7 @@ dependencies = [ [[package]] name = "tauri-plugin-sql" -version = "2.0.0-rc.2" +version = "2.0.0-rc.3" dependencies = [ "futures-core", "indexmap 2.5.0", @@ -6981,7 +6981,7 @@ dependencies = [ [[package]] name = "tauri-plugin-store" -version = "2.0.0-rc.3" +version = "2.0.0-rc.4" dependencies = [ "dunce", "log", @@ -7016,7 +7016,7 @@ dependencies = [ [[package]] name = "tauri-plugin-updater" -version = "2.0.0-rc.3" +version = "2.0.0-rc.4" dependencies = [ "base64 0.22.1", "dirs 5.0.1", diff --git a/examples/api/CHANGELOG.md b/examples/api/CHANGELOG.md index 07e31aae..73471a13 100644 --- a/examples/api/CHANGELOG.md +++ b/examples/api/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.0-rc.5] + +### Dependencies + +- Upgraded to `store-js@2.0.0-rc.2` + ## \[2.0.0-rc.4] ### Dependencies diff --git a/examples/api/package.json b/examples/api/package.json index f5426331..bde55fd1 100644 --- a/examples/api/package.json +++ b/examples/api/package.json @@ -1,7 +1,7 @@ { "name": "svelte-app", "private": true, - "version": "2.0.0-rc.4", + "version": "2.0.0-rc.5", "type": "module", "scripts": { "dev": "vite --clearScreen false", @@ -25,7 +25,7 @@ "@tauri-apps/plugin-os": "2.0.0-rc.1", "@tauri-apps/plugin-process": "2.0.0-rc.1", "@tauri-apps/plugin-shell": "2.0.0-rc.1", - "@tauri-apps/plugin-store": "2.0.0-rc.1", + "@tauri-apps/plugin-store": "2.0.0-rc.2", "@tauri-apps/plugin-updater": "2.0.0-rc.2", "@zerodevx/svelte-json-view": "1.0.11" }, diff --git a/examples/api/src-tauri/CHANGELOG.md b/examples/api/src-tauri/CHANGELOG.md index 63b7e477..d2c25fcc 100644 --- a/examples/api/src-tauri/CHANGELOG.md +++ b/examples/api/src-tauri/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## \[2.0.0-rc.8] + +### Dependencies + +- Upgraded to `cli@2.0.0-rc.2` +- Upgraded to `dialog@2.0.0-rc.8` +- Upgraded to `fs@2.0.0-rc.6` +- Upgraded to `shell@2.0.0-rc.4` +- Upgraded to `store@2.0.0-rc.4` +- Upgraded to `updater@2.0.0-rc.4` +- Upgraded to `http@2.0.0-rc.6` + ## \[2.0.0-rc.7] ### Dependencies diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml index 4fdb6fdf..ac9d537a 100644 --- a/examples/api/src-tauri/Cargo.toml +++ b/examples/api/src-tauri/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "api" publish = false -version = "2.0.0-rc.7" +version = "2.0.0-rc.8" description = "An example Tauri Application showcasing the api" edition = "2021" rust-version = { workspace = true } @@ -20,21 +20,21 @@ serde = { workspace = true } tiny_http = "0.12" log = { workspace = true } tauri-plugin-log = { path = "../../../plugins/log", version = "2.0.0-rc.2" } -tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.0.0-rc.5", features = [ +tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.0.0-rc.6", features = [ "watch", ] } tauri-plugin-clipboard-manager = { path = "../../../plugins/clipboard-manager", version = "2.0.0-rc.4" } -tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.0.0-rc.7" } +tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.0.0-rc.8" } tauri-plugin-http = { path = "../../../plugins/http", features = [ "multipart", -], version = "2.0.0-rc.5" } +], version = "2.0.0-rc.6" } tauri-plugin-notification = { path = "../../../plugins/notification", version = "2.0.0-rc.5", features = [ "windows7-compat", ] } tauri-plugin-os = { path = "../../../plugins/os", version = "2.0.0-rc.1" } tauri-plugin-process = { path = "../../../plugins/process", version = "2.0.0-rc.1" } -tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.0.0-rc.3" } -tauri-plugin-store = { path = "../../../plugins/store", version = "2.0.0-rc.3" } +tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.0.0-rc.4" } +tauri-plugin-store = { path = "../../../plugins/store", version = "2.0.0-rc.4" } [dependencies.tauri] workspace = true @@ -50,9 +50,9 @@ features = [ ] [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.0.0-rc.1" } +tauri-plugin-cli = { path = "../../../plugins/cli", version = "2.0.0-rc.2" } tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut", version = "2.0.0-rc.2" } -tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.0.0-rc.3" } +tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.0.0-rc.4" } tauri-plugin-window-state = { path = "../../../plugins/window-state", version = "2.0.0-rc.3" } [target."cfg(any(target_os = \"android\", target_os = \"ios\"))".dependencies] diff --git a/plugins/cli/CHANGELOG.md b/plugins/cli/CHANGELOG.md index 3a6da093..20a19788 100644 --- a/plugins/cli/CHANGELOG.md +++ b/plugins/cli/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0-rc.2] + +- [`68579934`](https://github.com/tauri-apps/plugins-workspace/commit/68579934c93f6ed2edbc97474560d6a8a00e8f70) ([#1856](https://github.com/tauri-apps/plugins-workspace/pull/1856) by [@amrbashir](https://github.com/tauri-apps/plugins-workspace/../../amrbashir)) Expose `Matches`, `SubcommandMatches` and `ArgData` structs. + ## \[2.0.0-rc.1] - [`e2e97db5`](https://github.com/tauri-apps/plugins-workspace/commit/e2e97db51983267f5be84d4f6f0278d58834d1f5) ([#1701](https://github.com/tauri-apps/plugins-workspace/pull/1701) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Update to tauri 2.0.0-rc.8 diff --git a/plugins/cli/Cargo.toml b/plugins/cli/Cargo.toml index ccecff05..cdc6cb94 100644 --- a/plugins/cli/Cargo.toml +++ b/plugins/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-cli" -version = "2.0.0-rc.1" +version = "2.0.0-rc.2" description = "Parse arguments from your Tauri application's command line interface." edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/deep-link/CHANGELOG.md b/plugins/deep-link/CHANGELOG.md index 4b1a6c39..1e12c678 100644 --- a/plugins/deep-link/CHANGELOG.md +++ b/plugins/deep-link/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0-rc.7] + +- [`3168e176`](https://github.com/tauri-apps/plugins-workspace/commit/3168e176031a61215be542595ba90ca51f8f2d97) ([#1806](https://github.com/tauri-apps/plugins-workspace/pull/1806) by [@auggiebennett](https://github.com/tauri-apps/plugins-workspace/../../auggiebennett)) Fix fails to start when having spaces in the main binary path on Windows + ## \[2.0.0-rc.6] - [`6f3f6679`](https://github.com/tauri-apps/plugins-workspace/commit/6f3f66794a87ef9d1c16667c425d5ad7091a9c2f) ([#1780](https://github.com/tauri-apps/plugins-workspace/pull/1780)) Added `DeepLink::on_open_url` function to match the JavaScript API implementation, diff --git a/plugins/deep-link/Cargo.toml b/plugins/deep-link/Cargo.toml index 9a085493..d1280495 100644 --- a/plugins/deep-link/Cargo.toml +++ b/plugins/deep-link/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-deep-link" -version = "2.0.0-rc.6" +version = "2.0.0-rc.7" description = "Set your Tauri application as the default handler for an URL" authors = { workspace = true } license = { workspace = true } diff --git a/plugins/dialog/CHANGELOG.md b/plugins/dialog/CHANGELOG.md index 54117e16..22019e39 100644 --- a/plugins/dialog/CHANGELOG.md +++ b/plugins/dialog/CHANGELOG.md @@ -1,5 +1,17 @@ # Changelog +## \[2.0.0-rc.8] + +- [`6bf1bd8d`](https://github.com/tauri-apps/plugins-workspace/commit/6bf1bd8d44bb95618590aa066e638509b014e0f9) ([#1805](https://github.com/tauri-apps/plugins-workspace/pull/1805) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Update rfd to 0.15 + +### Dependencies + +- Upgraded to `fs@2.0.0-rc.6` + +### breaking + +- [`04459afb`](https://github.com/tauri-apps/plugins-workspace/commit/04459afbb67aafa5cd57e6a148c2beb0a8d3e04a) ([#1842](https://github.com/tauri-apps/plugins-workspace/pull/1842) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) Changed `MessageDialogBuilder::ok_button_label` and `MessageDialogBuilder::cancel_button_label` to `MessageDialogBuilder::buttons` which takes an enum now + ## \[2.0.0-rc.7] ### Dependencies diff --git a/plugins/dialog/Cargo.toml b/plugins/dialog/Cargo.toml index 75327f74..6040b794 100644 --- a/plugins/dialog/Cargo.toml +++ b/plugins/dialog/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-dialog" -version = "2.0.0-rc.7" +version = "2.0.0-rc.8" description = "Native system dialogs for opening and saving files along with message dialogs on your Tauri application." edition = { workspace = true } authors = { workspace = true } @@ -34,7 +34,7 @@ tauri = { workspace = true } log = { workspace = true } thiserror = { workspace = true } url = { workspace = true } -tauri-plugin-fs = { path = "../fs", version = "2.0.0-rc.5" } +tauri-plugin-fs = { path = "../fs", version = "2.0.0-rc.6" } [target.'cfg(target_os = "ios")'.dependencies] tauri = { workspace = true, features = ["wry"] } diff --git a/plugins/fs/CHANGELOG.md b/plugins/fs/CHANGELOG.md index 8f04d893..6a7954c6 100644 --- a/plugins/fs/CHANGELOG.md +++ b/plugins/fs/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0-rc.6] + +- [`fc9b189e`](https://github.com/tauri-apps/plugins-workspace/commit/fc9b189e83a29bd750714ec6336133c6eabdfa20) ([#1837](https://github.com/tauri-apps/plugins-workspace/pull/1837) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Fix failing to deserialize capability file when using an OS specific path in the scope that is not available on the current OS. + ## \[2.0.0-rc.5] - [`cc03ccf5`](https://github.com/tauri-apps/plugins-workspace/commit/cc03ccf5e0e4be8bbf50bbdebe957c84be7f779b) ([#1774](https://github.com/tauri-apps/plugins-workspace/pull/1774)) Fix `scope-app`, `scope-app-recursive` and `scope-index` not properly enabling the application paths. diff --git a/plugins/fs/Cargo.toml b/plugins/fs/Cargo.toml index 2b4ffcea..fb9c9c71 100644 --- a/plugins/fs/Cargo.toml +++ b/plugins/fs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-fs" -version = "2.0.0-rc.5" +version = "2.0.0-rc.6" description = "Access the file system." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/http/CHANGELOG.md b/plugins/http/CHANGELOG.md index 864b756c..35b261af 100644 --- a/plugins/http/CHANGELOG.md +++ b/plugins/http/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.0-rc.6] + +### Dependencies + +- Upgraded to `fs@2.0.0-rc.6` + ## \[2.0.0-rc.5] ### Dependencies diff --git a/plugins/http/Cargo.toml b/plugins/http/Cargo.toml index 057780c5..6ff3419a 100644 --- a/plugins/http/Cargo.toml +++ b/plugins/http/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-http" -version = "2.0.0-rc.5" +version = "2.0.0-rc.6" description = "Access an HTTP client written in Rust." edition = { workspace = true } authors = { workspace = true } @@ -34,7 +34,7 @@ serde_json = { workspace = true } tauri = { workspace = true } thiserror = { workspace = true } tokio = { version = "1", features = ["sync", "macros"] } -tauri-plugin-fs = { path = "../fs", version = "2.0.0-rc.5" } +tauri-plugin-fs = { path = "../fs", version = "2.0.0-rc.6" } urlpattern = "0.3" regex = "1" http = "1" diff --git a/plugins/persisted-scope/CHANGELOG.md b/plugins/persisted-scope/CHANGELOG.md index 8ffd0c0e..4ea413bb 100644 --- a/plugins/persisted-scope/CHANGELOG.md +++ b/plugins/persisted-scope/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.0-rc.6] + +### Dependencies + +- Upgraded to `fs@2.0.0-rc.6` + ## \[2.0.0-rc.5] ### Dependencies diff --git a/plugins/persisted-scope/Cargo.toml b/plugins/persisted-scope/Cargo.toml index df924ea4..caee3522 100644 --- a/plugins/persisted-scope/Cargo.toml +++ b/plugins/persisted-scope/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-persisted-scope" -version = "2.0.0-rc.5" +version = "2.0.0-rc.6" description = "Save filesystem and asset scopes and restore them when the app is reopened." authors = { workspace = true } license = { workspace = true } @@ -27,7 +27,7 @@ log = { workspace = true } thiserror = { workspace = true } aho-corasick = "1" bincode = "1" -tauri-plugin-fs = { path = "../fs", version = "2.0.0-rc.5" } +tauri-plugin-fs = { path = "../fs", version = "2.0.0-rc.6" } [features] protocol-asset = ["tauri/protocol-asset"] diff --git a/plugins/positioner/CHANGELOG.md b/plugins/positioner/CHANGELOG.md index 4b11283f..8372e591 100644 --- a/plugins/positioner/CHANGELOG.md +++ b/plugins/positioner/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0-rc.2] + +- [`2f7e32b5`](https://github.com/tauri-apps/plugins-workspace/commit/2f7e32b5e07454d6c0cf3ab03f8af8da74c4a8a7) ([#1822](https://github.com/tauri-apps/plugins-workspace/pull/1822) by [@jbolda](https://github.com/tauri-apps/plugins-workspace/../../jbolda)) `handleIconState` function for use in JavaScript event handlers. This allows one to update the TrayIcon state through JavaScript and fully create and handle the TrayIcon without requiring Rust (and the side-effect of creating a TrayIcon). + ## \[2.0.0-rc.1] - [`e2e97db5`](https://github.com/tauri-apps/plugins-workspace/commit/e2e97db51983267f5be84d4f6f0278d58834d1f5) ([#1701](https://github.com/tauri-apps/plugins-workspace/pull/1701) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Update to tauri 2.0.0-rc.8 diff --git a/plugins/positioner/Cargo.toml b/plugins/positioner/Cargo.toml index 757bfac0..a99250cf 100644 --- a/plugins/positioner/Cargo.toml +++ b/plugins/positioner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-positioner" -version = "2.0.0-rc.1" +version = "2.0.0-rc.2" description = "Position your windows at well-known locations." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/positioner/package.json b/plugins/positioner/package.json index 5eb9027a..a39d33d1 100644 --- a/plugins/positioner/package.json +++ b/plugins/positioner/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-positioner", - "version": "2.0.0-rc.1", + "version": "2.0.0-rc.2", "description": "Position your windows at well-known locations.", "license": "MIT or APACHE-2.0", "authors": [ diff --git a/plugins/shell/CHANGELOG.md b/plugins/shell/CHANGELOG.md index 0a9eebbb..d57b07e9 100644 --- a/plugins/shell/CHANGELOG.md +++ b/plugins/shell/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0-rc.4] + +- [`44273b98`](https://github.com/tauri-apps/plugins-workspace/commit/44273b988957a254eff715d6be7547d2ace882e1) ([#1839](https://github.com/tauri-apps/plugins-workspace/pull/1839) by [@amrbashir](https://github.com/tauri-apps/plugins-workspace/../../amrbashir)) Fix the plugin schema requiring to set `sidecar` property when it is in fact optional. + ## \[2.0.0-rc.1] - [`e2e97db5`](https://github.com/tauri-apps/plugins-workspace/commit/e2e97db51983267f5be84d4f6f0278d58834d1f5) ([#1701](https://github.com/tauri-apps/plugins-workspace/pull/1701) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Update to tauri 2.0.0-rc.8 diff --git a/plugins/shell/Cargo.toml b/plugins/shell/Cargo.toml index a045f0c2..860414e8 100644 --- a/plugins/shell/Cargo.toml +++ b/plugins/shell/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-shell" -version = "2.0.0-rc.3" +version = "2.0.0-rc.4" description = "Access the system shell. Allows you to spawn child processes and manage files and URLs using their default application." edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/single-instance/CHANGELOG.md b/plugins/single-instance/CHANGELOG.md index fbfa610a..1cb7f316 100644 --- a/plugins/single-instance/CHANGELOG.md +++ b/plugins/single-instance/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.0-rc.5] + +### Dependencies + +- Upgraded to `deep-link@2.0.0-rc.7` + ## \[2.0.0-rc.4] ### Dependencies diff --git a/plugins/single-instance/Cargo.toml b/plugins/single-instance/Cargo.toml index 1d6f0b95..22de8666 100644 --- a/plugins/single-instance/Cargo.toml +++ b/plugins/single-instance/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-single-instance" -version = "2.0.0-rc.4" +version = "2.0.0-rc.5" description = "Ensure a single instance of your tauri app is running." authors = { workspace = true } license = { workspace = true } @@ -26,7 +26,7 @@ serde_json = { workspace = true } tauri = { workspace = true } log = { workspace = true } thiserror = { workspace = true } -tauri-plugin-deep-link = { path = "../deep-link", version = "2.0.0-rc.6", optional = true } +tauri-plugin-deep-link = { path = "../deep-link", version = "2.0.0-rc.7", optional = true } semver = { version = "1", optional = true } [target."cfg(target_os = \"windows\")".dependencies.windows-sys] diff --git a/plugins/sql/CHANGELOG.md b/plugins/sql/CHANGELOG.md index 1d5fd993..5ef4ae39 100644 --- a/plugins/sql/CHANGELOG.md +++ b/plugins/sql/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0-rc.3] + +- [`30bcf5dc`](https://github.com/tauri-apps/plugins-workspace/commit/30bcf5dcc22e1bb1fb983a8d2887edc39404e6df) ([#1838](https://github.com/tauri-apps/plugins-workspace/pull/1838) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) It is now possible to enable multiple SQL backends at the same time. There will be no compile error anymore if no backends are enabled! + ## \[2.0.0-rc.2] - [`0dd97d91`](https://github.com/tauri-apps/plugins-workspace/commit/0dd97d911569cdedab07f504b708036d62ff83c1) ([#1375](https://github.com/tauri-apps/plugins-workspace/pull/1375) by [@KauanCurbani](https://github.com/tauri-apps/plugins-workspace/../../KauanCurbani)) Added support for `UUID` columns to the postgres implementation. diff --git a/plugins/sql/Cargo.toml b/plugins/sql/Cargo.toml index 4f4db76f..09570eb5 100644 --- a/plugins/sql/Cargo.toml +++ b/plugins/sql/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-sql" -version = "2.0.0-rc.2" +version = "2.0.0-rc.3" description = "Interface with SQL databases." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/store/CHANGELOG.md b/plugins/store/CHANGELOG.md index 3c46d597..9b7c2257 100644 --- a/plugins/store/CHANGELOG.md +++ b/plugins/store/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0-rc.2] + +- [`f12d3560`](https://github.com/tauri-apps/plugins-workspace/commit/f12d35609ab84f536c0f087665fdc1f978af3093) ([#1550](https://github.com/tauri-apps/plugins-workspace/pull/1550) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) **Breaking change**: Removed the `Store` constructor and added the `createStore` API. + ## \[2.0.0-rc.1] - [`e2e97db5`](https://github.com/tauri-apps/plugins-workspace/commit/e2e97db51983267f5be84d4f6f0278d58834d1f5) ([#1701](https://github.com/tauri-apps/plugins-workspace/pull/1701) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Update to tauri 2.0.0-rc.8 @@ -107,7 +111,9 @@ ps://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release! 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release! com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release! -eb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release! + eb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release! ps://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release! 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release! com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release! +plugins-workspace/pull/371)) First v2 alpha release! + com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release! diff --git a/plugins/store/Cargo.toml b/plugins/store/Cargo.toml index c2f8ddd9..f906603b 100644 --- a/plugins/store/Cargo.toml +++ b/plugins/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-store" -version = "2.0.0-rc.3" +version = "2.0.0-rc.4" description = "Simple, persistent key-value store." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/store/package.json b/plugins/store/package.json index 54ab7936..314e0962 100644 --- a/plugins/store/package.json +++ b/plugins/store/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-store", - "version": "2.0.0-rc.1", + "version": "2.0.0-rc.2", "description": "Simple, persistent key-value store.", "license": "MIT or APACHE-2.0", "authors": [ diff --git a/plugins/updater/CHANGELOG.md b/plugins/updater/CHANGELOG.md index a714a4ec..220f3df5 100644 --- a/plugins/updater/CHANGELOG.md +++ b/plugins/updater/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.0-rc.4] + +- [`221f50f5`](https://github.com/tauri-apps/plugins-workspace/commit/221f50f53bd7a87dbd404e4cb1aaf502a5047785) ([#1816](https://github.com/tauri-apps/plugins-workspace/pull/1816) by [@amrbashir](https://github.com/tauri-apps/plugins-workspace/../../amrbashir)) Encode `+` when making updater requests which can be cause incorrectly interpolating the endpoint when using `{{current_version}}` in the endpoint where the current version contains a build number, for example `1.8.0+1`. +- [`04a0aea0`](https://github.com/tauri-apps/plugins-workspace/commit/04a0aea0ab9f8750200bc2fe5aff99c1c488082d) ([#1814](https://github.com/tauri-apps/plugins-workspace/pull/1814) by [@amrbashir](https://github.com/tauri-apps/plugins-workspace/../../amrbashir)) **Breaking change**, Changed `UpdaterBuilder::endpoints` method to return a `Result`. +- [`04a0aea0`](https://github.com/tauri-apps/plugins-workspace/commit/04a0aea0ab9f8750200bc2fe5aff99c1c488082d) ([#1814](https://github.com/tauri-apps/plugins-workspace/pull/1814) by [@amrbashir](https://github.com/tauri-apps/plugins-workspace/../../amrbashir)) Add `dangerousInsecureTransportProtocol` config option to allow using insecure transport protocols, like `http` + ## \[2.0.0-rc.3] - [`d00519e3`](https://github.com/tauri-apps/plugins-workspace/commit/d00519e3e3a3234f9eb6c2ba82c92d4199f03e53) ([#1735](https://github.com/tauri-apps/plugins-workspace/pull/1735) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) This releases the changes from 2.0.0-rc.2 to crates.io. Please see the links below for the actual changes. diff --git a/plugins/updater/Cargo.toml b/plugins/updater/Cargo.toml index f2de9ecf..b0697acc 100644 --- a/plugins/updater/Cargo.toml +++ b/plugins/updater/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-updater" -version = "2.0.0-rc.3" +version = "2.0.0-rc.4" description = "In-app updates for Tauri applications." edition = { workspace = true } authors = { workspace = true } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 7480d338..9e6c5973 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -106,7 +106,7 @@ importers: specifier: 2.0.0-rc.1 version: link:../../plugins/shell '@tauri-apps/plugin-store': - specifier: 2.0.0-rc.1 + specifier: 2.0.0-rc.2 version: link:../../plugins/store '@tauri-apps/plugin-updater': specifier: 2.0.0-rc.2 From 58eab11faf27d33a4327524c6b2eb3c515b9b624 Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Wed, 2 Oct 2024 08:27:27 -0300 Subject: [PATCH 14/40] chore: document supported platforms on README, clarify unsupported APIs (#1857) closes #1795 --- examples/api/vite.config.js | 7 ------- plugins/autostart/README.md | 10 +++++++++- plugins/barcode-scanner/README.md | 8 ++++++++ plugins/biometric/README.md | 8 ++++++++ plugins/cli/README.md | 8 +++++++- plugins/clipboard-manager/README.md | 8 ++++++++ plugins/clipboard-manager/guest-js/index.ts | 15 +++++++++++++++ plugins/deep-link/README.md | 8 ++++++++ plugins/dialog/README.md | 8 ++++++++ plugins/fs/README.md | 8 ++++++++ plugins/geolocation/README.md | 8 ++++++++ plugins/global-shortcut/README.md | 8 +++++++- plugins/haptics/README.md | 8 ++++++++ plugins/http/README.md | 8 ++++++++ plugins/localhost/README.md | 8 ++++++++ plugins/log/README.md | 8 ++++++++ plugins/nfc/README.md | 8 ++++++++ plugins/notification/README.md | 8 ++++++++ plugins/os/README.md | 8 ++++++++ plugins/persisted-scope/Cargo.toml | 4 ++-- plugins/persisted-scope/README.md | 8 ++++++++ plugins/positioner/README.md | 8 ++++++++ plugins/process/README.md | 8 ++++++++ plugins/shell/README.md | 8 ++++++++ plugins/single-instance/README.md | 8 ++++++++ plugins/sql/README.md | 8 ++++++++ plugins/store/README.md | 8 ++++++++ plugins/stronghold/Cargo.toml | 6 +++--- plugins/stronghold/README.md | 10 +++++++++- plugins/updater/README.md | 8 +++++++- plugins/upload/Cargo.toml | 4 ++-- plugins/upload/README.md | 8 ++++++++ plugins/websocket/Cargo.toml | 4 ++-- plugins/websocket/README.md | 8 ++++++++ plugins/window-state/README.md | 8 ++++++++ shared/template/README.md | 8 ++++++++ 36 files changed, 263 insertions(+), 21 deletions(-) diff --git a/examples/api/vite.config.js b/examples/api/vite.config.js index 3b34cccd..f7d87db8 100644 --- a/examples/api/vite.config.js +++ b/examples/api/vite.config.js @@ -26,13 +26,6 @@ export default defineConfig(async () => { host: host || false, port: 5173, strictPort: true, - hmr: host - ? { - protocol: 'ws', - host, - port: 5183 - } - : undefined, fs: { allow: ['.', '../../tooling/api/dist'] } diff --git a/plugins/autostart/README.md b/plugins/autostart/README.md index 5855c989..93c74271 100644 --- a/plugins/autostart/README.md +++ b/plugins/autostart/README.md @@ -1,6 +1,14 @@ ![plugin-autostart](https://github.com/tauri-apps/plugins-workspace/raw/v2/plugins/autostart/banner.png) -Automatically launch your application at startup. Supports Windows, Mac (via AppleScript or Launch Agent), and Linux. +Automatically launch your application at startup. + +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | x | +| iOS | x | ## Install diff --git a/plugins/barcode-scanner/README.md b/plugins/barcode-scanner/README.md index ee983130..aca340bc 100644 --- a/plugins/barcode-scanner/README.md +++ b/plugins/barcode-scanner/README.md @@ -2,6 +2,14 @@ Allows your mobile application to use the camera to scan QR codes, EAN-13 and other kinds of barcodes. +| Platform | Supported | +| -------- | --------- | +| Linux | x | +| Windows | x | +| macOS | x | +| Android | ✓ | +| iOS | ✓ | + ## Install _This plugin requires a Rust version of at least **1.64**_ diff --git a/plugins/biometric/README.md b/plugins/biometric/README.md index bc4708c3..c97b8f9a 100644 --- a/plugins/biometric/README.md +++ b/plugins/biometric/README.md @@ -2,6 +2,14 @@ Prompt the user for biometric authentication on Android and iOS. +| Platform | Supported | +| -------- | --------- | +| Linux | x | +| Windows | x | +| macOS | x | +| Android | ✓ | +| iOS | ✓ | + ## Install _This plugin requires a Rust version of at least **1.65**_ diff --git a/plugins/cli/README.md b/plugins/cli/README.md index 362597b5..8f0e0e62 100644 --- a/plugins/cli/README.md +++ b/plugins/cli/README.md @@ -2,7 +2,13 @@ Parse arguments from your Command Line Interface. -- Supported platforms: Windows, Linux and macOS. +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | x | +| iOS | x | ## Install diff --git a/plugins/clipboard-manager/README.md b/plugins/clipboard-manager/README.md index 98ee2da0..e22df0f6 100644 --- a/plugins/clipboard-manager/README.md +++ b/plugins/clipboard-manager/README.md @@ -2,6 +2,14 @@ Read and write to the system clipboard. +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | ✓ | +| iOS | ✓ | + ## Install _This plugin requires a Rust version of at least **1.75**_ diff --git a/plugins/clipboard-manager/guest-js/index.ts b/plugins/clipboard-manager/guest-js/index.ts index d39e2f81..f7f31842 100644 --- a/plugins/clipboard-manager/guest-js/index.ts +++ b/plugins/clipboard-manager/guest-js/index.ts @@ -49,6 +49,11 @@ async function readText(): Promise { /** * Writes image buffer to the clipboard. + * + * #### Platform-specific + * + * - **Android / iOS:** Not supported. + * * @example * ```typescript * import { writeImage } from '@tauri-apps/plugin-clipboard-manager'; @@ -75,6 +80,11 @@ async function writeImage( /** * Gets the clipboard content as Uint8Array image. + * + * #### Platform-specific + * + * - **Android / iOS:** Not supported. + * * @example * ```typescript * import { readImage } from '@tauri-apps/plugin-clipboard-manager'; @@ -93,6 +103,11 @@ async function readImage(): Promise { /** * * Writes HTML or fallbacks to write provided plain text to the clipboard. + * + * #### Platform-specific + * + * - **Android / iOS:** Not supported. + * * @example * ```typescript * import { writeHtml, readHtml } from '@tauri-apps/plugin-clipboard-manager'; diff --git a/plugins/deep-link/README.md b/plugins/deep-link/README.md index e761fa68..8ecdc8f0 100644 --- a/plugins/deep-link/README.md +++ b/plugins/deep-link/README.md @@ -2,6 +2,14 @@ Set your Tauri application as the default handler for an URL. +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | ✓ | +| iOS | ✓ | + ## Install _This plugin requires a Rust version of at least **1.75**_ diff --git a/plugins/dialog/README.md b/plugins/dialog/README.md index 29c0a2c0..099e3939 100644 --- a/plugins/dialog/README.md +++ b/plugins/dialog/README.md @@ -2,6 +2,14 @@ Native system dialogs for opening and saving files along with message dialogs. +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | ✓ | +| iOS | ✓ | + ## Install _This plugin requires a Rust version of at least **1.75**_ diff --git a/plugins/fs/README.md b/plugins/fs/README.md index 8ced39c4..187d7622 100644 --- a/plugins/fs/README.md +++ b/plugins/fs/README.md @@ -2,6 +2,14 @@ Access the file system. +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | ✓ | +| iOS | ✓ | + ## Install _This plugin requires a Rust version of at least **1.75**_ diff --git a/plugins/geolocation/README.md b/plugins/geolocation/README.md index 57de24dd..1923727f 100644 --- a/plugins/geolocation/README.md +++ b/plugins/geolocation/README.md @@ -2,6 +2,14 @@ This plugin provides APIs for getting and tracking the device's current position, including information about altitude, heading, and speed (if available). +| Platform | Supported | +| -------- | --------- | +| Linux | x | +| Windows | x | +| macOS | x | +| Android | ✓ | +| iOS | ✓ | + ## Install _This plugin requires a Rust version of at least **1.75**_ diff --git a/plugins/global-shortcut/README.md b/plugins/global-shortcut/README.md index 68ee4b53..5978cae3 100644 --- a/plugins/global-shortcut/README.md +++ b/plugins/global-shortcut/README.md @@ -2,7 +2,13 @@ Register global shortcuts. -- Supported platforms: Windows, Linux and macOS. +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | x | +| iOS | x | ## Install diff --git a/plugins/haptics/README.md b/plugins/haptics/README.md index f29c8c32..42c9b455 100644 --- a/plugins/haptics/README.md +++ b/plugins/haptics/README.md @@ -4,6 +4,14 @@ Haptic feedback and vibrations on Android and iOS. There are no standards/requirements for vibration support on Android, so the `feedback` APIs may not work correctly on more affordable phones, including recently released ones. +| Platform | Supported | +| -------- | --------- | +| Linux | x | +| Windows | x | +| macOS | x | +| Android | ✓ | +| iOS | ✓ | + ## Install _This plugin requires a Rust version of at least **1.75**_ diff --git a/plugins/http/README.md b/plugins/http/README.md index d6c6a980..b45f8268 100644 --- a/plugins/http/README.md +++ b/plugins/http/README.md @@ -2,6 +2,14 @@ Access the HTTP client written in Rust. +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | ✓ | +| iOS | ✓ | + ## Install _This plugin requires a Rust version of at least **1.75**_ diff --git a/plugins/localhost/README.md b/plugins/localhost/README.md index 21d76429..b1e825de 100644 --- a/plugins/localhost/README.md +++ b/plugins/localhost/README.md @@ -2,6 +2,14 @@ Expose your apps assets through a localhost server instead of the default custom protocol. +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | ✓ | +| iOS | ✓ | + > Note: This plugins brings considerable security risks and you should only use it if you know what your are doing. If in doubt, use the default custom protocol implementation. ## Install diff --git a/plugins/log/README.md b/plugins/log/README.md index e1410ecf..9362fa25 100644 --- a/plugins/log/README.md +++ b/plugins/log/README.md @@ -2,6 +2,14 @@ Configurable logging for your Tauri app. +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | ✓ | +| iOS | ✓ | + ## Install _This plugin requires a Rust version of at least **1.75**_ diff --git a/plugins/nfc/README.md b/plugins/nfc/README.md index 7ad2213d..9427d7ca 100644 --- a/plugins/nfc/README.md +++ b/plugins/nfc/README.md @@ -2,6 +2,14 @@ Read and write NFC tags on Android and iOS. +| Platform | Supported | +| -------- | --------- | +| Linux | x | +| Windows | x | +| macOS | x | +| Android | ✓ | +| iOS | ✓ | + ## Install _This plugin requires a Rust version of at least **1.65**_ diff --git a/plugins/notification/README.md b/plugins/notification/README.md index 65fd4852..14977dbd 100644 --- a/plugins/notification/README.md +++ b/plugins/notification/README.md @@ -2,6 +2,14 @@ Send message notifications (brief auto-expiring OS window element) to your user. Can also be used with the Notification Web API. +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | ✓ | +| iOS | ✓ | + ## Install _This plugin requires a Rust version of at least **1.75**_ diff --git a/plugins/os/README.md b/plugins/os/README.md index 5d82e997..f84d123a 100644 --- a/plugins/os/README.md +++ b/plugins/os/README.md @@ -2,6 +2,14 @@ Read information about the operating system. +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | ✓ | +| iOS | ✓ | + ## Install _This plugin requires a Rust version of at least **1.75**_ diff --git a/plugins/persisted-scope/Cargo.toml b/plugins/persisted-scope/Cargo.toml index caee3522..19acc56b 100644 --- a/plugins/persisted-scope/Cargo.toml +++ b/plugins/persisted-scope/Cargo.toml @@ -16,8 +16,8 @@ rustdoc-args = ["--cfg", "docsrs"] windows = { level = "full", notes = "" } linux = { level = "full", notes = "" } macos = { level = "full", notes = "" } -android = { level = "none", notes = "" } -ios = { level = "none", notes = "" } +android = { level = "full", notes = "" } +ios = { level = "full", notes = "" } [dependencies] serde = { workspace = true } diff --git a/plugins/persisted-scope/README.md b/plugins/persisted-scope/README.md index 8be89f69..bf959443 100644 --- a/plugins/persisted-scope/README.md +++ b/plugins/persisted-scope/README.md @@ -2,6 +2,14 @@ Save filesystem and asset scopes and restore them when the app is reopened. +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | ✓ | +| iOS | ✓ | + ## Install _This plugin requires a Rust version of at least **1.75**_ diff --git a/plugins/positioner/README.md b/plugins/positioner/README.md index 3c8ac1d9..3652c162 100644 --- a/plugins/positioner/README.md +++ b/plugins/positioner/README.md @@ -4,6 +4,14 @@ Position your windows at well-known locations. This plugin is a port of [electron-positioner](https://github.com/jenslind/electron-positioner) for Tauri. +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | x | +| iOS | x | + ## Install _This plugin requires a Rust version of at least **1.75**_ diff --git a/plugins/process/README.md b/plugins/process/README.md index 89c04d5a..50c7634b 100644 --- a/plugins/process/README.md +++ b/plugins/process/README.md @@ -2,6 +2,14 @@ This plugin provides APIs to access the current process. To spawn child processes, see the [`shell`](https://github.com/tauri-apps/tauri-plugin-shell) plugin. +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | x | +| iOS | x | + ## Install _This plugin requires a Rust version of at least **1.75**_ diff --git a/plugins/shell/README.md b/plugins/shell/README.md index 25137648..c52b0eb4 100644 --- a/plugins/shell/README.md +++ b/plugins/shell/README.md @@ -2,6 +2,14 @@ Access the system shell. Allows you to spawn child processes and manage files and URLs using their default application. +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | ✓ | +| iOS | ✓ | + ## Install _This plugin requires a Rust version of at least **1.75**_ diff --git a/plugins/single-instance/README.md b/plugins/single-instance/README.md index bd761018..551ea72d 100644 --- a/plugins/single-instance/README.md +++ b/plugins/single-instance/README.md @@ -2,6 +2,14 @@ Ensure a single instance of your tauri app is running. +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | x | +| iOS | x | + ## Install _This plugin requires a Rust version of at least **1.75**_ diff --git a/plugins/sql/README.md b/plugins/sql/README.md index 24ba1bdf..a04e992a 100644 --- a/plugins/sql/README.md +++ b/plugins/sql/README.md @@ -2,6 +2,14 @@ Interface with SQL databases through [sqlx](https://github.com/launchbadge/sqlx). It supports the `sqlite`, `mysql` and `postgres` drivers, enabled by a Cargo feature. +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | ✓ | +| iOS | x | + ## Install _This plugin requires a Rust version of at least **1.75**_ diff --git a/plugins/store/README.md b/plugins/store/README.md index f7d65a0f..5ba41c80 100644 --- a/plugins/store/README.md +++ b/plugins/store/README.md @@ -2,6 +2,14 @@ Simple, persistent key-value store. +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | ✓ | +| iOS | ✓ | + ## Install _This plugin requires a Rust version of at least **1.75**_ diff --git a/plugins/stronghold/Cargo.toml b/plugins/stronghold/Cargo.toml index 374134dc..d979bb86 100644 --- a/plugins/stronghold/Cargo.toml +++ b/plugins/stronghold/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tauri-plugin-stronghold" version = "2.0.0-rc.1" -description = "Store secrets and keys using the IOTA Stronghold encrypted database." +description = "Store secrets and keys using the IOTA Stronghold secret management engine." authors = { workspace = true } license = { workspace = true } edition = { workspace = true } @@ -17,8 +17,8 @@ rustdoc-args = ["--cfg", "docsrs"] windows = { level = "full", notes = "" } linux = { level = "full", notes = "" } macos = { level = "full", notes = "" } -android = { level = "none", notes = "" } -ios = { level = "none", notes = "" } +android = { level = "full", notes = "" } +ios = { level = "full", notes = "" } [build-dependencies] tauri-plugin = { workspace = true, features = ["build"] } diff --git a/plugins/stronghold/README.md b/plugins/stronghold/README.md index fd1dae01..17bd125b 100644 --- a/plugins/stronghold/README.md +++ b/plugins/stronghold/README.md @@ -1,6 +1,14 @@ ![plugin-stronghold](https://github.com/tauri-apps/plugins-workspace/raw/v2/plugins/stronghold/banner.png) -Store secrets and keys using the [IOTA Stronghold](https://github.com/iotaledger/stronghold.rs) encrypted database and secure runtime. +Store secrets and keys using the [IOTA Stronghold](https://github.com/iotaledger/stronghold.rs) secret management engine. + +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | ✓ | +| iOS | ✓ | ## Install diff --git a/plugins/updater/README.md b/plugins/updater/README.md index 836a63b1..918e624f 100644 --- a/plugins/updater/README.md +++ b/plugins/updater/README.md @@ -2,7 +2,13 @@ In-app updates for Tauri applications. -- Supported platforms: Windows, Linux and macOS. +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | x | +| iOS | x | ## Install diff --git a/plugins/upload/Cargo.toml b/plugins/upload/Cargo.toml index d01f6bbe..8e2db6ba 100644 --- a/plugins/upload/Cargo.toml +++ b/plugins/upload/Cargo.toml @@ -17,8 +17,8 @@ rustdoc-args = ["--cfg", "docsrs"] windows = { level = "full", notes = "" } linux = { level = "full", notes = "" } macos = { level = "full", notes = "" } -android = { level = "none", notes = "" } -ios = { level = "none", notes = "" } +android = { level = "full", notes = "" } +ios = { level = "full", notes = "" } [build-dependencies] tauri-plugin = { workspace = true, features = ["build"] } diff --git a/plugins/upload/README.md b/plugins/upload/README.md index a675ad6a..bf6a734b 100644 --- a/plugins/upload/README.md +++ b/plugins/upload/README.md @@ -3,6 +3,14 @@ Upload files from disk to a remote server over HTTP. Download files from a remote HTTP server to disk. +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | ✓ | +| iOS | ✓ | + ## Install _This plugin requires a Rust version of at least **1.75**_ diff --git a/plugins/websocket/Cargo.toml b/plugins/websocket/Cargo.toml index 67c4a9ae..8fdb22b7 100644 --- a/plugins/websocket/Cargo.toml +++ b/plugins/websocket/Cargo.toml @@ -18,8 +18,8 @@ rustdoc-args = ["--cfg", "docsrs"] windows = { level = "full", notes = "" } linux = { level = "full", notes = "" } macos = { level = "full", notes = "" } -android = { level = "none", notes = "" } -ios = { level = "none", notes = "" } +android = { level = "full", notes = "" } +ios = { level = "full", notes = "" } [build-dependencies] tauri-plugin = { workspace = true, features = ["build"] } diff --git a/plugins/websocket/README.md b/plugins/websocket/README.md index db4d1ada..09a0f558 100644 --- a/plugins/websocket/README.md +++ b/plugins/websocket/README.md @@ -2,6 +2,14 @@ Expose a WebSocket server to your Tauri frontend. +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | ✓ | +| iOS | ✓ | + ## Install _This plugin requires a Rust version of at least **1.75**_ diff --git a/plugins/window-state/README.md b/plugins/window-state/README.md index 8781ea61..96133e15 100644 --- a/plugins/window-state/README.md +++ b/plugins/window-state/README.md @@ -2,6 +2,14 @@ Save window positions and sizes and restore them when the app is reopened. +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | x | +| iOS | x | + ## Install _This plugin requires a Rust version of at least **1.75**_ diff --git a/shared/template/README.md b/shared/template/README.md index 1dd0a09b..4387ef32 100644 --- a/shared/template/README.md +++ b/shared/template/README.md @@ -2,6 +2,14 @@ +| Platform | Supported | +| -------- | --------- | +| Linux | ✓ | +| Windows | ✓ | +| macOS | ✓ | +| Android | ✓ | +| iOS | ✓ | + ## Install _This plugin requires a Rust version of at least **1.75**_ From 654a7299c3f5b1ea3f6814dabd96d10bef42d8ed Mon Sep 17 00:00:00 2001 From: Amr Bashir Date: Wed, 2 Oct 2024 14:28:28 +0300 Subject: [PATCH 15/40] fix(positioner): pass correct values through IPC (#1858) * fix(positioner): pass correct values through IPC followup to https://github.com/tauri-apps/plugins-workspace/pull/1822 * build api & remove packageManager field --- plugins/autostart/package.json | 2 +- plugins/barcode-scanner/package.json | 2 +- plugins/biometric/package.json | 2 +- plugins/cli/package.json | 2 +- plugins/clipboard-manager/package.json | 2 +- plugins/deep-link/package.json | 2 +- plugins/dialog/package.json | 2 +- plugins/fs/package.json | 2 +- plugins/geolocation/package.json | 2 +- plugins/global-shortcut/package.json | 2 +- plugins/haptics/package.json | 2 +- plugins/http/package.json | 2 +- plugins/log/package.json | 2 +- plugins/nfc/package.json | 2 +- plugins/notification/package.json | 2 +- plugins/os/package.json | 2 +- plugins/positioner/README.md | 4 +- plugins/positioner/api-iife.js | 2 +- plugins/positioner/guest-js/index.ts | 18 ++++-- plugins/positioner/package.json | 2 +- plugins/process/package.json | 2 +- plugins/shell/package.json | 2 +- plugins/sql/package.json | 2 +- plugins/store/package.json | 2 +- plugins/stronghold/package.json | 2 +- plugins/updater/package.json | 2 +- plugins/upload/package.json | 2 +- plugins/websocket/package.json | 2 +- plugins/window-state/package.json | 2 +- pnpm-lock.yaml | 76 +++++++++++++------------- shared/template/package.json | 2 +- 31 files changed, 82 insertions(+), 72 deletions(-) diff --git a/plugins/autostart/package.json b/plugins/autostart/package.json index 9b9f54f6..b6ad5765 100644 --- a/plugins/autostart/package.json +++ b/plugins/autostart/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/barcode-scanner/package.json b/plugins/barcode-scanner/package.json index ec01ad21..eb3fa4fe 100644 --- a/plugins/barcode-scanner/package.json +++ b/plugins/barcode-scanner/package.json @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/biometric/package.json b/plugins/biometric/package.json index 9465cb26..74ba1593 100644 --- a/plugins/biometric/package.json +++ b/plugins/biometric/package.json @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/cli/package.json b/plugins/cli/package.json index 09a48618..77b705bf 100644 --- a/plugins/cli/package.json +++ b/plugins/cli/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/clipboard-manager/package.json b/plugins/clipboard-manager/package.json index a5fb15e9..572d0636 100644 --- a/plugins/clipboard-manager/package.json +++ b/plugins/clipboard-manager/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/deep-link/package.json b/plugins/deep-link/package.json index 11faee2b..7f5bb342 100644 --- a/plugins/deep-link/package.json +++ b/plugins/deep-link/package.json @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/dialog/package.json b/plugins/dialog/package.json index 41a80999..c12835d0 100644 --- a/plugins/dialog/package.json +++ b/plugins/dialog/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/fs/package.json b/plugins/fs/package.json index 7fd93a02..67f7fa1b 100644 --- a/plugins/fs/package.json +++ b/plugins/fs/package.json @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/geolocation/package.json b/plugins/geolocation/package.json index c846a61d..01f21fee 100644 --- a/plugins/geolocation/package.json +++ b/plugins/geolocation/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/global-shortcut/package.json b/plugins/global-shortcut/package.json index e0ecf02b..6ccc8216 100644 --- a/plugins/global-shortcut/package.json +++ b/plugins/global-shortcut/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/haptics/package.json b/plugins/haptics/package.json index 661b946e..07e82320 100644 --- a/plugins/haptics/package.json +++ b/plugins/haptics/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/http/package.json b/plugins/http/package.json index c58dd8af..82ee3ea6 100644 --- a/plugins/http/package.json +++ b/plugins/http/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/log/package.json b/plugins/log/package.json index 94fee1fc..c56b3445 100644 --- a/plugins/log/package.json +++ b/plugins/log/package.json @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/nfc/package.json b/plugins/nfc/package.json index ee2fa2a4..7a50a6fd 100644 --- a/plugins/nfc/package.json +++ b/plugins/nfc/package.json @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/notification/package.json b/plugins/notification/package.json index edee7118..d91f0cdb 100644 --- a/plugins/notification/package.json +++ b/plugins/notification/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/os/package.json b/plugins/os/package.json index fd3b8e75..d8759826 100644 --- a/plugins/os/package.json +++ b/plugins/os/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/positioner/README.md b/plugins/positioner/README.md index 3652c162..05a9b7f9 100644 --- a/plugins/positioner/README.md +++ b/plugins/positioner/README.md @@ -102,8 +102,8 @@ import { const action = async (event: TrayIconEvent) => { // add the handle in the action to update the state await handleIconState(event); - if ("click" in event) { - const { click } = event; + + if (event.type === "Click") { // note this option requires enabling the `tray-icon` // feature in the Cargo.toml await moveWindow(Position.TrayLeft); diff --git a/plugins/positioner/api-iife.js b/plugins/positioner/api-iife.js index 5504ebe8..bce8ee32 100644 --- a/plugins/positioner/api-iife.js +++ b/plugins/positioner/api-iife.js @@ -1 +1 @@ -if("__TAURI__"in window){var __TAURI_PLUGIN_POSITIONER__=function(t){"use strict";async function o(t,o={},e){return window.__TAURI_INTERNALS__.invoke(t,o,e)}var e;return"function"==typeof SuppressedError&&SuppressedError,t.Position=void 0,(e=t.Position||(t.Position={}))[e.TopLeft=0]="TopLeft",e[e.TopRight=1]="TopRight",e[e.BottomLeft=2]="BottomLeft",e[e.BottomRight=3]="BottomRight",e[e.TopCenter=4]="TopCenter",e[e.BottomCenter=5]="BottomCenter",e[e.LeftCenter=6]="LeftCenter",e[e.RightCenter=7]="RightCenter",e[e.Center=8]="Center",e[e.TrayLeft=9]="TrayLeft",e[e.TrayBottomLeft=10]="TrayBottomLeft",e[e.TrayRight=11]="TrayRight",e[e.TrayBottomRight=12]="TrayBottomRight",e[e.TrayCenter=13]="TrayCenter",e[e.TrayBottomCenter=14]="TrayBottomCenter",t.handleIconState=async function(t){await async function(t){await o("plugin:positioner|set_tray_icon_state",{position:t.position,size:t.size})}(t.rect)},t.moveWindow=async function(t){await o("plugin:positioner|move_window",{position:t})},t}({});Object.defineProperty(window.__TAURI__,"positioner",{value:__TAURI_PLUGIN_POSITIONER__})} +if("__TAURI__"in window){var __TAURI_PLUGIN_POSITIONER__=function(t){"use strict";async function e(t,e={},o){return window.__TAURI_INTERNALS__.invoke(t,e,o)}var o;return"function"==typeof SuppressedError&&SuppressedError,t.Position=void 0,(o=t.Position||(t.Position={}))[o.TopLeft=0]="TopLeft",o[o.TopRight=1]="TopRight",o[o.BottomLeft=2]="BottomLeft",o[o.BottomRight=3]="BottomRight",o[o.TopCenter=4]="TopCenter",o[o.BottomCenter=5]="BottomCenter",o[o.LeftCenter=6]="LeftCenter",o[o.RightCenter=7]="RightCenter",o[o.Center=8]="Center",o[o.TrayLeft=9]="TrayLeft",o[o.TrayBottomLeft=10]="TrayBottomLeft",o[o.TrayRight=11]="TrayRight",o[o.TrayBottomRight=12]="TrayBottomRight",o[o.TrayCenter=13]="TrayCenter",o[o.TrayBottomCenter=14]="TrayBottomCenter",t.handleIconState=async function(t){const o={};o[`${t.rect.size.type}`]={width:t.rect.size.width,height:t.rect.size.height};const i={};i[`${t.rect.position.type}`]={x:t.rect.position.x,y:t.rect.position.y},await e("plugin:positioner|set_tray_icon_state",{position:i,size:o})},t.moveWindow=async function(t){await e("plugin:positioner|move_window",{position:t})},t}({});Object.defineProperty(window.__TAURI__,"positioner",{value:__TAURI_PLUGIN_POSITIONER__})} diff --git a/plugins/positioner/guest-js/index.ts b/plugins/positioner/guest-js/index.ts index 319f80db..8ba1d609 100644 --- a/plugins/positioner/guest-js/index.ts +++ b/plugins/positioner/guest-js/index.ts @@ -40,12 +40,20 @@ export async function moveWindow(to: Position): Promise { } export async function handleIconState(event: TrayIconEvent): Promise { - await invokeSetTrayIconState(event.rect) -} + const size = {} as Record + size[`${event.rect.size.type}`] = { + width: event.rect.size.width, + height: event.rect.size.height + } + + const position = {} as Record + position[`${event.rect.position.type}`] = { + x: event.rect.position.x, + y: event.rect.position.y + } -async function invokeSetTrayIconState(rect: TrayIconEvent['rect']) { await invoke('plugin:positioner|set_tray_icon_state', { - position: rect.position, - size: rect.size + position, + size }) } diff --git a/plugins/positioner/package.json b/plugins/positioner/package.json index a39d33d1..de094257 100644 --- a/plugins/positioner/package.json +++ b/plugins/positioner/package.json @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/process/package.json b/plugins/process/package.json index 041ee6ec..9af4b822 100644 --- a/plugins/process/package.json +++ b/plugins/process/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/shell/package.json b/plugins/shell/package.json index 2786ba5f..3ba415db 100644 --- a/plugins/shell/package.json +++ b/plugins/shell/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/sql/package.json b/plugins/sql/package.json index 532f7e59..727eeda5 100644 --- a/plugins/sql/package.json +++ b/plugins/sql/package.json @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/store/package.json b/plugins/store/package.json index 314e0962..5b21fae7 100644 --- a/plugins/store/package.json +++ b/plugins/store/package.json @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/stronghold/package.json b/plugins/stronghold/package.json index 75ad663a..975ee521 100644 --- a/plugins/stronghold/package.json +++ b/plugins/stronghold/package.json @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/updater/package.json b/plugins/updater/package.json index acb38425..2f2e9069 100644 --- a/plugins/updater/package.json +++ b/plugins/updater/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/upload/package.json b/plugins/upload/package.json index 6b44bb00..a8f6c14e 100644 --- a/plugins/upload/package.json +++ b/plugins/upload/package.json @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/websocket/package.json b/plugins/websocket/package.json index c121cbe8..7a6fb96e 100644 --- a/plugins/websocket/package.json +++ b/plugins/websocket/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/plugins/window-state/package.json b/plugins/window-state/package.json index 0f5ee261..da5b719b 100644 --- a/plugins/window-state/package.json +++ b/plugins/window-state/package.json @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9e6c5973..be0db27b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -143,37 +143,37 @@ importers: plugins/autostart: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/barcode-scanner: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/biometric: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/cli: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/clipboard-manager: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/deep-link: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/deep-link/examples/app: @@ -198,79 +198,79 @@ importers: plugins/dialog: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/fs: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/geolocation: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/global-shortcut: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/haptics: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/http: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/log: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/nfc: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/notification: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/os: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/positioner: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/process: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/shell: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/single-instance/examples/vanilla: @@ -282,13 +282,13 @@ importers: plugins/sql: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/store: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/store/examples/AppSettingsManager: @@ -306,25 +306,25 @@ importers: plugins/stronghold: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/updater: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/upload: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/websocket: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 plugins/websocket/examples/tauri-app: @@ -346,7 +346,7 @@ importers: plugins/window-state: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.4 + specifier: ^2.0.0-rc.6 version: 2.0.0-rc.6 packages: @@ -2330,9 +2330,9 @@ snapshots: - encoding - mocha - '@covector/assemble@0.12.0': + '@covector/assemble@0.12.0(mocha@10.7.3)': dependencies: - '@covector/command': 0.8.0 + '@covector/command': 0.8.0(mocha@10.7.3) '@covector/files': 0.8.0 effection: 2.0.8(mocha@10.7.3) js-yaml: 4.1.0 @@ -2343,9 +2343,10 @@ snapshots: unified: 9.2.2 transitivePeerDependencies: - encoding + - mocha - supports-color - '@covector/changelog@0.12.0': + '@covector/changelog@0.12.0(mocha@10.7.3)': dependencies: '@covector/files': 0.8.0 effection: 2.0.8(mocha@10.7.3) @@ -2355,14 +2356,16 @@ snapshots: unified: 9.2.2 transitivePeerDependencies: - encoding + - mocha - supports-color - '@covector/command@0.8.0': + '@covector/command@0.8.0(mocha@10.7.3)': dependencies: - '@effection/process': 2.1.4 + '@effection/process': 2.1.4(mocha@10.7.3) effection: 2.0.8(mocha@10.7.3) transitivePeerDependencies: - encoding + - mocha '@covector/files@0.8.0': dependencies: @@ -2409,10 +2412,8 @@ snapshots: dependencies: effection: 2.0.8(mocha@10.7.3) mocha: 10.7.3 - transitivePeerDependencies: - - encoding - '@effection/process@2.1.4': + '@effection/process@2.1.4(mocha@10.7.3)': dependencies: cross-spawn: 7.0.3 ctrlc-windows: 2.1.0 @@ -2420,6 +2421,7 @@ snapshots: shellwords: 0.1.1 transitivePeerDependencies: - encoding + - mocha '@effection/stream@2.0.6': dependencies: @@ -3223,9 +3225,9 @@ snapshots: dependencies: '@clack/prompts': 0.7.0 '@covector/apply': 0.10.0(mocha@10.7.3) - '@covector/assemble': 0.12.0 - '@covector/changelog': 0.12.0 - '@covector/command': 0.8.0 + '@covector/assemble': 0.12.0(mocha@10.7.3) + '@covector/changelog': 0.12.0(mocha@10.7.3) + '@covector/command': 0.8.0(mocha@10.7.3) '@covector/files': 0.8.0 effection: 2.0.8(mocha@10.7.3) globby: 11.1.0 diff --git a/shared/template/package.json b/shared/template/package.json index 43fe2958..614dabb9 100644 --- a/shared/template/package.json +++ b/shared/template/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "2.0.0-rc.4" + "@tauri-apps/api": "^2.0.0-rc.6" } } From 0975a687a017dce014a5042f98b605198061a721 Mon Sep 17 00:00:00 2001 From: pajlada Date: Wed, 2 Oct 2024 13:29:34 +0200 Subject: [PATCH 16/40] fix: make package.json licenses SPDX compliant (#1861) * fix: make plugin template package.json license SPDX compliant * fix: make plugin package.json license SPDX compliant * fix: make root package.json license SPDX compliant --- package.json | 2 +- plugins/autostart/package.json | 2 +- plugins/barcode-scanner/package.json | 2 +- plugins/biometric/package.json | 2 +- plugins/cli/package.json | 2 +- plugins/clipboard-manager/package.json | 2 +- plugins/deep-link/package.json | 2 +- plugins/dialog/package.json | 2 +- plugins/fs/package.json | 2 +- plugins/geolocation/package.json | 2 +- plugins/global-shortcut/package.json | 2 +- plugins/haptics/package.json | 2 +- plugins/http/package.json | 2 +- plugins/log/package.json | 2 +- plugins/nfc/package.json | 2 +- plugins/notification/package.json | 2 +- plugins/os/package.json | 2 +- plugins/positioner/package.json | 2 +- plugins/process/package.json | 2 +- plugins/shell/package.json | 2 +- plugins/sql/package.json | 2 +- plugins/store/package.json | 2 +- plugins/stronghold/package.json | 2 +- plugins/updater/package.json | 2 +- plugins/upload/package.json | 2 +- plugins/websocket/package.json | 2 +- plugins/window-state/package.json | 2 +- shared/template/package.json | 2 +- 28 files changed, 28 insertions(+), 28 deletions(-) diff --git a/package.json b/package.json index 1cd01f8c..ae587a37 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "plugins-workspace", "private": true, - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "type": "module", "scripts": { "build": "pnpm run -r --parallel --filter !plugins-workspace --filter !\"./plugins/*/examples/**\" --filter !\"./examples/*\" build", diff --git a/plugins/autostart/package.json b/plugins/autostart/package.json index b6ad5765..ab11a465 100644 --- a/plugins/autostart/package.json +++ b/plugins/autostart/package.json @@ -1,7 +1,7 @@ { "name": "@tauri-apps/plugin-autostart", "version": "2.0.0-rc.1", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/barcode-scanner/package.json b/plugins/barcode-scanner/package.json index eb3fa4fe..9b53ea4c 100644 --- a/plugins/barcode-scanner/package.json +++ b/plugins/barcode-scanner/package.json @@ -2,7 +2,7 @@ "name": "@tauri-apps/plugin-barcode-scanner", "version": "2.0.0-rc.2", "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": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/biometric/package.json b/plugins/biometric/package.json index 74ba1593..9635ef95 100644 --- a/plugins/biometric/package.json +++ b/plugins/biometric/package.json @@ -1,7 +1,7 @@ { "name": "@tauri-apps/plugin-biometric", "version": "2.0.0-rc.1", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/cli/package.json b/plugins/cli/package.json index 77b705bf..454f8764 100644 --- a/plugins/cli/package.json +++ b/plugins/cli/package.json @@ -1,7 +1,7 @@ { "name": "@tauri-apps/plugin-cli", "version": "2.0.0-rc.1", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/clipboard-manager/package.json b/plugins/clipboard-manager/package.json index 572d0636..74a40cfc 100644 --- a/plugins/clipboard-manager/package.json +++ b/plugins/clipboard-manager/package.json @@ -1,7 +1,7 @@ { "name": "@tauri-apps/plugin-clipboard-manager", "version": "2.0.0-rc.2", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/deep-link/package.json b/plugins/deep-link/package.json index 7f5bb342..659655c1 100644 --- a/plugins/deep-link/package.json +++ b/plugins/deep-link/package.json @@ -2,7 +2,7 @@ "name": "@tauri-apps/plugin-deep-link", "version": "2.0.0-rc.2", "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": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/dialog/package.json b/plugins/dialog/package.json index c12835d0..ab1d908b 100644 --- a/plugins/dialog/package.json +++ b/plugins/dialog/package.json @@ -1,7 +1,7 @@ { "name": "@tauri-apps/plugin-dialog", "version": "2.0.0-rc.1", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/fs/package.json b/plugins/fs/package.json index 67f7fa1b..8e12f572 100644 --- a/plugins/fs/package.json +++ b/plugins/fs/package.json @@ -2,7 +2,7 @@ "name": "@tauri-apps/plugin-fs", "version": "2.0.0-rc.2", "description": "Access the file system.", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/geolocation/package.json b/plugins/geolocation/package.json index 01f21fee..f07899dc 100644 --- a/plugins/geolocation/package.json +++ b/plugins/geolocation/package.json @@ -1,7 +1,7 @@ { "name": "@tauri-apps/plugin-geolocation", "version": "2.0.0-rc.2", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/global-shortcut/package.json b/plugins/global-shortcut/package.json index 6ccc8216..23ebc501 100644 --- a/plugins/global-shortcut/package.json +++ b/plugins/global-shortcut/package.json @@ -1,7 +1,7 @@ { "name": "@tauri-apps/plugin-global-shortcut", "version": "2.0.0-rc.1", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/haptics/package.json b/plugins/haptics/package.json index 07e82320..6ead8ee4 100644 --- a/plugins/haptics/package.json +++ b/plugins/haptics/package.json @@ -1,7 +1,7 @@ { "name": "@tauri-apps/plugin-haptics", "version": "2.0.0-rc.1", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/http/package.json b/plugins/http/package.json index 82ee3ea6..5000b5fa 100644 --- a/plugins/http/package.json +++ b/plugins/http/package.json @@ -1,7 +1,7 @@ { "name": "@tauri-apps/plugin-http", "version": "2.0.0-rc.2", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/log/package.json b/plugins/log/package.json index c56b3445..b1a4bf67 100644 --- a/plugins/log/package.json +++ b/plugins/log/package.json @@ -2,7 +2,7 @@ "name": "@tauri-apps/plugin-log", "version": "2.0.0-rc.1", "description": "Configurable logging for your Tauri app.", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/nfc/package.json b/plugins/nfc/package.json index 7a50a6fd..9eb4f02f 100644 --- a/plugins/nfc/package.json +++ b/plugins/nfc/package.json @@ -1,7 +1,7 @@ { "name": "@tauri-apps/plugin-nfc", "version": "2.0.0-rc.1", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/notification/package.json b/plugins/notification/package.json index d91f0cdb..90808a01 100644 --- a/plugins/notification/package.json +++ b/plugins/notification/package.json @@ -1,7 +1,7 @@ { "name": "@tauri-apps/plugin-notification", "version": "2.0.0-rc.1", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/os/package.json b/plugins/os/package.json index d8759826..9bdcee04 100644 --- a/plugins/os/package.json +++ b/plugins/os/package.json @@ -1,7 +1,7 @@ { "name": "@tauri-apps/plugin-os", "version": "2.0.0-rc.1", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/positioner/package.json b/plugins/positioner/package.json index de094257..bd9408cf 100644 --- a/plugins/positioner/package.json +++ b/plugins/positioner/package.json @@ -2,7 +2,7 @@ "name": "@tauri-apps/plugin-positioner", "version": "2.0.0-rc.2", "description": "Position your windows at well-known locations.", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/process/package.json b/plugins/process/package.json index 9af4b822..cd743a7b 100644 --- a/plugins/process/package.json +++ b/plugins/process/package.json @@ -1,7 +1,7 @@ { "name": "@tauri-apps/plugin-process", "version": "2.0.0-rc.1", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/shell/package.json b/plugins/shell/package.json index 3ba415db..18ee7719 100644 --- a/plugins/shell/package.json +++ b/plugins/shell/package.json @@ -1,7 +1,7 @@ { "name": "@tauri-apps/plugin-shell", "version": "2.0.0-rc.1", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/sql/package.json b/plugins/sql/package.json index 727eeda5..304bdd41 100644 --- a/plugins/sql/package.json +++ b/plugins/sql/package.json @@ -2,7 +2,7 @@ "name": "@tauri-apps/plugin-sql", "version": "2.0.0-rc.1", "description": "Interface with SQL databases", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/store/package.json b/plugins/store/package.json index 5b21fae7..988e9e56 100644 --- a/plugins/store/package.json +++ b/plugins/store/package.json @@ -2,7 +2,7 @@ "name": "@tauri-apps/plugin-store", "version": "2.0.0-rc.2", "description": "Simple, persistent key-value store.", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/stronghold/package.json b/plugins/stronghold/package.json index 975ee521..bb054d51 100644 --- a/plugins/stronghold/package.json +++ b/plugins/stronghold/package.json @@ -2,7 +2,7 @@ "name": "@tauri-apps/plugin-stronghold", "version": "2.0.0-rc.1", "description": "Store secrets and keys using the IOTA Stronghold encrypted database.", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/updater/package.json b/plugins/updater/package.json index 2f2e9069..9c60d908 100644 --- a/plugins/updater/package.json +++ b/plugins/updater/package.json @@ -1,7 +1,7 @@ { "name": "@tauri-apps/plugin-updater", "version": "2.0.0-rc.2", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/upload/package.json b/plugins/upload/package.json index a8f6c14e..4650b236 100644 --- a/plugins/upload/package.json +++ b/plugins/upload/package.json @@ -2,7 +2,7 @@ "name": "@tauri-apps/plugin-upload", "version": "2.0.0-rc.1", "description": "Upload files from disk to a remote server over HTTP.", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/websocket/package.json b/plugins/websocket/package.json index 7a6fb96e..57b2c706 100644 --- a/plugins/websocket/package.json +++ b/plugins/websocket/package.json @@ -1,7 +1,7 @@ { "name": "@tauri-apps/plugin-websocket", "version": "2.0.0-rc.1", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/plugins/window-state/package.json b/plugins/window-state/package.json index da5b719b..2be791f5 100644 --- a/plugins/window-state/package.json +++ b/plugins/window-state/package.json @@ -2,7 +2,7 @@ "name": "@tauri-apps/plugin-window-state", "version": "2.0.0-rc.1", "description": "Save window positions and sizes and restore them when the app is reopened.", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], diff --git a/shared/template/package.json b/shared/template/package.json index 614dabb9..36cd017f 100644 --- a/shared/template/package.json +++ b/shared/template/package.json @@ -1,7 +1,7 @@ { "name": "@tauri-apps/plugin-PLUGIN_NAME", "version": "1.0.0", - "license": "MIT or APACHE-2.0", + "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" ], From e8069af80401cfc1e90297b786bef05a929ed9a6 Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Wed, 2 Oct 2024 12:08:37 -0300 Subject: [PATCH 17/40] feat: update to tauri v2 stable, promote all packages to 2.0.0 (#1863) * update to tauri v2 * covector setup * update locks * bump packages to v2 through covector, remove rc references * msrv 1.78 * downgrade 1.79 msrv dep * test clipboard * fmt * bitstream-io 2.3.0 * Revert "test clipboard" This reverts commit c3e19dbe59af7b471cdcc5b0c58f855c0ba18546. --- .changes/android-dialog-save.md | 5 - .changes/barcode-dependencies.md | 5 - .changes/barcode-scanner-validate-plist.md | 5 - .changes/cli-hidden-structs.md | 5 - .changes/config.json | 4 +- .changes/consolidate-permission-state.md | 10 - .changes/deep-link-event.md | 6 - .changes/deep-link-get-current-desktop.md | 6 - .changes/deep-link-on-new-url.md | 6 - .changes/deep-link-register-all.md | 5 - .changes/deep-link-space-in-path.md | 5 - .changes/dialog-asset-scope.md | 5 - .../dialog-file-response-non-exhaustive.md | 5 - .changes/dialog-return-path.md | 7 - .changes/dialog-rfd-015.md | 5 - .changes/feat-multiple-sql-backends.md | 5 - .changes/fix-barcodae-scanner-imports.md | 5 - .changes/fix-clipboard-warnings-sdk.md | 6 - .changes/fix-deep-link-config.md | 5 - .changes/fix-fs-app-scopes.md | 5 - .changes/fix-fs-scope-unknown-path.md | 5 - .changes/fix-fs-write-file-android.md | 5 - .changes/fix-http-plugin-abort.md | 5 - .changes/fix-ios-file-dialog-default-mode.md | 5 - .../fix-linux-updater-permission-error.md | 5 - .../fix-restore-minimized-window-position.md | 5 - .../fix-restore-minimized-window-state.md | 5 - .changes/fix-restore-window-state-deadlock.md | 5 - .../fix-upload-handle-non-success-download.md | 5 - .changes/fs-dialog-file-path-methods.md | 10 - .changes/fs-dialog-file-path-traits.md | 6 - .changes/fs-dialog-non-exhaustive-error.md | 6 - .changes/fs-dialog-safe-file-path.md | 6 - .changes/fs-scope-recursive-allow-read-dir.md | 5 - .changes/fs-windows-path.md | 5 - .changes/fs-write-file-utf8-chars.md | 5 - .changes/geolocation-permission-refactor.md | 5 - .changes/geolocation-release.md | 6 - .changes/global-shortcut-0.6.md | 5 - .changes/haptics-release.md | 6 - .changes/iife-varname-spacing.md | 9 - .changes/ios-dialog-save.md | 5 - .changes/native-dialog-button-text.md | 5 - .changes/notification-body-optional-ios.md | 5 - .../notification-permission-type-change.md | 5 - .changes/positioner-v2-handleIconState.md | 6 - .changes/pre.json | 75 ----- .changes/rc.md | 61 ---- .changes/remove-target-sdk.md | 15 - .changes/resolve-content-uris.md | 5 - .changes/shell-open-regex-match-string.md | 5 - .changes/shell-regex-match-string.md | 6 - .changes/shell-schema-required-sidcar.md | 6 - .changes/single-instance-deep-link.md | 5 - .../single-instance-optional-deep-link.md | 5 - .changes/single-instance-windows-sys.0.59.md | 5 - .changes/sql-uuid-type.md | 5 - .changes/store-api-refactor.md | 5 - .changes/store-auto-save.md | 7 - .changes/store-remove-mobile-plugin.md | 5 - .changes/swift-build-older-versions.md | 15 - .changes/tauri-rc-8.md | 61 ---- .changes/update-fs-api-docs.md | 5 - .changes/update-geolocation-api.md | 5 - .changes/update-tauri-rc-12.md | 5 - .changes/update-tauri-rc-3.md | 7 - .changes/updater-endpoint-version-encoded.md | 5 - .changes/updater-endpoints-result.md | 5 - .../updater-insecure-transport-protocol.md | 5 - .changes/updater-js-headers-download-crate.md | 5 - .changes/updater-js-headers-download.md | 5 - .changes/window-state-physical-size.md | 5 - .github/workflows/test-rust.yml | 2 +- Cargo.lock | 102 ++++--- Cargo.toml | 10 +- README.md | 2 +- examples/api/CHANGELOG.md | 23 ++ examples/api/package.json | 40 +-- examples/api/src-tauri/CHANGELOG.md | 23 ++ examples/api/src-tauri/Cargo.toml | 40 +-- plugins/autostart/CHANGELOG.md | 4 + plugins/autostart/Cargo.toml | 2 +- plugins/autostart/README.md | 4 +- plugins/autostart/package.json | 4 +- plugins/barcode-scanner/CHANGELOG.md | 4 + plugins/barcode-scanner/Cargo.toml | 2 +- plugins/barcode-scanner/README.md | 2 +- plugins/barcode-scanner/package.json | 4 +- plugins/biometric/CHANGELOG.md | 4 + plugins/biometric/Cargo.toml | 2 +- plugins/biometric/README.md | 2 +- plugins/biometric/package.json | 4 +- plugins/cli/CHANGELOG.md | 4 + plugins/cli/Cargo.toml | 2 +- plugins/cli/README.md | 4 +- plugins/cli/package.json | 4 +- plugins/clipboard-manager/CHANGELOG.md | 4 + plugins/clipboard-manager/Cargo.toml | 2 +- plugins/clipboard-manager/README.md | 4 +- plugins/clipboard-manager/package.json | 4 +- plugins/deep-link/CHANGELOG.md | 4 + plugins/deep-link/Cargo.toml | 2 +- plugins/deep-link/README.md | 4 +- plugins/deep-link/examples/app/CHANGELOG.md | 8 + plugins/deep-link/examples/app/package.json | 8 +- .../examples/app/src-tauri/Cargo.toml | 2 +- plugins/deep-link/package.json | 4 +- plugins/dialog/CHANGELOG.md | 8 + plugins/dialog/Cargo.toml | 4 +- plugins/dialog/README.md | 4 +- plugins/dialog/package.json | 4 +- plugins/fs/CHANGELOG.md | 4 + plugins/fs/Cargo.toml | 2 +- plugins/fs/README.md | 4 +- plugins/fs/package.json | 4 +- plugins/geolocation/CHANGELOG.md | 6 +- plugins/geolocation/Cargo.toml | 2 +- plugins/geolocation/README.md | 4 +- plugins/geolocation/package.json | 4 +- plugins/global-shortcut/CHANGELOG.md | 6 +- plugins/global-shortcut/Cargo.toml | 2 +- plugins/global-shortcut/README.md | 4 +- plugins/global-shortcut/package.json | 4 +- plugins/haptics/CHANGELOG.md | 4 + plugins/haptics/Cargo.toml | 2 +- plugins/haptics/README.md | 4 +- plugins/haptics/package.json | 4 +- plugins/http/CHANGELOG.md | 8 + plugins/http/Cargo.toml | 4 +- plugins/http/README.md | 4 +- plugins/http/package.json | 4 +- plugins/localhost/CHANGELOG.md | 4 + plugins/localhost/Cargo.toml | 2 +- plugins/localhost/README.md | 4 +- plugins/log/CHANGELOG.md | 4 + plugins/log/Cargo.toml | 2 +- plugins/log/README.md | 4 +- plugins/log/package.json | 4 +- plugins/nfc/CHANGELOG.md | 4 + plugins/nfc/Cargo.toml | 2 +- plugins/nfc/README.md | 2 +- plugins/nfc/package.json | 4 +- plugins/notification/CHANGELOG.md | 4 + plugins/notification/Cargo.toml | 2 +- plugins/notification/README.md | 4 +- plugins/notification/package.json | 4 +- plugins/os/CHANGELOG.md | 4 + plugins/os/Cargo.toml | 2 +- plugins/os/README.md | 4 +- plugins/os/package.json | 4 +- plugins/persisted-scope/CHANGELOG.md | 8 + plugins/persisted-scope/Cargo.toml | 4 +- plugins/persisted-scope/README.md | 4 +- plugins/positioner/CHANGELOG.md | 4 + plugins/positioner/Cargo.toml | 2 +- plugins/positioner/README.md | 4 +- plugins/positioner/package.json | 4 +- plugins/process/CHANGELOG.md | 4 + plugins/process/Cargo.toml | 2 +- plugins/process/README.md | 4 +- plugins/process/package.json | 4 +- plugins/shell/CHANGELOG.md | 4 + plugins/shell/Cargo.toml | 2 +- plugins/shell/README.md | 4 +- plugins/shell/package.json | 4 +- plugins/single-instance/CHANGELOG.md | 8 + plugins/single-instance/Cargo.toml | 4 +- plugins/single-instance/README.md | 4 +- .../examples/vanilla/package.json | 2 +- .../examples/vanilla/src-tauri/Cargo.toml | 2 +- plugins/sql/CHANGELOG.md | 4 + plugins/sql/Cargo.toml | 2 +- plugins/sql/README.md | 4 +- plugins/sql/package.json | 4 +- plugins/store/CHANGELOG.md | 6 +- plugins/store/Cargo.toml | 2 +- plugins/store/README.md | 4 +- .../examples/AppSettingsManager/package.json | 2 +- plugins/store/package.json | 4 +- plugins/stronghold/CHANGELOG.md | 4 + plugins/stronghold/Cargo.toml | 2 +- plugins/stronghold/README.md | 4 +- plugins/stronghold/package.json | 4 +- plugins/updater/CHANGELOG.md | 4 + plugins/updater/Cargo.toml | 2 +- plugins/updater/README.md | 4 +- plugins/updater/package.json | 4 +- plugins/upload/CHANGELOG.md | 4 + plugins/upload/Cargo.toml | 2 +- plugins/upload/README.md | 4 +- plugins/upload/package.json | 4 +- plugins/websocket/CHANGELOG.md | 4 + plugins/websocket/Cargo.toml | 2 +- plugins/websocket/README.md | 4 +- .../websocket/examples/tauri-app/package.json | 2 +- plugins/websocket/package.json | 4 +- plugins/window-state/CHANGELOG.md | 4 + plugins/window-state/Cargo.toml | 2 +- plugins/window-state/README.md | 4 +- plugins/window-state/package.json | 4 +- pnpm-lock.yaml | 284 +++++++++--------- shared/template/README.md | 4 +- shared/template/package.json | 2 +- 203 files changed, 584 insertions(+), 985 deletions(-) delete mode 100644 .changes/android-dialog-save.md delete mode 100644 .changes/barcode-dependencies.md delete mode 100644 .changes/barcode-scanner-validate-plist.md delete mode 100644 .changes/cli-hidden-structs.md delete mode 100644 .changes/consolidate-permission-state.md delete mode 100644 .changes/deep-link-event.md delete mode 100644 .changes/deep-link-get-current-desktop.md delete mode 100644 .changes/deep-link-on-new-url.md delete mode 100644 .changes/deep-link-register-all.md delete mode 100644 .changes/deep-link-space-in-path.md delete mode 100644 .changes/dialog-asset-scope.md delete mode 100644 .changes/dialog-file-response-non-exhaustive.md delete mode 100644 .changes/dialog-return-path.md delete mode 100644 .changes/dialog-rfd-015.md delete mode 100644 .changes/feat-multiple-sql-backends.md delete mode 100644 .changes/fix-barcodae-scanner-imports.md delete mode 100644 .changes/fix-clipboard-warnings-sdk.md delete mode 100644 .changes/fix-deep-link-config.md delete mode 100644 .changes/fix-fs-app-scopes.md delete mode 100644 .changes/fix-fs-scope-unknown-path.md delete mode 100644 .changes/fix-fs-write-file-android.md delete mode 100644 .changes/fix-http-plugin-abort.md delete mode 100644 .changes/fix-ios-file-dialog-default-mode.md delete mode 100644 .changes/fix-linux-updater-permission-error.md delete mode 100644 .changes/fix-restore-minimized-window-position.md delete mode 100644 .changes/fix-restore-minimized-window-state.md delete mode 100644 .changes/fix-restore-window-state-deadlock.md delete mode 100644 .changes/fix-upload-handle-non-success-download.md delete mode 100644 .changes/fs-dialog-file-path-methods.md delete mode 100644 .changes/fs-dialog-file-path-traits.md delete mode 100644 .changes/fs-dialog-non-exhaustive-error.md delete mode 100644 .changes/fs-dialog-safe-file-path.md delete mode 100644 .changes/fs-scope-recursive-allow-read-dir.md delete mode 100644 .changes/fs-windows-path.md delete mode 100644 .changes/fs-write-file-utf8-chars.md delete mode 100644 .changes/geolocation-permission-refactor.md delete mode 100644 .changes/geolocation-release.md delete mode 100644 .changes/global-shortcut-0.6.md delete mode 100644 .changes/haptics-release.md delete mode 100644 .changes/iife-varname-spacing.md delete mode 100644 .changes/ios-dialog-save.md delete mode 100644 .changes/native-dialog-button-text.md delete mode 100644 .changes/notification-body-optional-ios.md delete mode 100644 .changes/notification-permission-type-change.md delete mode 100644 .changes/positioner-v2-handleIconState.md delete mode 100644 .changes/pre.json delete mode 100644 .changes/rc.md delete mode 100644 .changes/remove-target-sdk.md delete mode 100644 .changes/resolve-content-uris.md delete mode 100644 .changes/shell-open-regex-match-string.md delete mode 100644 .changes/shell-regex-match-string.md delete mode 100644 .changes/shell-schema-required-sidcar.md delete mode 100644 .changes/single-instance-deep-link.md delete mode 100644 .changes/single-instance-optional-deep-link.md delete mode 100644 .changes/single-instance-windows-sys.0.59.md delete mode 100644 .changes/sql-uuid-type.md delete mode 100644 .changes/store-api-refactor.md delete mode 100644 .changes/store-auto-save.md delete mode 100644 .changes/store-remove-mobile-plugin.md delete mode 100644 .changes/swift-build-older-versions.md delete mode 100644 .changes/tauri-rc-8.md delete mode 100644 .changes/update-fs-api-docs.md delete mode 100644 .changes/update-geolocation-api.md delete mode 100644 .changes/update-tauri-rc-12.md delete mode 100644 .changes/update-tauri-rc-3.md delete mode 100644 .changes/updater-endpoint-version-encoded.md delete mode 100644 .changes/updater-endpoints-result.md delete mode 100644 .changes/updater-insecure-transport-protocol.md delete mode 100644 .changes/updater-js-headers-download-crate.md delete mode 100644 .changes/updater-js-headers-download.md delete mode 100644 .changes/window-state-physical-size.md diff --git a/.changes/android-dialog-save.md b/.changes/android-dialog-save.md deleted file mode 100644 index 9b4b2c4a..00000000 --- a/.changes/android-dialog-save.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"dialog": patch:feat ---- - -Implement `save` API on Android. diff --git a/.changes/barcode-dependencies.md b/.changes/barcode-dependencies.md deleted file mode 100644 index 7beab24f..00000000 --- a/.changes/barcode-dependencies.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"barcode-scanner": patch ---- - -Remove unused Android dependencies. \ No newline at end of file diff --git a/.changes/barcode-scanner-validate-plist.md b/.changes/barcode-scanner-validate-plist.md deleted file mode 100644 index 70780005..00000000 --- a/.changes/barcode-scanner-validate-plist.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"barcode-scanner": patch ---- - -Validate missing `NSCameraUsageDescription` Info.plist value. diff --git a/.changes/cli-hidden-structs.md b/.changes/cli-hidden-structs.md deleted file mode 100644 index 61619a05..00000000 --- a/.changes/cli-hidden-structs.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"cli": patch ---- - -Expose `Matches`, `SubcommandMatches` and `ArgData` structs. \ No newline at end of file diff --git a/.changes/config.json b/.changes/config.json index 5837be88..5f5fe841 100644 --- a/.changes/config.json +++ b/.changes/config.json @@ -69,7 +69,9 @@ "process", "shell", "store", - "updater" + "updater", + "geolocation", + "haptics" ] }, "api-example-js": { diff --git a/.changes/consolidate-permission-state.md b/.changes/consolidate-permission-state.md deleted file mode 100644 index 93f8c9ae..00000000 --- a/.changes/consolidate-permission-state.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -"barcode-scanner": patch -"barcode-scanner-js": patch -"geolocation": patch -"geolocation-js": patch -"notification": patch -"notification-js": patch ---- - -Use `PermissionState` from the `tauri` crate, which now also includes a "prompt with rationale" variant for Android (returned when your app must explain to the user why it needs the permission). diff --git a/.changes/deep-link-event.md b/.changes/deep-link-event.md deleted file mode 100644 index 15d45f04..00000000 --- a/.changes/deep-link-event.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"deep-link": patch ---- - -Emit the `deep-link://new-url` event on Linux and Windows when the app is executed with a deep link CLI argument, -matching the iOS and macOS behavior. diff --git a/.changes/deep-link-get-current-desktop.md b/.changes/deep-link-get-current-desktop.md deleted file mode 100644 index ffc3f83e..00000000 --- a/.changes/deep-link-get-current-desktop.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"deep-link": patch -"deep-link-js": patch ---- - -Implement `get_current` on Linux and Windows. diff --git a/.changes/deep-link-on-new-url.md b/.changes/deep-link-on-new-url.md deleted file mode 100644 index b37bed90..00000000 --- a/.changes/deep-link-on-new-url.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"deep-link": patch ---- - -Added `DeepLink::on_open_url` function to match the JavaScript API implementation, -which wraps the `deep-link://new-url` event and also send the current deep link if there's any. diff --git a/.changes/deep-link-register-all.md b/.changes/deep-link-register-all.md deleted file mode 100644 index 63edee03..00000000 --- a/.changes/deep-link-register-all.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"deep-link": patch ---- - -Added `register_all` to register all desktop schemes - useful for Linux to not require a formal AppImage installation. diff --git a/.changes/deep-link-space-in-path.md b/.changes/deep-link-space-in-path.md deleted file mode 100644 index 53fa8822..00000000 --- a/.changes/deep-link-space-in-path.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"deep-link": patch ---- - -Fix fails to start when having spaces in the main binary path on Windows diff --git a/.changes/dialog-asset-scope.md b/.changes/dialog-asset-scope.md deleted file mode 100644 index 9e2f031e..00000000 --- a/.changes/dialog-asset-scope.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"dialog": patch ---- - -Update Tauri scopes (asset protocol) when using the `open()` command to select directories. diff --git a/.changes/dialog-file-response-non-exhaustive.md b/.changes/dialog-file-response-non-exhaustive.md deleted file mode 100644 index f8d45d80..00000000 --- a/.changes/dialog-file-response-non-exhaustive.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"dialog": "patch" ---- - -Mark `FileResponse` as `non_exhaustive`. diff --git a/.changes/dialog-return-path.md b/.changes/dialog-return-path.md deleted file mode 100644 index 2bd7b4db..00000000 --- a/.changes/dialog-return-path.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"dialog": patch -"dialog-js": patch ---- - -The `open` function now returns a string representing either the file path or URI instead of an object. -To read the file data, use the `fs` APIs. diff --git a/.changes/dialog-rfd-015.md b/.changes/dialog-rfd-015.md deleted file mode 100644 index c434c802..00000000 --- a/.changes/dialog-rfd-015.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"dialog": patch ---- - -Update rfd to 0.15 diff --git a/.changes/feat-multiple-sql-backends.md b/.changes/feat-multiple-sql-backends.md deleted file mode 100644 index 65b8fe86..00000000 --- a/.changes/feat-multiple-sql-backends.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -sql: patch ---- - -It is now possible to enable multiple SQL backends at the same time. There will be no compile error anymore if no backends are enabled! diff --git a/.changes/fix-barcodae-scanner-imports.md b/.changes/fix-barcodae-scanner-imports.md deleted file mode 100644 index b3cd753f..00000000 --- a/.changes/fix-barcodae-scanner-imports.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"barcode-scanner-js": patch ---- - -Fixed an issue which caused checkPermission and requestPermission to be mixed up. \ No newline at end of file diff --git a/.changes/fix-clipboard-warnings-sdk.md b/.changes/fix-clipboard-warnings-sdk.md deleted file mode 100644 index b98f222e..00000000 --- a/.changes/fix-clipboard-warnings-sdk.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"clipboard-manager": patch -"clipboard-manager-js": patch ---- - -Fix warnings and clear implementation on Android below SDK 28. diff --git a/.changes/fix-deep-link-config.md b/.changes/fix-deep-link-config.md deleted file mode 100644 index 81b5bcf1..00000000 --- a/.changes/fix-deep-link-config.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"deep-link": patch ---- - -Allow empty configuration values. diff --git a/.changes/fix-fs-app-scopes.md b/.changes/fix-fs-app-scopes.md deleted file mode 100644 index 48c31bd7..00000000 --- a/.changes/fix-fs-app-scopes.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"fs": patch ---- - -Fix `scope-app`, `scope-app-recursive` and `scope-index` not properly enabling the application paths. diff --git a/.changes/fix-fs-scope-unknown-path.md b/.changes/fix-fs-scope-unknown-path.md deleted file mode 100644 index 5e63a6fc..00000000 --- a/.changes/fix-fs-scope-unknown-path.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -fs: patch ---- - -Fix failing to deserialize capability file when using an OS specific path in the scope that is not available on the current OS. \ No newline at end of file diff --git a/.changes/fix-fs-write-file-android.md b/.changes/fix-fs-write-file-android.md deleted file mode 100644 index e83a03c2..00000000 --- a/.changes/fix-fs-write-file-android.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"fs": patch:bug ---- - -Fixes `writeFile` command implementation on Android. diff --git a/.changes/fix-http-plugin-abort.md b/.changes/fix-http-plugin-abort.md deleted file mode 100644 index 8714523c..00000000 --- a/.changes/fix-http-plugin-abort.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"http-js": patch ---- - -Fixed an issue with abort signal not aborting the fetch request. diff --git a/.changes/fix-ios-file-dialog-default-mode.md b/.changes/fix-ios-file-dialog-default-mode.md deleted file mode 100644 index 40321596..00000000 --- a/.changes/fix-ios-file-dialog-default-mode.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"dialog": patch:breaking ---- - -If no filters are specified, the file picker dialog now defaults to a file selection instead of photos. diff --git a/.changes/fix-linux-updater-permission-error.md b/.changes/fix-linux-updater-permission-error.md deleted file mode 100644 index b343ebfe..00000000 --- a/.changes/fix-linux-updater-permission-error.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"updater": patch ---- - -Fixes the updater not preserving AppImage file permissions. diff --git a/.changes/fix-restore-minimized-window-position.md b/.changes/fix-restore-minimized-window-position.md deleted file mode 100644 index 37334c30..00000000 --- a/.changes/fix-restore-minimized-window-position.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"window-state": patch ---- - -Fix saving a minimized window's state changes its position to -32000 diff --git a/.changes/fix-restore-minimized-window-state.md b/.changes/fix-restore-minimized-window-state.md deleted file mode 100644 index 6c673205..00000000 --- a/.changes/fix-restore-minimized-window-state.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"window-state": patch ---- - -Fix can't restore a minimized window's size and position properly diff --git a/.changes/fix-restore-window-state-deadlock.md b/.changes/fix-restore-window-state-deadlock.md deleted file mode 100644 index b9145064..00000000 --- a/.changes/fix-restore-window-state-deadlock.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"window-state": patch ---- - -Fix deadlock when trying to restore window states on initial load diff --git a/.changes/fix-upload-handle-non-success-download.md b/.changes/fix-upload-handle-non-success-download.md deleted file mode 100644 index 0bfc4913..00000000 --- a/.changes/fix-upload-handle-non-success-download.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"upload": 'patch:bug' ---- - -fix download content to file when unsuccessful response diff --git a/.changes/fs-dialog-file-path-methods.md b/.changes/fs-dialog-file-path-methods.md deleted file mode 100644 index 1adfbbf3..00000000 --- a/.changes/fs-dialog-file-path-methods.md +++ /dev/null @@ -1,10 +0,0 @@ ---- -"fs": patch -"dialog": patch ---- - -Add utility methods on `FilePath` and `SafeFilePath` enums which are: - -- `path` -- `simplified` -- `into_path` diff --git a/.changes/fs-dialog-file-path-traits.md b/.changes/fs-dialog-file-path-traits.md deleted file mode 100644 index 3dfa4ee9..00000000 --- a/.changes/fs-dialog-file-path-traits.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"fs": patch -"dialog": patch ---- - -Implement `Serialize`, `Deserialize`, `From`, `TryFrom` and `FromStr` traits for `FilePath` and `SafeFilePath` enums. diff --git a/.changes/fs-dialog-non-exhaustive-error.md b/.changes/fs-dialog-non-exhaustive-error.md deleted file mode 100644 index d1779193..00000000 --- a/.changes/fs-dialog-non-exhaustive-error.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"fs": patch -"dialog": patch ---- - -Mark `Error` enum as `#[non_exhuastive]`. diff --git a/.changes/fs-dialog-safe-file-path.md b/.changes/fs-dialog-safe-file-path.md deleted file mode 100644 index 4e460683..00000000 --- a/.changes/fs-dialog-safe-file-path.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"fs": patch -"dialog": patch ---- - -Add `SafeFilePath` enum. diff --git a/.changes/fs-scope-recursive-allow-read-dir.md b/.changes/fs-scope-recursive-allow-read-dir.md deleted file mode 100644 index 5fdd210a..00000000 --- a/.changes/fs-scope-recursive-allow-read-dir.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"fs": patch:enhance ---- - -The `scope-*-recursive` permissions now also allow reading the contents of the directory. diff --git a/.changes/fs-windows-path.md b/.changes/fs-windows-path.md deleted file mode 100644 index 561e5619..00000000 --- a/.changes/fs-windows-path.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"fs": patch ---- - -Fix can't use Windows paths like `C:/Users/UserName/file.txt` diff --git a/.changes/fs-write-file-utf8-chars.md b/.changes/fs-write-file-utf8-chars.md deleted file mode 100644 index 805439ff..00000000 --- a/.changes/fs-write-file-utf8-chars.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"fs": patch ---- - -Support any UTF-8 character in the writeFile API. \ No newline at end of file diff --git a/.changes/geolocation-permission-refactor.md b/.changes/geolocation-permission-refactor.md deleted file mode 100644 index 20014615..00000000 --- a/.changes/geolocation-permission-refactor.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"geolocation": patch ---- - -No longer request permission automatically and leave to the user how to handle the `checkPermissions` and `requestPermissions` APIs. diff --git a/.changes/geolocation-release.md b/.changes/geolocation-release.md deleted file mode 100644 index db6a124a..00000000 --- a/.changes/geolocation-release.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"geolocation": major -"geolocation-js": major ---- - -Initial release. \ No newline at end of file diff --git a/.changes/global-shortcut-0.6.md b/.changes/global-shortcut-0.6.md deleted file mode 100644 index c65d9e1a..00000000 --- a/.changes/global-shortcut-0.6.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"global-shortcut": "patch" ---- - -Updated `global-hotkey` crate dependency to `0.6` diff --git a/.changes/haptics-release.md b/.changes/haptics-release.md deleted file mode 100644 index 26d2f15b..00000000 --- a/.changes/haptics-release.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"haptics": major -"haptics-js": major ---- - -Initial release. \ No newline at end of file diff --git a/.changes/iife-varname-spacing.md b/.changes/iife-varname-spacing.md deleted file mode 100644 index 64901e43..00000000 --- a/.changes/iife-varname-spacing.md +++ /dev/null @@ -1,9 +0,0 @@ ---- -barcode-scanner: patch -clipboard-manager: patch -deep-link: patch -global-shortcut: patch -window-state: patch ---- - -Fixed an issue that caused multi-word IIFE names to not be formatted correctly. For example the `barcode-scanner` was defined as `window.__TAURI_PLUGIN_CLIPBOARDMANAGER__` instead of `window.__TAURI_PLUGIN_CLIPBOARD_MANAGER__`. diff --git a/.changes/ios-dialog-save.md b/.changes/ios-dialog-save.md deleted file mode 100644 index 27e52645..00000000 --- a/.changes/ios-dialog-save.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"dialog": patch:feat ---- - -Implement `save` API on iOS. diff --git a/.changes/native-dialog-button-text.md b/.changes/native-dialog-button-text.md deleted file mode 100644 index 5440cea1..00000000 --- a/.changes/native-dialog-button-text.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"dialog": patch:breaking ---- - -Changed `MessageDialogBuilder::ok_button_label` and `MessageDialogBuilder::cancel_button_label` to `MessageDialogBuilder::buttons` which takes an enum now diff --git a/.changes/notification-body-optional-ios.md b/.changes/notification-body-optional-ios.md deleted file mode 100644 index 3bcdbc75..00000000 --- a/.changes/notification-body-optional-ios.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"notification": patch ---- - -The notification body is now optional on iOS to match the other platforms. diff --git a/.changes/notification-permission-type-change.md b/.changes/notification-permission-type-change.md deleted file mode 100644 index 451c8b77..00000000 --- a/.changes/notification-permission-type-change.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"notification-js": patch ---- - -**Breaking change**: The permission type when using the API is now `'granted' | 'denied' | 'prompt' | 'prompt-with-rationale'` instead of `'granted' | 'denied' | 'default'` for consistency with Rust types. When using the `window.Notification` API the type is unchanged to match the Web API type. diff --git a/.changes/positioner-v2-handleIconState.md b/.changes/positioner-v2-handleIconState.md deleted file mode 100644 index e43c84d8..00000000 --- a/.changes/positioner-v2-handleIconState.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"positioner": patch -"positioner-js": patch ---- - -`handleIconState` function for use in JavaScript event handlers. This allows one to update the TrayIcon state through JavaScript and fully create and handle the TrayIcon without requiring Rust (and the side-effect of creating a TrayIcon). diff --git a/.changes/pre.json b/.changes/pre.json deleted file mode 100644 index 922d3c45..00000000 --- a/.changes/pre.json +++ /dev/null @@ -1,75 +0,0 @@ -{ - "tag": "rc", - "changes": [ - ".changes/android-dialog-save.md", - ".changes/barcode-dependencies.md", - ".changes/barcode-scanner-validate-plist.md", - ".changes/cli-hidden-structs.md", - ".changes/consolidate-permission-state.md", - ".changes/deep-link-event.md", - ".changes/deep-link-get-current-desktop.md", - ".changes/deep-link-on-new-url.md", - ".changes/deep-link-register-all.md", - ".changes/deep-link-space-in-path.md", - ".changes/dialog-asset-scope.md", - ".changes/dialog-file-response-non-exhaustive.md", - ".changes/dialog-return-path.md", - ".changes/dialog-rfd-015.md", - ".changes/feat-multiple-sql-backends.md", - ".changes/fix-barcodae-scanner-imports.md", - ".changes/fix-clipboard-warnings-sdk.md", - ".changes/fix-deep-link-config.md", - ".changes/fix-fs-app-scopes.md", - ".changes/fix-fs-scope-unknown-path.md", - ".changes/fix-fs-write-file-android.md", - ".changes/fix-http-plugin-abort.md", - ".changes/fix-ios-file-dialog-default-mode.md", - ".changes/fix-linux-updater-permission-error.md", - ".changes/fix-restore-minimized-window-position.md", - ".changes/fix-restore-minimized-window-state.md", - ".changes/fix-restore-window-state-deadlock.md", - ".changes/fix-upload-handle-non-success-download.md", - ".changes/fs-dialog-file-path-methods.md", - ".changes/fs-dialog-file-path-traits.md", - ".changes/fs-dialog-non-exhaustive-error.md", - ".changes/fs-dialog-safe-file-path.md", - ".changes/fs-scope-recursive-allow-read-dir.md", - ".changes/fs-windows-path.md", - ".changes/fs-write-file-utf8-chars.md", - ".changes/geolocation-permission-refactor.md", - ".changes/geolocation-release.md", - ".changes/global-shortcut-0.6.md", - ".changes/haptics-release.md", - ".changes/iife-varname-spacing.md", - ".changes/ios-dialog-save.md", - ".changes/native-dialog-button-text.md", - ".changes/notification-body-optional-ios.md", - ".changes/notification-permission-type-change.md", - ".changes/positioner-v2-handleIconState.md", - ".changes/rc.md", - ".changes/remove-target-sdk.md", - ".changes/resolve-content-uris.md", - ".changes/shell-open-regex-match-string.md", - ".changes/shell-regex-match-string.md", - ".changes/shell-schema-required-sidcar.md", - ".changes/single-instance-deep-link.md", - ".changes/single-instance-optional-deep-link.md", - ".changes/single-instance-windows-sys.0.59.md", - ".changes/sql-uuid-type.md", - ".changes/store-api-refactor.md", - ".changes/store-auto-save.md", - ".changes/store-remove-mobile-plugin.md", - ".changes/swift-build-older-versions.md", - ".changes/tauri-rc-8.md", - ".changes/update-fs-api-docs.md", - ".changes/update-geolocation-api.md", - ".changes/update-tauri-rc-12.md", - ".changes/update-tauri-rc-3.md", - ".changes/updater-endpoint-version-encoded.md", - ".changes/updater-endpoints-result.md", - ".changes/updater-insecure-transport-protocol.md", - ".changes/updater-js-headers-download-crate.md", - ".changes/updater-js-headers-download.md", - ".changes/window-state-physical-size.md" - ] -} diff --git a/.changes/rc.md b/.changes/rc.md deleted file mode 100644 index e5df0121..00000000 --- a/.changes/rc.md +++ /dev/null @@ -1,61 +0,0 @@ ---- -"authenticator": patch -"autostart": patch -"barcode-scanner": patch -"biometric": patch -"cli": patch -"clipboard-manager": patch -"deep-link": patch -"dialog": patch -"fs": patch -"global-shortcut": patch -"http": patch -"localhost": patch -"log-plugin": patch -"nfc": patch -"notification": patch -"os": patch -"persisted-scope": patch -"positioner": patch -"process": patch -"shell": patch -"single-instance": patch -"sql": patch -"store": patch -"stronghold": patch -"updater": patch -"upload": patch -"websocket": patch -"window-state": patch -"authenticator-js": patch -"autostart-js": patch -"barcode-scanner-js": patch -"biometric-js": patch -"cli-js": patch -"clipboard-manager-js": patch -"deep-link-js": patch -"dialog-js": patch -"fs-js": patch -"global-shortcut-js": patch -"http-js": patch -"log-js": patch -"nfc-js": patch -"notification-js": patch -"os-js": patch -"positioner-js": patch -"process-js": patch -"shell-js": patch -"sql-js": patch -"store-js": patch -"stronghold-js": patch -"updater-js": patch -"upload-js": patch -"websocket-js": patch -"window-state-js": patch -"haptics": patch -"haptics-js": patch -"geolocation": patch -"geolocation-js": patch ---- - -Update to tauri RC. diff --git a/.changes/remove-target-sdk.md b/.changes/remove-target-sdk.md deleted file mode 100644 index bea40026..00000000 --- a/.changes/remove-target-sdk.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -"barcode-scanner": patch:changes -"biometric": patch:changes -"clipboard-manager": patch:changes -"deep-link": patch:changes -"dialog": patch:changes -"geolocation": patch:changes -"haptics": patch:changes -"nfc": patch:changes -"notification": patch:changes -"shell": patch:changes -"store": patch:changes ---- - -Remove targetSdk from build.kts files as it is deprecated and will be removed from DSL v9.0 diff --git a/.changes/resolve-content-uris.md b/.changes/resolve-content-uris.md deleted file mode 100644 index 781eff70..00000000 --- a/.changes/resolve-content-uris.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"fs": patch:feat ---- - -Resolve `content://` path URIs on Android. diff --git a/.changes/shell-open-regex-match-string.md b/.changes/shell-open-regex-match-string.md deleted file mode 100644 index 05ee1444..00000000 --- a/.changes/shell-open-regex-match-string.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"shell": patch ---- - -Change the `open` scope validator regex to match on the entire string. diff --git a/.changes/shell-regex-match-string.md b/.changes/shell-regex-match-string.md deleted file mode 100644 index b7b798d1..00000000 --- a/.changes/shell-regex-match-string.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"shell": patch ---- - -Change the `execute` scope argument validator regex to match on the entire string by default. -If this behavior is not desired check the `raw` boolean configuration option that is available along the `validator` string. diff --git a/.changes/shell-schema-required-sidcar.md b/.changes/shell-schema-required-sidcar.md deleted file mode 100644 index 7e48f653..00000000 --- a/.changes/shell-schema-required-sidcar.md +++ /dev/null @@ -1,6 +0,0 @@ ---- -"shell": "patch" ---- - -Fix the plugin schema requiring to set `sidecar` property when it is in fact optional. - diff --git a/.changes/single-instance-deep-link.md b/.changes/single-instance-deep-link.md deleted file mode 100644 index 43aac1bf..00000000 --- a/.changes/single-instance-deep-link.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"single-instance": patch ---- - -Integrate with the deep link plugin out of the box. diff --git a/.changes/single-instance-optional-deep-link.md b/.changes/single-instance-optional-deep-link.md deleted file mode 100644 index aabf98d1..00000000 --- a/.changes/single-instance-optional-deep-link.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"single-instance": "patch" ---- - -Put deep link integration behined a feature diff --git a/.changes/single-instance-windows-sys.0.59.md b/.changes/single-instance-windows-sys.0.59.md deleted file mode 100644 index 7f7af001..00000000 --- a/.changes/single-instance-windows-sys.0.59.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"single-instance": "patch" ---- - -Updated `windows-sys` crate to `0.59` diff --git a/.changes/sql-uuid-type.md b/.changes/sql-uuid-type.md deleted file mode 100644 index 879104b8..00000000 --- a/.changes/sql-uuid-type.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"sql": patch ---- - -Added support for `UUID` columns to the postgres implementation. \ No newline at end of file diff --git a/.changes/store-api-refactor.md b/.changes/store-api-refactor.md deleted file mode 100644 index ed049eb1..00000000 --- a/.changes/store-api-refactor.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"store-js": patch ---- - -**Breaking change**: Removed the `Store` constructor and added the `createStore` API. diff --git a/.changes/store-auto-save.md b/.changes/store-auto-save.md deleted file mode 100644 index 4babad27..00000000 --- a/.changes/store-auto-save.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"store": patch ---- - -Add a setting `auto_save` to enable a store to debounce save on modification (on calls like set, clear, delete, reset) - -**Breaking change**: Removed the `with_store` API and added `StoreExt::store_builder`. diff --git a/.changes/store-remove-mobile-plugin.md b/.changes/store-remove-mobile-plugin.md deleted file mode 100644 index 64baadec..00000000 --- a/.changes/store-remove-mobile-plugin.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"store": patch:breaking ---- - -Implement mobile support in Rust directly. This changes the store directories, invalidating all previously generated stores. diff --git a/.changes/swift-build-older-versions.md b/.changes/swift-build-older-versions.md deleted file mode 100644 index 41666a91..00000000 --- a/.changes/swift-build-older-versions.md +++ /dev/null @@ -1,15 +0,0 @@ ---- -"barcode-scanner": patch -"biometric": patch -"clipboard-manager": patch -"dialog": patch -"geolocation": patch -"haptics": patch -"log-plugin": patch -"nfc": patch -"notification": patch -"shell": patch -"store": patch ---- - -Explicitly set a minimum macOS version for the Swift package. diff --git a/.changes/tauri-rc-8.md b/.changes/tauri-rc-8.md deleted file mode 100644 index 9a708301..00000000 --- a/.changes/tauri-rc-8.md +++ /dev/null @@ -1,61 +0,0 @@ ---- -"authenticator": patch -"autostart": patch -"barcode-scanner": patch -"biometric": patch -"cli": patch -"clipboard-manager": patch -"deep-link": patch -"dialog": patch -"fs": patch -"global-shortcut": patch -"http": patch -"localhost": patch -"log-plugin": patch -"nfc": patch -"notification": patch -"os": patch -"persisted-scope": patch -"positioner": patch -"process": patch -"shell": patch -"single-instance": patch -"sql": patch -"store": patch -"stronghold": patch -"updater": patch -"upload": patch -"websocket": patch -"window-state": patch -"authenticator-js": patch -"autostart-js": patch -"barcode-scanner-js": patch -"biometric-js": patch -"cli-js": patch -"clipboard-manager-js": patch -"deep-link-js": patch -"dialog-js": patch -"fs-js": patch -"global-shortcut-js": patch -"http-js": patch -"log-js": patch -"nfc-js": patch -"notification-js": patch -"os-js": patch -"positioner-js": patch -"process-js": patch -"shell-js": patch -"sql-js": patch -"store-js": patch -"stronghold-js": patch -"updater-js": patch -"upload-js": patch -"websocket-js": patch -"window-state-js": patch -"haptics": patch -"haptics-js": patch -"geolocation": patch -"geolocation-js": patch ---- - -Update to tauri 2.0.0-rc.8 diff --git a/.changes/update-fs-api-docs.md b/.changes/update-fs-api-docs.md deleted file mode 100644 index d9093c03..00000000 --- a/.changes/update-fs-api-docs.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"fs-js": patch ---- - -Update documentation. \ No newline at end of file diff --git a/.changes/update-geolocation-api.md b/.changes/update-geolocation-api.md deleted file mode 100644 index 709e9fa0..00000000 --- a/.changes/update-geolocation-api.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"geolocation-js": patch ---- - -Update API to match other plugins. diff --git a/.changes/update-tauri-rc-12.md b/.changes/update-tauri-rc-12.md deleted file mode 100644 index fd69ac6b..00000000 --- a/.changes/update-tauri-rc-12.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"notification": patch ---- - -Update to tauri 2.0.0-rc.12. diff --git a/.changes/update-tauri-rc-3.md b/.changes/update-tauri-rc-3.md deleted file mode 100644 index 7e0ac01c..00000000 --- a/.changes/update-tauri-rc-3.md +++ /dev/null @@ -1,7 +0,0 @@ ---- -"geolocation": patch -"deep-link": patch -"updater": patch ---- - -Update to tauri 2.0.0-rc.3. diff --git a/.changes/updater-endpoint-version-encoded.md b/.changes/updater-endpoint-version-encoded.md deleted file mode 100644 index 8445c5e3..00000000 --- a/.changes/updater-endpoint-version-encoded.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -'updater': 'patch' ---- - -Encode `+` when making updater requests which can be cause incorrectly interpolating the endpoint when using `{{current_version}}` in the endpoint where the current version contains a build number, for example `1.8.0+1`. diff --git a/.changes/updater-endpoints-result.md b/.changes/updater-endpoints-result.md deleted file mode 100644 index d257d793..00000000 --- a/.changes/updater-endpoints-result.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"updater": patch ---- - -**Breaking change**, Changed `UpdaterBuilder::endpoints` method to return a `Result`. \ No newline at end of file diff --git a/.changes/updater-insecure-transport-protocol.md b/.changes/updater-insecure-transport-protocol.md deleted file mode 100644 index b95aad57..00000000 --- a/.changes/updater-insecure-transport-protocol.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"updater": patch ---- - -Add `dangerousInsecureTransportProtocol` config option to allow using insecure transport protocols, like `http` \ No newline at end of file diff --git a/.changes/updater-js-headers-download-crate.md b/.changes/updater-js-headers-download-crate.md deleted file mode 100644 index f19aaa54..00000000 --- a/.changes/updater-js-headers-download-crate.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"updater": "patch" ---- - -Add a second argument in `Update.download` and `Update.donloadAndInstall` JS APIs to modify headers and timeout when downloading the update. diff --git a/.changes/updater-js-headers-download.md b/.changes/updater-js-headers-download.md deleted file mode 100644 index d60533bf..00000000 --- a/.changes/updater-js-headers-download.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"updater-js": "patch" ---- - -Add a second argument in `Update.download` and `Update.donloadAndInstall` JS APIs to modify headers and timeout when downloading the update. diff --git a/.changes/window-state-physical-size.md b/.changes/window-state-physical-size.md deleted file mode 100644 index 543b3125..00000000 --- a/.changes/window-state-physical-size.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"window-state": patch:breaking ---- - -Window's size is now stored in physical size instead of logical size diff --git a/.github/workflows/test-rust.yml b/.github/workflows/test-rust.yml index 34af5e2c..7df99f71 100644 --- a/.github/workflows/test-rust.yml +++ b/.github/workflows/test-rust.yml @@ -202,7 +202,7 @@ jobs: sudo apt-get update sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev - - uses: dtolnay/rust-toolchain@1.75.0 + - uses: dtolnay/rust-toolchain@1.78.0 with: targets: ${{ matrix.platform.target }} diff --git a/Cargo.lock b/Cargo.lock index 214a2b8d..298f0e6a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -218,7 +218,7 @@ checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "api" -version = "2.0.0-rc.8" +version = "2.0.0" dependencies = [ "log", "serde", @@ -682,9 +682,9 @@ dependencies = [ [[package]] name = "bitstream-io" -version = "2.5.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b81e1519b0d82120d2fd469d5bfb2919a9361c48b02d82d04befc1cdd2002452" +checksum = "7c12d1856e42f0d817a835fe55853957c85c8c8a470114029143d3f12671446e" [[package]] name = "bitvec" @@ -3646,6 +3646,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8ea1f30cedd69f0a2954655f7188c6a834246d2bcf1e315e2ac40c4b24dc9519" dependencies = [ "cfg-if", + "rayon", ] [[package]] @@ -5032,15 +5033,16 @@ dependencies = [ [[package]] name = "ravif" -version = "0.11.10" +version = "0.11.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a8f0bfd976333248de2078d350bfdf182ff96e168a24d23d2436cef320dd4bdd" +checksum = "bc13288f5ab39e6d7c9d501759712e6969fcc9734220846fc9ed26cae2cc4234" dependencies = [ "avif-serialize", "imgref", "loop9", "quick-error 2.0.1", "rav1e", + "rayon", "rgb", ] @@ -6496,9 +6498,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.0.0-rc.16" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "246bd333561c5601241b7a09f19957d5f659667f3c1191c869a066fb309e1841" +checksum = "3c9c08beea86d5095b6f5fb1c788fe8759b23c3f71927c66a69e725a91d089cd" dependencies = [ "anyhow", "bytes", @@ -6550,9 +6552,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.0-rc.13" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5bc30f14b3c1548d75dfdf3e40bffe20a53bc4e3381e9bacc21dc765d701d0a" +checksum = "93bb649a284aec2ab43e8df6831b8c8060d231ec8ddf05bf021d58cb67570e1f" dependencies = [ "anyhow", "cargo_toml", @@ -6574,9 +6576,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-rc.13" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1cfb6089cfc626b81bb8aa4692ede527732011dfd22486d8ac5bf299189841f" +checksum = "a4511912612ba0da11aeb300e18e18b2c7067fd14aa886eac46bdcc43b4fa3ee" dependencies = [ "base64 0.22.1", "brotli", @@ -6601,9 +6603,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-rc.12" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f04ed6fadd294ef8061137463fe31abccbb5fa61ff9946aab2896acd140cff1" +checksum = "62ee976578a14b779996d7b6879d7e625c8ce674bc87e223953664f37def2eef" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -6615,9 +6617,9 @@ dependencies = [ [[package]] name = "tauri-plugin" -version = "2.0.0-rc.13" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6de7ffe64afa61c4cc13d450d64643b8db6cbb177a802beb88bf595594505ddf" +checksum = "774d084450b7ec8e445ad119079307f935b7bf3d736da139a8664eb1d4909aa5" dependencies = [ "anyhow", "glob", @@ -6632,7 +6634,7 @@ dependencies = [ [[package]] name = "tauri-plugin-autostart" -version = "2.0.0-rc.1" +version = "2.0.0" dependencies = [ "auto-launch", "log", @@ -6645,7 +6647,7 @@ dependencies = [ [[package]] name = "tauri-plugin-barcode-scanner" -version = "2.0.0-rc.4" +version = "2.0.0" dependencies = [ "log", "serde", @@ -6657,7 +6659,7 @@ dependencies = [ [[package]] name = "tauri-plugin-biometric" -version = "2.0.0-rc.3" +version = "2.0.0" dependencies = [ "log", "serde", @@ -6670,7 +6672,7 @@ dependencies = [ [[package]] name = "tauri-plugin-cli" -version = "2.0.0-rc.2" +version = "2.0.0" dependencies = [ "clap", "log", @@ -6683,7 +6685,7 @@ dependencies = [ [[package]] name = "tauri-plugin-clipboard-manager" -version = "2.0.0-rc.4" +version = "2.0.0" dependencies = [ "arboard", "image", @@ -6697,7 +6699,7 @@ dependencies = [ [[package]] name = "tauri-plugin-deep-link" -version = "2.0.0-rc.7" +version = "2.0.0" dependencies = [ "dunce", "log", @@ -6715,7 +6717,7 @@ dependencies = [ [[package]] name = "tauri-plugin-dialog" -version = "2.0.0-rc.8" +version = "2.0.0" dependencies = [ "log", "raw-window-handle", @@ -6731,7 +6733,7 @@ dependencies = [ [[package]] name = "tauri-plugin-fs" -version = "2.0.0-rc.6" +version = "2.0.0" dependencies = [ "anyhow", "dunce", @@ -6752,7 +6754,7 @@ dependencies = [ [[package]] name = "tauri-plugin-geolocation" -version = "2.0.0-rc.4" +version = "2.0.0" dependencies = [ "log", "serde", @@ -6765,7 +6767,7 @@ dependencies = [ [[package]] name = "tauri-plugin-global-shortcut" -version = "2.0.0-rc.2" +version = "2.0.0" dependencies = [ "global-hotkey", "log", @@ -6778,7 +6780,7 @@ dependencies = [ [[package]] name = "tauri-plugin-haptics" -version = "2.0.0-rc.3" +version = "2.0.0" dependencies = [ "log", "serde", @@ -6791,7 +6793,7 @@ dependencies = [ [[package]] name = "tauri-plugin-http" -version = "2.0.0-rc.6" +version = "2.0.0" dependencies = [ "data-url", "http", @@ -6811,7 +6813,7 @@ dependencies = [ [[package]] name = "tauri-plugin-localhost" -version = "2.0.0-rc.1" +version = "2.0.0" dependencies = [ "http", "log", @@ -6824,7 +6826,7 @@ dependencies = [ [[package]] name = "tauri-plugin-log" -version = "2.0.0-rc.2" +version = "2.0.0" dependencies = [ "android_logger", "byte-unit", @@ -6844,7 +6846,7 @@ dependencies = [ [[package]] name = "tauri-plugin-nfc" -version = "2.0.0-rc.3" +version = "2.0.0" dependencies = [ "log", "serde", @@ -6857,7 +6859,7 @@ dependencies = [ [[package]] name = "tauri-plugin-notification" -version = "2.0.0-rc.5" +version = "2.0.0" dependencies = [ "color-backtrace", "ctor", @@ -6879,7 +6881,7 @@ dependencies = [ [[package]] name = "tauri-plugin-os" -version = "2.0.0-rc.1" +version = "2.0.0" dependencies = [ "gethostname 0.5.0", "log", @@ -6895,7 +6897,7 @@ dependencies = [ [[package]] name = "tauri-plugin-persisted-scope" -version = "2.0.0-rc.6" +version = "2.0.0" dependencies = [ "aho-corasick", "bincode", @@ -6909,7 +6911,7 @@ dependencies = [ [[package]] name = "tauri-plugin-positioner" -version = "2.0.0-rc.2" +version = "2.0.0" dependencies = [ "log", "serde", @@ -6922,7 +6924,7 @@ dependencies = [ [[package]] name = "tauri-plugin-process" -version = "2.0.0-rc.1" +version = "2.0.0" dependencies = [ "tauri", "tauri-plugin", @@ -6930,7 +6932,7 @@ dependencies = [ [[package]] name = "tauri-plugin-shell" -version = "2.0.0-rc.4" +version = "2.0.0" dependencies = [ "encoding_rs", "log", @@ -6949,7 +6951,7 @@ dependencies = [ [[package]] name = "tauri-plugin-single-instance" -version = "2.0.0-rc.5" +version = "2.0.0" dependencies = [ "log", "semver", @@ -6964,7 +6966,7 @@ dependencies = [ [[package]] name = "tauri-plugin-sql" -version = "2.0.0-rc.3" +version = "2.0.0" dependencies = [ "futures-core", "indexmap 2.5.0", @@ -6981,7 +6983,7 @@ dependencies = [ [[package]] name = "tauri-plugin-store" -version = "2.0.0-rc.4" +version = "2.0.0" dependencies = [ "dunce", "log", @@ -6995,7 +6997,7 @@ dependencies = [ [[package]] name = "tauri-plugin-stronghold" -version = "2.0.0-rc.1" +version = "2.0.0" dependencies = [ "hex", "iota-crypto", @@ -7016,7 +7018,7 @@ dependencies = [ [[package]] name = "tauri-plugin-updater" -version = "2.0.0-rc.4" +version = "2.0.0" dependencies = [ "base64 0.22.1", "dirs 5.0.1", @@ -7044,7 +7046,7 @@ dependencies = [ [[package]] name = "tauri-plugin-upload" -version = "2.0.0-rc.2" +version = "2.0.0" dependencies = [ "futures-util", "log", @@ -7062,7 +7064,7 @@ dependencies = [ [[package]] name = "tauri-plugin-websocket" -version = "2.0.0-rc.1" +version = "2.0.0" dependencies = [ "futures-util", "http", @@ -7079,7 +7081,7 @@ dependencies = [ [[package]] name = "tauri-plugin-window-state" -version = "2.0.0-rc.5" +version = "2.0.0" dependencies = [ "bitflags 2.6.0", "log", @@ -7092,9 +7094,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.0.0-rc.13" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8d9465366fd7f9e9c77385fa8b7cb583b060544e8800bd0309deb100008c312d" +checksum = "2570e1f33f332a2d2d9967ebb3903bc4e1f92b9c47e4d1b302c10ea4153fcdbb" dependencies = [ "dpi", "gtk", @@ -7111,9 +7113,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.0.0-rc.14" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a03a49d6bcc0e65d64ea4420e2097270a25a9e1ff0fb2ece75e54fbbd54e45f7" +checksum = "8147d8f9ed418d83a90af3d64fbdca5e0e924ae28e5351da88f9568169db8665" dependencies = [ "gtk", "http", @@ -7137,9 +7139,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-rc.13" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a271545e4c25b36b922d98cf7e0c1755f64e92355705f656893e352aef0331e3" +checksum = "f87856e9d7fa91fd710362f3c73fccbf6bfd036934908791e65bd803d54dc8a8" dependencies = [ "aes-gcm", "brotli", diff --git a/Cargo.toml b/Cargo.toml index 40d983a4..88830f33 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,10 +11,10 @@ resolver = "2" [workspace.dependencies] serde = { version = "1", features = ["derive"] } log = "0.4" -tauri = { version = "2.0.0-rc.16", default-features = false } -tauri-build = "2.0.0-rc.13" -tauri-plugin = "2.0.0-rc.13" -tauri-utils = "2.0.0-rc.13" +tauri = { version = "2.0.0", default-features = false } +tauri-build = "2.0.0" +tauri-plugin = "2.0.0" +tauri-utils = "2.0.0" serde_json = "1" thiserror = "1" url = "2" @@ -27,7 +27,7 @@ specta = "=2.0.0-rc.20" edition = "2021" authors = ["Tauri Programme within The Commons Conservancy"] license = "Apache-2.0 OR MIT" -rust-version = "1.75" +rust-version = "1.78" repository = "https://github.com/tauri-apps/plugins-workspace" # default to small, optimized release binaries diff --git a/README.md b/README.md index 9597af5a..bcd64832 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ | [websocket](plugins/websocket) | Open a WebSocket connection using a Rust client in JS. | ✅ | ✅ | ✅ | ? | ? | | [window-state](plugins/window-state) | Persist window sizes and positions. | ✅ | ✅ | ✅ | ? | ? | -_This repo and all plugins require a Rust version of at least **1.75**_ +_This repo and all plugins require a Rust version of at least **1.78**_ ## Contributing diff --git a/examples/api/CHANGELOG.md b/examples/api/CHANGELOG.md index 73471a13..022ce3f2 100644 --- a/examples/api/CHANGELOG.md +++ b/examples/api/CHANGELOG.md @@ -1,5 +1,28 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + +### Dependencies + +- Upgraded to `barcode-scanner-js@2.0.0` +- Upgraded to `biometric-js@2.0.0` +- Upgraded to `cli-js@2.0.0` +- Upgraded to `clipboard-manager-js@2.0.0` +- Upgraded to `fs-js@2.0.0` +- Upgraded to `dialog-js@2.0.0` +- Upgraded to `global-shortcut-js@2.0.0` +- Upgraded to `http-js@2.0.0` +- Upgraded to `log-js@2.0.0` +- Upgraded to `nfc-js@2.0.0` +- Upgraded to `notification-js@2.0.0` +- Upgraded to `os-js@2.0.0` +- Upgraded to `process-js@2.0.0` +- Upgraded to `shell-js@2.0.0` +- Upgraded to `store-js@2.0.0` +- Upgraded to `updater-js@2.0.0` + ## \[2.0.0-rc.5] ### Dependencies diff --git a/examples/api/package.json b/examples/api/package.json index bde55fd1..e9e712cd 100644 --- a/examples/api/package.json +++ b/examples/api/package.json @@ -1,7 +1,7 @@ { "name": "svelte-app", "private": true, - "version": "2.0.0-rc.5", + "version": "2.0.0", "type": "module", "scripts": { "dev": "vite --clearScreen false", @@ -9,31 +9,31 @@ "serve": "vite preview" }, "dependencies": { - "@tauri-apps/api": "2.0.0-rc.6", - "@tauri-apps/plugin-barcode-scanner": "2.0.0-rc.2", - "@tauri-apps/plugin-biometric": "2.0.0-rc.1", - "@tauri-apps/plugin-cli": "2.0.0-rc.1", - "@tauri-apps/plugin-clipboard-manager": "2.0.0-rc.2", - "@tauri-apps/plugin-dialog": "2.0.0-rc.1", - "@tauri-apps/plugin-fs": "2.0.0-rc.2", - "@tauri-apps/plugin-geolocation": "2.0.0-rc.2", - "@tauri-apps/plugin-global-shortcut": "2.0.0-rc.1", - "@tauri-apps/plugin-haptics": "2.0.0-rc.1", - "@tauri-apps/plugin-http": "2.0.0-rc.2", - "@tauri-apps/plugin-nfc": "2.0.0-rc.1", - "@tauri-apps/plugin-notification": "2.0.0-rc.1", - "@tauri-apps/plugin-os": "2.0.0-rc.1", - "@tauri-apps/plugin-process": "2.0.0-rc.1", - "@tauri-apps/plugin-shell": "2.0.0-rc.1", - "@tauri-apps/plugin-store": "2.0.0-rc.2", - "@tauri-apps/plugin-updater": "2.0.0-rc.2", + "@tauri-apps/api": "2.0.0", + "@tauri-apps/plugin-barcode-scanner": "2.0.0", + "@tauri-apps/plugin-biometric": "2.0.0", + "@tauri-apps/plugin-cli": "2.0.0", + "@tauri-apps/plugin-clipboard-manager": "2.0.0", + "@tauri-apps/plugin-dialog": "2.0.0", + "@tauri-apps/plugin-fs": "2.0.0", + "@tauri-apps/plugin-geolocation": "2.0.0", + "@tauri-apps/plugin-global-shortcut": "2.0.0", + "@tauri-apps/plugin-haptics": "2.0.0", + "@tauri-apps/plugin-http": "2.0.0", + "@tauri-apps/plugin-nfc": "2.0.0", + "@tauri-apps/plugin-notification": "2.0.0", + "@tauri-apps/plugin-os": "2.0.0", + "@tauri-apps/plugin-process": "2.0.0", + "@tauri-apps/plugin-shell": "2.0.0", + "@tauri-apps/plugin-store": "2.0.0", + "@tauri-apps/plugin-updater": "2.0.0", "@zerodevx/svelte-json-view": "1.0.11" }, "devDependencies": { "@iconify-json/codicon": "^1.1.37", "@iconify-json/ph": "^1.1.8", "@sveltejs/vite-plugin-svelte": "^3.0.1", - "@tauri-apps/cli": "2.0.0-rc.17", + "@tauri-apps/cli": "2.0.0", "@unocss/extractor-svelte": "^0.63.0", "svelte": "^4.2.19", "unocss": "^0.63.0", diff --git a/examples/api/src-tauri/CHANGELOG.md b/examples/api/src-tauri/CHANGELOG.md index d2c25fcc..f936e930 100644 --- a/examples/api/src-tauri/CHANGELOG.md +++ b/examples/api/src-tauri/CHANGELOG.md @@ -1,5 +1,28 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + +### Dependencies + +- Upgraded to `barcode-scanner@2.0.0` +- Upgraded to `biometric@2.0.0` +- Upgraded to `cli@2.0.0` +- Upgraded to `clipboard-manager@2.0.0` +- Upgraded to `fs@2.0.0` +- Upgraded to `dialog@2.0.0` +- Upgraded to `global-shortcut@2.0.0` +- Upgraded to `http@2.0.0` +- Upgraded to `log-plugin@2.0.0` +- Upgraded to `nfc@2.0.0` +- Upgraded to `notification@2.0.0` +- Upgraded to `os@2.0.0` +- Upgraded to `process@2.0.0` +- Upgraded to `shell@2.0.0` +- Upgraded to `store@2.0.0` +- Upgraded to `updater@2.0.0` + ## \[2.0.0-rc.8] ### Dependencies diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml index ac9d537a..3a007fa9 100644 --- a/examples/api/src-tauri/Cargo.toml +++ b/examples/api/src-tauri/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "api" publish = false -version = "2.0.0-rc.8" +version = "2.0.0" description = "An example Tauri Application showcasing the api" edition = "2021" rust-version = { workspace = true } @@ -19,22 +19,22 @@ serde_json = { workspace = true } serde = { workspace = true } tiny_http = "0.12" log = { workspace = true } -tauri-plugin-log = { path = "../../../plugins/log", version = "2.0.0-rc.2" } -tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.0.0-rc.6", features = [ +tauri-plugin-log = { path = "../../../plugins/log", version = "2.0.0" } +tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.0.0", features = [ "watch", ] } -tauri-plugin-clipboard-manager = { path = "../../../plugins/clipboard-manager", version = "2.0.0-rc.4" } -tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.0.0-rc.8" } +tauri-plugin-clipboard-manager = { path = "../../../plugins/clipboard-manager", version = "2.0.0" } +tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.0.0" } tauri-plugin-http = { path = "../../../plugins/http", features = [ "multipart", -], version = "2.0.0-rc.6" } -tauri-plugin-notification = { path = "../../../plugins/notification", version = "2.0.0-rc.5", features = [ +], version = "2.0.0" } +tauri-plugin-notification = { path = "../../../plugins/notification", version = "2.0.0", features = [ "windows7-compat", ] } -tauri-plugin-os = { path = "../../../plugins/os", version = "2.0.0-rc.1" } -tauri-plugin-process = { path = "../../../plugins/process", version = "2.0.0-rc.1" } -tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.0.0-rc.4" } -tauri-plugin-store = { path = "../../../plugins/store", version = "2.0.0-rc.4" } +tauri-plugin-os = { path = "../../../plugins/os", version = "2.0.0" } +tauri-plugin-process = { path = "../../../plugins/process", version = "2.0.0" } +tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.0.0" } +tauri-plugin-store = { path = "../../../plugins/store", version = "2.0.0" } [dependencies.tauri] workspace = true @@ -50,17 +50,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] -tauri-plugin-cli = { path = "../../../plugins/cli", version = "2.0.0-rc.2" } -tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut", version = "2.0.0-rc.2" } -tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.0.0-rc.4" } -tauri-plugin-window-state = { path = "../../../plugins/window-state", version = "2.0.0-rc.3" } +tauri-plugin-cli = { path = "../../../plugins/cli", version = "2.0.0" } +tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut", version = "2.0.0" } +tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.0.0" } +tauri-plugin-window-state = { path = "../../../plugins/window-state", version = "2.0.0" } [target."cfg(any(target_os = \"android\", target_os = \"ios\"))".dependencies] -tauri-plugin-barcode-scanner = { path = "../../../plugins/barcode-scanner/", version = "2.0.0-rc.4" } -tauri-plugin-nfc = { path = "../../../plugins/nfc", version = "2.0.0-rc.3" } -tauri-plugin-biometric = { path = "../../../plugins/biometric/", version = "2.0.0-rc.3" } -tauri-plugin-geolocation = { path = "../../../plugins/geolocation/", version = "2.0.0-rc.3" } -tauri-plugin-haptics = { path = "../../../plugins/haptics/", version = "2.0.0-rc.3" } +tauri-plugin-barcode-scanner = { path = "../../../plugins/barcode-scanner/", version = "2.0.0" } +tauri-plugin-nfc = { path = "../../../plugins/nfc", version = "2.0.0" } +tauri-plugin-biometric = { path = "../../../plugins/biometric/", version = "2.0.0" } +tauri-plugin-geolocation = { path = "../../../plugins/geolocation/", version = "2.0.0" } +tauri-plugin-haptics = { path = "../../../plugins/haptics/", version = "2.0.0" } [features] prod = ["tauri/custom-protocol"] diff --git a/plugins/autostart/CHANGELOG.md b/plugins/autostart/CHANGELOG.md index 91d05907..1fdc66a6 100644 --- a/plugins/autostart/CHANGELOG.md +++ b/plugins/autostart/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.1] - [`e2e97db5`](https://github.com/tauri-apps/plugins-workspace/commit/e2e97db51983267f5be84d4f6f0278d58834d1f5) ([#1701](https://github.com/tauri-apps/plugins-workspace/pull/1701) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Update to tauri 2.0.0-rc.8 diff --git a/plugins/autostart/Cargo.toml b/plugins/autostart/Cargo.toml index 7df265ff..a0f1883e 100644 --- a/plugins/autostart/Cargo.toml +++ b/plugins/autostart/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-autostart" -version = "2.0.0-rc.1" +version = "2.0.0" description = "Automatically launch your application at startup." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/autostart/README.md b/plugins/autostart/README.md index 93c74271..6dd932b3 100644 --- a/plugins/autostart/README.md +++ b/plugins/autostart/README.md @@ -12,7 +12,7 @@ Automatically launch your application at startup. ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -26,7 +26,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-autostart = "2.0.0-rc" +tauri-plugin-autostart = "2.0.0" # alternatively with Git: tauri-plugin-autostart = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/autostart/package.json b/plugins/autostart/package.json index ab11a465..9ea68630 100644 --- a/plugins/autostart/package.json +++ b/plugins/autostart/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-autostart", - "version": "2.0.0-rc.1", + "version": "2.0.0", "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/barcode-scanner/CHANGELOG.md b/plugins/barcode-scanner/CHANGELOG.md index 878452ca..167e1182 100644 --- a/plugins/barcode-scanner/CHANGELOG.md +++ b/plugins/barcode-scanner/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.2] - [`79d6e19c`](https://github.com/tauri-apps/plugins-workspace/commit/79d6e19c4b38bae0cab29eb88df379e2237d9aac) ([#1777](https://github.com/tauri-apps/plugins-workspace/pull/1777)) Fixed an issue which caused checkPermission and requestPermission to be mixed up. diff --git a/plugins/barcode-scanner/Cargo.toml b/plugins/barcode-scanner/Cargo.toml index 85d5181c..eb75acf6 100644 --- a/plugins/barcode-scanner/Cargo.toml +++ b/plugins/barcode-scanner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-barcode-scanner" -version = "2.0.0-rc.4" +version = "2.0.0" description = "Scan QR codes, EAN-13 and other kinds of barcodes on Android and iOS" edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/barcode-scanner/README.md b/plugins/barcode-scanner/README.md index aca340bc..f0fe8371 100644 --- a/plugins/barcode-scanner/README.md +++ b/plugins/barcode-scanner/README.md @@ -26,7 +26,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-barcode-scanner = "2.0.0-rc" +tauri-plugin-barcode-scanner = "2.0.0" # alternatively with Git: tauri-plugin-barcode-scanner = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/barcode-scanner/package.json b/plugins/barcode-scanner/package.json index 9b53ea4c..b90be3d7 100644 --- a/plugins/barcode-scanner/package.json +++ b/plugins/barcode-scanner/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-barcode-scanner", - "version": "2.0.0-rc.2", + "version": "2.0.0", "description": "Scan QR codes, EAN-13 and other kinds of barcodes on Android and iOS", "license": "MIT OR Apache-2.0", "authors": [ @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/biometric/CHANGELOG.md b/plugins/biometric/CHANGELOG.md index 719621bb..f8033058 100644 --- a/plugins/biometric/CHANGELOG.md +++ b/plugins/biometric/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.1] - [`e2e97db5`](https://github.com/tauri-apps/plugins-workspace/commit/e2e97db51983267f5be84d4f6f0278d58834d1f5) ([#1701](https://github.com/tauri-apps/plugins-workspace/pull/1701) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Update to tauri 2.0.0-rc.8 diff --git a/plugins/biometric/Cargo.toml b/plugins/biometric/Cargo.toml index b242dab1..74ef49bc 100644 --- a/plugins/biometric/Cargo.toml +++ b/plugins/biometric/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-biometric" -version = "2.0.0-rc.3" +version = "2.0.0" description = "Prompt the user for biometric authentication on Android and iOS." edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/biometric/README.md b/plugins/biometric/README.md index c97b8f9a..2028595d 100644 --- a/plugins/biometric/README.md +++ b/plugins/biometric/README.md @@ -26,7 +26,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-biometric = "2.0.0-rc" +tauri-plugin-biometric = "2.0.0" # alternatively with Git: tauri-plugin-biometric = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/biometric/package.json b/plugins/biometric/package.json index 9635ef95..5d0cd5c0 100644 --- a/plugins/biometric/package.json +++ b/plugins/biometric/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-biometric", - "version": "2.0.0-rc.1", + "version": "2.0.0", "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/cli/CHANGELOG.md b/plugins/cli/CHANGELOG.md index 20a19788..3e94c5a3 100644 --- a/plugins/cli/CHANGELOG.md +++ b/plugins/cli/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.2] - [`68579934`](https://github.com/tauri-apps/plugins-workspace/commit/68579934c93f6ed2edbc97474560d6a8a00e8f70) ([#1856](https://github.com/tauri-apps/plugins-workspace/pull/1856) by [@amrbashir](https://github.com/tauri-apps/plugins-workspace/../../amrbashir)) Expose `Matches`, `SubcommandMatches` and `ArgData` structs. diff --git a/plugins/cli/Cargo.toml b/plugins/cli/Cargo.toml index cdc6cb94..a1b34dcd 100644 --- a/plugins/cli/Cargo.toml +++ b/plugins/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-cli" -version = "2.0.0-rc.2" +version = "2.0.0" description = "Parse arguments from your Tauri application's command line interface." edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/cli/README.md b/plugins/cli/README.md index 8f0e0e62..6323a84c 100644 --- a/plugins/cli/README.md +++ b/plugins/cli/README.md @@ -12,7 +12,7 @@ Parse arguments from your Command Line Interface. ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -27,7 +27,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml # you can add the dependencies on the `[dependencies]` section if you do not target mobile [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies] -tauri-plugin-cli = "2.0.0-rc" +tauri-plugin-cli = "2.0.0" # alternatively with Git: tauri-plugin-cli = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/cli/package.json b/plugins/cli/package.json index 454f8764..481082bb 100644 --- a/plugins/cli/package.json +++ b/plugins/cli/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-cli", - "version": "2.0.0-rc.1", + "version": "2.0.0", "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/clipboard-manager/CHANGELOG.md b/plugins/clipboard-manager/CHANGELOG.md index deaf7346..efc7a4de 100644 --- a/plugins/clipboard-manager/CHANGELOG.md +++ b/plugins/clipboard-manager/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.2] - [`341a5320`](https://github.com/tauri-apps/plugins-workspace/commit/341a5320c33d3c7b041abf7eb0ab7ad8009e6c3f) ([#1771](https://github.com/tauri-apps/plugins-workspace/pull/1771)) Fix warnings and clear implementation on Android below SDK 28. diff --git a/plugins/clipboard-manager/Cargo.toml b/plugins/clipboard-manager/Cargo.toml index e25aabd5..47cda536 100644 --- a/plugins/clipboard-manager/Cargo.toml +++ b/plugins/clipboard-manager/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-clipboard-manager" -version = "2.0.0-rc.4" +version = "2.0.0" description = "Read and write to the system clipboard." edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/clipboard-manager/README.md b/plugins/clipboard-manager/README.md index e22df0f6..26b433b2 100644 --- a/plugins/clipboard-manager/README.md +++ b/plugins/clipboard-manager/README.md @@ -12,7 +12,7 @@ Read and write to the system clipboard. ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -26,7 +26,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-clipboard-manager = "2.0.0-rc" +tauri-plugin-clipboard-manager = "2.0.0" # alternatively with Git: tauri-plugin-clipboard-manager = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/clipboard-manager/package.json b/plugins/clipboard-manager/package.json index 74a40cfc..f4897994 100644 --- a/plugins/clipboard-manager/package.json +++ b/plugins/clipboard-manager/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-clipboard-manager", - "version": "2.0.0-rc.2", + "version": "2.0.0", "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/deep-link/CHANGELOG.md b/plugins/deep-link/CHANGELOG.md index 1e12c678..99fa7159 100644 --- a/plugins/deep-link/CHANGELOG.md +++ b/plugins/deep-link/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.7] - [`3168e176`](https://github.com/tauri-apps/plugins-workspace/commit/3168e176031a61215be542595ba90ca51f8f2d97) ([#1806](https://github.com/tauri-apps/plugins-workspace/pull/1806) by [@auggiebennett](https://github.com/tauri-apps/plugins-workspace/../../auggiebennett)) Fix fails to start when having spaces in the main binary path on Windows diff --git a/plugins/deep-link/Cargo.toml b/plugins/deep-link/Cargo.toml index d1280495..33fb8f07 100644 --- a/plugins/deep-link/Cargo.toml +++ b/plugins/deep-link/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-deep-link" -version = "2.0.0-rc.7" +version = "2.0.0" description = "Set your Tauri application as the default handler for an URL" authors = { workspace = true } license = { workspace = true } diff --git a/plugins/deep-link/README.md b/plugins/deep-link/README.md index 8ecdc8f0..44bf2769 100644 --- a/plugins/deep-link/README.md +++ b/plugins/deep-link/README.md @@ -12,7 +12,7 @@ Set your Tauri application as the default handler for an URL. ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -26,7 +26,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-deep-link = "2.0.0-rc" +tauri-plugin-deep-link = "2.0.0" # alternatively with Git: tauri-plugin-deep-link = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/deep-link/examples/app/CHANGELOG.md b/plugins/deep-link/examples/app/CHANGELOG.md index 14f4fd9b..ba903aea 100644 --- a/plugins/deep-link/examples/app/CHANGELOG.md +++ b/plugins/deep-link/examples/app/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + +### Dependencies + +- Upgraded to `deep-link-js@2.0.0` + ## \[2.0.0-rc.1] ### Dependencies diff --git a/plugins/deep-link/examples/app/package.json b/plugins/deep-link/examples/app/package.json index db2b47b6..fa227558 100644 --- a/plugins/deep-link/examples/app/package.json +++ b/plugins/deep-link/examples/app/package.json @@ -1,7 +1,7 @@ { "name": "deep-link-example", "private": true, - "version": "2.0.0-rc.1", + "version": "2.0.0", "type": "module", "scripts": { "dev": "vite", @@ -10,11 +10,11 @@ "tauri": "tauri" }, "dependencies": { - "@tauri-apps/api": "2.0.0-rc.6", - "@tauri-apps/plugin-deep-link": "2.0.0-rc.2" + "@tauri-apps/api": "2.0.0", + "@tauri-apps/plugin-deep-link": "2.0.0" }, "devDependencies": { - "@tauri-apps/cli": "2.0.0-rc.17", + "@tauri-apps/cli": "2.0.0", "typescript": "^5.2.2", "vite": "^5.4.7" } diff --git a/plugins/deep-link/examples/app/src-tauri/Cargo.toml b/plugins/deep-link/examples/app/src-tauri/Cargo.toml index 57b9180e..e2624f7a 100644 --- a/plugins/deep-link/examples/app/src-tauri/Cargo.toml +++ b/plugins/deep-link/examples/app/src-tauri/Cargo.toml @@ -6,7 +6,7 @@ authors = ["you"] license = "" repository = "" edition = "2021" -rust-version = "1.75" +rust-version = "1.78" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/plugins/deep-link/package.json b/plugins/deep-link/package.json index 659655c1..c2ca9aa2 100644 --- a/plugins/deep-link/package.json +++ b/plugins/deep-link/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-deep-link", - "version": "2.0.0-rc.2", + "version": "2.0.0", "description": "Set your Tauri application as the default handler for an URL", "license": "MIT OR Apache-2.0", "authors": [ @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/dialog/CHANGELOG.md b/plugins/dialog/CHANGELOG.md index 22019e39..70681113 100644 --- a/plugins/dialog/CHANGELOG.md +++ b/plugins/dialog/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + +### Dependencies + +- Upgraded to `fs@2.0.0` + ## \[2.0.0-rc.8] - [`6bf1bd8d`](https://github.com/tauri-apps/plugins-workspace/commit/6bf1bd8d44bb95618590aa066e638509b014e0f9) ([#1805](https://github.com/tauri-apps/plugins-workspace/pull/1805) by [@renovate](https://github.com/tauri-apps/plugins-workspace/../../renovate)) Update rfd to 0.15 diff --git a/plugins/dialog/Cargo.toml b/plugins/dialog/Cargo.toml index 6040b794..25667742 100644 --- a/plugins/dialog/Cargo.toml +++ b/plugins/dialog/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-dialog" -version = "2.0.0-rc.8" +version = "2.0.0" description = "Native system dialogs for opening and saving files along with message dialogs on your Tauri application." edition = { workspace = true } authors = { workspace = true } @@ -34,7 +34,7 @@ tauri = { workspace = true } log = { workspace = true } thiserror = { workspace = true } url = { workspace = true } -tauri-plugin-fs = { path = "../fs", version = "2.0.0-rc.6" } +tauri-plugin-fs = { path = "../fs", version = "2.0.0" } [target.'cfg(target_os = "ios")'.dependencies] tauri = { workspace = true, features = ["wry"] } diff --git a/plugins/dialog/README.md b/plugins/dialog/README.md index 099e3939..f03ba952 100644 --- a/plugins/dialog/README.md +++ b/plugins/dialog/README.md @@ -12,7 +12,7 @@ Native system dialogs for opening and saving files along with message dialogs. ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -26,7 +26,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-dialog = "2.0.0-rc" +tauri-plugin-dialog = "2.0.0" # alternatively with Git: tauri-plugin-dialog = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/dialog/package.json b/plugins/dialog/package.json index ab1d908b..72ebd27a 100644 --- a/plugins/dialog/package.json +++ b/plugins/dialog/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-dialog", - "version": "2.0.0-rc.1", + "version": "2.0.0", "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/fs/CHANGELOG.md b/plugins/fs/CHANGELOG.md index 6a7954c6..01fda791 100644 --- a/plugins/fs/CHANGELOG.md +++ b/plugins/fs/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.6] - [`fc9b189e`](https://github.com/tauri-apps/plugins-workspace/commit/fc9b189e83a29bd750714ec6336133c6eabdfa20) ([#1837](https://github.com/tauri-apps/plugins-workspace/pull/1837) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) Fix failing to deserialize capability file when using an OS specific path in the scope that is not available on the current OS. diff --git a/plugins/fs/Cargo.toml b/plugins/fs/Cargo.toml index fb9c9c71..0ad68abe 100644 --- a/plugins/fs/Cargo.toml +++ b/plugins/fs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-fs" -version = "2.0.0-rc.6" +version = "2.0.0" description = "Access the file system." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/fs/README.md b/plugins/fs/README.md index 187d7622..c1516343 100644 --- a/plugins/fs/README.md +++ b/plugins/fs/README.md @@ -12,7 +12,7 @@ Access the file system. ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -26,7 +26,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-fs = "2.0.0-rc" +tauri-plugin-fs = "2.0.0" # alternatively with Git: tauri-plugin-fs = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/fs/package.json b/plugins/fs/package.json index 8e12f572..7a6cf527 100644 --- a/plugins/fs/package.json +++ b/plugins/fs/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-fs", - "version": "2.0.0-rc.2", + "version": "2.0.0", "description": "Access the file system.", "license": "MIT OR Apache-2.0", "authors": [ @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/geolocation/CHANGELOG.md b/plugins/geolocation/CHANGELOG.md index 5a4b19f4..31f944ff 100644 --- a/plugins/geolocation/CHANGELOG.md +++ b/plugins/geolocation/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.2] - [`60765694`](https://github.com/tauri-apps/plugins-workspace/commit/60765694f54875e22b8eb70b1d2e32dbf0c585c7) ([#1773](https://github.com/tauri-apps/plugins-workspace/pull/1773) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Update API to match other plugins. @@ -25,4 +29,4 @@ - [`9606089b`](https://github.com/tauri-apps/plugins-workspace/commit/9606089b2add4a17f80ed5a09d59ce94824bd672) ([#1599](https://github.com/tauri-apps/plugins-workspace/pull/1599)) Initial release. - [`9887d1`](https://github.com/tauri-apps/plugins-workspace/commit/9887d14bd0e971c4c0f5c1188fc4005d3fc2e29e) Update to tauri RC. -tauri-apps/plugins-workspace/commit/9887d14bd0e971c4c0f5c1188fc4005d3fc2e29e) Update to tauri RC. + tauri-apps/plugins-workspace/commit/9887d14bd0e971c4c0f5c1188fc4005d3fc2e29e) Update to tauri RC. diff --git a/plugins/geolocation/Cargo.toml b/plugins/geolocation/Cargo.toml index 876c378c..ddfd64ef 100644 --- a/plugins/geolocation/Cargo.toml +++ b/plugins/geolocation/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tauri-plugin-geolocation" description = "Get and track the device's current position" -version = "2.0.0-rc.4" +version = "2.0.0" edition = { workspace = true } authors = { workspace = true } license = { workspace = true } diff --git a/plugins/geolocation/README.md b/plugins/geolocation/README.md index 1923727f..a5957c07 100644 --- a/plugins/geolocation/README.md +++ b/plugins/geolocation/README.md @@ -12,7 +12,7 @@ This plugin provides APIs for getting and tracking the device's current position ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -26,7 +26,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-geolocation = "2.0.0-rc" +tauri-plugin-geolocation = "2.0.0" # alternatively with Git: tauri-plugin-geolocation = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/geolocation/package.json b/plugins/geolocation/package.json index f07899dc..998d2456 100644 --- a/plugins/geolocation/package.json +++ b/plugins/geolocation/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-geolocation", - "version": "2.0.0-rc.2", + "version": "2.0.0", "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/global-shortcut/CHANGELOG.md b/plugins/global-shortcut/CHANGELOG.md index a8f01b02..d111ad96 100644 --- a/plugins/global-shortcut/CHANGELOG.md +++ b/plugins/global-shortcut/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.1] - [`e2e97db5`](https://github.com/tauri-apps/plugins-workspace/commit/e2e97db51983267f5be84d4f6f0278d58834d1f5) ([#1701](https://github.com/tauri-apps/plugins-workspace/pull/1701) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Update to tauri 2.0.0-rc.8 @@ -111,7 +115,7 @@ ]\(https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release! 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release! om/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release! -st v2 alpha release! + st v2 alpha release! ]\(https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release! 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release! om/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release! diff --git a/plugins/global-shortcut/Cargo.toml b/plugins/global-shortcut/Cargo.toml index 5b560b75..0ab9a698 100644 --- a/plugins/global-shortcut/Cargo.toml +++ b/plugins/global-shortcut/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-global-shortcut" -version = "2.0.0-rc.2" +version = "2.0.0" description = "Register global hotkeys listeners on your Tauri application." edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/global-shortcut/README.md b/plugins/global-shortcut/README.md index 5978cae3..b0407213 100644 --- a/plugins/global-shortcut/README.md +++ b/plugins/global-shortcut/README.md @@ -12,7 +12,7 @@ Register global shortcuts. ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -27,7 +27,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml # you can add the dependencies on the `[dependencies]` section if you do not target mobile [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies] -tauri-plugin-global-shortcut = "2.0.0-rc" +tauri-plugin-global-shortcut = "2.0.0" # alternatively with Git: tauri-plugin-global-shortcut = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/global-shortcut/package.json b/plugins/global-shortcut/package.json index 23ebc501..a247f93b 100644 --- a/plugins/global-shortcut/package.json +++ b/plugins/global-shortcut/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-global-shortcut", - "version": "2.0.0-rc.1", + "version": "2.0.0", "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/haptics/CHANGELOG.md b/plugins/haptics/CHANGELOG.md index 83751c0e..90ad6e62 100644 --- a/plugins/haptics/CHANGELOG.md +++ b/plugins/haptics/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.1] - [`e2e97db5`](https://github.com/tauri-apps/plugins-workspace/commit/e2e97db51983267f5be84d4f6f0278d58834d1f5) ([#1701](https://github.com/tauri-apps/plugins-workspace/pull/1701) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Update to tauri 2.0.0-rc.8 diff --git a/plugins/haptics/Cargo.toml b/plugins/haptics/Cargo.toml index 8c8ff132..1a605370 100644 --- a/plugins/haptics/Cargo.toml +++ b/plugins/haptics/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tauri-plugin-haptics" description = "Haptic feedback and vibrations on Android and iOS" -version = "2.0.0-rc.3" +version = "2.0.0" edition = { workspace = true } authors = { workspace = true } license = { workspace = true } diff --git a/plugins/haptics/README.md b/plugins/haptics/README.md index 42c9b455..3102a20c 100644 --- a/plugins/haptics/README.md +++ b/plugins/haptics/README.md @@ -14,7 +14,7 @@ There are no standards/requirements for vibration support on Android, so the `fe ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -28,7 +28,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-haptics = "2.0.0-rc" +tauri-plugin-haptics = "2.0.0" # alternatively with Git: tauri-plugin-haptics = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/haptics/package.json b/plugins/haptics/package.json index 6ead8ee4..f29bdc24 100644 --- a/plugins/haptics/package.json +++ b/plugins/haptics/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-haptics", - "version": "2.0.0-rc.1", + "version": "2.0.0", "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/http/CHANGELOG.md b/plugins/http/CHANGELOG.md index 35b261af..aa116a5c 100644 --- a/plugins/http/CHANGELOG.md +++ b/plugins/http/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + +### Dependencies + +- Upgraded to `fs@2.0.0` + ## \[2.0.0-rc.6] ### Dependencies diff --git a/plugins/http/Cargo.toml b/plugins/http/Cargo.toml index 6ff3419a..dfd199f7 100644 --- a/plugins/http/Cargo.toml +++ b/plugins/http/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-http" -version = "2.0.0-rc.6" +version = "2.0.0" description = "Access an HTTP client written in Rust." edition = { workspace = true } authors = { workspace = true } @@ -34,7 +34,7 @@ serde_json = { workspace = true } tauri = { workspace = true } thiserror = { workspace = true } tokio = { version = "1", features = ["sync", "macros"] } -tauri-plugin-fs = { path = "../fs", version = "2.0.0-rc.6" } +tauri-plugin-fs = { path = "../fs", version = "2.0.0" } urlpattern = "0.3" regex = "1" http = "1" diff --git a/plugins/http/README.md b/plugins/http/README.md index b45f8268..3d343316 100644 --- a/plugins/http/README.md +++ b/plugins/http/README.md @@ -12,7 +12,7 @@ Access the HTTP client written in Rust. ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -26,7 +26,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-http = "2.0.0-rc" +tauri-plugin-http = "2.0.0" # alternatively with Git: tauri-plugin-http = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/http/package.json b/plugins/http/package.json index 5000b5fa..24fb27f7 100644 --- a/plugins/http/package.json +++ b/plugins/http/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-http", - "version": "2.0.0-rc.2", + "version": "2.0.0", "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/localhost/CHANGELOG.md b/plugins/localhost/CHANGELOG.md index 616886e2..1e46570f 100644 --- a/plugins/localhost/CHANGELOG.md +++ b/plugins/localhost/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.1] - [`e2e97db5`](https://github.com/tauri-apps/plugins-workspace/commit/e2e97db51983267f5be84d4f6f0278d58834d1f5) ([#1701](https://github.com/tauri-apps/plugins-workspace/pull/1701) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Update to tauri 2.0.0-rc.8 diff --git a/plugins/localhost/Cargo.toml b/plugins/localhost/Cargo.toml index 9f0e1853..ed0453d4 100644 --- a/plugins/localhost/Cargo.toml +++ b/plugins/localhost/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-localhost" -version = "2.0.0-rc.1" +version = "2.0.0" description = "Expose your apps assets through a localhost server instead of the default custom protocol." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/localhost/README.md b/plugins/localhost/README.md index b1e825de..e42ef72b 100644 --- a/plugins/localhost/README.md +++ b/plugins/localhost/README.md @@ -14,7 +14,7 @@ Expose your apps assets through a localhost server instead of the default custom ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -29,7 +29,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] portpicker = "0.1" # used in the example to pick a random free port -tauri-plugin-localhost = "2.0.0-rc" +tauri-plugin-localhost = "2.0.0" # alternatively with Git: tauri-plugin-localhost = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/log/CHANGELOG.md b/plugins/log/CHANGELOG.md index d19e3245..a09f3f0d 100644 --- a/plugins/log/CHANGELOG.md +++ b/plugins/log/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.1] - [`e2e97db5`](https://github.com/tauri-apps/plugins-workspace/commit/e2e97db51983267f5be84d4f6f0278d58834d1f5) ([#1701](https://github.com/tauri-apps/plugins-workspace/pull/1701) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Update to tauri 2.0.0-rc.8 diff --git a/plugins/log/Cargo.toml b/plugins/log/Cargo.toml index 57f96b4a..179505e7 100644 --- a/plugins/log/Cargo.toml +++ b/plugins/log/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-log" -version = "2.0.0-rc.2" +version = "2.0.0" description = "Configurable logging for your Tauri app." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/log/README.md b/plugins/log/README.md index 9362fa25..fd10ad79 100644 --- a/plugins/log/README.md +++ b/plugins/log/README.md @@ -12,7 +12,7 @@ Configurable logging for your Tauri app. ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -26,7 +26,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-log = "2.0.0-rc" +tauri-plugin-log = "2.0.0" # alternatively with Git: tauri-plugin-log = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/log/package.json b/plugins/log/package.json index b1a4bf67..fd021701 100644 --- a/plugins/log/package.json +++ b/plugins/log/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-log", - "version": "2.0.0-rc.1", + "version": "2.0.0", "description": "Configurable logging for your Tauri app.", "license": "MIT OR Apache-2.0", "authors": [ @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/nfc/CHANGELOG.md b/plugins/nfc/CHANGELOG.md index 7666b3ef..ba8e2c3a 100644 --- a/plugins/nfc/CHANGELOG.md +++ b/plugins/nfc/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.1] - [`e2e97db5`](https://github.com/tauri-apps/plugins-workspace/commit/e2e97db51983267f5be84d4f6f0278d58834d1f5) ([#1701](https://github.com/tauri-apps/plugins-workspace/pull/1701) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Update to tauri 2.0.0-rc.8 diff --git a/plugins/nfc/Cargo.toml b/plugins/nfc/Cargo.toml index a40c9117..0db42d6d 100644 --- a/plugins/nfc/Cargo.toml +++ b/plugins/nfc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-nfc" -version = "2.0.0-rc.3" +version = "2.0.0" description = "Read and write NFC tags on Android and iOS." edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/nfc/README.md b/plugins/nfc/README.md index 9427d7ca..e8a9e156 100644 --- a/plugins/nfc/README.md +++ b/plugins/nfc/README.md @@ -26,7 +26,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-nfc = "2.0.0-rc" +tauri-plugin-nfc = "2.0.0" # alternatively with Git: tauri-plugin-nfc = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/nfc/package.json b/plugins/nfc/package.json index 9eb4f02f..e9c9ec8b 100644 --- a/plugins/nfc/package.json +++ b/plugins/nfc/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-nfc", - "version": "2.0.0-rc.1", + "version": "2.0.0", "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/notification/CHANGELOG.md b/plugins/notification/CHANGELOG.md index a38f1afe..6fc7b136 100644 --- a/plugins/notification/CHANGELOG.md +++ b/plugins/notification/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.5] - [`fb85e5dd`](https://github.com/tauri-apps/plugins-workspace/commit/fb85e5dd76688f3ae836890160f9bde843b70167) ([#1785](https://github.com/tauri-apps/plugins-workspace/pull/1785)) Update to tauri 2.0.0-rc.12. diff --git a/plugins/notification/Cargo.toml b/plugins/notification/Cargo.toml index 8d0f9270..543ad243 100644 --- a/plugins/notification/Cargo.toml +++ b/plugins/notification/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-notification" -version = "2.0.0-rc.5" +version = "2.0.0" description = "Send desktop and mobile notifications on your Tauri application." edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/notification/README.md b/plugins/notification/README.md index 14977dbd..96b51be6 100644 --- a/plugins/notification/README.md +++ b/plugins/notification/README.md @@ -12,7 +12,7 @@ Send message notifications (brief auto-expiring OS window element) to your user. ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -26,7 +26,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-notification = "2.0.0-rc" +tauri-plugin-notification = "2.0.0" # alternatively with Git: tauri-plugin-notification = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/notification/package.json b/plugins/notification/package.json index 90808a01..37bb5f97 100644 --- a/plugins/notification/package.json +++ b/plugins/notification/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-notification", - "version": "2.0.0-rc.1", + "version": "2.0.0", "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/os/CHANGELOG.md b/plugins/os/CHANGELOG.md index 5afc474e..e0bf7dfa 100644 --- a/plugins/os/CHANGELOG.md +++ b/plugins/os/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.1] - [`e2e97db5`](https://github.com/tauri-apps/plugins-workspace/commit/e2e97db51983267f5be84d4f6f0278d58834d1f5) ([#1701](https://github.com/tauri-apps/plugins-workspace/pull/1701) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Update to tauri 2.0.0-rc.8 diff --git a/plugins/os/Cargo.toml b/plugins/os/Cargo.toml index 1e36e220..20050f8c 100644 --- a/plugins/os/Cargo.toml +++ b/plugins/os/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-os" -version = "2.0.0-rc.1" +version = "2.0.0" description = "Read information about the operating system." edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/os/README.md b/plugins/os/README.md index f84d123a..376e028b 100644 --- a/plugins/os/README.md +++ b/plugins/os/README.md @@ -12,7 +12,7 @@ Read information about the operating system. ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -26,7 +26,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-os = "2.0.0-rc" +tauri-plugin-os = "2.0.0" # alternatively with Git: tauri-plugin-os = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/os/package.json b/plugins/os/package.json index 9bdcee04..f255299a 100644 --- a/plugins/os/package.json +++ b/plugins/os/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-os", - "version": "2.0.0-rc.1", + "version": "2.0.0", "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/persisted-scope/CHANGELOG.md b/plugins/persisted-scope/CHANGELOG.md index 4ea413bb..dc28e28c 100644 --- a/plugins/persisted-scope/CHANGELOG.md +++ b/plugins/persisted-scope/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + +### Dependencies + +- Upgraded to `fs@2.0.0` + ## \[2.0.0-rc.6] ### Dependencies diff --git a/plugins/persisted-scope/Cargo.toml b/plugins/persisted-scope/Cargo.toml index 19acc56b..bcb29355 100644 --- a/plugins/persisted-scope/Cargo.toml +++ b/plugins/persisted-scope/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-persisted-scope" -version = "2.0.0-rc.6" +version = "2.0.0" description = "Save filesystem and asset scopes and restore them when the app is reopened." authors = { workspace = true } license = { workspace = true } @@ -27,7 +27,7 @@ log = { workspace = true } thiserror = { workspace = true } aho-corasick = "1" bincode = "1" -tauri-plugin-fs = { path = "../fs", version = "2.0.0-rc.6" } +tauri-plugin-fs = { path = "../fs", version = "2.0.0" } [features] protocol-asset = ["tauri/protocol-asset"] diff --git a/plugins/persisted-scope/README.md b/plugins/persisted-scope/README.md index bf959443..059d2468 100644 --- a/plugins/persisted-scope/README.md +++ b/plugins/persisted-scope/README.md @@ -12,7 +12,7 @@ Save filesystem and asset scopes and restore them when the app is reopened. ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -26,7 +26,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-persisted-scope = "2.0.0-rc" +tauri-plugin-persisted-scope = "2.0.0" # alternatively with Git: tauri-plugin-persisted-scope = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/positioner/CHANGELOG.md b/plugins/positioner/CHANGELOG.md index 8372e591..caddd682 100644 --- a/plugins/positioner/CHANGELOG.md +++ b/plugins/positioner/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.2] - [`2f7e32b5`](https://github.com/tauri-apps/plugins-workspace/commit/2f7e32b5e07454d6c0cf3ab03f8af8da74c4a8a7) ([#1822](https://github.com/tauri-apps/plugins-workspace/pull/1822) by [@jbolda](https://github.com/tauri-apps/plugins-workspace/../../jbolda)) `handleIconState` function for use in JavaScript event handlers. This allows one to update the TrayIcon state through JavaScript and fully create and handle the TrayIcon without requiring Rust (and the side-effect of creating a TrayIcon). diff --git a/plugins/positioner/Cargo.toml b/plugins/positioner/Cargo.toml index a99250cf..eac68902 100644 --- a/plugins/positioner/Cargo.toml +++ b/plugins/positioner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-positioner" -version = "2.0.0-rc.2" +version = "2.0.0" description = "Position your windows at well-known locations." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/positioner/README.md b/plugins/positioner/README.md index 05a9b7f9..881afdcf 100644 --- a/plugins/positioner/README.md +++ b/plugins/positioner/README.md @@ -14,7 +14,7 @@ This plugin is a port of [electron-positioner](https://github.com/jenslind/elect ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -28,7 +28,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-positioner = "2.0.0-rc" +tauri-plugin-positioner = "2.0.0" # alternatively with Git: tauri-plugin-positioner = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/positioner/package.json b/plugins/positioner/package.json index bd9408cf..faba11e2 100644 --- a/plugins/positioner/package.json +++ b/plugins/positioner/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-positioner", - "version": "2.0.0-rc.2", + "version": "2.0.0", "description": "Position your windows at well-known locations.", "license": "MIT OR Apache-2.0", "authors": [ @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/process/CHANGELOG.md b/plugins/process/CHANGELOG.md index 3a6da093..6566fcdc 100644 --- a/plugins/process/CHANGELOG.md +++ b/plugins/process/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.1] - [`e2e97db5`](https://github.com/tauri-apps/plugins-workspace/commit/e2e97db51983267f5be84d4f6f0278d58834d1f5) ([#1701](https://github.com/tauri-apps/plugins-workspace/pull/1701) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Update to tauri 2.0.0-rc.8 diff --git a/plugins/process/Cargo.toml b/plugins/process/Cargo.toml index 62422707..915b7265 100644 --- a/plugins/process/Cargo.toml +++ b/plugins/process/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-process" -version = "2.0.0-rc.1" +version = "2.0.0" description = "Access the current process of your Tauri application." edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/process/README.md b/plugins/process/README.md index 50c7634b..331bf934 100644 --- a/plugins/process/README.md +++ b/plugins/process/README.md @@ -12,7 +12,7 @@ This plugin provides APIs to access the current process. To spawn child processe ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -26,7 +26,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-process = "2.0.0-rc" +tauri-plugin-process = "2.0.0" # alternatively with Git: tauri-plugin-process = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/process/package.json b/plugins/process/package.json index cd743a7b..bac14def 100644 --- a/plugins/process/package.json +++ b/plugins/process/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-process", - "version": "2.0.0-rc.1", + "version": "2.0.0", "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/shell/CHANGELOG.md b/plugins/shell/CHANGELOG.md index d57b07e9..0c5c2866 100644 --- a/plugins/shell/CHANGELOG.md +++ b/plugins/shell/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.4] - [`44273b98`](https://github.com/tauri-apps/plugins-workspace/commit/44273b988957a254eff715d6be7547d2ace882e1) ([#1839](https://github.com/tauri-apps/plugins-workspace/pull/1839) by [@amrbashir](https://github.com/tauri-apps/plugins-workspace/../../amrbashir)) Fix the plugin schema requiring to set `sidecar` property when it is in fact optional. diff --git a/plugins/shell/Cargo.toml b/plugins/shell/Cargo.toml index 860414e8..b22aab30 100644 --- a/plugins/shell/Cargo.toml +++ b/plugins/shell/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-shell" -version = "2.0.0-rc.4" +version = "2.0.0" description = "Access the system shell. Allows you to spawn child processes and manage files and URLs using their default application." edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/shell/README.md b/plugins/shell/README.md index c52b0eb4..3d09b6ce 100644 --- a/plugins/shell/README.md +++ b/plugins/shell/README.md @@ -12,7 +12,7 @@ Access the system shell. Allows you to spawn child processes and manage files an ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -26,7 +26,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-shell = "2.0.0-rc" +tauri-plugin-shell = "2.0.0" # alternatively with Git: tauri-plugin-shell = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/shell/package.json b/plugins/shell/package.json index 18ee7719..0975f8f9 100644 --- a/plugins/shell/package.json +++ b/plugins/shell/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-shell", - "version": "2.0.0-rc.1", + "version": "2.0.0", "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/single-instance/CHANGELOG.md b/plugins/single-instance/CHANGELOG.md index 1cb7f316..8212d7ea 100644 --- a/plugins/single-instance/CHANGELOG.md +++ b/plugins/single-instance/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + +### Dependencies + +- Upgraded to `deep-link@2.0.0` + ## \[2.0.0-rc.5] ### Dependencies diff --git a/plugins/single-instance/Cargo.toml b/plugins/single-instance/Cargo.toml index 22de8666..8e37f50d 100644 --- a/plugins/single-instance/Cargo.toml +++ b/plugins/single-instance/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-single-instance" -version = "2.0.0-rc.5" +version = "2.0.0" description = "Ensure a single instance of your tauri app is running." authors = { workspace = true } license = { workspace = true } @@ -26,7 +26,7 @@ serde_json = { workspace = true } tauri = { workspace = true } log = { workspace = true } thiserror = { workspace = true } -tauri-plugin-deep-link = { path = "../deep-link", version = "2.0.0-rc.7", optional = true } +tauri-plugin-deep-link = { path = "../deep-link", version = "2.0.0", optional = true } semver = { version = "1", optional = true } [target."cfg(target_os = \"windows\")".dependencies.windows-sys] diff --git a/plugins/single-instance/README.md b/plugins/single-instance/README.md index 551ea72d..768b7469 100644 --- a/plugins/single-instance/README.md +++ b/plugins/single-instance/README.md @@ -12,7 +12,7 @@ Ensure a single instance of your tauri app is running. ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -26,7 +26,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-single-instance = "2.0.0-rc" +tauri-plugin-single-instance = "2.0.0" # alternatively with Git: tauri-plugin-single-instance = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/single-instance/examples/vanilla/package.json b/plugins/single-instance/examples/vanilla/package.json index 70506755..b4c80cbd 100644 --- a/plugins/single-instance/examples/vanilla/package.json +++ b/plugins/single-instance/examples/vanilla/package.json @@ -9,6 +9,6 @@ "author": "", "license": "MIT", "devDependencies": { - "@tauri-apps/cli": "2.0.0-rc.17" + "@tauri-apps/cli": "2.0.0" } } diff --git a/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml b/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml index da5d8cd6..2d4e4e2a 100644 --- a/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml +++ b/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml @@ -5,7 +5,7 @@ description = "A Tauri App" authors = ["You"] repository = "" edition = "2021" -rust-version = "1.75" +rust-version = "1.78" [dependencies] serde = { workspace = true } diff --git a/plugins/sql/CHANGELOG.md b/plugins/sql/CHANGELOG.md index 5ef4ae39..61816b41 100644 --- a/plugins/sql/CHANGELOG.md +++ b/plugins/sql/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.3] - [`30bcf5dc`](https://github.com/tauri-apps/plugins-workspace/commit/30bcf5dcc22e1bb1fb983a8d2887edc39404e6df) ([#1838](https://github.com/tauri-apps/plugins-workspace/pull/1838) by [@FabianLars](https://github.com/tauri-apps/plugins-workspace/../../FabianLars)) It is now possible to enable multiple SQL backends at the same time. There will be no compile error anymore if no backends are enabled! diff --git a/plugins/sql/Cargo.toml b/plugins/sql/Cargo.toml index 09570eb5..df308e67 100644 --- a/plugins/sql/Cargo.toml +++ b/plugins/sql/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-sql" -version = "2.0.0-rc.3" +version = "2.0.0" description = "Interface with SQL databases." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/sql/README.md b/plugins/sql/README.md index a04e992a..fb1eddbc 100644 --- a/plugins/sql/README.md +++ b/plugins/sql/README.md @@ -12,7 +12,7 @@ Interface with SQL databases through [sqlx](https://github.com/launchbadge/sqlx) ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -27,7 +27,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies.tauri-plugin-sql] features = ["sqlite"] # or "postgres", or "mysql" -version = "2.0.0-rc" +version = "2.0.0" # alternatively with Git git = "https://github.com/tauri-apps/plugins-workspace" branch = "v2" diff --git a/plugins/sql/package.json b/plugins/sql/package.json index 304bdd41..db2c6d2a 100644 --- a/plugins/sql/package.json +++ b/plugins/sql/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-sql", - "version": "2.0.0-rc.1", + "version": "2.0.0", "description": "Interface with SQL databases", "license": "MIT OR Apache-2.0", "authors": [ @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/store/CHANGELOG.md b/plugins/store/CHANGELOG.md index 9b7c2257..85fc373c 100644 --- a/plugins/store/CHANGELOG.md +++ b/plugins/store/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.2] - [`f12d3560`](https://github.com/tauri-apps/plugins-workspace/commit/f12d35609ab84f536c0f087665fdc1f978af3093) ([#1550](https://github.com/tauri-apps/plugins-workspace/pull/1550) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) **Breaking change**: Removed the `Store` constructor and added the `createStore` API. @@ -115,5 +119,5 @@ ps://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release! 717ae670978feb4492fac1f295998b93f2b9347f)([#371](https://github.com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release! com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release! -plugins-workspace/pull/371)) First v2 alpha release! + plugins-workspace/pull/371)) First v2 alpha release! com/tauri-apps/plugins-workspace/pull/371)) First v2 alpha release! diff --git a/plugins/store/Cargo.toml b/plugins/store/Cargo.toml index f906603b..e5f8c07b 100644 --- a/plugins/store/Cargo.toml +++ b/plugins/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-store" -version = "2.0.0-rc.4" +version = "2.0.0" description = "Simple, persistent key-value store." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/store/README.md b/plugins/store/README.md index 5ba41c80..d781878d 100644 --- a/plugins/store/README.md +++ b/plugins/store/README.md @@ -12,7 +12,7 @@ Simple, persistent key-value store. ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -26,7 +26,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-store = "2.0.0-rc" +tauri-plugin-store = "2.0.0" # alternatively with Git: tauri-plugin-store = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/store/examples/AppSettingsManager/package.json b/plugins/store/examples/AppSettingsManager/package.json index 183de4d8..ca7e3b95 100644 --- a/plugins/store/examples/AppSettingsManager/package.json +++ b/plugins/store/examples/AppSettingsManager/package.json @@ -8,7 +8,7 @@ "tauri": "tauri" }, "devDependencies": { - "@tauri-apps/cli": "2.0.0-rc.17", + "@tauri-apps/cli": "2.0.0", "vite": "^5.0.12", "typescript": "^5.4.7" } diff --git a/plugins/store/package.json b/plugins/store/package.json index 988e9e56..034f8873 100644 --- a/plugins/store/package.json +++ b/plugins/store/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-store", - "version": "2.0.0-rc.2", + "version": "2.0.0", "description": "Simple, persistent key-value store.", "license": "MIT OR Apache-2.0", "authors": [ @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/stronghold/CHANGELOG.md b/plugins/stronghold/CHANGELOG.md index bd42fda0..6ce30b6d 100644 --- a/plugins/stronghold/CHANGELOG.md +++ b/plugins/stronghold/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.1] - [`e2e97db5`](https://github.com/tauri-apps/plugins-workspace/commit/e2e97db51983267f5be84d4f6f0278d58834d1f5) ([#1701](https://github.com/tauri-apps/plugins-workspace/pull/1701) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Update to tauri 2.0.0-rc.8 diff --git a/plugins/stronghold/Cargo.toml b/plugins/stronghold/Cargo.toml index d979bb86..76368926 100644 --- a/plugins/stronghold/Cargo.toml +++ b/plugins/stronghold/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-stronghold" -version = "2.0.0-rc.1" +version = "2.0.0" description = "Store secrets and keys using the IOTA Stronghold secret management engine." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/stronghold/README.md b/plugins/stronghold/README.md index 17bd125b..de4384d2 100644 --- a/plugins/stronghold/README.md +++ b/plugins/stronghold/README.md @@ -12,7 +12,7 @@ Store secrets and keys using the [IOTA Stronghold](https://github.com/iotaledger ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -26,7 +26,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-stronghold = "2.0.0-rc" +tauri-plugin-stronghold = "2.0.0" # alternatively with Git: tauri-plugin-stronghold = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/stronghold/package.json b/plugins/stronghold/package.json index bb054d51..cbefad53 100644 --- a/plugins/stronghold/package.json +++ b/plugins/stronghold/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-stronghold", - "version": "2.0.0-rc.1", + "version": "2.0.0", "description": "Store secrets and keys using the IOTA Stronghold encrypted database.", "license": "MIT OR Apache-2.0", "authors": [ @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/updater/CHANGELOG.md b/plugins/updater/CHANGELOG.md index 220f3df5..6cef3a2e 100644 --- a/plugins/updater/CHANGELOG.md +++ b/plugins/updater/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.4] - [`221f50f5`](https://github.com/tauri-apps/plugins-workspace/commit/221f50f53bd7a87dbd404e4cb1aaf502a5047785) ([#1816](https://github.com/tauri-apps/plugins-workspace/pull/1816) by [@amrbashir](https://github.com/tauri-apps/plugins-workspace/../../amrbashir)) Encode `+` when making updater requests which can be cause incorrectly interpolating the endpoint when using `{{current_version}}` in the endpoint where the current version contains a build number, for example `1.8.0+1`. diff --git a/plugins/updater/Cargo.toml b/plugins/updater/Cargo.toml index b0697acc..f6f0a655 100644 --- a/plugins/updater/Cargo.toml +++ b/plugins/updater/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-updater" -version = "2.0.0-rc.4" +version = "2.0.0" description = "In-app updates for Tauri applications." edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/updater/README.md b/plugins/updater/README.md index 918e624f..99547136 100644 --- a/plugins/updater/README.md +++ b/plugins/updater/README.md @@ -12,7 +12,7 @@ In-app updates for Tauri applications. ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -27,7 +27,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml # you can add the dependencies on the `[dependencies]` section if you do not target mobile [target."cfg(not(any(target_os = \"android\", target_os = \"ios\")))".dependencies] -tauri-plugin-updater = "2.0.0-rc" +tauri-plugin-updater = "2.0.0" # alternatively with Git: tauri-plugin-updater = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/updater/package.json b/plugins/updater/package.json index 9c60d908..3afb2f4e 100644 --- a/plugins/updater/package.json +++ b/plugins/updater/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-updater", - "version": "2.0.0-rc.2", + "version": "2.0.0", "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/upload/CHANGELOG.md b/plugins/upload/CHANGELOG.md index 5dec7a7e..2d422cbc 100644 --- a/plugins/upload/CHANGELOG.md +++ b/plugins/upload/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.2] ### bug diff --git a/plugins/upload/Cargo.toml b/plugins/upload/Cargo.toml index 8e2db6ba..8403b486 100644 --- a/plugins/upload/Cargo.toml +++ b/plugins/upload/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-upload" -version = "2.0.0-rc.2" +version = "2.0.0" description = "Upload files from disk to a remote server over HTTP." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/upload/README.md b/plugins/upload/README.md index bf6a734b..1207f142 100644 --- a/plugins/upload/README.md +++ b/plugins/upload/README.md @@ -13,7 +13,7 @@ Download files from a remote HTTP server to disk. ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -27,7 +27,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-upload = "2.0.0-rc" +tauri-plugin-upload = "2.0.0" # alternatively with Git: tauri-plugin-upload = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/upload/package.json b/plugins/upload/package.json index 4650b236..03b1c9ea 100644 --- a/plugins/upload/package.json +++ b/plugins/upload/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-upload", - "version": "2.0.0-rc.1", + "version": "2.0.0", "description": "Upload files from disk to a remote server over HTTP.", "license": "MIT OR Apache-2.0", "authors": [ @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/websocket/CHANGELOG.md b/plugins/websocket/CHANGELOG.md index 73b148b1..da39a241 100644 --- a/plugins/websocket/CHANGELOG.md +++ b/plugins/websocket/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.1] - [`e2e97db5`](https://github.com/tauri-apps/plugins-workspace/commit/e2e97db51983267f5be84d4f6f0278d58834d1f5) ([#1701](https://github.com/tauri-apps/plugins-workspace/pull/1701) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Update to tauri 2.0.0-rc.8 diff --git a/plugins/websocket/Cargo.toml b/plugins/websocket/Cargo.toml index 8fdb22b7..9696f2bd 100644 --- a/plugins/websocket/Cargo.toml +++ b/plugins/websocket/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-websocket" -version = "2.0.0-rc.1" +version = "2.0.0" description = "Expose a WebSocket server to your Tauri frontend." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/websocket/README.md b/plugins/websocket/README.md index 09a0f558..cc992d9c 100644 --- a/plugins/websocket/README.md +++ b/plugins/websocket/README.md @@ -12,7 +12,7 @@ Expose a WebSocket server to your Tauri frontend. ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -26,7 +26,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-websocket = "2.0.0-rc" +tauri-plugin-websocket = "2.0.0" # alternatively with Git: tauri-plugin-websocket = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/websocket/examples/tauri-app/package.json b/plugins/websocket/examples/tauri-app/package.json index d71974e5..dc8f68bb 100644 --- a/plugins/websocket/examples/tauri-app/package.json +++ b/plugins/websocket/examples/tauri-app/package.json @@ -9,7 +9,7 @@ "preview": "vite preview" }, "devDependencies": { - "@tauri-apps/cli": "2.0.0-rc.17", + "@tauri-apps/cli": "2.0.0", "typescript": "^5.3.3", "vite": "^5.4.7" }, diff --git a/plugins/websocket/package.json b/plugins/websocket/package.json index 57b2c706..2579eb42 100644 --- a/plugins/websocket/package.json +++ b/plugins/websocket/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-websocket", - "version": "2.0.0-rc.1", + "version": "2.0.0", "license": "MIT OR Apache-2.0", "authors": [ "Tauri Programme within The Commons Conservancy" @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/plugins/window-state/CHANGELOG.md b/plugins/window-state/CHANGELOG.md index 9ffe3bb0..c07cb8d9 100644 --- a/plugins/window-state/CHANGELOG.md +++ b/plugins/window-state/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.0] + +- [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. + ## \[2.0.0-rc.5] - [`7a37355e`](https://github.com/tauri-apps/plugins-workspace/commit/7a37355e177772cbddf24397d5a23280e00558af) ([#1787](https://github.com/tauri-apps/plugins-workspace/pull/1787) by [@Legend-Master](https://github.com/tauri-apps/plugins-workspace/../../Legend-Master)) Fix deadlock when trying to restore window states on initial load diff --git a/plugins/window-state/Cargo.toml b/plugins/window-state/Cargo.toml index 60d7cbd5..7db3bb29 100644 --- a/plugins/window-state/Cargo.toml +++ b/plugins/window-state/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-window-state" -version = "2.0.0-rc.5" +version = "2.0.0" description = "Save window positions and sizes and restore them when the app is reopened." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/window-state/README.md b/plugins/window-state/README.md index 96133e15..1c8ca795 100644 --- a/plugins/window-state/README.md +++ b/plugins/window-state/README.md @@ -12,7 +12,7 @@ Save window positions and sizes and restore them when the app is reopened. ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -26,7 +26,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-window-state = "2.0.0-rc" +tauri-plugin-window-state = "2.0.0" # alternatively with Git: tauri-plugin-window-state = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/plugins/window-state/package.json b/plugins/window-state/package.json index 2be791f5..eea695bf 100644 --- a/plugins/window-state/package.json +++ b/plugins/window-state/package.json @@ -1,6 +1,6 @@ { "name": "@tauri-apps/plugin-window-state", - "version": "2.0.0-rc.1", + "version": "2.0.0", "description": "Save window positions and sizes and restore them when the app is reopened.", "license": "MIT OR Apache-2.0", "authors": [ @@ -25,6 +25,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index be0db27b..2790f8bc 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -58,58 +58,58 @@ importers: examples/api: dependencies: '@tauri-apps/api': - specifier: 2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: 2.0.0 + version: 2.0.0 '@tauri-apps/plugin-barcode-scanner': - specifier: 2.0.0-rc.2 + specifier: 2.0.0 version: link:../../plugins/barcode-scanner '@tauri-apps/plugin-biometric': - specifier: 2.0.0-rc.1 + specifier: 2.0.0 version: link:../../plugins/biometric '@tauri-apps/plugin-cli': - specifier: 2.0.0-rc.1 + specifier: 2.0.0 version: link:../../plugins/cli '@tauri-apps/plugin-clipboard-manager': - specifier: 2.0.0-rc.2 + specifier: 2.0.0 version: link:../../plugins/clipboard-manager '@tauri-apps/plugin-dialog': - specifier: 2.0.0-rc.1 + specifier: 2.0.0 version: link:../../plugins/dialog '@tauri-apps/plugin-fs': - specifier: 2.0.0-rc.2 + specifier: 2.0.0 version: link:../../plugins/fs '@tauri-apps/plugin-geolocation': - specifier: 2.0.0-rc.2 + specifier: 2.0.0 version: link:../../plugins/geolocation '@tauri-apps/plugin-global-shortcut': - specifier: 2.0.0-rc.1 + specifier: 2.0.0 version: link:../../plugins/global-shortcut '@tauri-apps/plugin-haptics': - specifier: 2.0.0-rc.1 + specifier: 2.0.0 version: link:../../plugins/haptics '@tauri-apps/plugin-http': - specifier: 2.0.0-rc.2 + specifier: 2.0.0 version: link:../../plugins/http '@tauri-apps/plugin-nfc': - specifier: 2.0.0-rc.1 + specifier: 2.0.0 version: link:../../plugins/nfc '@tauri-apps/plugin-notification': - specifier: 2.0.0-rc.1 + specifier: 2.0.0 version: link:../../plugins/notification '@tauri-apps/plugin-os': - specifier: 2.0.0-rc.1 + specifier: 2.0.0 version: link:../../plugins/os '@tauri-apps/plugin-process': - specifier: 2.0.0-rc.1 + specifier: 2.0.0 version: link:../../plugins/process '@tauri-apps/plugin-shell': - specifier: 2.0.0-rc.1 + specifier: 2.0.0 version: link:../../plugins/shell '@tauri-apps/plugin-store': - specifier: 2.0.0-rc.2 + specifier: 2.0.0 version: link:../../plugins/store '@tauri-apps/plugin-updater': - specifier: 2.0.0-rc.2 + specifier: 2.0.0 version: link:../../plugins/updater '@zerodevx/svelte-json-view': specifier: 1.0.11 @@ -125,8 +125,8 @@ importers: specifier: ^3.0.1 version: 3.1.2(svelte@4.2.19)(vite@5.4.8(terser@5.34.1)) '@tauri-apps/cli': - specifier: 2.0.0-rc.17 - version: 2.0.0-rc.17 + specifier: 2.0.0 + version: 2.0.0 '@unocss/extractor-svelte': specifier: ^0.63.0 version: 0.63.1 @@ -143,51 +143,51 @@ importers: plugins/autostart: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/barcode-scanner: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/biometric: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/cli: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/clipboard-manager: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/deep-link: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/deep-link/examples/app: dependencies: '@tauri-apps/api': - specifier: 2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: 2.0.0 + version: 2.0.0 '@tauri-apps/plugin-deep-link': - specifier: 2.0.0-rc.2 + specifier: 2.0.0 version: link:../.. devDependencies: '@tauri-apps/cli': - specifier: 2.0.0-rc.17 - version: 2.0.0-rc.17 + specifier: 2.0.0 + version: 2.0.0 typescript: specifier: ^5.2.2 version: 5.6.2 @@ -198,104 +198,104 @@ importers: plugins/dialog: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/fs: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/geolocation: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/global-shortcut: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/haptics: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/http: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/log: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/nfc: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/notification: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/os: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/positioner: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/process: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/shell: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/single-instance/examples/vanilla: devDependencies: '@tauri-apps/cli': - specifier: 2.0.0-rc.17 - version: 2.0.0-rc.17 + specifier: 2.0.0 + version: 2.0.0 plugins/sql: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/store: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/store/examples/AppSettingsManager: devDependencies: '@tauri-apps/cli': - specifier: 2.0.0-rc.17 - version: 2.0.0-rc.17 + specifier: 2.0.0 + version: 2.0.0 typescript: specifier: ^5.4.7 version: 5.6.2 @@ -306,26 +306,26 @@ importers: plugins/stronghold: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/updater: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/upload: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/websocket: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 plugins/websocket/examples/tauri-app: dependencies: @@ -334,8 +334,8 @@ importers: version: link:../.. devDependencies: '@tauri-apps/cli': - specifier: 2.0.0-rc.17 - version: 2.0.0-rc.17 + specifier: 2.0.0 + version: 2.0.0 typescript: specifier: ^5.3.3 version: 5.6.2 @@ -346,8 +346,8 @@ importers: plugins/window-state: dependencies: '@tauri-apps/api': - specifier: ^2.0.0-rc.6 - version: 2.0.0-rc.6 + specifier: ^2.0.0 + version: 2.0.0 packages: @@ -928,71 +928,71 @@ packages: svelte: ^4.0.0 || ^5.0.0-next.0 vite: ^5.0.0 - '@tauri-apps/api@2.0.0-rc.6': - resolution: {integrity: sha512-oENxL0C5WqHNSXWjZEbjnzoBwFFyn8do5S0elOg0ME1cLvWJOAKmqdCnWPpAwtzHQZ+xAzMU0/k8nPpJq4OQYA==} + '@tauri-apps/api@2.0.0': + resolution: {integrity: sha512-moKgCp2EX7X5GiOx/G/bmoEpkFQVVmyS98UaJU4xUVzan+E1BdwlAKcbip+cGldshYOqL4JSwAEN1OkRXeug0Q==} - '@tauri-apps/cli-darwin-arm64@2.0.0-rc.17': - resolution: {integrity: sha512-LXlLpavNfhvELPBcjCzQ9DOLx7rlAzZM4iltsaKawAewx30Q0EpIjK53Sg5AR3p5/KzNfCsTMjjpeUZg1AcFgw==} + '@tauri-apps/cli-darwin-arm64@2.0.0': + resolution: {integrity: sha512-+agYqg2c77imaMfKw7mzqecVIDGcwr6bZMdglJ808O2UjTFzMwnAam1sU26YBYU+IyIjwOu00fm9Azpal+N/Ew==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] - '@tauri-apps/cli-darwin-x64@2.0.0-rc.17': - resolution: {integrity: sha512-86jlpD9DQEMdPCu+foqady2Kov3u151Pgs1uOdA3SQxXph4L31T7j26axIhADLYZH6T1be+lSVPm6+fp0iXGgw==} + '@tauri-apps/cli-darwin-x64@2.0.0': + resolution: {integrity: sha512-keN2PLTTcZmbWwFMup/NGcshmvyLnhRPChO8lbm9C5a0IY7zUNQUD7/o/zIulQdLJqDxkdpWJ1j2jTycAtvtKQ==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] - '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-rc.17': - resolution: {integrity: sha512-ZFZeVBFdM9ogNebqzU3vo6f662YwmnE5XzeT6UEKUy+df49Fw2Npebmg0t/BPoF9e/nEgK1w1Jy68aK2JISscg==} + '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0': + resolution: {integrity: sha512-FQJNrlCUBb9E7Fhp5ARy+Or8lSvorG41aVrfi0cGNvv1QlIGSj77TN7SKK+L1jAGzKj1Bl2kCZIESF6Zi8N/+Q==} engines: {node: '>= 10'} cpu: [arm] os: [linux] - '@tauri-apps/cli-linux-arm64-gnu@2.0.0-rc.17': - resolution: {integrity: sha512-GvO7BNJL6y8CumvaidJ+cEXn0KRaCzhmwtrMfTEl9jsqhGYvmNXuOlZR41hgoy6CQtUiu11ZGoBtU37/lxEKaQ==} + '@tauri-apps/cli-linux-arm64-gnu@2.0.0': + resolution: {integrity: sha512-TK3VrZG5LK1NGueKwnZA1/3gj/qkwry001MNCHXjT6394dwrDv+digCc9Qc569h+xeH/FF71jyoiRIu3gRE6iA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-arm64-musl@2.0.0-rc.17': - resolution: {integrity: sha512-DypDS3rJjcKzpgZKqHsCrzVGDbjo17XcYNhAYd2VxvXmGVAq05eZ71jLYHSSofXTxbpLZMcGKaino0jKyX1mOA==} + '@tauri-apps/cli-linux-arm64-musl@2.0.0': + resolution: {integrity: sha512-E3hRmS/0m8YUYMTKZtBExpk/284CTi2nymks0dK0L1j+3KjffL7DiilnIfNFmTvWBgMrs0cVCtoaN/ba/A9mNA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-x64-gnu@2.0.0-rc.17': - resolution: {integrity: sha512-nKCAJtC4b9HnVpDsCVXASPEXOEIZb/HFmdRPuKiYXmpziL5OByCJLjhVx5EFhpVtqAg1isCmOutqKc8Nmw1QQQ==} + '@tauri-apps/cli-linux-x64-gnu@2.0.0': + resolution: {integrity: sha512-veX4BJp5xnW8KmxVjchWt4oZEIvKGhuSR7qU1WpqTR21e/eTe/ksGsdXPsqOKQvv/w1X6jhqmlPvhnFmDwUJ/w==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-linux-x64-musl@2.0.0-rc.17': - resolution: {integrity: sha512-cSi3M/hcNo+NubSKJG96Af6o6cL38RCvP0ImFiyIOU/adYmW0bQGWI4u/eL14IpdNCR1pbifgEcQL6dteyod0g==} + '@tauri-apps/cli-linux-x64-musl@2.0.0': + resolution: {integrity: sha512-9Eso/8wbsWbOyd9PZEIzN/48ZQJrUGQqGZtglcjUku0lO76mnX0fOnit4nQ57Oj0wezJPhv4mgSseG1OsTIVzw==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-win32-arm64-msvc@2.0.0-rc.17': - resolution: {integrity: sha512-hMtNtm2zXvUwzzTEJIf/GQplWHNLEeAjiLGaX9sS2Me96X/OzU1PUXcWTYdjVA102cf6q//0/pgpPo/Yn480KA==} + '@tauri-apps/cli-win32-arm64-msvc@2.0.0': + resolution: {integrity: sha512-ky8vWAuDUf8WGt9+a0G/EbU0OhdIkogelh9qjIYGHbyEYAJqXfN5P40aHUEg3y8ngQ0YGwRX5ePsQsSZiiR5PQ==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] - '@tauri-apps/cli-win32-ia32-msvc@2.0.0-rc.17': - resolution: {integrity: sha512-XO+zgvYvpz65aYbXMyFhej4Td5sEK7bSLPr2+8BigiI7F4tHaS7KJpYVtJtjHQtAo6KBy/bT8P9VW6xM4G+YVA==} + '@tauri-apps/cli-win32-ia32-msvc@2.0.0': + resolution: {integrity: sha512-uD45cLZ/EBaT8o4a27tHW7t5UKFplnvDLt/uSUaCpJ3NyOTV6nMXOUrJBe+hH9hSBohqNAF7LEyYo1p932DWFg==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] - '@tauri-apps/cli-win32-x64-msvc@2.0.0-rc.17': - resolution: {integrity: sha512-sVV0o9careFJuL3fTtkp6ed8X4FGGfMyK1WbXR5ci4Z2dn94wIJuefzTnGaQnvur4PaEJQ9WmTlQ2Pe3UrokBQ==} + '@tauri-apps/cli-win32-x64-msvc@2.0.0': + resolution: {integrity: sha512-oFlo14YMsvyhJHmmHgRuOpJ1L9w15193c1Nfj1DksS2LHj6tLzirI7YrAF9inY/XjHFjNHzYPmBpABibkf/9wQ==} engines: {node: '>= 10'} cpu: [x64] os: [win32] - '@tauri-apps/cli@2.0.0-rc.17': - resolution: {integrity: sha512-7YQljT+izYmhLqsI5G2xg3AHBPx3gAHc+gB/s+NKqdSL4CuGImLiii8Rw/qBtuJpWFWLJiaGXnpra35zrSlknQ==} + '@tauri-apps/cli@2.0.0': + resolution: {integrity: sha512-xxmPllRa6w/LRRcPczST3yHrYoi8l6ZZmzwabEmM0cgDdhVDmX+Y4oDJkiKD+8cVdxwwEzIuIKuaCwsX8iNsgA==} engines: {node: '>= 10'} hasBin: true @@ -2330,9 +2330,9 @@ snapshots: - encoding - mocha - '@covector/assemble@0.12.0(mocha@10.7.3)': + '@covector/assemble@0.12.0': dependencies: - '@covector/command': 0.8.0(mocha@10.7.3) + '@covector/command': 0.8.0 '@covector/files': 0.8.0 effection: 2.0.8(mocha@10.7.3) js-yaml: 4.1.0 @@ -2343,10 +2343,9 @@ snapshots: unified: 9.2.2 transitivePeerDependencies: - encoding - - mocha - supports-color - '@covector/changelog@0.12.0(mocha@10.7.3)': + '@covector/changelog@0.12.0': dependencies: '@covector/files': 0.8.0 effection: 2.0.8(mocha@10.7.3) @@ -2356,16 +2355,14 @@ snapshots: unified: 9.2.2 transitivePeerDependencies: - encoding - - mocha - supports-color - '@covector/command@0.8.0(mocha@10.7.3)': + '@covector/command@0.8.0': dependencies: - '@effection/process': 2.1.4(mocha@10.7.3) + '@effection/process': 2.1.4 effection: 2.0.8(mocha@10.7.3) transitivePeerDependencies: - encoding - - mocha '@covector/files@0.8.0': dependencies: @@ -2412,8 +2409,10 @@ snapshots: dependencies: effection: 2.0.8(mocha@10.7.3) mocha: 10.7.3 + transitivePeerDependencies: + - encoding - '@effection/process@2.1.4(mocha@10.7.3)': + '@effection/process@2.1.4': dependencies: cross-spawn: 7.0.3 ctrlc-windows: 2.1.0 @@ -2421,7 +2420,6 @@ snapshots: shellwords: 0.1.1 transitivePeerDependencies: - encoding - - mocha '@effection/stream@2.0.6': dependencies: @@ -2780,50 +2778,50 @@ snapshots: transitivePeerDependencies: - supports-color - '@tauri-apps/api@2.0.0-rc.6': {} + '@tauri-apps/api@2.0.0': {} - '@tauri-apps/cli-darwin-arm64@2.0.0-rc.17': + '@tauri-apps/cli-darwin-arm64@2.0.0': optional: true - '@tauri-apps/cli-darwin-x64@2.0.0-rc.17': + '@tauri-apps/cli-darwin-x64@2.0.0': optional: true - '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0-rc.17': + '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0': optional: true - '@tauri-apps/cli-linux-arm64-gnu@2.0.0-rc.17': + '@tauri-apps/cli-linux-arm64-gnu@2.0.0': optional: true - '@tauri-apps/cli-linux-arm64-musl@2.0.0-rc.17': + '@tauri-apps/cli-linux-arm64-musl@2.0.0': optional: true - '@tauri-apps/cli-linux-x64-gnu@2.0.0-rc.17': + '@tauri-apps/cli-linux-x64-gnu@2.0.0': optional: true - '@tauri-apps/cli-linux-x64-musl@2.0.0-rc.17': + '@tauri-apps/cli-linux-x64-musl@2.0.0': optional: true - '@tauri-apps/cli-win32-arm64-msvc@2.0.0-rc.17': + '@tauri-apps/cli-win32-arm64-msvc@2.0.0': optional: true - '@tauri-apps/cli-win32-ia32-msvc@2.0.0-rc.17': + '@tauri-apps/cli-win32-ia32-msvc@2.0.0': optional: true - '@tauri-apps/cli-win32-x64-msvc@2.0.0-rc.17': + '@tauri-apps/cli-win32-x64-msvc@2.0.0': optional: true - '@tauri-apps/cli@2.0.0-rc.17': + '@tauri-apps/cli@2.0.0': optionalDependencies: - '@tauri-apps/cli-darwin-arm64': 2.0.0-rc.17 - '@tauri-apps/cli-darwin-x64': 2.0.0-rc.17 - '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0-rc.17 - '@tauri-apps/cli-linux-arm64-gnu': 2.0.0-rc.17 - '@tauri-apps/cli-linux-arm64-musl': 2.0.0-rc.17 - '@tauri-apps/cli-linux-x64-gnu': 2.0.0-rc.17 - '@tauri-apps/cli-linux-x64-musl': 2.0.0-rc.17 - '@tauri-apps/cli-win32-arm64-msvc': 2.0.0-rc.17 - '@tauri-apps/cli-win32-ia32-msvc': 2.0.0-rc.17 - '@tauri-apps/cli-win32-x64-msvc': 2.0.0-rc.17 + '@tauri-apps/cli-darwin-arm64': 2.0.0 + '@tauri-apps/cli-darwin-x64': 2.0.0 + '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0 + '@tauri-apps/cli-linux-arm64-gnu': 2.0.0 + '@tauri-apps/cli-linux-arm64-musl': 2.0.0 + '@tauri-apps/cli-linux-x64-gnu': 2.0.0 + '@tauri-apps/cli-linux-x64-musl': 2.0.0 + '@tauri-apps/cli-win32-arm64-msvc': 2.0.0 + '@tauri-apps/cli-win32-ia32-msvc': 2.0.0 + '@tauri-apps/cli-win32-x64-msvc': 2.0.0 '@types/eslint@9.6.1': dependencies: @@ -3225,9 +3223,9 @@ snapshots: dependencies: '@clack/prompts': 0.7.0 '@covector/apply': 0.10.0(mocha@10.7.3) - '@covector/assemble': 0.12.0(mocha@10.7.3) - '@covector/changelog': 0.12.0(mocha@10.7.3) - '@covector/command': 0.8.0(mocha@10.7.3) + '@covector/assemble': 0.12.0 + '@covector/changelog': 0.12.0 + '@covector/command': 0.8.0 '@covector/files': 0.8.0 effection: 2.0.8(mocha@10.7.3) globby: 11.1.0 diff --git a/shared/template/README.md b/shared/template/README.md index 4387ef32..aef892b6 100644 --- a/shared/template/README.md +++ b/shared/template/README.md @@ -12,7 +12,7 @@ ## Install -_This plugin requires a Rust version of at least **1.75**_ +_This plugin requires a Rust version of at least **1.78**_ There are three general methods of installation that we can recommend. @@ -26,7 +26,7 @@ Install the Core plugin by adding the following to your `Cargo.toml` file: ```toml [dependencies] -tauri-plugin-PLUGIN_NAME = "2.0.0-rc" +tauri-plugin-PLUGIN_NAME = "2.0.0" # alternatively with Git: tauri-plugin-PLUGIN_NAME = { git = "https://github.com/tauri-apps/plugins-workspace", branch = "v2" } ``` diff --git a/shared/template/package.json b/shared/template/package.json index 36cd017f..75ce480a 100644 --- a/shared/template/package.json +++ b/shared/template/package.json @@ -24,6 +24,6 @@ "LICENSE" ], "dependencies": { - "@tauri-apps/api": "^2.0.0-rc.6" + "@tauri-apps/api": "^2.0.0" } } From 9501cfa5f5385b2d7eb43a8378b322ee97cba06f Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Wed, 2 Oct 2024 16:28:16 -0300 Subject: [PATCH 18/40] fix(updater): validate endpoint scheme before printing warning (#1868) regression from #1814 --- .changes/fix-updater-warning.md | 5 +++++ plugins/updater/src/config.rs | 13 ++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) create mode 100644 .changes/fix-updater-warning.md diff --git a/.changes/fix-updater-warning.md b/.changes/fix-updater-warning.md new file mode 100644 index 00000000..394e38ac --- /dev/null +++ b/.changes/fix-updater-warning.md @@ -0,0 +1,5 @@ +--- +"updater": patch +--- + +Fix configuration parser incorrectly warning about the endpoint scheme. diff --git a/plugins/updater/src/config.rs b/plugins/updater/src/config.rs index b95c6ae4..6b16bc01 100644 --- a/plugins/updater/src/config.rs +++ b/plugins/updater/src/config.rs @@ -142,14 +142,13 @@ pub(crate) fn validate_endpoints( ) -> crate::Result<()> { if !dangerous_insecure_transport_protocol { for url in endpoints { - #[cfg(debug_assertions)] - #[cfg(debug_assertions)] - eprintln!("[\x1b[33mWARNING\x1b[0m] The updater endpoint \"{url}\" doesn't use `https` protocol. This is allowed in development but will fail in release builds."); - #[cfg(debug_assertions)] - eprintln!("[\x1b[33mWARNING\x1b[0m] if this is a desired behavior, you can enable `dangerousInsecureTransportProtocol` in the plugin configuration"); - - #[cfg(not(debug_assertions))] if url.scheme() != "https" { + #[cfg(debug_assertions)] + { + eprintln!("[\x1b[33mWARNING\x1b[0m] The updater endpoint \"{url}\" doesn't use `https` protocol. This is allowed in development but will fail in release builds."); + eprintln!("[\x1b[33mWARNING\x1b[0m] if this is a desired behavior, you can enable `dangerousInsecureTransportProtocol` in the plugin configuration"); + } + #[cfg(not(debug_assertions))] return Err(crate::Error::InsecureTransportProtocol); } } From ee02ea7746d2fff7b725b9db77dd8f1ae63b9f5a Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Wed, 2 Oct 2024 16:40:18 -0300 Subject: [PATCH 19/40] publish new versions (#1869) Co-authored-by: lucasfernog --- .changes/fix-updater-warning.md | 5 ----- Cargo.lock | 4 ++-- examples/api/src-tauri/CHANGELOG.md | 6 ++++++ examples/api/src-tauri/Cargo.toml | 4 ++-- plugins/updater/CHANGELOG.md | 4 ++++ plugins/updater/Cargo.toml | 2 +- 6 files changed, 15 insertions(+), 10 deletions(-) delete mode 100644 .changes/fix-updater-warning.md diff --git a/.changes/fix-updater-warning.md b/.changes/fix-updater-warning.md deleted file mode 100644 index 394e38ac..00000000 --- a/.changes/fix-updater-warning.md +++ /dev/null @@ -1,5 +0,0 @@ ---- -"updater": patch ---- - -Fix configuration parser incorrectly warning about the endpoint scheme. diff --git a/Cargo.lock b/Cargo.lock index 298f0e6a..3f95c411 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -218,7 +218,7 @@ checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "api" -version = "2.0.0" +version = "2.0.1" dependencies = [ "log", "serde", @@ -7018,7 +7018,7 @@ dependencies = [ [[package]] name = "tauri-plugin-updater" -version = "2.0.0" +version = "2.0.1" dependencies = [ "base64 0.22.1", "dirs 5.0.1", diff --git a/examples/api/src-tauri/CHANGELOG.md b/examples/api/src-tauri/CHANGELOG.md index f936e930..2f0343ac 100644 --- a/examples/api/src-tauri/CHANGELOG.md +++ b/examples/api/src-tauri/CHANGELOG.md @@ -1,5 +1,11 @@ # Changelog +## \[2.0.1] + +### Dependencies + +- Upgraded to `updater@2.0.1` + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml index 3a007fa9..abb6578e 100644 --- a/examples/api/src-tauri/Cargo.toml +++ b/examples/api/src-tauri/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "api" publish = false -version = "2.0.0" +version = "2.0.1" description = "An example Tauri Application showcasing the api" edition = "2021" rust-version = { workspace = true } @@ -52,7 +52,7 @@ features = [ [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.0.0" } tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut", version = "2.0.0" } -tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.0.0" } +tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.0.1" } tauri-plugin-window-state = { path = "../../../plugins/window-state", version = "2.0.0" } [target."cfg(any(target_os = \"android\", target_os = \"ios\"))".dependencies] diff --git a/plugins/updater/CHANGELOG.md b/plugins/updater/CHANGELOG.md index 6cef3a2e..ed894170 100644 --- a/plugins/updater/CHANGELOG.md +++ b/plugins/updater/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`9501cfa5`](https://github.com/tauri-apps/plugins-workspace/commit/9501cfa5f5385b2d7eb43a8378b322ee97cba06f) ([#1868](https://github.com/tauri-apps/plugins-workspace/pull/1868) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Fix configuration parser incorrectly warning about the endpoint scheme. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/updater/Cargo.toml b/plugins/updater/Cargo.toml index f6f0a655..23509464 100644 --- a/plugins/updater/Cargo.toml +++ b/plugins/updater/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-updater" -version = "2.0.0" +version = "2.0.1" description = "In-app updates for Tauri applications." edition = { workspace = true } authors = { workspace = true } From ab8d089b2be6019508c0a1e8643b27656671051c Mon Sep 17 00:00:00 2001 From: Horu <73709188+HigherOrderLogic@users.noreply.github.com> Date: Thu, 3 Oct 2024 12:04:38 +1000 Subject: [PATCH 20/40] chore(barcode-scanner): fix banner link in readme (#1870) * chore: fix banner link in readme * chore: raw --- plugins/barcode-scanner/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/barcode-scanner/README.md b/plugins/barcode-scanner/README.md index f0fe8371..eba7ca9e 100644 --- a/plugins/barcode-scanner/README.md +++ b/plugins/barcode-scanner/README.md @@ -1,4 +1,4 @@ -![Barcode Scanner](https://github.com/tauri-apps/plugins-workspace/raw/v2/plugins/scanner/banner.png) +![Barcode Scanner](https://github.com/tauri-apps/plugins-workspace/raw/v2/plugins/barcode-scanner/banner.png) Allows your mobile application to use the camera to scan QR codes, EAN-13 and other kinds of barcodes. From fe6dd0ff9e6dbe3cbd8abcddc4ad16049bf0bf32 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 10:54:25 +0800 Subject: [PATCH 21/40] fix(deps): update dependency @tauri-apps/api to v2.0.1 (#1862) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- examples/api/package.json | 2 +- plugins/deep-link/examples/app/package.json | 2 +- pnpm-lock.yaml | 66 ++++++++++----------- 3 files changed, 35 insertions(+), 35 deletions(-) diff --git a/examples/api/package.json b/examples/api/package.json index e9e712cd..599276b8 100644 --- a/examples/api/package.json +++ b/examples/api/package.json @@ -9,7 +9,7 @@ "serve": "vite preview" }, "dependencies": { - "@tauri-apps/api": "2.0.0", + "@tauri-apps/api": "2.0.1", "@tauri-apps/plugin-barcode-scanner": "2.0.0", "@tauri-apps/plugin-biometric": "2.0.0", "@tauri-apps/plugin-cli": "2.0.0", diff --git a/plugins/deep-link/examples/app/package.json b/plugins/deep-link/examples/app/package.json index fa227558..98864087 100644 --- a/plugins/deep-link/examples/app/package.json +++ b/plugins/deep-link/examples/app/package.json @@ -10,7 +10,7 @@ "tauri": "tauri" }, "dependencies": { - "@tauri-apps/api": "2.0.0", + "@tauri-apps/api": "2.0.1", "@tauri-apps/plugin-deep-link": "2.0.0" }, "devDependencies": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 2790f8bc..fe477c92 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -58,8 +58,8 @@ importers: examples/api: dependencies: '@tauri-apps/api': - specifier: 2.0.0 - version: 2.0.0 + specifier: 2.0.1 + version: 2.0.1 '@tauri-apps/plugin-barcode-scanner': specifier: 2.0.0 version: link:../../plugins/barcode-scanner @@ -144,43 +144,43 @@ importers: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/barcode-scanner: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/biometric: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/cli: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/clipboard-manager: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/deep-link: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/deep-link/examples/app: dependencies: '@tauri-apps/api': - specifier: 2.0.0 - version: 2.0.0 + specifier: 2.0.1 + version: 2.0.1 '@tauri-apps/plugin-deep-link': specifier: 2.0.0 version: link:../.. @@ -199,79 +199,79 @@ importers: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/fs: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/geolocation: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/global-shortcut: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/haptics: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/http: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/log: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/nfc: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/notification: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/os: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/positioner: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/process: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/shell: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/single-instance/examples/vanilla: devDependencies: @@ -283,13 +283,13 @@ importers: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/store: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/store/examples/AppSettingsManager: devDependencies: @@ -307,25 +307,25 @@ importers: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/updater: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/upload: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/websocket: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 plugins/websocket/examples/tauri-app: dependencies: @@ -347,7 +347,7 @@ importers: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.0 + version: 2.0.1 packages: @@ -928,8 +928,8 @@ packages: svelte: ^4.0.0 || ^5.0.0-next.0 vite: ^5.0.0 - '@tauri-apps/api@2.0.0': - resolution: {integrity: sha512-moKgCp2EX7X5GiOx/G/bmoEpkFQVVmyS98UaJU4xUVzan+E1BdwlAKcbip+cGldshYOqL4JSwAEN1OkRXeug0Q==} + '@tauri-apps/api@2.0.1': + resolution: {integrity: sha512-eoQWT+Tq1qSwQpHV+nw1eNYe5B/nm1PoRjQCRiEOS12I1b+X4PUcREfXVX8dPcBT6GrzWGDtaecY0+1p0Rfqlw==} '@tauri-apps/cli-darwin-arm64@2.0.0': resolution: {integrity: sha512-+agYqg2c77imaMfKw7mzqecVIDGcwr6bZMdglJ808O2UjTFzMwnAam1sU26YBYU+IyIjwOu00fm9Azpal+N/Ew==} @@ -2778,7 +2778,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@tauri-apps/api@2.0.0': {} + '@tauri-apps/api@2.0.1': {} '@tauri-apps/cli-darwin-arm64@2.0.0': optional: true From 4c2454d410554900307cc569f95db4870c28978b Mon Sep 17 00:00:00 2001 From: Tillmann <28728469+tweidinger@users.noreply.github.com> Date: Thu, 3 Oct 2024 19:23:40 +0900 Subject: [PATCH 22/40] sync readme with metadata (#1872) --- plugins/http/Cargo.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/http/Cargo.toml b/plugins/http/Cargo.toml index dfd199f7..f59859d8 100644 --- a/plugins/http/Cargo.toml +++ b/plugins/http/Cargo.toml @@ -17,8 +17,8 @@ rustdoc-args = ["--cfg", "docsrs"] windows = { level = "full", notes = "" } linux = { level = "full", notes = "" } macos = { level = "full", notes = "" } -android = { level = "none", notes = "" } -ios = { level = "none", notes = "" } +android = { level = "full", notes = "" } +ios = { level = "full", notes = "" } [build-dependencies] tauri-plugin = { workspace = true, features = ["build"] } From dc49de53419c802b821e487d2ff0f7fb4283b935 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 20:52:00 +0800 Subject: [PATCH 23/40] chore(deps): update dependency typescript-eslint to v8.8.0 (#1854) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- pnpm-lock.yaml | 102 ++++++++++++++++++++++++------------------------- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/package.json b/package.json index ae587a37..38b712dc 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "rollup": "4.22.4", "tslib": "2.7.0", "typescript": "5.6.2", - "typescript-eslint": "8.7.0" + "typescript-eslint": "8.8.0" }, "resolutions": { "semver": ">=7.5.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index fe477c92..3c643cc5 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -52,8 +52,8 @@ importers: specifier: 5.6.2 version: 5.6.2 typescript-eslint: - specifier: 8.7.0 - version: 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + specifier: 8.8.0 + version: 8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) examples/api: dependencies: @@ -1020,8 +1020,8 @@ packages: '@types/unist@2.0.11': resolution: {integrity: sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==} - '@typescript-eslint/eslint-plugin@8.7.0': - resolution: {integrity: sha512-RIHOoznhA3CCfSTFiB6kBGLQtB/sox+pJ6jeFu6FxJvqL8qRxq/FfGO/UhsGgQM9oGdXkV4xUgli+dt26biB6A==} + '@typescript-eslint/eslint-plugin@8.8.0': + resolution: {integrity: sha512-wORFWjU30B2WJ/aXBfOm1LX9v9nyt9D3jsSOxC3cCaTQGCW5k4jNpmjFv3U7p/7s4yvdjHzwtv2Sd2dOyhjS0A==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0 @@ -1031,8 +1031,8 @@ packages: typescript: optional: true - '@typescript-eslint/parser@8.7.0': - resolution: {integrity: sha512-lN0btVpj2unxHlNYLI//BQ7nzbMJYBVQX5+pbNXvGYazdlgYonMn4AhhHifQ+J4fGRYA/m1DjaQjx+fDetqBOQ==} + '@typescript-eslint/parser@8.8.0': + resolution: {integrity: sha512-uEFUsgR+tl8GmzmLjRqz+VrDv4eoaMqMXW7ruXfgThaAShO9JTciKpEsB+TvnfFfbg5IpujgMXVV36gOJRLtZg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 @@ -1041,12 +1041,12 @@ packages: typescript: optional: true - '@typescript-eslint/scope-manager@8.7.0': - resolution: {integrity: sha512-87rC0k3ZlDOuz82zzXRtQ7Akv3GKhHs0ti4YcbAJtaomllXoSO8hi7Ix3ccEvCd824dy9aIX+j3d2UMAfCtVpg==} + '@typescript-eslint/scope-manager@8.8.0': + resolution: {integrity: sha512-EL8eaGC6gx3jDd8GwEFEV091210U97J0jeEHrAYvIYosmEGet4wJ+g0SYmLu+oRiAwbSA5AVrt6DxLHfdd+bUg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/type-utils@8.7.0': - resolution: {integrity: sha512-tl0N0Mj3hMSkEYhLkjREp54OSb/FI6qyCzfiiclvJvOqre6hsZTGSnHtmFLDU8TIM62G7ygEa1bI08lcuRwEnQ==} + '@typescript-eslint/type-utils@8.8.0': + resolution: {integrity: sha512-IKwJSS7bCqyCeG4NVGxnOP6lLT9Okc3Zj8hLO96bpMkJab+10HIfJbMouLrlpyOr3yrQ1cA413YPFiGd1mW9/Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '*' @@ -1054,12 +1054,12 @@ packages: typescript: optional: true - '@typescript-eslint/types@8.7.0': - resolution: {integrity: sha512-LLt4BLHFwSfASHSF2K29SZ+ZCsbQOM+LuarPjRUuHm+Qd09hSe3GCeaQbcCr+Mik+0QFRmep/FyZBO6fJ64U3w==} + '@typescript-eslint/types@8.8.0': + resolution: {integrity: sha512-QJwc50hRCgBd/k12sTykOJbESe1RrzmX6COk8Y525C9l7oweZ+1lw9JiU56im7Amm8swlz00DRIlxMYLizr2Vw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/typescript-estree@8.7.0': - resolution: {integrity: sha512-MC8nmcGHsmfAKxwnluTQpNqceniT8SteVwd2voYlmiSWGOtjvGXdPl17dYu2797GVscK30Z04WRM28CrKS9WOg==} + '@typescript-eslint/typescript-estree@8.8.0': + resolution: {integrity: sha512-ZaMJwc/0ckLz5DaAZ+pNLmHv8AMVGtfWxZe/x2JVEkD5LnmhWiQMMcYT7IY7gkdJuzJ9P14fRy28lUrlDSWYdw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '*' @@ -1067,14 +1067,14 @@ packages: typescript: optional: true - '@typescript-eslint/utils@8.7.0': - resolution: {integrity: sha512-ZbdUdwsl2X/s3CiyAu3gOlfQzpbuG3nTWKPoIvAu1pu5r8viiJvv2NPN2AqArL35NCYtw/lrPPfM4gxrMLNLPw==} + '@typescript-eslint/utils@8.8.0': + resolution: {integrity: sha512-QE2MgfOTem00qrlPgyByaCHay9yb1+9BjnMFnSFkUKQfu7adBXDTnCAivURnuPPAG/qiB+kzKkZKmKfaMT0zVg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 - '@typescript-eslint/visitor-keys@8.7.0': - resolution: {integrity: sha512-b1tx0orFCCh/THWPQa2ZwWzvOeyzzp36vkJYOpVg0u8UVOIsfVrnuC9FqAw9gRKn+rG2VmWQ/zDJZzkxUnj/XQ==} + '@typescript-eslint/visitor-keys@8.8.0': + resolution: {integrity: sha512-8mq51Lx6Hpmd7HnA2fcHQo3YgfX1qbccxQOgZcb4tvasu//zXRaA1j5ZRFeCw/VRAdFi4mRM9DnZw0Nu0Q2d1g==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@unocss/astro@0.63.1': @@ -2141,8 +2141,8 @@ packages: resolution: {integrity: sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==} engines: {node: '>=8'} - typescript-eslint@8.7.0: - resolution: {integrity: sha512-nEHbEYJyHwsuf7c3V3RS7Saq+1+la3i0ieR3qP0yjqWSzVmh8Drp47uOl9LjbPANac4S7EFSqvcYIKXUUwIfIQ==} + typescript-eslint@8.8.0: + resolution: {integrity: sha512-BjIT/VwJ8+0rVO01ZQ2ZVnjE1svFBiRczcpr1t1Yxt7sT25VSbPfrJtDsQ8uQTy2pilX5nI9gwxhUyLULNentw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '*' @@ -2846,14 +2846,14 @@ snapshots: '@types/unist@2.0.11': {} - '@typescript-eslint/eslint-plugin@8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2))(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/eslint-plugin@8.8.0(@typescript-eslint/parser@8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2))(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': dependencies: '@eslint-community/regexpp': 4.11.1 - '@typescript-eslint/parser': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) - '@typescript-eslint/scope-manager': 8.7.0 - '@typescript-eslint/type-utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) - '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) - '@typescript-eslint/visitor-keys': 8.7.0 + '@typescript-eslint/parser': 8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/scope-manager': 8.8.0 + '@typescript-eslint/type-utils': 8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/utils': 8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/visitor-keys': 8.8.0 eslint: 9.11.1(jiti@2.0.0) graphemer: 1.4.0 ignore: 5.3.2 @@ -2864,12 +2864,12 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/parser@8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': dependencies: - '@typescript-eslint/scope-manager': 8.7.0 - '@typescript-eslint/types': 8.7.0 - '@typescript-eslint/typescript-estree': 8.7.0(typescript@5.6.2) - '@typescript-eslint/visitor-keys': 8.7.0 + '@typescript-eslint/scope-manager': 8.8.0 + '@typescript-eslint/types': 8.8.0 + '@typescript-eslint/typescript-estree': 8.8.0(typescript@5.6.2) + '@typescript-eslint/visitor-keys': 8.8.0 debug: 4.3.7(supports-color@8.1.1) eslint: 9.11.1(jiti@2.0.0) optionalDependencies: @@ -2877,15 +2877,15 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/scope-manager@8.7.0': + '@typescript-eslint/scope-manager@8.8.0': dependencies: - '@typescript-eslint/types': 8.7.0 - '@typescript-eslint/visitor-keys': 8.7.0 + '@typescript-eslint/types': 8.8.0 + '@typescript-eslint/visitor-keys': 8.8.0 - '@typescript-eslint/type-utils@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/type-utils@8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': dependencies: - '@typescript-eslint/typescript-estree': 8.7.0(typescript@5.6.2) - '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/typescript-estree': 8.8.0(typescript@5.6.2) + '@typescript-eslint/utils': 8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) debug: 4.3.7(supports-color@8.1.1) ts-api-utils: 1.3.0(typescript@5.6.2) optionalDependencies: @@ -2894,12 +2894,12 @@ snapshots: - eslint - supports-color - '@typescript-eslint/types@8.7.0': {} + '@typescript-eslint/types@8.8.0': {} - '@typescript-eslint/typescript-estree@8.7.0(typescript@5.6.2)': + '@typescript-eslint/typescript-estree@8.8.0(typescript@5.6.2)': dependencies: - '@typescript-eslint/types': 8.7.0 - '@typescript-eslint/visitor-keys': 8.7.0 + '@typescript-eslint/types': 8.8.0 + '@typescript-eslint/visitor-keys': 8.8.0 debug: 4.3.7(supports-color@8.1.1) fast-glob: 3.3.2 is-glob: 4.0.3 @@ -2911,20 +2911,20 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/utils@8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@2.0.0)) - '@typescript-eslint/scope-manager': 8.7.0 - '@typescript-eslint/types': 8.7.0 - '@typescript-eslint/typescript-estree': 8.7.0(typescript@5.6.2) + '@typescript-eslint/scope-manager': 8.8.0 + '@typescript-eslint/types': 8.8.0 + '@typescript-eslint/typescript-estree': 8.8.0(typescript@5.6.2) eslint: 9.11.1(jiti@2.0.0) transitivePeerDependencies: - supports-color - typescript - '@typescript-eslint/visitor-keys@8.7.0': + '@typescript-eslint/visitor-keys@8.8.0': dependencies: - '@typescript-eslint/types': 8.7.0 + '@typescript-eslint/types': 8.8.0 eslint-visitor-keys: 3.4.3 '@unocss/astro@0.63.1(rollup@4.22.4)(vite@5.4.8(terser@5.34.1))': @@ -4130,11 +4130,11 @@ snapshots: type-fest@0.7.1: {} - typescript-eslint@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2): + typescript-eslint@8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2): dependencies: - '@typescript-eslint/eslint-plugin': 8.7.0(@typescript-eslint/parser@8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2))(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) - '@typescript-eslint/parser': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) - '@typescript-eslint/utils': 8.7.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/eslint-plugin': 8.8.0(@typescript-eslint/parser@8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2))(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/parser': 8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/utils': 8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) optionalDependencies: typescript: 5.6.2 transitivePeerDependencies: From a1a82208ed4ab87f83310be0dc95428aec9ab241 Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Thu, 3 Oct 2024 10:31:13 -0300 Subject: [PATCH 24/40] chore: change MSRV to 1.77.2 to support Windows 7 (#1873) * chore: change MSRV to 1.77.2 to support Windows 7 * fmt --- .changes/msrv-1.77.2.md | 34 +++++++++++++++++++ .github/workflows/test-rust.yml | 2 +- Cargo.lock | 32 ++++++++--------- Cargo.toml | 10 +++--- README.md | 2 +- plugins/autostart/README.md | 2 +- plugins/cli/README.md | 2 +- plugins/clipboard-manager/README.md | 2 +- plugins/deep-link/README.md | 2 +- .../examples/app/src-tauri/Cargo.toml | 2 +- plugins/dialog/README.md | 2 +- plugins/fs/README.md | 2 +- plugins/geolocation/README.md | 2 +- plugins/global-shortcut/README.md | 2 +- plugins/haptics/README.md | 2 +- plugins/http/README.md | 2 +- plugins/localhost/README.md | 2 +- plugins/log/README.md | 2 +- plugins/notification/README.md | 2 +- plugins/os/README.md | 2 +- plugins/persisted-scope/README.md | 2 +- plugins/positioner/README.md | 2 +- plugins/process/README.md | 2 +- plugins/shell/README.md | 2 +- plugins/single-instance/README.md | 2 +- .../examples/vanilla/src-tauri/Cargo.toml | 2 +- plugins/sql/README.md | 2 +- plugins/store/README.md | 2 +- plugins/stronghold/README.md | 2 +- plugins/updater/README.md | 2 +- plugins/upload/README.md | 2 +- plugins/websocket/README.md | 2 +- plugins/window-state/README.md | 2 +- shared/template/README.md | 2 +- 34 files changed, 86 insertions(+), 52 deletions(-) create mode 100644 .changes/msrv-1.77.2.md diff --git a/.changes/msrv-1.77.2.md b/.changes/msrv-1.77.2.md new file mode 100644 index 00000000..118608f4 --- /dev/null +++ b/.changes/msrv-1.77.2.md @@ -0,0 +1,34 @@ +--- +"api-example": patch +"autostart": patch +"barcode-scanner": patch +"biometric": patch +"cli": patch +"clipboard-manager": patch +"deep-link": patch +"fs": patch +"dialog": patch +"geolocation": patch +"global-shortcut": patch +"haptics": patch +"http": patch +"localhost": patch +"log-plugin": patch +"nfc": patch +"notification": patch +"os": patch +"persisted-scope": patch +"positioner": patch +"process": patch +"shell": patch +"single-instance": patch +"sql": patch +"store": patch +"stronghold": patch +"updater": patch +"upload": patch +"websocket": patch +"window-state": patch +--- + +Downgrade MSRV to 1.77.2 to support Windows 7. diff --git a/.github/workflows/test-rust.yml b/.github/workflows/test-rust.yml index 7df99f71..016e3673 100644 --- a/.github/workflows/test-rust.yml +++ b/.github/workflows/test-rust.yml @@ -202,7 +202,7 @@ jobs: sudo apt-get update sudo apt-get install -y libwebkit2gtk-4.0-dev libwebkit2gtk-4.1-dev - - uses: dtolnay/rust-toolchain@1.78.0 + - uses: dtolnay/rust-toolchain@1.77.2 with: targets: ${{ matrix.platform.target }} diff --git a/Cargo.lock b/Cargo.lock index 3f95c411..d176659c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6498,9 +6498,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c9c08beea86d5095b6f5fb1c788fe8759b23c3f71927c66a69e725a91d089cd" +checksum = "f3fad474c02a3bcd4a304afff97159a31b9bab84e29563f7109c7b0ce8cd774e" dependencies = [ "anyhow", "bytes", @@ -6552,9 +6552,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93bb649a284aec2ab43e8df6831b8c8060d231ec8ddf05bf021d58cb67570e1f" +checksum = "935f9b3c49b22b3e2e485a57f46d61cd1ae07b1cbb2ba87387a387caf2d8c4e7" dependencies = [ "anyhow", "cargo_toml", @@ -6576,9 +6576,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4511912612ba0da11aeb300e18e18b2c7067fd14aa886eac46bdcc43b4fa3ee" +checksum = "95d7443dd4f0b597704b6a14b964ee2ed16e99928d8e6292ae9825f09fbcd30e" dependencies = [ "base64 0.22.1", "brotli", @@ -6603,9 +6603,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62ee976578a14b779996d7b6879d7e625c8ce674bc87e223953664f37def2eef" +checksum = "4d2c0963ccfc3f5194415f2cce7acc975942a8797fbabfb0aa1ed6f59326ae7f" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -6617,9 +6617,9 @@ dependencies = [ [[package]] name = "tauri-plugin" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "774d084450b7ec8e445ad119079307f935b7bf3d736da139a8664eb1d4909aa5" +checksum = "b2e6660a409963e4d57b9bfab4addd141eeff41bd3a7fb14e13004a832cf7ef6" dependencies = [ "anyhow", "glob", @@ -7094,9 +7094,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2570e1f33f332a2d2d9967ebb3903bc4e1f92b9c47e4d1b302c10ea4153fcdbb" +checksum = "af12ad1af974b274ef1d32a94e6eba27a312b429ef28fcb98abc710df7f9151d" dependencies = [ "dpi", "gtk", @@ -7113,9 +7113,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8147d8f9ed418d83a90af3d64fbdca5e0e924ae28e5351da88f9568169db8665" +checksum = "e45e88aa0b11b302d836e6ea3e507a6359044c4a8bc86b865ba99868c695753d" dependencies = [ "gtk", "http", @@ -7139,9 +7139,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f87856e9d7fa91fd710362f3c73fccbf6bfd036934908791e65bd803d54dc8a8" +checksum = "c38b0230d6880cf6dd07b6d7dd7789a0869f98ac12146e0d18d1c1049215a045" dependencies = [ "aes-gcm", "brotli", diff --git a/Cargo.toml b/Cargo.toml index 88830f33..f4d619d3 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,10 +11,10 @@ resolver = "2" [workspace.dependencies] serde = { version = "1", features = ["derive"] } log = "0.4" -tauri = { version = "2.0.0", default-features = false } -tauri-build = "2.0.0" -tauri-plugin = "2.0.0" -tauri-utils = "2.0.0" +tauri = { version = "2.0.1", default-features = false } +tauri-build = "2.0.1" +tauri-plugin = "2.0.1" +tauri-utils = "2.0.1" serde_json = "1" thiserror = "1" url = "2" @@ -27,7 +27,7 @@ specta = "=2.0.0-rc.20" edition = "2021" authors = ["Tauri Programme within The Commons Conservancy"] license = "Apache-2.0 OR MIT" -rust-version = "1.78" +rust-version = "1.77.2" repository = "https://github.com/tauri-apps/plugins-workspace" # default to small, optimized release binaries diff --git a/README.md b/README.md index bcd64832..dbb5b0c6 100644 --- a/README.md +++ b/README.md @@ -30,7 +30,7 @@ | [websocket](plugins/websocket) | Open a WebSocket connection using a Rust client in JS. | ✅ | ✅ | ✅ | ? | ? | | [window-state](plugins/window-state) | Persist window sizes and positions. | ✅ | ✅ | ✅ | ? | ? | -_This repo and all plugins require a Rust version of at least **1.78**_ +_This repo and all plugins require a Rust version of at least **1.77.2**_ ## Contributing diff --git a/plugins/autostart/README.md b/plugins/autostart/README.md index 6dd932b3..0a1415db 100644 --- a/plugins/autostart/README.md +++ b/plugins/autostart/README.md @@ -12,7 +12,7 @@ Automatically launch your application at startup. ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/cli/README.md b/plugins/cli/README.md index 6323a84c..05d5bd35 100644 --- a/plugins/cli/README.md +++ b/plugins/cli/README.md @@ -12,7 +12,7 @@ Parse arguments from your Command Line Interface. ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/clipboard-manager/README.md b/plugins/clipboard-manager/README.md index 26b433b2..daec970d 100644 --- a/plugins/clipboard-manager/README.md +++ b/plugins/clipboard-manager/README.md @@ -12,7 +12,7 @@ Read and write to the system clipboard. ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/deep-link/README.md b/plugins/deep-link/README.md index 44bf2769..77fae2c8 100644 --- a/plugins/deep-link/README.md +++ b/plugins/deep-link/README.md @@ -12,7 +12,7 @@ Set your Tauri application as the default handler for an URL. ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/deep-link/examples/app/src-tauri/Cargo.toml b/plugins/deep-link/examples/app/src-tauri/Cargo.toml index e2624f7a..11e7c41f 100644 --- a/plugins/deep-link/examples/app/src-tauri/Cargo.toml +++ b/plugins/deep-link/examples/app/src-tauri/Cargo.toml @@ -6,7 +6,7 @@ authors = ["you"] license = "" repository = "" edition = "2021" -rust-version = "1.78" +rust-version = "1.77.2" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/plugins/dialog/README.md b/plugins/dialog/README.md index f03ba952..2259e35b 100644 --- a/plugins/dialog/README.md +++ b/plugins/dialog/README.md @@ -12,7 +12,7 @@ Native system dialogs for opening and saving files along with message dialogs. ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/fs/README.md b/plugins/fs/README.md index c1516343..af5c63a8 100644 --- a/plugins/fs/README.md +++ b/plugins/fs/README.md @@ -12,7 +12,7 @@ Access the file system. ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/geolocation/README.md b/plugins/geolocation/README.md index a5957c07..0557cc98 100644 --- a/plugins/geolocation/README.md +++ b/plugins/geolocation/README.md @@ -12,7 +12,7 @@ This plugin provides APIs for getting and tracking the device's current position ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/global-shortcut/README.md b/plugins/global-shortcut/README.md index b0407213..12a9b08d 100644 --- a/plugins/global-shortcut/README.md +++ b/plugins/global-shortcut/README.md @@ -12,7 +12,7 @@ Register global shortcuts. ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/haptics/README.md b/plugins/haptics/README.md index 3102a20c..b96e267c 100644 --- a/plugins/haptics/README.md +++ b/plugins/haptics/README.md @@ -14,7 +14,7 @@ There are no standards/requirements for vibration support on Android, so the `fe ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/http/README.md b/plugins/http/README.md index 3d343316..c3fe92c0 100644 --- a/plugins/http/README.md +++ b/plugins/http/README.md @@ -12,7 +12,7 @@ Access the HTTP client written in Rust. ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/localhost/README.md b/plugins/localhost/README.md index e42ef72b..4e23c038 100644 --- a/plugins/localhost/README.md +++ b/plugins/localhost/README.md @@ -14,7 +14,7 @@ Expose your apps assets through a localhost server instead of the default custom ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/log/README.md b/plugins/log/README.md index fd10ad79..1748d0c0 100644 --- a/plugins/log/README.md +++ b/plugins/log/README.md @@ -12,7 +12,7 @@ Configurable logging for your Tauri app. ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/notification/README.md b/plugins/notification/README.md index 96b51be6..e75ce540 100644 --- a/plugins/notification/README.md +++ b/plugins/notification/README.md @@ -12,7 +12,7 @@ Send message notifications (brief auto-expiring OS window element) to your user. ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/os/README.md b/plugins/os/README.md index 376e028b..aafda769 100644 --- a/plugins/os/README.md +++ b/plugins/os/README.md @@ -12,7 +12,7 @@ Read information about the operating system. ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/persisted-scope/README.md b/plugins/persisted-scope/README.md index 059d2468..c45a1711 100644 --- a/plugins/persisted-scope/README.md +++ b/plugins/persisted-scope/README.md @@ -12,7 +12,7 @@ Save filesystem and asset scopes and restore them when the app is reopened. ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/positioner/README.md b/plugins/positioner/README.md index 881afdcf..1c766849 100644 --- a/plugins/positioner/README.md +++ b/plugins/positioner/README.md @@ -14,7 +14,7 @@ This plugin is a port of [electron-positioner](https://github.com/jenslind/elect ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/process/README.md b/plugins/process/README.md index 331bf934..ad7d53ab 100644 --- a/plugins/process/README.md +++ b/plugins/process/README.md @@ -12,7 +12,7 @@ This plugin provides APIs to access the current process. To spawn child processe ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/shell/README.md b/plugins/shell/README.md index 3d09b6ce..2f6e5ad6 100644 --- a/plugins/shell/README.md +++ b/plugins/shell/README.md @@ -12,7 +12,7 @@ Access the system shell. Allows you to spawn child processes and manage files an ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/single-instance/README.md b/plugins/single-instance/README.md index 768b7469..64224602 100644 --- a/plugins/single-instance/README.md +++ b/plugins/single-instance/README.md @@ -12,7 +12,7 @@ Ensure a single instance of your tauri app is running. ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml b/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml index 2d4e4e2a..d764081c 100644 --- a/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml +++ b/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml @@ -5,7 +5,7 @@ description = "A Tauri App" authors = ["You"] repository = "" edition = "2021" -rust-version = "1.78" +rust-version = "1.77.2" [dependencies] serde = { workspace = true } diff --git a/plugins/sql/README.md b/plugins/sql/README.md index fb1eddbc..85318cff 100644 --- a/plugins/sql/README.md +++ b/plugins/sql/README.md @@ -12,7 +12,7 @@ Interface with SQL databases through [sqlx](https://github.com/launchbadge/sqlx) ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/store/README.md b/plugins/store/README.md index d781878d..391d7a0c 100644 --- a/plugins/store/README.md +++ b/plugins/store/README.md @@ -12,7 +12,7 @@ Simple, persistent key-value store. ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/stronghold/README.md b/plugins/stronghold/README.md index de4384d2..d885bf64 100644 --- a/plugins/stronghold/README.md +++ b/plugins/stronghold/README.md @@ -12,7 +12,7 @@ Store secrets and keys using the [IOTA Stronghold](https://github.com/iotaledger ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/updater/README.md b/plugins/updater/README.md index 99547136..f8dd5347 100644 --- a/plugins/updater/README.md +++ b/plugins/updater/README.md @@ -12,7 +12,7 @@ In-app updates for Tauri applications. ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/upload/README.md b/plugins/upload/README.md index 1207f142..15dd3ad6 100644 --- a/plugins/upload/README.md +++ b/plugins/upload/README.md @@ -13,7 +13,7 @@ Download files from a remote HTTP server to disk. ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/websocket/README.md b/plugins/websocket/README.md index cc992d9c..a9c3a267 100644 --- a/plugins/websocket/README.md +++ b/plugins/websocket/README.md @@ -12,7 +12,7 @@ Expose a WebSocket server to your Tauri frontend. ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/plugins/window-state/README.md b/plugins/window-state/README.md index 1c8ca795..a4355fb5 100644 --- a/plugins/window-state/README.md +++ b/plugins/window-state/README.md @@ -12,7 +12,7 @@ Save window positions and sizes and restore them when the app is reopened. ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. diff --git a/shared/template/README.md b/shared/template/README.md index aef892b6..d22a2ba6 100644 --- a/shared/template/README.md +++ b/shared/template/README.md @@ -12,7 +12,7 @@ ## Install -_This plugin requires a Rust version of at least **1.78**_ +_This plugin requires a Rust version of at least **1.77.2**_ There are three general methods of installation that we can recommend. From fd785ab5de5693a251540e64f7c4c1fcdab536ab Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 10:58:13 -0300 Subject: [PATCH 25/40] publish new versions (#1878) Co-authored-by: lucasfernog --- .changes/msrv-1.77.2.md | 34 --------------- Cargo.lock | 60 +++++++++++++------------- examples/api/src-tauri/CHANGELOG.md | 25 +++++++++++ examples/api/src-tauri/Cargo.toml | 38 ++++++++-------- plugins/autostart/CHANGELOG.md | 4 ++ plugins/autostart/Cargo.toml | 2 +- plugins/barcode-scanner/CHANGELOG.md | 4 ++ plugins/barcode-scanner/Cargo.toml | 2 +- plugins/biometric/CHANGELOG.md | 4 ++ plugins/biometric/Cargo.toml | 2 +- plugins/cli/CHANGELOG.md | 4 ++ plugins/cli/Cargo.toml | 2 +- plugins/clipboard-manager/CHANGELOG.md | 4 ++ plugins/clipboard-manager/Cargo.toml | 2 +- plugins/deep-link/CHANGELOG.md | 4 ++ plugins/deep-link/Cargo.toml | 2 +- plugins/dialog/CHANGELOG.md | 8 ++++ plugins/dialog/Cargo.toml | 4 +- plugins/fs/CHANGELOG.md | 4 ++ plugins/fs/Cargo.toml | 2 +- plugins/geolocation/CHANGELOG.md | 4 ++ plugins/geolocation/Cargo.toml | 2 +- plugins/global-shortcut/CHANGELOG.md | 4 ++ plugins/global-shortcut/Cargo.toml | 2 +- plugins/haptics/CHANGELOG.md | 4 ++ plugins/haptics/Cargo.toml | 2 +- plugins/http/CHANGELOG.md | 8 ++++ plugins/http/Cargo.toml | 4 +- plugins/localhost/CHANGELOG.md | 4 ++ plugins/localhost/Cargo.toml | 2 +- plugins/log/CHANGELOG.md | 4 ++ plugins/log/Cargo.toml | 2 +- plugins/nfc/CHANGELOG.md | 4 ++ plugins/nfc/Cargo.toml | 2 +- plugins/notification/CHANGELOG.md | 4 ++ plugins/notification/Cargo.toml | 2 +- plugins/os/CHANGELOG.md | 4 ++ plugins/os/Cargo.toml | 2 +- plugins/persisted-scope/CHANGELOG.md | 8 ++++ plugins/persisted-scope/Cargo.toml | 4 +- plugins/positioner/CHANGELOG.md | 4 ++ plugins/positioner/Cargo.toml | 2 +- plugins/process/CHANGELOG.md | 4 ++ plugins/process/Cargo.toml | 2 +- plugins/shell/CHANGELOG.md | 4 ++ plugins/shell/Cargo.toml | 2 +- plugins/single-instance/CHANGELOG.md | 8 ++++ plugins/single-instance/Cargo.toml | 4 +- plugins/sql/CHANGELOG.md | 4 ++ plugins/sql/Cargo.toml | 2 +- plugins/store/CHANGELOG.md | 4 ++ plugins/store/Cargo.toml | 2 +- plugins/stronghold/CHANGELOG.md | 4 ++ plugins/stronghold/Cargo.toml | 2 +- plugins/updater/CHANGELOG.md | 4 ++ plugins/updater/Cargo.toml | 2 +- plugins/upload/CHANGELOG.md | 4 ++ plugins/upload/Cargo.toml | 2 +- plugins/websocket/CHANGELOG.md | 4 ++ plugins/websocket/Cargo.toml | 2 +- plugins/window-state/CHANGELOG.md | 4 ++ plugins/window-state/Cargo.toml | 2 +- 62 files changed, 239 insertions(+), 116 deletions(-) delete mode 100644 .changes/msrv-1.77.2.md diff --git a/.changes/msrv-1.77.2.md b/.changes/msrv-1.77.2.md deleted file mode 100644 index 118608f4..00000000 --- a/.changes/msrv-1.77.2.md +++ /dev/null @@ -1,34 +0,0 @@ ---- -"api-example": patch -"autostart": patch -"barcode-scanner": patch -"biometric": patch -"cli": patch -"clipboard-manager": patch -"deep-link": patch -"fs": patch -"dialog": patch -"geolocation": patch -"global-shortcut": patch -"haptics": patch -"http": patch -"localhost": patch -"log-plugin": patch -"nfc": patch -"notification": patch -"os": patch -"persisted-scope": patch -"positioner": patch -"process": patch -"shell": patch -"single-instance": patch -"sql": patch -"store": patch -"stronghold": patch -"updater": patch -"upload": patch -"websocket": patch -"window-state": patch ---- - -Downgrade MSRV to 1.77.2 to support Windows 7. diff --git a/Cargo.lock b/Cargo.lock index d176659c..2044a052 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -218,7 +218,7 @@ checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6" [[package]] name = "api" -version = "2.0.1" +version = "2.0.2" dependencies = [ "log", "serde", @@ -6634,7 +6634,7 @@ dependencies = [ [[package]] name = "tauri-plugin-autostart" -version = "2.0.0" +version = "2.0.1" dependencies = [ "auto-launch", "log", @@ -6647,7 +6647,7 @@ dependencies = [ [[package]] name = "tauri-plugin-barcode-scanner" -version = "2.0.0" +version = "2.0.1" dependencies = [ "log", "serde", @@ -6659,7 +6659,7 @@ dependencies = [ [[package]] name = "tauri-plugin-biometric" -version = "2.0.0" +version = "2.0.1" dependencies = [ "log", "serde", @@ -6672,7 +6672,7 @@ dependencies = [ [[package]] name = "tauri-plugin-cli" -version = "2.0.0" +version = "2.0.1" dependencies = [ "clap", "log", @@ -6685,7 +6685,7 @@ dependencies = [ [[package]] name = "tauri-plugin-clipboard-manager" -version = "2.0.0" +version = "2.0.1" dependencies = [ "arboard", "image", @@ -6699,7 +6699,7 @@ dependencies = [ [[package]] name = "tauri-plugin-deep-link" -version = "2.0.0" +version = "2.0.1" dependencies = [ "dunce", "log", @@ -6717,7 +6717,7 @@ dependencies = [ [[package]] name = "tauri-plugin-dialog" -version = "2.0.0" +version = "2.0.1" dependencies = [ "log", "raw-window-handle", @@ -6733,7 +6733,7 @@ dependencies = [ [[package]] name = "tauri-plugin-fs" -version = "2.0.0" +version = "2.0.1" dependencies = [ "anyhow", "dunce", @@ -6754,7 +6754,7 @@ dependencies = [ [[package]] name = "tauri-plugin-geolocation" -version = "2.0.0" +version = "2.0.1" dependencies = [ "log", "serde", @@ -6767,7 +6767,7 @@ dependencies = [ [[package]] name = "tauri-plugin-global-shortcut" -version = "2.0.0" +version = "2.0.1" dependencies = [ "global-hotkey", "log", @@ -6780,7 +6780,7 @@ dependencies = [ [[package]] name = "tauri-plugin-haptics" -version = "2.0.0" +version = "2.0.1" dependencies = [ "log", "serde", @@ -6793,7 +6793,7 @@ dependencies = [ [[package]] name = "tauri-plugin-http" -version = "2.0.0" +version = "2.0.1" dependencies = [ "data-url", "http", @@ -6813,7 +6813,7 @@ dependencies = [ [[package]] name = "tauri-plugin-localhost" -version = "2.0.0" +version = "2.0.1" dependencies = [ "http", "log", @@ -6826,7 +6826,7 @@ dependencies = [ [[package]] name = "tauri-plugin-log" -version = "2.0.0" +version = "2.0.1" dependencies = [ "android_logger", "byte-unit", @@ -6846,7 +6846,7 @@ dependencies = [ [[package]] name = "tauri-plugin-nfc" -version = "2.0.0" +version = "2.0.1" dependencies = [ "log", "serde", @@ -6859,7 +6859,7 @@ dependencies = [ [[package]] name = "tauri-plugin-notification" -version = "2.0.0" +version = "2.0.1" dependencies = [ "color-backtrace", "ctor", @@ -6881,7 +6881,7 @@ dependencies = [ [[package]] name = "tauri-plugin-os" -version = "2.0.0" +version = "2.0.1" dependencies = [ "gethostname 0.5.0", "log", @@ -6897,7 +6897,7 @@ dependencies = [ [[package]] name = "tauri-plugin-persisted-scope" -version = "2.0.0" +version = "2.0.1" dependencies = [ "aho-corasick", "bincode", @@ -6911,7 +6911,7 @@ dependencies = [ [[package]] name = "tauri-plugin-positioner" -version = "2.0.0" +version = "2.0.1" dependencies = [ "log", "serde", @@ -6924,7 +6924,7 @@ dependencies = [ [[package]] name = "tauri-plugin-process" -version = "2.0.0" +version = "2.0.1" dependencies = [ "tauri", "tauri-plugin", @@ -6932,7 +6932,7 @@ dependencies = [ [[package]] name = "tauri-plugin-shell" -version = "2.0.0" +version = "2.0.1" dependencies = [ "encoding_rs", "log", @@ -6951,7 +6951,7 @@ dependencies = [ [[package]] name = "tauri-plugin-single-instance" -version = "2.0.0" +version = "2.0.1" dependencies = [ "log", "semver", @@ -6966,7 +6966,7 @@ dependencies = [ [[package]] name = "tauri-plugin-sql" -version = "2.0.0" +version = "2.0.1" dependencies = [ "futures-core", "indexmap 2.5.0", @@ -6983,7 +6983,7 @@ dependencies = [ [[package]] name = "tauri-plugin-store" -version = "2.0.0" +version = "2.0.1" dependencies = [ "dunce", "log", @@ -6997,7 +6997,7 @@ dependencies = [ [[package]] name = "tauri-plugin-stronghold" -version = "2.0.0" +version = "2.0.1" dependencies = [ "hex", "iota-crypto", @@ -7018,7 +7018,7 @@ dependencies = [ [[package]] name = "tauri-plugin-updater" -version = "2.0.1" +version = "2.0.2" dependencies = [ "base64 0.22.1", "dirs 5.0.1", @@ -7046,7 +7046,7 @@ dependencies = [ [[package]] name = "tauri-plugin-upload" -version = "2.0.0" +version = "2.0.1" dependencies = [ "futures-util", "log", @@ -7064,7 +7064,7 @@ dependencies = [ [[package]] name = "tauri-plugin-websocket" -version = "2.0.0" +version = "2.0.1" dependencies = [ "futures-util", "http", @@ -7081,7 +7081,7 @@ dependencies = [ [[package]] name = "tauri-plugin-window-state" -version = "2.0.0" +version = "2.0.1" dependencies = [ "bitflags 2.6.0", "log", diff --git a/examples/api/src-tauri/CHANGELOG.md b/examples/api/src-tauri/CHANGELOG.md index 2f0343ac..0f557732 100644 --- a/examples/api/src-tauri/CHANGELOG.md +++ b/examples/api/src-tauri/CHANGELOG.md @@ -1,5 +1,30 @@ # Changelog +## \[2.0.2] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + +### Dependencies + +- Upgraded to `barcode-scanner@2.0.1` +- Upgraded to `biometric@2.0.1` +- Upgraded to `cli@2.0.1` +- Upgraded to `clipboard-manager@2.0.1` +- Upgraded to `fs@2.0.1` +- Upgraded to `dialog@2.0.1` +- Upgraded to `geolocation@2.0.1` +- Upgraded to `global-shortcut@2.0.1` +- Upgraded to `haptics@2.0.1` +- Upgraded to `http@2.0.1` +- Upgraded to `log-plugin@2.0.1` +- Upgraded to `nfc@2.0.1` +- Upgraded to `notification@2.0.1` +- Upgraded to `os@2.0.1` +- Upgraded to `process@2.0.1` +- Upgraded to `shell@2.0.1` +- Upgraded to `store@2.0.1` +- Upgraded to `updater@2.0.2` + ## \[2.0.1] ### Dependencies diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml index abb6578e..50cd940f 100644 --- a/examples/api/src-tauri/Cargo.toml +++ b/examples/api/src-tauri/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "api" publish = false -version = "2.0.1" +version = "2.0.2" description = "An example Tauri Application showcasing the api" edition = "2021" rust-version = { workspace = true } @@ -19,22 +19,22 @@ serde_json = { workspace = true } serde = { workspace = true } tiny_http = "0.12" log = { workspace = true } -tauri-plugin-log = { path = "../../../plugins/log", version = "2.0.0" } -tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.0.0", features = [ +tauri-plugin-log = { path = "../../../plugins/log", version = "2.0.1" } +tauri-plugin-fs = { path = "../../../plugins/fs", version = "2.0.1", features = [ "watch", ] } -tauri-plugin-clipboard-manager = { path = "../../../plugins/clipboard-manager", version = "2.0.0" } -tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.0.0" } +tauri-plugin-clipboard-manager = { path = "../../../plugins/clipboard-manager", version = "2.0.1" } +tauri-plugin-dialog = { path = "../../../plugins/dialog", version = "2.0.1" } tauri-plugin-http = { path = "../../../plugins/http", features = [ "multipart", -], version = "2.0.0" } -tauri-plugin-notification = { path = "../../../plugins/notification", version = "2.0.0", features = [ +], version = "2.0.1" } +tauri-plugin-notification = { path = "../../../plugins/notification", version = "2.0.1", features = [ "windows7-compat", ] } -tauri-plugin-os = { path = "../../../plugins/os", version = "2.0.0" } -tauri-plugin-process = { path = "../../../plugins/process", version = "2.0.0" } -tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.0.0" } -tauri-plugin-store = { path = "../../../plugins/store", version = "2.0.0" } +tauri-plugin-os = { path = "../../../plugins/os", version = "2.0.1" } +tauri-plugin-process = { path = "../../../plugins/process", version = "2.0.1" } +tauri-plugin-shell = { path = "../../../plugins/shell", version = "2.0.1" } +tauri-plugin-store = { path = "../../../plugins/store", version = "2.0.1" } [dependencies.tauri] workspace = true @@ -50,17 +50,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] -tauri-plugin-cli = { path = "../../../plugins/cli", version = "2.0.0" } -tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut", version = "2.0.0" } -tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.0.1" } +tauri-plugin-cli = { path = "../../../plugins/cli", version = "2.0.1" } +tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut", version = "2.0.1" } +tauri-plugin-updater = { path = "../../../plugins/updater", version = "2.0.2" } tauri-plugin-window-state = { path = "../../../plugins/window-state", version = "2.0.0" } [target."cfg(any(target_os = \"android\", target_os = \"ios\"))".dependencies] -tauri-plugin-barcode-scanner = { path = "../../../plugins/barcode-scanner/", version = "2.0.0" } -tauri-plugin-nfc = { path = "../../../plugins/nfc", version = "2.0.0" } -tauri-plugin-biometric = { path = "../../../plugins/biometric/", version = "2.0.0" } -tauri-plugin-geolocation = { path = "../../../plugins/geolocation/", version = "2.0.0" } -tauri-plugin-haptics = { path = "../../../plugins/haptics/", version = "2.0.0" } +tauri-plugin-barcode-scanner = { path = "../../../plugins/barcode-scanner/", version = "2.0.1" } +tauri-plugin-nfc = { path = "../../../plugins/nfc", version = "2.0.1" } +tauri-plugin-biometric = { path = "../../../plugins/biometric/", version = "2.0.1" } +tauri-plugin-geolocation = { path = "../../../plugins/geolocation/", version = "2.0.1" } +tauri-plugin-haptics = { path = "../../../plugins/haptics/", version = "2.0.1" } [features] prod = ["tauri/custom-protocol"] diff --git a/plugins/autostart/CHANGELOG.md b/plugins/autostart/CHANGELOG.md index 1fdc66a6..cd26fad7 100644 --- a/plugins/autostart/CHANGELOG.md +++ b/plugins/autostart/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/autostart/Cargo.toml b/plugins/autostart/Cargo.toml index a0f1883e..77f555e6 100644 --- a/plugins/autostart/Cargo.toml +++ b/plugins/autostart/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-autostart" -version = "2.0.0" +version = "2.0.1" description = "Automatically launch your application at startup." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/barcode-scanner/CHANGELOG.md b/plugins/barcode-scanner/CHANGELOG.md index 167e1182..447499bc 100644 --- a/plugins/barcode-scanner/CHANGELOG.md +++ b/plugins/barcode-scanner/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/barcode-scanner/Cargo.toml b/plugins/barcode-scanner/Cargo.toml index eb75acf6..8fabe711 100644 --- a/plugins/barcode-scanner/Cargo.toml +++ b/plugins/barcode-scanner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-barcode-scanner" -version = "2.0.0" +version = "2.0.1" description = "Scan QR codes, EAN-13 and other kinds of barcodes on Android and iOS" edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/biometric/CHANGELOG.md b/plugins/biometric/CHANGELOG.md index f8033058..1eac8a95 100644 --- a/plugins/biometric/CHANGELOG.md +++ b/plugins/biometric/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/biometric/Cargo.toml b/plugins/biometric/Cargo.toml index 74ef49bc..816c5ef1 100644 --- a/plugins/biometric/Cargo.toml +++ b/plugins/biometric/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-biometric" -version = "2.0.0" +version = "2.0.1" description = "Prompt the user for biometric authentication on Android and iOS." edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/cli/CHANGELOG.md b/plugins/cli/CHANGELOG.md index 3e94c5a3..879c20b6 100644 --- a/plugins/cli/CHANGELOG.md +++ b/plugins/cli/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/cli/Cargo.toml b/plugins/cli/Cargo.toml index a1b34dcd..b4db6991 100644 --- a/plugins/cli/Cargo.toml +++ b/plugins/cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-cli" -version = "2.0.0" +version = "2.0.1" description = "Parse arguments from your Tauri application's command line interface." edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/clipboard-manager/CHANGELOG.md b/plugins/clipboard-manager/CHANGELOG.md index efc7a4de..68dee776 100644 --- a/plugins/clipboard-manager/CHANGELOG.md +++ b/plugins/clipboard-manager/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/clipboard-manager/Cargo.toml b/plugins/clipboard-manager/Cargo.toml index 47cda536..3c086574 100644 --- a/plugins/clipboard-manager/Cargo.toml +++ b/plugins/clipboard-manager/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-clipboard-manager" -version = "2.0.0" +version = "2.0.1" description = "Read and write to the system clipboard." edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/deep-link/CHANGELOG.md b/plugins/deep-link/CHANGELOG.md index 99fa7159..2f2da36d 100644 --- a/plugins/deep-link/CHANGELOG.md +++ b/plugins/deep-link/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/deep-link/Cargo.toml b/plugins/deep-link/Cargo.toml index 33fb8f07..db5c0247 100644 --- a/plugins/deep-link/Cargo.toml +++ b/plugins/deep-link/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-deep-link" -version = "2.0.0" +version = "2.0.1" description = "Set your Tauri application as the default handler for an URL" authors = { workspace = true } license = { workspace = true } diff --git a/plugins/dialog/CHANGELOG.md b/plugins/dialog/CHANGELOG.md index 70681113..150e092e 100644 --- a/plugins/dialog/CHANGELOG.md +++ b/plugins/dialog/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + +### Dependencies + +- Upgraded to `fs@2.0.1` + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/dialog/Cargo.toml b/plugins/dialog/Cargo.toml index 25667742..eec855bd 100644 --- a/plugins/dialog/Cargo.toml +++ b/plugins/dialog/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-dialog" -version = "2.0.0" +version = "2.0.1" description = "Native system dialogs for opening and saving files along with message dialogs on your Tauri application." edition = { workspace = true } authors = { workspace = true } @@ -34,7 +34,7 @@ tauri = { workspace = true } log = { workspace = true } thiserror = { workspace = true } url = { workspace = true } -tauri-plugin-fs = { path = "../fs", version = "2.0.0" } +tauri-plugin-fs = { path = "../fs", version = "2.0.1" } [target.'cfg(target_os = "ios")'.dependencies] tauri = { workspace = true, features = ["wry"] } diff --git a/plugins/fs/CHANGELOG.md b/plugins/fs/CHANGELOG.md index 01fda791..41e6411a 100644 --- a/plugins/fs/CHANGELOG.md +++ b/plugins/fs/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/fs/Cargo.toml b/plugins/fs/Cargo.toml index 0ad68abe..1d9b5f34 100644 --- a/plugins/fs/Cargo.toml +++ b/plugins/fs/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-fs" -version = "2.0.0" +version = "2.0.1" description = "Access the file system." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/geolocation/CHANGELOG.md b/plugins/geolocation/CHANGELOG.md index 31f944ff..32952ac7 100644 --- a/plugins/geolocation/CHANGELOG.md +++ b/plugins/geolocation/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/geolocation/Cargo.toml b/plugins/geolocation/Cargo.toml index ddfd64ef..550a66cb 100644 --- a/plugins/geolocation/Cargo.toml +++ b/plugins/geolocation/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tauri-plugin-geolocation" description = "Get and track the device's current position" -version = "2.0.0" +version = "2.0.1" edition = { workspace = true } authors = { workspace = true } license = { workspace = true } diff --git a/plugins/global-shortcut/CHANGELOG.md b/plugins/global-shortcut/CHANGELOG.md index d111ad96..5cd07c7d 100644 --- a/plugins/global-shortcut/CHANGELOG.md +++ b/plugins/global-shortcut/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/global-shortcut/Cargo.toml b/plugins/global-shortcut/Cargo.toml index 0ab9a698..a26be3fb 100644 --- a/plugins/global-shortcut/Cargo.toml +++ b/plugins/global-shortcut/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-global-shortcut" -version = "2.0.0" +version = "2.0.1" description = "Register global hotkeys listeners on your Tauri application." edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/haptics/CHANGELOG.md b/plugins/haptics/CHANGELOG.md index 90ad6e62..f8e3fad7 100644 --- a/plugins/haptics/CHANGELOG.md +++ b/plugins/haptics/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/haptics/Cargo.toml b/plugins/haptics/Cargo.toml index 1a605370..8335475f 100644 --- a/plugins/haptics/Cargo.toml +++ b/plugins/haptics/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "tauri-plugin-haptics" description = "Haptic feedback and vibrations on Android and iOS" -version = "2.0.0" +version = "2.0.1" edition = { workspace = true } authors = { workspace = true } license = { workspace = true } diff --git a/plugins/http/CHANGELOG.md b/plugins/http/CHANGELOG.md index aa116a5c..508780fa 100644 --- a/plugins/http/CHANGELOG.md +++ b/plugins/http/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + +### Dependencies + +- Upgraded to `fs@2.0.1` + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/http/Cargo.toml b/plugins/http/Cargo.toml index f59859d8..64b9aa75 100644 --- a/plugins/http/Cargo.toml +++ b/plugins/http/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-http" -version = "2.0.0" +version = "2.0.1" description = "Access an HTTP client written in Rust." edition = { workspace = true } authors = { workspace = true } @@ -34,7 +34,7 @@ serde_json = { workspace = true } tauri = { workspace = true } thiserror = { workspace = true } tokio = { version = "1", features = ["sync", "macros"] } -tauri-plugin-fs = { path = "../fs", version = "2.0.0" } +tauri-plugin-fs = { path = "../fs", version = "2.0.1" } urlpattern = "0.3" regex = "1" http = "1" diff --git a/plugins/localhost/CHANGELOG.md b/plugins/localhost/CHANGELOG.md index 1e46570f..3a2bf060 100644 --- a/plugins/localhost/CHANGELOG.md +++ b/plugins/localhost/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/localhost/Cargo.toml b/plugins/localhost/Cargo.toml index ed0453d4..3d9460d0 100644 --- a/plugins/localhost/Cargo.toml +++ b/plugins/localhost/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-localhost" -version = "2.0.0" +version = "2.0.1" description = "Expose your apps assets through a localhost server instead of the default custom protocol." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/log/CHANGELOG.md b/plugins/log/CHANGELOG.md index a09f3f0d..f0177138 100644 --- a/plugins/log/CHANGELOG.md +++ b/plugins/log/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/log/Cargo.toml b/plugins/log/Cargo.toml index 179505e7..4f7c34d4 100644 --- a/plugins/log/Cargo.toml +++ b/plugins/log/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-log" -version = "2.0.0" +version = "2.0.1" description = "Configurable logging for your Tauri app." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/nfc/CHANGELOG.md b/plugins/nfc/CHANGELOG.md index ba8e2c3a..7960011f 100644 --- a/plugins/nfc/CHANGELOG.md +++ b/plugins/nfc/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/nfc/Cargo.toml b/plugins/nfc/Cargo.toml index 0db42d6d..5cf4f6c4 100644 --- a/plugins/nfc/Cargo.toml +++ b/plugins/nfc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-nfc" -version = "2.0.0" +version = "2.0.1" description = "Read and write NFC tags on Android and iOS." edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/notification/CHANGELOG.md b/plugins/notification/CHANGELOG.md index 6fc7b136..e8dc3380 100644 --- a/plugins/notification/CHANGELOG.md +++ b/plugins/notification/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/notification/Cargo.toml b/plugins/notification/Cargo.toml index 543ad243..02e5cce8 100644 --- a/plugins/notification/Cargo.toml +++ b/plugins/notification/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-notification" -version = "2.0.0" +version = "2.0.1" description = "Send desktop and mobile notifications on your Tauri application." edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/os/CHANGELOG.md b/plugins/os/CHANGELOG.md index e0bf7dfa..42311804 100644 --- a/plugins/os/CHANGELOG.md +++ b/plugins/os/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/os/Cargo.toml b/plugins/os/Cargo.toml index 20050f8c..88cd5ceb 100644 --- a/plugins/os/Cargo.toml +++ b/plugins/os/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-os" -version = "2.0.0" +version = "2.0.1" description = "Read information about the operating system." edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/persisted-scope/CHANGELOG.md b/plugins/persisted-scope/CHANGELOG.md index dc28e28c..b27277fa 100644 --- a/plugins/persisted-scope/CHANGELOG.md +++ b/plugins/persisted-scope/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + +### Dependencies + +- Upgraded to `fs@2.0.1` + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/persisted-scope/Cargo.toml b/plugins/persisted-scope/Cargo.toml index bcb29355..c03276d0 100644 --- a/plugins/persisted-scope/Cargo.toml +++ b/plugins/persisted-scope/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-persisted-scope" -version = "2.0.0" +version = "2.0.1" description = "Save filesystem and asset scopes and restore them when the app is reopened." authors = { workspace = true } license = { workspace = true } @@ -27,7 +27,7 @@ log = { workspace = true } thiserror = { workspace = true } aho-corasick = "1" bincode = "1" -tauri-plugin-fs = { path = "../fs", version = "2.0.0" } +tauri-plugin-fs = { path = "../fs", version = "2.0.1" } [features] protocol-asset = ["tauri/protocol-asset"] diff --git a/plugins/positioner/CHANGELOG.md b/plugins/positioner/CHANGELOG.md index caddd682..ee4c473f 100644 --- a/plugins/positioner/CHANGELOG.md +++ b/plugins/positioner/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/positioner/Cargo.toml b/plugins/positioner/Cargo.toml index eac68902..807d1ed9 100644 --- a/plugins/positioner/Cargo.toml +++ b/plugins/positioner/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-positioner" -version = "2.0.0" +version = "2.0.1" description = "Position your windows at well-known locations." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/process/CHANGELOG.md b/plugins/process/CHANGELOG.md index 6566fcdc..8c69c695 100644 --- a/plugins/process/CHANGELOG.md +++ b/plugins/process/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/process/Cargo.toml b/plugins/process/Cargo.toml index 915b7265..4c679022 100644 --- a/plugins/process/Cargo.toml +++ b/plugins/process/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-process" -version = "2.0.0" +version = "2.0.1" description = "Access the current process of your Tauri application." edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/shell/CHANGELOG.md b/plugins/shell/CHANGELOG.md index 0c5c2866..bcc894c8 100644 --- a/plugins/shell/CHANGELOG.md +++ b/plugins/shell/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/shell/Cargo.toml b/plugins/shell/Cargo.toml index b22aab30..31c0cc97 100644 --- a/plugins/shell/Cargo.toml +++ b/plugins/shell/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-shell" -version = "2.0.0" +version = "2.0.1" description = "Access the system shell. Allows you to spawn child processes and manage files and URLs using their default application." edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/single-instance/CHANGELOG.md b/plugins/single-instance/CHANGELOG.md index 8212d7ea..0724caad 100644 --- a/plugins/single-instance/CHANGELOG.md +++ b/plugins/single-instance/CHANGELOG.md @@ -1,5 +1,13 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + +### Dependencies + +- Upgraded to `deep-link@2.0.1` + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/single-instance/Cargo.toml b/plugins/single-instance/Cargo.toml index 8e37f50d..666c0d04 100644 --- a/plugins/single-instance/Cargo.toml +++ b/plugins/single-instance/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-single-instance" -version = "2.0.0" +version = "2.0.1" description = "Ensure a single instance of your tauri app is running." authors = { workspace = true } license = { workspace = true } @@ -26,7 +26,7 @@ serde_json = { workspace = true } tauri = { workspace = true } log = { workspace = true } thiserror = { workspace = true } -tauri-plugin-deep-link = { path = "../deep-link", version = "2.0.0", optional = true } +tauri-plugin-deep-link = { path = "../deep-link", version = "2.0.1", optional = true } semver = { version = "1", optional = true } [target."cfg(target_os = \"windows\")".dependencies.windows-sys] diff --git a/plugins/sql/CHANGELOG.md b/plugins/sql/CHANGELOG.md index 61816b41..8fe92f86 100644 --- a/plugins/sql/CHANGELOG.md +++ b/plugins/sql/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/sql/Cargo.toml b/plugins/sql/Cargo.toml index df308e67..8e6ed457 100644 --- a/plugins/sql/Cargo.toml +++ b/plugins/sql/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-sql" -version = "2.0.0" +version = "2.0.1" description = "Interface with SQL databases." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/store/CHANGELOG.md b/plugins/store/CHANGELOG.md index 85fc373c..59d4b9b1 100644 --- a/plugins/store/CHANGELOG.md +++ b/plugins/store/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/store/Cargo.toml b/plugins/store/Cargo.toml index e5f8c07b..d270b1f1 100644 --- a/plugins/store/Cargo.toml +++ b/plugins/store/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-store" -version = "2.0.0" +version = "2.0.1" description = "Simple, persistent key-value store." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/stronghold/CHANGELOG.md b/plugins/stronghold/CHANGELOG.md index 6ce30b6d..1b292461 100644 --- a/plugins/stronghold/CHANGELOG.md +++ b/plugins/stronghold/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/stronghold/Cargo.toml b/plugins/stronghold/Cargo.toml index 76368926..fbfdf47e 100644 --- a/plugins/stronghold/Cargo.toml +++ b/plugins/stronghold/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-stronghold" -version = "2.0.0" +version = "2.0.1" description = "Store secrets and keys using the IOTA Stronghold secret management engine." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/updater/CHANGELOG.md b/plugins/updater/CHANGELOG.md index ed894170..802b31c1 100644 --- a/plugins/updater/CHANGELOG.md +++ b/plugins/updater/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.2] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.1] - [`9501cfa5`](https://github.com/tauri-apps/plugins-workspace/commit/9501cfa5f5385b2d7eb43a8378b322ee97cba06f) ([#1868](https://github.com/tauri-apps/plugins-workspace/pull/1868) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Fix configuration parser incorrectly warning about the endpoint scheme. diff --git a/plugins/updater/Cargo.toml b/plugins/updater/Cargo.toml index 23509464..9a1944e8 100644 --- a/plugins/updater/Cargo.toml +++ b/plugins/updater/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-updater" -version = "2.0.1" +version = "2.0.2" description = "In-app updates for Tauri applications." edition = { workspace = true } authors = { workspace = true } diff --git a/plugins/upload/CHANGELOG.md b/plugins/upload/CHANGELOG.md index 2d422cbc..3c52be17 100644 --- a/plugins/upload/CHANGELOG.md +++ b/plugins/upload/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/upload/Cargo.toml b/plugins/upload/Cargo.toml index 8403b486..692c13e1 100644 --- a/plugins/upload/Cargo.toml +++ b/plugins/upload/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-upload" -version = "2.0.0" +version = "2.0.1" description = "Upload files from disk to a remote server over HTTP." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/websocket/CHANGELOG.md b/plugins/websocket/CHANGELOG.md index da39a241..4268e32e 100644 --- a/plugins/websocket/CHANGELOG.md +++ b/plugins/websocket/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/websocket/Cargo.toml b/plugins/websocket/Cargo.toml index 9696f2bd..e3d92026 100644 --- a/plugins/websocket/Cargo.toml +++ b/plugins/websocket/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-websocket" -version = "2.0.0" +version = "2.0.1" description = "Expose a WebSocket server to your Tauri frontend." authors = { workspace = true } license = { workspace = true } diff --git a/plugins/window-state/CHANGELOG.md b/plugins/window-state/CHANGELOG.md index c07cb8d9..4f6eb45d 100644 --- a/plugins/window-state/CHANGELOG.md +++ b/plugins/window-state/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## \[2.0.1] + +- [`a1a82208`](https://github.com/tauri-apps/plugins-workspace/commit/a1a82208ed4ab87f83310be0dc95428aec9ab241) ([#1873](https://github.com/tauri-apps/plugins-workspace/pull/1873) by [@lucasfernog](https://github.com/tauri-apps/plugins-workspace/../../lucasfernog)) Downgrade MSRV to 1.77.2 to support Windows 7. + ## \[2.0.0] - [`e2c4dfb6`](https://github.com/tauri-apps/plugins-workspace/commit/e2c4dfb6af43e5dd8d9ceba232c315f5febd55c1) Update to tauri v2 stable release. diff --git a/plugins/window-state/Cargo.toml b/plugins/window-state/Cargo.toml index 7db3bb29..d7a7a5f7 100644 --- a/plugins/window-state/Cargo.toml +++ b/plugins/window-state/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "tauri-plugin-window-state" -version = "2.0.0" +version = "2.0.1" description = "Save window positions and sizes and restore them when the app is reopened." authors = { workspace = true } license = { workspace = true } From f445c704a1b247d56ae2ff43c1f818d7d8152720 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2024 07:29:30 +0800 Subject: [PATCH 26/40] chore(deps): update eslint monorepo to v9.12.0 (#1887) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 4 +- pnpm-lock.yaml | 101 ++++++++++++++++++++++++++----------------------- 2 files changed, 56 insertions(+), 49 deletions(-) diff --git a/package.json b/package.json index 38b712dc..c74b41d4 100644 --- a/package.json +++ b/package.json @@ -10,13 +10,13 @@ "format:check": "prettier --check ." }, "devDependencies": { - "@eslint/js": "9.11.1", + "@eslint/js": "9.12.0", "@rollup/plugin-node-resolve": "15.3.0", "@rollup/plugin-terser": "0.4.4", "@rollup/plugin-typescript": "11.1.6", "@types/eslint__js": "8.42.3", "covector": "^0.12.3", - "eslint": "9.11.1", + "eslint": "9.12.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-security": "3.0.1", "prettier": "3.3.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 3c643cc5..956ba8cb 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -13,8 +13,8 @@ importers: .: devDependencies: '@eslint/js': - specifier: 9.11.1 - version: 9.11.1 + specifier: 9.12.0 + version: 9.12.0 '@rollup/plugin-node-resolve': specifier: 15.3.0 version: 15.3.0(rollup@4.22.4) @@ -31,11 +31,11 @@ importers: specifier: ^0.12.3 version: 0.12.3(mocha@10.7.3) eslint: - specifier: 9.11.1 - version: 9.11.1(jiti@2.0.0) + specifier: 9.12.0 + version: 9.12.0(jiti@2.0.0) eslint-config-prettier: specifier: 9.1.0 - version: 9.1.0(eslint@9.11.1(jiti@2.0.0)) + version: 9.1.0(eslint@9.12.0(jiti@2.0.0)) eslint-plugin-security: specifier: 3.0.1 version: 3.0.1 @@ -53,7 +53,7 @@ importers: version: 5.6.2 typescript-eslint: specifier: 8.8.0 - version: 8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + version: 8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) examples/api: dependencies: @@ -725,8 +725,8 @@ packages: resolution: {integrity: sha512-4Bfj15dVJdoy3RfZmmo86RK1Fwzn6SstsvK9JS+BaVKqC6QQQQyXekNaC+g+LKNgkQ+2VhGAzm6hO40AhMR3zQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@eslint/js@9.11.1': - resolution: {integrity: sha512-/qu+TWz8WwPWc7/HcIJKi+c+MOm46GdVaSlTTQcaqaL53+GsoA6MxWp5PtTx48qbSP7ylM1Kn7nhvkugfJvRSA==} + '@eslint/js@9.12.0': + resolution: {integrity: sha512-eohesHH8WFRUprDNyEREgqP6beG6htMeUYeCpkEgBCieCMme5r9zFWjzAJp//9S+Kub4rqE+jXe9Cp1a7IYIIA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@eslint/object-schema@2.1.4': @@ -737,12 +737,20 @@ packages: resolution: {integrity: sha512-vH9PiIMMwvhCx31Af3HiGzsVNULDbyVkHXwlemn/B0TFj/00ho3y55efXrUZTfQipxoHC5u4xq6zblww1zm1Ig==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} + '@humanfs/core@0.19.0': + resolution: {integrity: sha512-2cbWIHbZVEweE853g8jymffCA+NCMiuqeECeBBLm8dg2oFdjuGJhgN4UAbI+6v0CKbbhvtXA4qV8YR5Ji86nmw==} + engines: {node: '>=18.18.0'} + + '@humanfs/node@0.16.5': + resolution: {integrity: sha512-KSPA4umqSG4LHYRodq31VDwKAvaTF4xmVlzM8Aeh4PlU1JQ3IG0wiA8C25d3RQ9nJyM3mBHyI53K06VVL/oFFg==} + engines: {node: '>=18.18.0'} + '@humanwhocodes/module-importer@1.0.1': resolution: {integrity: sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==} engines: {node: '>=12.22'} - '@humanwhocodes/retry@0.3.0': - resolution: {integrity: sha512-d2CGZR2o7fS6sWB7DG/3a95bGKQyHMACZ5aW8qGkkqQpUoZV6C0X7Pc7l4ZNMZkfNBf4VWNe9E1jRsf0G146Ew==} + '@humanwhocodes/retry@0.3.1': + resolution: {integrity: sha512-JBxkERygn7Bv/GbN5Rv8Ul6LVknS+5Bp6RgDC/O8gEBU/yeH5Ui5C/OlWrTb6qct7LjjfT6Re2NxB0ln0yYybA==} engines: {node: '>=18.18'} '@iconify-json/codicon@1.2.2': @@ -1423,8 +1431,8 @@ packages: resolution: {integrity: sha512-Q7lok0mqMUSf5a/AdAZkA5a/gHcO6snwQClVNNvFKCAVlxXucdU8pKydU5ZVZjBx5xr37vGbFFWtLQYreLzrZg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - eslint@9.11.1: - resolution: {integrity: sha512-MobhYKIoAO1s1e4VUrgx1l1Sk2JBR/Gqjjgw8+mfgoLE2xwsHur4gdfTxyTgShrhvdVFTaJSgMiQBl1jv/AWxg==} + eslint@9.12.0: + resolution: {integrity: sha512-UVIOlTEWxwIopRL1wgSQYdnVDcEvs2wyaO6DGo5mXqe3r16IoCNWkR29iHhyaP4cICWjbgbmFUGAhh0GJRuGZw==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} hasBin: true peerDependencies: @@ -1654,10 +1662,6 @@ packages: resolution: {integrity: sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==} engines: {node: '>=0.12.0'} - is-path-inside@3.0.3: - resolution: {integrity: sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==} - engines: {node: '>=8'} - is-plain-obj@2.1.0: resolution: {integrity: sha512-YWnfyRwxL/+SsrWYfOpUtz5b3YD+nyfkHvjbcanzk8zgyO4ASD67uVMRt8k5bM4lLMDnXfriRhOpemw+NfT1eA==} engines: {node: '>=8'} @@ -2571,9 +2575,9 @@ snapshots: '@esbuild/win32-x64@0.23.1': optional: true - '@eslint-community/eslint-utils@4.4.0(eslint@9.11.1(jiti@2.0.0))': + '@eslint-community/eslint-utils@4.4.0(eslint@9.12.0(jiti@2.0.0))': dependencies: - eslint: 9.11.1(jiti@2.0.0) + eslint: 9.12.0(jiti@2.0.0) eslint-visitor-keys: 3.4.3 '@eslint-community/regexpp@4.11.1': {} @@ -2602,7 +2606,7 @@ snapshots: transitivePeerDependencies: - supports-color - '@eslint/js@9.11.1': {} + '@eslint/js@9.12.0': {} '@eslint/object-schema@2.1.4': {} @@ -2610,9 +2614,16 @@ snapshots: dependencies: levn: 0.4.1 + '@humanfs/core@0.19.0': {} + + '@humanfs/node@0.16.5': + dependencies: + '@humanfs/core': 0.19.0 + '@humanwhocodes/retry': 0.3.1 + '@humanwhocodes/module-importer@1.0.1': {} - '@humanwhocodes/retry@0.3.0': {} + '@humanwhocodes/retry@0.3.1': {} '@iconify-json/codicon@1.2.2': dependencies: @@ -2846,15 +2857,15 @@ snapshots: '@types/unist@2.0.11': {} - '@typescript-eslint/eslint-plugin@8.8.0(@typescript-eslint/parser@8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2))(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/eslint-plugin@8.8.0(@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2))(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2)': dependencies: '@eslint-community/regexpp': 4.11.1 - '@typescript-eslint/parser': 8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/parser': 8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) '@typescript-eslint/scope-manager': 8.8.0 - '@typescript-eslint/type-utils': 8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) - '@typescript-eslint/utils': 8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/type-utils': 8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/utils': 8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) '@typescript-eslint/visitor-keys': 8.8.0 - eslint: 9.11.1(jiti@2.0.0) + eslint: 9.12.0(jiti@2.0.0) graphemer: 1.4.0 ignore: 5.3.2 natural-compare: 1.4.0 @@ -2864,14 +2875,14 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2)': dependencies: '@typescript-eslint/scope-manager': 8.8.0 '@typescript-eslint/types': 8.8.0 '@typescript-eslint/typescript-estree': 8.8.0(typescript@5.6.2) '@typescript-eslint/visitor-keys': 8.8.0 debug: 4.3.7(supports-color@8.1.1) - eslint: 9.11.1(jiti@2.0.0) + eslint: 9.12.0(jiti@2.0.0) optionalDependencies: typescript: 5.6.2 transitivePeerDependencies: @@ -2882,10 +2893,10 @@ snapshots: '@typescript-eslint/types': 8.8.0 '@typescript-eslint/visitor-keys': 8.8.0 - '@typescript-eslint/type-utils@8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/type-utils@8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2)': dependencies: '@typescript-eslint/typescript-estree': 8.8.0(typescript@5.6.2) - '@typescript-eslint/utils': 8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/utils': 8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) debug: 4.3.7(supports-color@8.1.1) ts-api-utils: 1.3.0(typescript@5.6.2) optionalDependencies: @@ -2911,13 +2922,13 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/utils@8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2)': dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@2.0.0)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0(jiti@2.0.0)) '@typescript-eslint/scope-manager': 8.8.0 '@typescript-eslint/types': 8.8.0 '@typescript-eslint/typescript-estree': 8.8.0(typescript@5.6.2) - eslint: 9.11.1(jiti@2.0.0) + eslint: 9.12.0(jiti@2.0.0) transitivePeerDependencies: - supports-color - typescript @@ -3360,9 +3371,9 @@ snapshots: escape-string-regexp@4.0.0: {} - eslint-config-prettier@9.1.0(eslint@9.11.1(jiti@2.0.0)): + eslint-config-prettier@9.1.0(eslint@9.12.0(jiti@2.0.0)): dependencies: - eslint: 9.11.1(jiti@2.0.0) + eslint: 9.12.0(jiti@2.0.0) eslint-plugin-security@3.0.1: dependencies: @@ -3377,18 +3388,18 @@ snapshots: eslint-visitor-keys@4.1.0: {} - eslint@9.11.1(jiti@2.0.0): + eslint@9.12.0(jiti@2.0.0): dependencies: - '@eslint-community/eslint-utils': 4.4.0(eslint@9.11.1(jiti@2.0.0)) + '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0(jiti@2.0.0)) '@eslint-community/regexpp': 4.11.1 '@eslint/config-array': 0.18.0 '@eslint/core': 0.6.0 '@eslint/eslintrc': 3.1.0 - '@eslint/js': 9.11.1 + '@eslint/js': 9.12.0 '@eslint/plugin-kit': 0.2.0 + '@humanfs/node': 0.16.5 '@humanwhocodes/module-importer': 1.0.1 - '@humanwhocodes/retry': 0.3.0 - '@nodelib/fs.walk': 1.2.8 + '@humanwhocodes/retry': 0.3.1 '@types/estree': 1.0.6 '@types/json-schema': 7.0.15 ajv: 6.12.6 @@ -3408,13 +3419,11 @@ snapshots: ignore: 5.3.2 imurmurhash: 0.1.4 is-glob: 4.0.3 - is-path-inside: 3.0.3 json-stable-stringify-without-jsonify: 1.0.1 lodash.merge: 4.6.2 minimatch: 3.1.2 natural-compare: 1.4.0 optionator: 0.9.4 - strip-ansi: 6.0.1 text-table: 0.2.0 optionalDependencies: jiti: 2.0.0 @@ -3619,8 +3628,6 @@ snapshots: is-number@7.0.0: {} - is-path-inside@3.0.3: {} - is-plain-obj@2.1.0: {} is-reference@3.0.2: @@ -4130,11 +4137,11 @@ snapshots: type-fest@0.7.1: {} - typescript-eslint@8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2): + typescript-eslint@8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2): dependencies: - '@typescript-eslint/eslint-plugin': 8.8.0(@typescript-eslint/parser@8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2))(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) - '@typescript-eslint/parser': 8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) - '@typescript-eslint/utils': 8.8.0(eslint@9.11.1(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/eslint-plugin': 8.8.0(@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2))(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/parser': 8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/utils': 8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) optionalDependencies: typescript: 5.6.2 transitivePeerDependencies: From fb676626f155769ce04f401ae402c288567bee3d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 10:01:07 +0800 Subject: [PATCH 27/40] chore(deps): update dependency typescript-eslint to v8.8.1 (#1899) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- pnpm-lock.yaml | 102 ++++++++++++++++++++++++------------------------- 2 files changed, 52 insertions(+), 52 deletions(-) diff --git a/package.json b/package.json index c74b41d4..0537973f 100644 --- a/package.json +++ b/package.json @@ -23,7 +23,7 @@ "rollup": "4.22.4", "tslib": "2.7.0", "typescript": "5.6.2", - "typescript-eslint": "8.8.0" + "typescript-eslint": "8.8.1" }, "resolutions": { "semver": ">=7.5.2", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 956ba8cb..9d5e1e3b 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -52,8 +52,8 @@ importers: specifier: 5.6.2 version: 5.6.2 typescript-eslint: - specifier: 8.8.0 - version: 8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) + specifier: 8.8.1 + version: 8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) examples/api: dependencies: @@ -1028,8 +1028,8 @@ packages: '@types/unist@2.0.11': resolution: {integrity: sha512-CmBKiL6NNo/OqgmMn95Fk9Whlp2mtvIv+KNpQKN2F4SjvrEesubTRWGYSg+BnWZOnlCaSTU1sMpsBOzgbYhnsA==} - '@typescript-eslint/eslint-plugin@8.8.0': - resolution: {integrity: sha512-wORFWjU30B2WJ/aXBfOm1LX9v9nyt9D3jsSOxC3cCaTQGCW5k4jNpmjFv3U7p/7s4yvdjHzwtv2Sd2dOyhjS0A==} + '@typescript-eslint/eslint-plugin@8.8.1': + resolution: {integrity: sha512-xfvdgA8AP/vxHgtgU310+WBnLB4uJQ9XdyP17RebG26rLtDrQJV3ZYrcopX91GrHmMoH8bdSwMRh2a//TiJ1jQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: '@typescript-eslint/parser': ^8.0.0 || ^8.0.0-alpha.0 @@ -1039,8 +1039,8 @@ packages: typescript: optional: true - '@typescript-eslint/parser@8.8.0': - resolution: {integrity: sha512-uEFUsgR+tl8GmzmLjRqz+VrDv4eoaMqMXW7ruXfgThaAShO9JTciKpEsB+TvnfFfbg5IpujgMXVV36gOJRLtZg==} + '@typescript-eslint/parser@8.8.1': + resolution: {integrity: sha512-hQUVn2Lij2NAxVFEdvIGxT9gP1tq2yM83m+by3whWFsWC+1y8pxxxHUFE1UqDu2VsGi2i6RLcv4QvouM84U+ow==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 @@ -1049,12 +1049,12 @@ packages: typescript: optional: true - '@typescript-eslint/scope-manager@8.8.0': - resolution: {integrity: sha512-EL8eaGC6gx3jDd8GwEFEV091210U97J0jeEHrAYvIYosmEGet4wJ+g0SYmLu+oRiAwbSA5AVrt6DxLHfdd+bUg==} + '@typescript-eslint/scope-manager@8.8.1': + resolution: {integrity: sha512-X4JdU+66Mazev/J0gfXlcC/dV6JI37h+93W9BRYXrSn0hrE64IoWgVkO9MSJgEzoWkxONgaQpICWg8vAN74wlA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/type-utils@8.8.0': - resolution: {integrity: sha512-IKwJSS7bCqyCeG4NVGxnOP6lLT9Okc3Zj8hLO96bpMkJab+10HIfJbMouLrlpyOr3yrQ1cA413YPFiGd1mW9/Q==} + '@typescript-eslint/type-utils@8.8.1': + resolution: {integrity: sha512-qSVnpcbLP8CALORf0za+vjLYj1Wp8HSoiI8zYU5tHxRVj30702Z1Yw4cLwfNKhTPWp5+P+k1pjmD5Zd1nhxiZA==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '*' @@ -1062,12 +1062,12 @@ packages: typescript: optional: true - '@typescript-eslint/types@8.8.0': - resolution: {integrity: sha512-QJwc50hRCgBd/k12sTykOJbESe1RrzmX6COk8Y525C9l7oweZ+1lw9JiU56im7Amm8swlz00DRIlxMYLizr2Vw==} + '@typescript-eslint/types@8.8.1': + resolution: {integrity: sha512-WCcTP4SDXzMd23N27u66zTKMuEevH4uzU8C9jf0RO4E04yVHgQgW+r+TeVTNnO1KIfrL8ebgVVYYMMO3+jC55Q==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} - '@typescript-eslint/typescript-estree@8.8.0': - resolution: {integrity: sha512-ZaMJwc/0ckLz5DaAZ+pNLmHv8AMVGtfWxZe/x2JVEkD5LnmhWiQMMcYT7IY7gkdJuzJ9P14fRy28lUrlDSWYdw==} + '@typescript-eslint/typescript-estree@8.8.1': + resolution: {integrity: sha512-A5d1R9p+X+1js4JogdNilDuuq+EHZdsH9MjTVxXOdVFfTJXunKJR/v+fNNyO4TnoOn5HqobzfRlc70NC6HTcdg==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '*' @@ -1075,14 +1075,14 @@ packages: typescript: optional: true - '@typescript-eslint/utils@8.8.0': - resolution: {integrity: sha512-QE2MgfOTem00qrlPgyByaCHay9yb1+9BjnMFnSFkUKQfu7adBXDTnCAivURnuPPAG/qiB+kzKkZKmKfaMT0zVg==} + '@typescript-eslint/utils@8.8.1': + resolution: {integrity: sha512-/QkNJDbV0bdL7H7d0/y0qBbV2HTtf0TIyjSDTvvmQEzeVx8jEImEbLuOA4EsvE8gIgqMitns0ifb5uQhMj8d9w==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: eslint: ^8.57.0 || ^9.0.0 - '@typescript-eslint/visitor-keys@8.8.0': - resolution: {integrity: sha512-8mq51Lx6Hpmd7HnA2fcHQo3YgfX1qbccxQOgZcb4tvasu//zXRaA1j5ZRFeCw/VRAdFi4mRM9DnZw0Nu0Q2d1g==} + '@typescript-eslint/visitor-keys@8.8.1': + resolution: {integrity: sha512-0/TdC3aeRAsW7MDvYRwEc1Uwm0TIBfzjPFgg60UU2Haj5qsCs9cc3zNgY71edqE3LbWfF/WoZQd3lJoDXFQpag==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} '@unocss/astro@0.63.1': @@ -2145,8 +2145,8 @@ packages: resolution: {integrity: sha512-Ne2YiiGN8bmrmJJEuTWTLJR32nh/JdL1+PSicowtNb0WFpn59GK8/lfD61bVtzguz7b3PBt74nxpv/Pw5po5Rg==} engines: {node: '>=8'} - typescript-eslint@8.8.0: - resolution: {integrity: sha512-BjIT/VwJ8+0rVO01ZQ2ZVnjE1svFBiRczcpr1t1Yxt7sT25VSbPfrJtDsQ8uQTy2pilX5nI9gwxhUyLULNentw==} + typescript-eslint@8.8.1: + resolution: {integrity: sha512-R0dsXFt6t4SAFjUSKFjMh4pXDtq04SsFKCVGDP3ZOzNP7itF0jBcZYU4fMsZr4y7O7V7Nc751dDeESbe4PbQMQ==} engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0} peerDependencies: typescript: '*' @@ -2857,14 +2857,14 @@ snapshots: '@types/unist@2.0.11': {} - '@typescript-eslint/eslint-plugin@8.8.0(@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2))(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/eslint-plugin@8.8.1(@typescript-eslint/parser@8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2))(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2)': dependencies: '@eslint-community/regexpp': 4.11.1 - '@typescript-eslint/parser': 8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) - '@typescript-eslint/scope-manager': 8.8.0 - '@typescript-eslint/type-utils': 8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) - '@typescript-eslint/utils': 8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) - '@typescript-eslint/visitor-keys': 8.8.0 + '@typescript-eslint/parser': 8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/scope-manager': 8.8.1 + '@typescript-eslint/type-utils': 8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/utils': 8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/visitor-keys': 8.8.1 eslint: 9.12.0(jiti@2.0.0) graphemer: 1.4.0 ignore: 5.3.2 @@ -2875,12 +2875,12 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/parser@8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2)': dependencies: - '@typescript-eslint/scope-manager': 8.8.0 - '@typescript-eslint/types': 8.8.0 - '@typescript-eslint/typescript-estree': 8.8.0(typescript@5.6.2) - '@typescript-eslint/visitor-keys': 8.8.0 + '@typescript-eslint/scope-manager': 8.8.1 + '@typescript-eslint/types': 8.8.1 + '@typescript-eslint/typescript-estree': 8.8.1(typescript@5.6.2) + '@typescript-eslint/visitor-keys': 8.8.1 debug: 4.3.7(supports-color@8.1.1) eslint: 9.12.0(jiti@2.0.0) optionalDependencies: @@ -2888,15 +2888,15 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/scope-manager@8.8.0': + '@typescript-eslint/scope-manager@8.8.1': dependencies: - '@typescript-eslint/types': 8.8.0 - '@typescript-eslint/visitor-keys': 8.8.0 + '@typescript-eslint/types': 8.8.1 + '@typescript-eslint/visitor-keys': 8.8.1 - '@typescript-eslint/type-utils@8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/type-utils@8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2)': dependencies: - '@typescript-eslint/typescript-estree': 8.8.0(typescript@5.6.2) - '@typescript-eslint/utils': 8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/typescript-estree': 8.8.1(typescript@5.6.2) + '@typescript-eslint/utils': 8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) debug: 4.3.7(supports-color@8.1.1) ts-api-utils: 1.3.0(typescript@5.6.2) optionalDependencies: @@ -2905,12 +2905,12 @@ snapshots: - eslint - supports-color - '@typescript-eslint/types@8.8.0': {} + '@typescript-eslint/types@8.8.1': {} - '@typescript-eslint/typescript-estree@8.8.0(typescript@5.6.2)': + '@typescript-eslint/typescript-estree@8.8.1(typescript@5.6.2)': dependencies: - '@typescript-eslint/types': 8.8.0 - '@typescript-eslint/visitor-keys': 8.8.0 + '@typescript-eslint/types': 8.8.1 + '@typescript-eslint/visitor-keys': 8.8.1 debug: 4.3.7(supports-color@8.1.1) fast-glob: 3.3.2 is-glob: 4.0.3 @@ -2922,20 +2922,20 @@ snapshots: transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/utils@8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0(jiti@2.0.0)) - '@typescript-eslint/scope-manager': 8.8.0 - '@typescript-eslint/types': 8.8.0 - '@typescript-eslint/typescript-estree': 8.8.0(typescript@5.6.2) + '@typescript-eslint/scope-manager': 8.8.1 + '@typescript-eslint/types': 8.8.1 + '@typescript-eslint/typescript-estree': 8.8.1(typescript@5.6.2) eslint: 9.12.0(jiti@2.0.0) transitivePeerDependencies: - supports-color - typescript - '@typescript-eslint/visitor-keys@8.8.0': + '@typescript-eslint/visitor-keys@8.8.1': dependencies: - '@typescript-eslint/types': 8.8.0 + '@typescript-eslint/types': 8.8.1 eslint-visitor-keys: 3.4.3 '@unocss/astro@0.63.1(rollup@4.22.4)(vite@5.4.8(terser@5.34.1))': @@ -4137,11 +4137,11 @@ snapshots: type-fest@0.7.1: {} - typescript-eslint@8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2): + typescript-eslint@8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2): dependencies: - '@typescript-eslint/eslint-plugin': 8.8.0(@typescript-eslint/parser@8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2))(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) - '@typescript-eslint/parser': 8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) - '@typescript-eslint/utils': 8.8.0(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/eslint-plugin': 8.8.1(@typescript-eslint/parser@8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2))(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/parser': 8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/utils': 8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) optionalDependencies: typescript: 5.6.2 transitivePeerDependencies: From 00585835834c6ddbf89e8d159804211ceba4bcfb Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 8 Oct 2024 15:29:28 +0800 Subject: [PATCH 28/40] fix(deps): update tauri monorepo to v2.0.2 (#1874) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Cargo.lock | 4 +- Cargo.toml | 2 +- examples/api/package.json | 4 +- plugins/deep-link/examples/app/package.json | 4 +- .../examples/vanilla/package.json | 2 +- .../examples/AppSettingsManager/package.json | 2 +- .../websocket/examples/tauri-app/package.json | 2 +- pnpm-lock.yaml | 172 +++++++++--------- 8 files changed, 96 insertions(+), 96 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2044a052..a8e5ee07 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -6498,9 +6498,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f3fad474c02a3bcd4a304afff97159a31b9bab84e29563f7109c7b0ce8cd774e" +checksum = "5920aad0804ea5e86808d4b6e8753d3bcbae7efc8f4e41a4da00b45427559868" dependencies = [ "anyhow", "bytes", diff --git a/Cargo.toml b/Cargo.toml index f4d619d3..8cdb23a9 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -11,7 +11,7 @@ resolver = "2" [workspace.dependencies] serde = { version = "1", features = ["derive"] } log = "0.4" -tauri = { version = "2.0.1", default-features = false } +tauri = { version = "2.0.2", default-features = false } tauri-build = "2.0.1" tauri-plugin = "2.0.1" tauri-utils = "2.0.1" diff --git a/examples/api/package.json b/examples/api/package.json index 599276b8..690c19f9 100644 --- a/examples/api/package.json +++ b/examples/api/package.json @@ -9,7 +9,7 @@ "serve": "vite preview" }, "dependencies": { - "@tauri-apps/api": "2.0.1", + "@tauri-apps/api": "2.0.2", "@tauri-apps/plugin-barcode-scanner": "2.0.0", "@tauri-apps/plugin-biometric": "2.0.0", "@tauri-apps/plugin-cli": "2.0.0", @@ -33,7 +33,7 @@ "@iconify-json/codicon": "^1.1.37", "@iconify-json/ph": "^1.1.8", "@sveltejs/vite-plugin-svelte": "^3.0.1", - "@tauri-apps/cli": "2.0.0", + "@tauri-apps/cli": "2.0.2", "@unocss/extractor-svelte": "^0.63.0", "svelte": "^4.2.19", "unocss": "^0.63.0", diff --git a/plugins/deep-link/examples/app/package.json b/plugins/deep-link/examples/app/package.json index 98864087..2ef38bd3 100644 --- a/plugins/deep-link/examples/app/package.json +++ b/plugins/deep-link/examples/app/package.json @@ -10,11 +10,11 @@ "tauri": "tauri" }, "dependencies": { - "@tauri-apps/api": "2.0.1", + "@tauri-apps/api": "2.0.2", "@tauri-apps/plugin-deep-link": "2.0.0" }, "devDependencies": { - "@tauri-apps/cli": "2.0.0", + "@tauri-apps/cli": "2.0.2", "typescript": "^5.2.2", "vite": "^5.4.7" } diff --git a/plugins/single-instance/examples/vanilla/package.json b/plugins/single-instance/examples/vanilla/package.json index b4c80cbd..5b736d55 100644 --- a/plugins/single-instance/examples/vanilla/package.json +++ b/plugins/single-instance/examples/vanilla/package.json @@ -9,6 +9,6 @@ "author": "", "license": "MIT", "devDependencies": { - "@tauri-apps/cli": "2.0.0" + "@tauri-apps/cli": "2.0.2" } } diff --git a/plugins/store/examples/AppSettingsManager/package.json b/plugins/store/examples/AppSettingsManager/package.json index ca7e3b95..e36d1bb3 100644 --- a/plugins/store/examples/AppSettingsManager/package.json +++ b/plugins/store/examples/AppSettingsManager/package.json @@ -8,7 +8,7 @@ "tauri": "tauri" }, "devDependencies": { - "@tauri-apps/cli": "2.0.0", + "@tauri-apps/cli": "2.0.2", "vite": "^5.0.12", "typescript": "^5.4.7" } diff --git a/plugins/websocket/examples/tauri-app/package.json b/plugins/websocket/examples/tauri-app/package.json index dc8f68bb..4bfbdfd5 100644 --- a/plugins/websocket/examples/tauri-app/package.json +++ b/plugins/websocket/examples/tauri-app/package.json @@ -9,7 +9,7 @@ "preview": "vite preview" }, "devDependencies": { - "@tauri-apps/cli": "2.0.0", + "@tauri-apps/cli": "2.0.2", "typescript": "^5.3.3", "vite": "^5.4.7" }, diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 9d5e1e3b..ec6022a8 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -58,8 +58,8 @@ importers: examples/api: dependencies: '@tauri-apps/api': - specifier: 2.0.1 - version: 2.0.1 + specifier: 2.0.2 + version: 2.0.2 '@tauri-apps/plugin-barcode-scanner': specifier: 2.0.0 version: link:../../plugins/barcode-scanner @@ -125,8 +125,8 @@ importers: specifier: ^3.0.1 version: 3.1.2(svelte@4.2.19)(vite@5.4.8(terser@5.34.1)) '@tauri-apps/cli': - specifier: 2.0.0 - version: 2.0.0 + specifier: 2.0.2 + version: 2.0.2 '@unocss/extractor-svelte': specifier: ^0.63.0 version: 0.63.1 @@ -144,50 +144,50 @@ importers: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/barcode-scanner: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/biometric: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/cli: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/clipboard-manager: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/deep-link: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/deep-link/examples/app: dependencies: '@tauri-apps/api': - specifier: 2.0.1 - version: 2.0.1 + specifier: 2.0.2 + version: 2.0.2 '@tauri-apps/plugin-deep-link': specifier: 2.0.0 version: link:../.. devDependencies: '@tauri-apps/cli': - specifier: 2.0.0 - version: 2.0.0 + specifier: 2.0.2 + version: 2.0.2 typescript: specifier: ^5.2.2 version: 5.6.2 @@ -199,103 +199,103 @@ importers: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/fs: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/geolocation: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/global-shortcut: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/haptics: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/http: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/log: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/nfc: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/notification: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/os: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/positioner: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/process: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/shell: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/single-instance/examples/vanilla: devDependencies: '@tauri-apps/cli': - specifier: 2.0.0 - version: 2.0.0 + specifier: 2.0.2 + version: 2.0.2 plugins/sql: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/store: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/store/examples/AppSettingsManager: devDependencies: '@tauri-apps/cli': - specifier: 2.0.0 - version: 2.0.0 + specifier: 2.0.2 + version: 2.0.2 typescript: specifier: ^5.4.7 version: 5.6.2 @@ -307,25 +307,25 @@ importers: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/updater: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/upload: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/websocket: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 plugins/websocket/examples/tauri-app: dependencies: @@ -334,8 +334,8 @@ importers: version: link:../.. devDependencies: '@tauri-apps/cli': - specifier: 2.0.0 - version: 2.0.0 + specifier: 2.0.2 + version: 2.0.2 typescript: specifier: ^5.3.3 version: 5.6.2 @@ -347,7 +347,7 @@ importers: dependencies: '@tauri-apps/api': specifier: ^2.0.0 - version: 2.0.1 + version: 2.0.2 packages: @@ -936,71 +936,71 @@ packages: svelte: ^4.0.0 || ^5.0.0-next.0 vite: ^5.0.0 - '@tauri-apps/api@2.0.1': - resolution: {integrity: sha512-eoQWT+Tq1qSwQpHV+nw1eNYe5B/nm1PoRjQCRiEOS12I1b+X4PUcREfXVX8dPcBT6GrzWGDtaecY0+1p0Rfqlw==} + '@tauri-apps/api@2.0.2': + resolution: {integrity: sha512-3wSwmG+1kr6WrgAFKK5ijkNFPp8TT3FLj3YHUb5EwMO+3FxX4uWlfSWkeeBy+Kc1RsKzugtYLuuya+98Flj+3w==} - '@tauri-apps/cli-darwin-arm64@2.0.0': - resolution: {integrity: sha512-+agYqg2c77imaMfKw7mzqecVIDGcwr6bZMdglJ808O2UjTFzMwnAam1sU26YBYU+IyIjwOu00fm9Azpal+N/Ew==} + '@tauri-apps/cli-darwin-arm64@2.0.2': + resolution: {integrity: sha512-B+/a8Q6wAqmB4A4HVeK0oQP5TdQGKW60ZLOI9O2ktH2HPr9ETr3XkwXPuJ2uAOuGEgtRZHBgFOIgG000vMnKlg==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] - '@tauri-apps/cli-darwin-x64@2.0.0': - resolution: {integrity: sha512-keN2PLTTcZmbWwFMup/NGcshmvyLnhRPChO8lbm9C5a0IY7zUNQUD7/o/zIulQdLJqDxkdpWJ1j2jTycAtvtKQ==} + '@tauri-apps/cli-darwin-x64@2.0.2': + resolution: {integrity: sha512-kaurhn6XT4gAVCPAQSSHl/CHFxTS0ljc47N7iGTSlYJ03sCWPRZeNuVa/bn6rolz9MA2JfnRnFqB1pUL6jzp9Q==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] - '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0': - resolution: {integrity: sha512-FQJNrlCUBb9E7Fhp5ARy+Or8lSvorG41aVrfi0cGNvv1QlIGSj77TN7SKK+L1jAGzKj1Bl2kCZIESF6Zi8N/+Q==} + '@tauri-apps/cli-linux-arm-gnueabihf@2.0.2': + resolution: {integrity: sha512-bVrofjlacMxmGMcqK18iBW05tsZXOd19/MnqruFFcHSVjvkGGIXHMtUbMXnZNXBPkHDsnfytNtkY9SZGfCFaBA==} engines: {node: '>= 10'} cpu: [arm] os: [linux] - '@tauri-apps/cli-linux-arm64-gnu@2.0.0': - resolution: {integrity: sha512-TK3VrZG5LK1NGueKwnZA1/3gj/qkwry001MNCHXjT6394dwrDv+digCc9Qc569h+xeH/FF71jyoiRIu3gRE6iA==} + '@tauri-apps/cli-linux-arm64-gnu@2.0.2': + resolution: {integrity: sha512-7XCBn0TTBVQGnV42dXcbHPLg/9W8kJoVzuliIozvNGyRWxfXqDbQYzpI48HUQG3LgHMabcw8+pVZAfGhevLrCA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-arm64-musl@2.0.0': - resolution: {integrity: sha512-E3hRmS/0m8YUYMTKZtBExpk/284CTi2nymks0dK0L1j+3KjffL7DiilnIfNFmTvWBgMrs0cVCtoaN/ba/A9mNA==} + '@tauri-apps/cli-linux-arm64-musl@2.0.2': + resolution: {integrity: sha512-1xi2SreGVlpAL68MCsDUY63rdItUdPZreXIAcOVqvUehcJRYOa1XGSBhrV0YXRgZeh0AtKC19z6PRzcv4rosZA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-x64-gnu@2.0.0': - resolution: {integrity: sha512-veX4BJp5xnW8KmxVjchWt4oZEIvKGhuSR7qU1WpqTR21e/eTe/ksGsdXPsqOKQvv/w1X6jhqmlPvhnFmDwUJ/w==} + '@tauri-apps/cli-linux-x64-gnu@2.0.2': + resolution: {integrity: sha512-WVjwYzPWFqZVg1fx6KSU5w47Q0VbMyaCp34qs5EcS8EIU0/RnofdzqUoOYqvgGVgNgoz7Pj5dXK2SkS8BHXMmA==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-linux-x64-musl@2.0.0': - resolution: {integrity: sha512-9Eso/8wbsWbOyd9PZEIzN/48ZQJrUGQqGZtglcjUku0lO76mnX0fOnit4nQ57Oj0wezJPhv4mgSseG1OsTIVzw==} + '@tauri-apps/cli-linux-x64-musl@2.0.2': + resolution: {integrity: sha512-h5miE2mctgaQNn/BbG9o1pnJcrx+VGBi2A6JFqGu934lFgSV5+s28M8Gc8AF2JgFH4hQV4IuMkeSw8Chu5Dodg==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-win32-arm64-msvc@2.0.0': - resolution: {integrity: sha512-ky8vWAuDUf8WGt9+a0G/EbU0OhdIkogelh9qjIYGHbyEYAJqXfN5P40aHUEg3y8ngQ0YGwRX5ePsQsSZiiR5PQ==} + '@tauri-apps/cli-win32-arm64-msvc@2.0.2': + resolution: {integrity: sha512-2b8oO0+dYonahG5PfA/zoq0zlafLclfmXgqoWDZ++UiPtQHJNpNeEQ8GWbSFKGHQ494Jo6jHvazOojGRE1kqAg==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] - '@tauri-apps/cli-win32-ia32-msvc@2.0.0': - resolution: {integrity: sha512-uD45cLZ/EBaT8o4a27tHW7t5UKFplnvDLt/uSUaCpJ3NyOTV6nMXOUrJBe+hH9hSBohqNAF7LEyYo1p932DWFg==} + '@tauri-apps/cli-win32-ia32-msvc@2.0.2': + resolution: {integrity: sha512-axgICLunFi0To3EibdCBgbST5RocsSmtM4c04+CbcX8WQQosJ9ziWlCSrrOTRr+gJERAMSvEyVUS98f6bWMw9A==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] - '@tauri-apps/cli-win32-x64-msvc@2.0.0': - resolution: {integrity: sha512-oFlo14YMsvyhJHmmHgRuOpJ1L9w15193c1Nfj1DksS2LHj6tLzirI7YrAF9inY/XjHFjNHzYPmBpABibkf/9wQ==} + '@tauri-apps/cli-win32-x64-msvc@2.0.2': + resolution: {integrity: sha512-JR17cM6+DyExZRgpXr2/DdqvcFYi/EKvQt8dI5R1/uQoesWd8jeNnrU7c1FG1Zmw9+pTzDztsNqEKsrNq2sNIg==} engines: {node: '>= 10'} cpu: [x64] os: [win32] - '@tauri-apps/cli@2.0.0': - resolution: {integrity: sha512-xxmPllRa6w/LRRcPczST3yHrYoi8l6ZZmzwabEmM0cgDdhVDmX+Y4oDJkiKD+8cVdxwwEzIuIKuaCwsX8iNsgA==} + '@tauri-apps/cli@2.0.2': + resolution: {integrity: sha512-R4ontHZvXORArERAHIidp5zRfZEshZczTiK+poslBv7AGKpQZoMw+E49zns7mOmP64i2Cq9Ci0pJvi4Rm8Okzw==} engines: {node: '>= 10'} hasBin: true @@ -2789,50 +2789,50 @@ snapshots: transitivePeerDependencies: - supports-color - '@tauri-apps/api@2.0.1': {} + '@tauri-apps/api@2.0.2': {} - '@tauri-apps/cli-darwin-arm64@2.0.0': + '@tauri-apps/cli-darwin-arm64@2.0.2': optional: true - '@tauri-apps/cli-darwin-x64@2.0.0': + '@tauri-apps/cli-darwin-x64@2.0.2': optional: true - '@tauri-apps/cli-linux-arm-gnueabihf@2.0.0': + '@tauri-apps/cli-linux-arm-gnueabihf@2.0.2': optional: true - '@tauri-apps/cli-linux-arm64-gnu@2.0.0': + '@tauri-apps/cli-linux-arm64-gnu@2.0.2': optional: true - '@tauri-apps/cli-linux-arm64-musl@2.0.0': + '@tauri-apps/cli-linux-arm64-musl@2.0.2': optional: true - '@tauri-apps/cli-linux-x64-gnu@2.0.0': + '@tauri-apps/cli-linux-x64-gnu@2.0.2': optional: true - '@tauri-apps/cli-linux-x64-musl@2.0.0': + '@tauri-apps/cli-linux-x64-musl@2.0.2': optional: true - '@tauri-apps/cli-win32-arm64-msvc@2.0.0': + '@tauri-apps/cli-win32-arm64-msvc@2.0.2': optional: true - '@tauri-apps/cli-win32-ia32-msvc@2.0.0': + '@tauri-apps/cli-win32-ia32-msvc@2.0.2': optional: true - '@tauri-apps/cli-win32-x64-msvc@2.0.0': + '@tauri-apps/cli-win32-x64-msvc@2.0.2': optional: true - '@tauri-apps/cli@2.0.0': + '@tauri-apps/cli@2.0.2': optionalDependencies: - '@tauri-apps/cli-darwin-arm64': 2.0.0 - '@tauri-apps/cli-darwin-x64': 2.0.0 - '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.0 - '@tauri-apps/cli-linux-arm64-gnu': 2.0.0 - '@tauri-apps/cli-linux-arm64-musl': 2.0.0 - '@tauri-apps/cli-linux-x64-gnu': 2.0.0 - '@tauri-apps/cli-linux-x64-musl': 2.0.0 - '@tauri-apps/cli-win32-arm64-msvc': 2.0.0 - '@tauri-apps/cli-win32-ia32-msvc': 2.0.0 - '@tauri-apps/cli-win32-x64-msvc': 2.0.0 + '@tauri-apps/cli-darwin-arm64': 2.0.2 + '@tauri-apps/cli-darwin-x64': 2.0.2 + '@tauri-apps/cli-linux-arm-gnueabihf': 2.0.2 + '@tauri-apps/cli-linux-arm64-gnu': 2.0.2 + '@tauri-apps/cli-linux-arm64-musl': 2.0.2 + '@tauri-apps/cli-linux-x64-gnu': 2.0.2 + '@tauri-apps/cli-linux-x64-musl': 2.0.2 + '@tauri-apps/cli-win32-arm64-msvc': 2.0.2 + '@tauri-apps/cli-win32-ia32-msvc': 2.0.2 + '@tauri-apps/cli-win32-x64-msvc': 2.0.2 '@types/eslint@9.6.1': dependencies: From 60064fce528303a3a7e31d44cf4c0e866e534d8a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 9 Oct 2024 09:28:06 +0800 Subject: [PATCH 29/40] chore(deps): update dependency typescript to v5.6.3 (#1905) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- pnpm-lock.yaml | 76 +++++++++++++++++++++++++------------------------- 2 files changed, 39 insertions(+), 39 deletions(-) diff --git a/package.json b/package.json index 0537973f..bd9039ab 100644 --- a/package.json +++ b/package.json @@ -22,7 +22,7 @@ "prettier": "3.3.3", "rollup": "4.22.4", "tslib": "2.7.0", - "typescript": "5.6.2", + "typescript": "5.6.3", "typescript-eslint": "8.8.1" }, "resolutions": { diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index ec6022a8..9005b2d2 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -23,7 +23,7 @@ importers: version: 0.4.4(rollup@4.22.4) '@rollup/plugin-typescript': specifier: 11.1.6 - version: 11.1.6(rollup@4.22.4)(tslib@2.7.0)(typescript@5.6.2) + version: 11.1.6(rollup@4.22.4)(tslib@2.7.0)(typescript@5.6.3) '@types/eslint__js': specifier: 8.42.3 version: 8.42.3 @@ -49,11 +49,11 @@ importers: specifier: 2.7.0 version: 2.7.0 typescript: - specifier: 5.6.2 - version: 5.6.2 + specifier: 5.6.3 + version: 5.6.3 typescript-eslint: specifier: 8.8.1 - version: 8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) + version: 8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.3) examples/api: dependencies: @@ -190,7 +190,7 @@ importers: version: 2.0.2 typescript: specifier: ^5.2.2 - version: 5.6.2 + version: 5.6.3 vite: specifier: ^5.4.7 version: 5.4.8(terser@5.34.1) @@ -298,7 +298,7 @@ importers: version: 2.0.2 typescript: specifier: ^5.4.7 - version: 5.6.2 + version: 5.6.3 vite: specifier: ^5.0.12 version: 5.4.8(terser@5.34.1) @@ -338,7 +338,7 @@ importers: version: 2.0.2 typescript: specifier: ^5.3.3 - version: 5.6.2 + version: 5.6.3 vite: specifier: ^5.4.7 version: 5.4.8(terser@5.34.1) @@ -2154,8 +2154,8 @@ packages: typescript: optional: true - typescript@5.6.2: - resolution: {integrity: sha512-NW8ByodCSNCwZeghjN3o+JX5OFH0Ojg6sadjEKY4huZ52TqbJTJnDo5+Tw98lSy63NZvi4n+ez5m2u5d4PkZyw==} + typescript@5.6.3: + resolution: {integrity: sha512-hjcS1mhfuyi4WW8IWtjP7brDrG2cuDZukyrYrSauoXGNgx0S7zceP07adYkJycEr56BOUTNPzbInooiN3fn1qw==} engines: {node: '>=14.17'} hasBin: true @@ -2701,11 +2701,11 @@ snapshots: optionalDependencies: rollup: 4.22.4 - '@rollup/plugin-typescript@11.1.6(rollup@4.22.4)(tslib@2.7.0)(typescript@5.6.2)': + '@rollup/plugin-typescript@11.1.6(rollup@4.22.4)(tslib@2.7.0)(typescript@5.6.3)': dependencies: '@rollup/pluginutils': 5.1.2(rollup@4.22.4) resolve: 1.22.8 - typescript: 5.6.2 + typescript: 5.6.3 optionalDependencies: rollup: 4.22.4 tslib: 2.7.0 @@ -2857,34 +2857,34 @@ snapshots: '@types/unist@2.0.11': {} - '@typescript-eslint/eslint-plugin@8.8.1(@typescript-eslint/parser@8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2))(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/eslint-plugin@8.8.1(@typescript-eslint/parser@8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.3))(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.3)': dependencies: '@eslint-community/regexpp': 4.11.1 - '@typescript-eslint/parser': 8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/parser': 8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.3) '@typescript-eslint/scope-manager': 8.8.1 - '@typescript-eslint/type-utils': 8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) - '@typescript-eslint/utils': 8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/type-utils': 8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.3) + '@typescript-eslint/utils': 8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.3) '@typescript-eslint/visitor-keys': 8.8.1 eslint: 9.12.0(jiti@2.0.0) graphemer: 1.4.0 ignore: 5.3.2 natural-compare: 1.4.0 - ts-api-utils: 1.3.0(typescript@5.6.2) + ts-api-utils: 1.3.0(typescript@5.6.3) optionalDependencies: - typescript: 5.6.2 + typescript: 5.6.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/parser@8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/parser@8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.3)': dependencies: '@typescript-eslint/scope-manager': 8.8.1 '@typescript-eslint/types': 8.8.1 - '@typescript-eslint/typescript-estree': 8.8.1(typescript@5.6.2) + '@typescript-eslint/typescript-estree': 8.8.1(typescript@5.6.3) '@typescript-eslint/visitor-keys': 8.8.1 debug: 4.3.7(supports-color@8.1.1) eslint: 9.12.0(jiti@2.0.0) optionalDependencies: - typescript: 5.6.2 + typescript: 5.6.3 transitivePeerDependencies: - supports-color @@ -2893,21 +2893,21 @@ snapshots: '@typescript-eslint/types': 8.8.1 '@typescript-eslint/visitor-keys': 8.8.1 - '@typescript-eslint/type-utils@8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/type-utils@8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.3)': dependencies: - '@typescript-eslint/typescript-estree': 8.8.1(typescript@5.6.2) - '@typescript-eslint/utils': 8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/typescript-estree': 8.8.1(typescript@5.6.3) + '@typescript-eslint/utils': 8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.3) debug: 4.3.7(supports-color@8.1.1) - ts-api-utils: 1.3.0(typescript@5.6.2) + ts-api-utils: 1.3.0(typescript@5.6.3) optionalDependencies: - typescript: 5.6.2 + typescript: 5.6.3 transitivePeerDependencies: - eslint - supports-color '@typescript-eslint/types@8.8.1': {} - '@typescript-eslint/typescript-estree@8.8.1(typescript@5.6.2)': + '@typescript-eslint/typescript-estree@8.8.1(typescript@5.6.3)': dependencies: '@typescript-eslint/types': 8.8.1 '@typescript-eslint/visitor-keys': 8.8.1 @@ -2916,18 +2916,18 @@ snapshots: is-glob: 4.0.3 minimatch: 9.0.5 semver: 7.6.3 - ts-api-utils: 1.3.0(typescript@5.6.2) + ts-api-utils: 1.3.0(typescript@5.6.3) optionalDependencies: - typescript: 5.6.2 + typescript: 5.6.3 transitivePeerDependencies: - supports-color - '@typescript-eslint/utils@8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2)': + '@typescript-eslint/utils@8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.3)': dependencies: '@eslint-community/eslint-utils': 4.4.0(eslint@9.12.0(jiti@2.0.0)) '@typescript-eslint/scope-manager': 8.8.1 '@typescript-eslint/types': 8.8.1 - '@typescript-eslint/typescript-estree': 8.8.1(typescript@5.6.2) + '@typescript-eslint/typescript-estree': 8.8.1(typescript@5.6.3) eslint: 9.12.0(jiti@2.0.0) transitivePeerDependencies: - supports-color @@ -4118,9 +4118,9 @@ snapshots: trough@1.0.5: {} - ts-api-utils@1.3.0(typescript@5.6.2): + ts-api-utils@1.3.0(typescript@5.6.3): dependencies: - typescript: 5.6.2 + typescript: 5.6.3 tslib@2.7.0: {} @@ -4137,18 +4137,18 @@ snapshots: type-fest@0.7.1: {} - typescript-eslint@8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2): + typescript-eslint@8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.3): dependencies: - '@typescript-eslint/eslint-plugin': 8.8.1(@typescript-eslint/parser@8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2))(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) - '@typescript-eslint/parser': 8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) - '@typescript-eslint/utils': 8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.2) + '@typescript-eslint/eslint-plugin': 8.8.1(@typescript-eslint/parser@8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.3))(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.3) + '@typescript-eslint/parser': 8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.3) + '@typescript-eslint/utils': 8.8.1(eslint@9.12.0(jiti@2.0.0))(typescript@5.6.3) optionalDependencies: - typescript: 5.6.2 + typescript: 5.6.3 transitivePeerDependencies: - eslint - supports-color - typescript@5.6.2: {} + typescript@5.6.3: {} ufo@1.5.4: {} From 9b2840db9464cf08db75806270e4441f0af81e5d Mon Sep 17 00:00:00 2001 From: Amr Bashir Date: Wed, 9 Oct 2024 14:07:46 +0300 Subject: [PATCH 30/40] fix(http): retain headers order (#1884) * fix(http): retain headers order closes #1882 * simplify if * actually set headers --------- Co-authored-by: Lucas Nogueira --- .changes/http-headers-order.md | 6 ++++ plugins/http/src/commands.rs | 51 ++++++++++++++++++---------------- 2 files changed, 33 insertions(+), 24 deletions(-) create mode 100644 .changes/http-headers-order.md diff --git a/.changes/http-headers-order.md b/.changes/http-headers-order.md new file mode 100644 index 00000000..66940b83 --- /dev/null +++ b/.changes/http-headers-order.md @@ -0,0 +1,6 @@ +--- +"http": "patch" +"http-js": "patch" +--- + +Retain headers order. \ No newline at end of file diff --git a/plugins/http/src/commands.rs b/plugins/http/src/commands.rs index b9c1cae2..cda21bd5 100644 --- a/plugins/http/src/commands.rs +++ b/plugins/http/src/commands.rs @@ -2,9 +2,9 @@ // SPDX-License-Identifier: Apache-2.0 // SPDX-License-Identifier: MIT -use std::{collections::HashMap, future::Future, pin::Pin, sync::Arc, time::Duration}; +use std::{future::Future, pin::Pin, str::FromStr, sync::Arc, time::Duration}; -use http::{header, HeaderName, Method, StatusCode}; +use http::{header, HeaderMap, HeaderName, HeaderValue, Method, StatusCode}; use reqwest::{redirect::Policy, NoProxy}; use serde::{Deserialize, Serialize}; use tauri::{ @@ -176,7 +176,7 @@ pub async fn fetch( let ClientConfig { method, url, - headers, + headers: headers_raw, data, connect_timeout, max_redirections, @@ -185,7 +185,17 @@ pub async fn fetch( let scheme = url.scheme(); let method = Method::from_bytes(method.as_bytes())?; - let headers: HashMap = HashMap::from_iter(headers); + + let mut headers = HeaderMap::new(); + for (h, v) in headers_raw { + let name = HeaderName::from_str(&h)?; + #[cfg(not(feature = "unsafe-headers"))] + if is_unsafe_header(&name) { + continue; + } + + headers.append(name, HeaderValue::from_str(&v)?); + } match scheme { "http" | "https" => { @@ -228,38 +238,29 @@ pub async fn fetch( let mut request = builder.build()?.request(method.clone(), url); - for (name, value) in &headers { - let name = HeaderName::from_bytes(name.as_bytes())?; - #[cfg(not(feature = "unsafe-headers"))] - if is_unsafe_header(&name) { - continue; - } - - request = request.header(name, value); - } - // POST and PUT requests should always have a 0 length content-length, // if there is no body. https://fetch.spec.whatwg.org/#http-network-or-cache-fetch if data.is_none() && matches!(method, Method::POST | Method::PUT) { - request = request.header(header::CONTENT_LENGTH, 0); + headers.append(header::CONTENT_LENGTH, HeaderValue::from_str("0")?); } - if headers.contains_key(header::RANGE.as_str()) { + if headers.contains_key(header::RANGE) { // https://fetch.spec.whatwg.org/#http-network-or-cache-fetch step 18 // If httpRequest’s header list contains `Range`, then append (`Accept-Encoding`, `identity`) - request = request.header(header::ACCEPT_ENCODING, "identity"); + headers.append(header::ACCEPT_ENCODING, HeaderValue::from_str("identity")?); } - if !headers.contains_key(header::USER_AGENT.as_str()) { - request = request.header(header::USER_AGENT, HTTP_USER_AGENT); + if !headers.contains_key(header::USER_AGENT) { + headers.append(header::USER_AGENT, HeaderValue::from_str(HTTP_USER_AGENT)?); } - if cfg!(feature = "unsafe-headers") - && !headers.contains_key(header::ORIGIN.as_str()) - { + // ensure we have an Origin header set + if cfg!(not(feature = "unsafe-headers")) || !headers.contains_key(header::ORIGIN) { if let Ok(url) = webview.url() { - request = - request.header(header::ORIGIN, url.origin().ascii_serialization()); + headers.append( + header::ORIGIN, + HeaderValue::from_str(&url.origin().ascii_serialization())?, + ); } } @@ -267,6 +268,8 @@ pub async fn fetch( request = request.body(data); } + request = request.headers(headers); + let fut = async move { request.send().await.map_err(Into::into) }; let mut resources_table = webview.resources_table(); let rid = resources_table.add_request(Box::pin(fut)); From aee14ed4261cdedc4ed7cc2686f01f437859a5c7 Mon Sep 17 00:00:00 2001 From: nashaofu <19303058+nashaofu@users.noreply.github.com> Date: Wed, 9 Oct 2024 19:45:05 +0800 Subject: [PATCH 31/40] fix(dialog): Fix the issue of Android saving files with a .txt extension (#1892) * fix: Fix the issue of Android saving files with a .txt extension * fix(dialog): pull intent type from extensions filters * fix covector --------- Co-authored-by: Lucas Nogueira --- .changes/fix-android-mime-type.md | 6 ++ .../src-tauri/gen/android/.idea/gradle.xml | 5 +- .../android/src/main/java/DialogPlugin.kt | 59 +++++++++++++------ 3 files changed, 52 insertions(+), 18 deletions(-) create mode 100644 .changes/fix-android-mime-type.md diff --git a/.changes/fix-android-mime-type.md b/.changes/fix-android-mime-type.md new file mode 100644 index 00000000..f9d92237 --- /dev/null +++ b/.changes/fix-android-mime-type.md @@ -0,0 +1,6 @@ +--- +"dialog": patch +"dialog-js": patch +--- + +Set `save` dialog mime type from the `filters` extensions on Android. diff --git a/examples/api/src-tauri/gen/android/.idea/gradle.xml b/examples/api/src-tauri/gen/android/.idea/gradle.xml index be741543..ff118549 100644 --- a/examples/api/src-tauri/gen/android/.idea/gradle.xml +++ b/examples/api/src-tauri/gen/android/.idea/gradle.xml @@ -1,5 +1,6 @@ +