diff --git a/Cargo.lock b/Cargo.lock index 447dad6d7..e13eef49d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -262,6 +262,8 @@ dependencies = [ "tauri-plugin-updater", "tauri-plugin-upload", "tauri-plugin-window-state", + "tauri-runtime-cef", + "tauri-runtime-wry", "time", "tiny_http", ] @@ -275,6 +277,7 @@ dependencies = [ "tauri", "tauri-build", "tauri-plugin-updater", + "tauri-runtime-wry", "time", "tiny_http", ] @@ -288,6 +291,7 @@ dependencies = [ "tauri", "tauri-build", "tauri-plugin-updater", + "tauri-runtime-wry", "tiny_http", ] @@ -300,6 +304,8 @@ dependencies = [ "tauri", "tauri-build", "tauri-plugin-store", + "tauri-runtime-cef", + "tauri-runtime-wry", ] [[package]] @@ -952,12 +958,13 @@ dependencies = [ [[package]] name = "cargo_toml" -version = "0.22.3" +version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "374b7c592d9c00c1f4972ea58390ac6b18cbb6ab79011f3bdc90a0b82ca06b77" +checksum = "82f4b26e751e711a5302649417f2da046dce6391b2ea30a4820f37462314f0b9" dependencies = [ + "semver", "serde", - "toml 0.9.12+spec-1.1.0", + "toml 1.1.2+spec-1.1.0", ] [[package]] @@ -974,9 +981,9 @@ dependencies = [ [[package]] name = "cef" -version = "148.0.0+147.0.10" +version = "151.8.1+151.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2445d2f1e820efc064c511faa3a07c3ee79e565fdae026ca62ed3c80d0459223" +checksum = "3d4fbc354286b45619122580b769f6cff53ed19565fe10359253ae4c235495db" dependencies = [ "anyhow", "cargo_metadata 0.23.1", @@ -994,9 +1001,9 @@ dependencies = [ [[package]] name = "cef-dll-sys" -version = "148.4.0+148.0.10" +version = "151.8.1+151.3.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44bb7cd245523541086bc978250e194ceff8d9988de9b81500a01dc195b71c65" +checksum = "d073a3cd9fb40877a1ae38560cf5df2bb4601e02198880b61ef5476a8e28c35e" dependencies = [ "anyhow", "cmake", @@ -1021,6 +1028,17 @@ dependencies = [ "uuid", ] +[[package]] +name = "cfb" +version = "0.14.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a347dcabdae9c31b0825fd6a8bed285ec9c2acb89c47827126d52fa4f59cece3" +dependencies = [ + "fnv", + "uuid", + "web-time", +] + [[package]] name = "cfg-expr" version = "0.15.8" @@ -1220,9 +1238,9 @@ dependencies = [ [[package]] name = "console" -version = "0.16.3" +version = "0.16.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d64e8af5551369d19cf50138de61f1c42074ab970f74e99be916646777f8fc87" +checksum = "4fe5f465a4f6fee88fad41b85d990f84c835335e85b5d9e6e63e0d06d28cba7c" dependencies = [ "encode_unicode", "libc", @@ -1452,7 +1470,7 @@ version = "0.29.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f93d03419cb5950ccfd3daf3ff1c7a36ace64609a1a8746d493df1ca0afde0fa" dependencies = [ - "cssparser-macros", + "cssparser-macros 0.6.1", "dtoa-short", "itoa", "matches", @@ -1465,11 +1483,11 @@ dependencies = [ [[package]] name = "cssparser" -version = "0.36.0" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dae61cf9c0abb83bd659dab65b7e4e38d8236824c85f0f804f173567bda257d2" +checksum = "8c9cdaae01d5ed7882b04d795e7f752f46ff52d2fa3b50a20d28c464510bba98" dependencies = [ - "cssparser-macros", + "cssparser-macros 0.7.1", "dtoa-short", "itoa", "phf 0.13.1", @@ -1487,20 +1505,20 @@ dependencies = [ ] [[package]] -name = "ctor" -version = "0.8.0" +name = "cssparser-macros" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "352d39c2f7bef1d6ad73db6f5160efcaed66d94ef8c6c573a8410c00bf909a98" +checksum = "d045de693cb712d0b22c6a64be5b953f67b3ce00ab5ad3dd5d8b441886ab8e1a" dependencies = [ - "ctor-proc-macro", - "dtor", + "quote", + "syn 2.0.118", ] [[package]] -name = "ctor-proc-macro" -version = "0.0.7" +name = "ctor" +version = "1.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52560adf09603e58c9a7ee1fe1dcb95a16927b17c127f0ac02d6e768a0e25bc1" +checksum = "914a755b7c2d4af2bdcff7ce1739e2db9a1b81a9b07123d8015786ae03c0980d" [[package]] name = "ctr" @@ -1596,6 +1614,17 @@ version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "be1e0bca6c3637f992fc1cc7cbc52a78c1ef6db076dbf1059c4323d6a2048376" +[[package]] +name = "dbus" +version = "0.9.12" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ab69f03cc8c4340c9c8e315114e1658e6775a9b16a04357973aa21cec22b32e" +dependencies = [ + "libc", + "libdbus-sys", + "windows-sys 0.61.2", +] + [[package]] name = "deep-link-example" version = "0.0.0" @@ -1608,6 +1637,8 @@ dependencies = [ "tauri-plugin-deep-link", "tauri-plugin-log", "tauri-plugin-single-instance", + "tauri-runtime-cef", + "tauri-runtime-wry", ] [[package]] @@ -1830,16 +1861,16 @@ dependencies = [ [[package]] name = "dom_query" -version = "0.27.0" +version = "0.28.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "521e380c0c8afb8d9a1e83a1822ee03556fc3e3e7dbc1fd30be14e37f9cb3f89" +checksum = "fac5fca71e65e94cc718a6e2af65d6e0f9c6027751c2aa562fbb5087fda639bc" dependencies = [ "bit-set", - "cssparser 0.36.0", + "cssparser 0.37.0", "foldhash 0.2.0", - "html5ever 0.38.0", + "html5ever 0.39.0", "precomputed-hash", - "selectors 0.36.1", + "selectors 0.38.0", "tendril 0.5.0", ] @@ -1899,21 +1930,6 @@ dependencies = [ "dtoa", ] -[[package]] -name = "dtor" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1057d6c64987086ff8ed0fd3fbf377a6b7d205cc7715868cd401705f715cbe4" -dependencies = [ - "dtor-proc-macro", -] - -[[package]] -name = "dtor-proc-macro" -version = "0.0.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f678cf4a922c215c63e0de95eb1ff08a958a81d47e485cf9da1e27bf6305cfa5" - [[package]] name = "dunce" version = "1.0.5" @@ -2309,9 +2325,9 @@ dependencies = [ [[package]] name = "fs-err" -version = "3.3.0" +version = "3.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73fde052dbfc920003cfd2c8e2c6e6d4cc7c1091538c3a24226cec0665ab08c0" +checksum = "b91aa448ca50d7e79433bdf3ee8d99215430d2ec02ade5aefab2a073a1822e8a" dependencies = [ "autocfg", ] @@ -2965,12 +2981,12 @@ dependencies = [ [[package]] name = "html5ever" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1054432bae2f14e0061e33d23402fbaa67a921d319d56adc6bcf887ddad1cbc2" +checksum = "46a1761807faccc9a19e86944bbf40610014066306f96edcdedc2fb714bcb7b8" dependencies = [ "log", - "markup5ever 0.38.0", + "markup5ever 0.39.0", ] [[package]] @@ -3286,9 +3302,9 @@ dependencies = [ [[package]] name = "indicatif" -version = "0.18.5" +version = "0.18.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "993f007684f2e9727160da8b960ec161264703bfd1af084fd2e34d040c9a0dd4" +checksum = "9433806cd6b4ec1aba79c021c7e4c58fb4c3b9977c085062e611ac929998fb0c" dependencies = [ "console", "portable-atomic", @@ -3303,7 +3319,16 @@ version = "0.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a588916bfdfd92e71cacef98a63d9b1f0d74d6599980d11894290e7ddefffcf7" dependencies = [ - "cfb", + "cfb 0.7.3", +] + +[[package]] +name = "infer" +version = "0.22.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f4200d433cbd5178df7797c9c2e75b348b728e39631cf14520d1e2fc424201f4" +dependencies = [ + "cfb 0.14.0", ] [[package]] @@ -3551,21 +3576,21 @@ dependencies = [ [[package]] name = "json-patch" -version = "3.0.1" +version = "4.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "863726d7afb6bc2590eeff7135d923545e5e964f004c2ccf8716c25e70a86f08" +checksum = "7421438de105a0827e44fadd05377727847d717c80ce29a229f85fd04c427b72" dependencies = [ "jsonptr", "serde", "serde_json", - "thiserror 1.0.69", + "thiserror 2.0.18", ] [[package]] name = "jsonptr" -version = "0.6.3" +version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5dea2b27dd239b2556ed7a25ba842fe47fd602e7fc7433c2a8d6106d4d9edd70" +checksum = "a5a3cc660ba5d72bce0b3bb295bf20847ccbb40fd423f3f05b61273672e561fe" dependencies = [ "serde", "serde_json", @@ -3682,6 +3707,15 @@ version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" +[[package]] +name = "libdbus-sys" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "328c4789d42200f1eeec05bd86c9c13c7f091d2ba9a6ea35acdf51f31bc0f043" +dependencies = [ + "pkg-config", +] + [[package]] name = "libflate" version = "2.3.0" @@ -3860,9 +3894,9 @@ dependencies = [ [[package]] name = "markup5ever" -version = "0.38.0" +version = "0.39.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8983d30f2915feeaaab2d6babdd6bc7e9ed1a00b66b5e6d74df19aa9c0e91862" +checksum = "7122d987ec5f704ee56f6e5b41a7d93722e9aae27ae07cafa4036c4d3f9757de" dependencies = [ "log", "tendril 0.5.0", @@ -5114,9 +5148,9 @@ dependencies = [ [[package]] name = "portable-atomic" -version = "1.13.1" +version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" +checksum = "05c8b63e8d9609db387f0324918f81d68fe27748f084ef092fb35954d0539a85" [[package]] name = "potential_utf" @@ -6063,9 +6097,9 @@ dependencies = [ [[package]] name = "sctk-adwaita" -version = "0.11.0" +version = "0.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1dd3accc0f3f4bbaf2c9e1957a030dc582028130c67660d44c0a0345a22ca69b" +checksum = "ea2a4360b9abcdcee43809e6fc11d6d61ca5d25734026a8fc46c2883eea3f13f" dependencies = [ "ab_glyph", "log", @@ -6137,12 +6171,12 @@ dependencies = [ [[package]] name = "selectors" -version = "0.36.1" +version = "0.38.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c5d9c0c92a92d33f08817311cf3f2c29a3538a8240e94a6a3c622ce652d7e00c" +checksum = "8adfa1c298912827b8a28b223b3b874357397ae706e6190acd9bf28cee99114d" dependencies = [ "bitflags 2.13.0", - "cssparser 0.36.0", + "cssparser 0.37.0", "derive_more 2.1.1", "log", "new_debug_unreachable", @@ -6469,6 +6503,8 @@ dependencies = [ "tauri-build", "tauri-plugin-cli", "tauri-plugin-single-instance", + "tauri-runtime-cef", + "tauri-runtime-wry", ] [[package]] @@ -6991,9 +7027,9 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "swift-rs" -version = "1.0.7" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4057c98e2e852d51fdcfca832aac7b571f6b351ad159f9eda5db1655f8d0c4d7" +checksum = "e45c444e496845d3f2a351146bff59aae4975b2280238df1dfaa0c7d1846f38e" dependencies = [ "base64 0.21.7", "serde", @@ -7087,15 +7123,16 @@ dependencies = [ [[package]] name = "tao" -version = "0.35.3" +version = "0.37.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d1c93047acf68669466a34690ac58cca7010bd1b201e1ec86f1fd0a75d3dd4a9" +checksum = "5d12c8607b01516c5d4a37e471a9cfb40b4a25cebce8fecbc6a559e125e51b6b" dependencies = [ "bitflags 2.13.0", "block2", "core-foundation 0.10.1", "core-graphics", "crossbeam-channel", + "dbus", "dispatch2", "dlopen2", "dpi", @@ -7106,6 +7143,7 @@ dependencies = [ "libc", "log", "ndk", + "ndk-context", "ndk-sys", "objc2", "objc2-app-kit", @@ -7118,17 +7156,17 @@ dependencies = [ "tao-macros", "unicode-segmentation", "url", - "windows 0.61.3", - "windows-core 0.61.2", + "windows 0.62.2", + "windows-core 0.62.2", "windows-version", "x11-dl", ] [[package]] name = "tao-macros" -version = "0.1.3" +version = "0.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4e16beb8b2ac17db28eab8bca40e62dbfbb34c0fcdc6d9826b11b7b5d047dfd" +checksum = "5f7eeb6d99155545da6150a1795945f16ac9c178deb2a5f2e74d776107bd5849" dependencies = [ "proc-macro2", "quote", @@ -7160,8 +7198,8 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.11.3" -source = "git+https://github.com/tauri-apps/tauri.git?tag=tauri-cef-v3.0.0-alpha.13#490e063b505f098322586c2aea9d60b6c6d97133" +version = "2.11.5" +source = "git+https://github.com/tauri-apps/tauri.git?tag=tauri-cef-v3.0.0-alpha.27#93ce35e4ce85054f75b809b789c0115b9ee26d47" dependencies = [ "anyhow", "bytes", @@ -7199,16 +7237,12 @@ dependencies = [ "tauri-build", "tauri-macros", "tauri-runtime", - "tauri-runtime-cef", - "tauri-runtime-wry", "tauri-utils", "thiserror 2.0.18", "tokio", "tray-icon", "url", "uuid", - "webkit2gtk", - "webview2-com", "window-vibrancy", "windows 0.61.3", ] @@ -7216,7 +7250,7 @@ dependencies = [ [[package]] name = "tauri-build" version = "2.6.3" -source = "git+https://github.com/tauri-apps/tauri.git?tag=tauri-cef-v3.0.0-alpha.13#490e063b505f098322586c2aea9d60b6c6d97133" +source = "git+https://github.com/tauri-apps/tauri.git?tag=tauri-cef-v3.0.0-alpha.27#93ce35e4ce85054f75b809b789c0115b9ee26d47" dependencies = [ "anyhow", "cargo_toml", @@ -7238,13 +7272,13 @@ dependencies = [ [[package]] name = "tauri-codegen" version = "2.6.3" -source = "git+https://github.com/tauri-apps/tauri.git?tag=tauri-cef-v3.0.0-alpha.13#490e063b505f098322586c2aea9d60b6c6d97133" +source = "git+https://github.com/tauri-apps/tauri.git?tag=tauri-cef-v3.0.0-alpha.27#93ce35e4ce85054f75b809b789c0115b9ee26d47" dependencies = [ "base64 0.22.1", "ico", "json-patch", "plist", - "png 0.17.16", + "png 0.18.1", "proc-macro2", "quote", "semver", @@ -7263,7 +7297,7 @@ dependencies = [ [[package]] name = "tauri-macros" version = "2.6.3" -source = "git+https://github.com/tauri-apps/tauri.git?tag=tauri-cef-v3.0.0-alpha.13#490e063b505f098322586c2aea9d60b6c6d97133" +source = "git+https://github.com/tauri-apps/tauri.git?tag=tauri-cef-v3.0.0-alpha.27#93ce35e4ce85054f75b809b789c0115b9ee26d47" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -7276,7 +7310,7 @@ dependencies = [ [[package]] name = "tauri-plugin" version = "2.6.3" -source = "git+https://github.com/tauri-apps/tauri.git?tag=tauri-cef-v3.0.0-alpha.13#490e063b505f098322586c2aea9d60b6c6d97133" +source = "git+https://github.com/tauri-apps/tauri.git?tag=tauri-cef-v3.0.0-alpha.27#93ce35e4ce85054f75b809b789c0115b9ee26d47" dependencies = [ "anyhow", "glob", @@ -7467,7 +7501,7 @@ dependencies = [ "tokio", "tracing", "url", - "urlpattern", + "urlpattern 0.3.0", ] [[package]] @@ -7703,7 +7737,7 @@ dependencies = [ "flate2", "futures-util", "http", - "infer", + "infer 0.19.0", "log", "minisign-verify", "osakit", @@ -7777,7 +7811,7 @@ dependencies = [ [[package]] name = "tauri-runtime" version = "2.11.3" -source = "git+https://github.com/tauri-apps/tauri.git?tag=tauri-cef-v3.0.0-alpha.13#490e063b505f098322586c2aea9d60b6c6d97133" +source = "git+https://github.com/tauri-apps/tauri.git?tag=tauri-cef-v3.0.0-alpha.27#93ce35e4ce85054f75b809b789c0115b9ee26d47" dependencies = [ "cookie", "dpi", @@ -7798,18 +7832,19 @@ dependencies = [ [[package]] name = "tauri-runtime-cef" version = "0.1.0" -source = "git+https://github.com/tauri-apps/tauri.git?tag=tauri-cef-v3.0.0-alpha.13#490e063b505f098322586c2aea9d60b6c6d97133" +source = "git+https://github.com/tauri-apps/tauri.git?tag=tauri-cef-v3.0.0-alpha.27#93ce35e4ce85054f75b809b789c0115b9ee26d47" dependencies = [ "base64 0.22.1", "cef", + "cef-dll-sys", "dioxus-debug-cell", "dirs 6.0.0", - "dispatch2", "dlopen2", "gtk", "html5ever 0.29.1", "http", "kuchikiki", + "libc", "log", "objc2", "objc2-app-kit", @@ -7821,6 +7856,8 @@ dependencies = [ "serde_json", "sha2", "softbuffer", + "tauri", + "tauri-macros", "tauri-runtime", "tauri-utils", "url", @@ -7831,8 +7868,8 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.11.3" -source = "git+https://github.com/tauri-apps/tauri.git?tag=tauri-cef-v3.0.0-alpha.13#490e063b505f098322586c2aea9d60b6c6d97133" +version = "2.11.4" +source = "git+https://github.com/tauri-apps/tauri.git?tag=tauri-cef-v3.0.0-alpha.27#93ce35e4ce85054f75b809b789c0115b9ee26d47" dependencies = [ "gtk", "http", @@ -7846,6 +7883,7 @@ dependencies = [ "raw-window-handle", "softbuffer", "tao", + "tauri", "tauri-runtime", "tauri-utils", "url", @@ -7858,7 +7896,7 @@ dependencies = [ [[package]] name = "tauri-utils" version = "2.9.3" -source = "git+https://github.com/tauri-apps/tauri.git?tag=tauri-cef-v3.0.0-alpha.13#490e063b505f098322586c2aea9d60b6c6d97133" +source = "git+https://github.com/tauri-apps/tauri.git?tag=tauri-cef-v3.0.0-alpha.27#93ce35e4ce85054f75b809b789c0115b9ee26d47" dependencies = [ "aes-gcm", "anyhow", @@ -7870,7 +7908,7 @@ dependencies = [ "glob", "html5ever 0.29.1", "http", - "infer", + "infer 0.22.0", "json-patch", "kuchikiki", "log", @@ -7891,7 +7929,7 @@ dependencies = [ "thiserror 2.0.18", "toml 1.1.2+spec-1.1.0", "url", - "urlpattern", + "urlpattern 0.6.0", "uuid", "walkdir", ] @@ -8050,9 +8088,9 @@ dependencies = [ [[package]] name = "tiny-skia" -version = "0.11.4" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83d13394d44dae3207b52a326c0c85a8bf87f1541f23b0d143811088497b09ab" +checksum = "47ffee5eaaf5527f630fb0e356b90ebdec84d5d18d937c5e440350f88c5a91ea" dependencies = [ "arrayref", "arrayvec", @@ -8064,9 +8102,9 @@ dependencies = [ [[package]] name = "tiny-skia-path" -version = "0.11.4" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c9e7fc0c2e86a30b117d0462aa261b72b7a99b7ebd7deb3a14ceda95c5bdc93" +checksum = "edca365c3faccca67d06593c5980fa6c57687de727a03131735bb85f01fdeeb9" dependencies = [ "arrayref", "bytemuck", @@ -8214,21 +8252,6 @@ dependencies = [ "toml_edit 0.20.2", ] -[[package]] -name = "toml" -version = "0.9.12+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf92845e79fc2e2def6a5d828f0801e29a2f8acc037becc5ab08595c7d5e9863" -dependencies = [ - "indexmap 2.14.0", - "serde_core", - "serde_spanned 1.1.1", - "toml_datetime 0.7.5+spec-1.1.0", - "toml_parser", - "toml_writer", - "winnow 0.7.15", -] - [[package]] name = "toml" version = "1.1.2+spec-1.1.0" @@ -8253,15 +8276,6 @@ dependencies = [ "serde", ] -[[package]] -name = "toml_datetime" -version = "0.7.5+spec-1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92e1cfed4a3038bc5a127e35a2d360f145e1f4b971b551a2ba5fd7aedf7e1347" -dependencies = [ - "serde_core", -] - [[package]] name = "toml_datetime" version = "1.1.1+spec-1.1.0" @@ -8406,9 +8420,9 @@ dependencies = [ [[package]] name = "tray-icon" -version = "0.24.1" +version = "0.24.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65ba1e5f6b9ef9fd87e21b9c6f351554dbd717960089168fcfdef854686961dc" +checksum = "045979e3f037cd18ad1cb2a419dfda133c5c29c9f3453370079f2255d46c257e" dependencies = [ "crossbeam-channel", "dirs 6.0.0", @@ -8682,6 +8696,18 @@ dependencies = [ "url", ] +[[package]] +name = "urlpattern" +version = "0.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df16f50ef4cc145211879a3867ba757076b25dfee812040dcb0658bd9ae7904b" +dependencies = [ + "icu_properties", + "regex", + "serde", + "url", +] + [[package]] name = "utf-8" version = "0.7.6" @@ -9147,6 +9173,8 @@ dependencies = [ "tauri", "tauri-build", "tauri-plugin-websocket", + "tauri-runtime-cef", + "tauri-runtime-wry", "tokio", "tokio-tungstenite", ] @@ -9278,11 +9306,23 @@ version = "0.61.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893" dependencies = [ - "windows-collections", + "windows-collections 0.2.0", "windows-core 0.61.2", - "windows-future", + "windows-future 0.2.1", "windows-link 0.1.3", - "windows-numerics", + "windows-numerics 0.2.0", +] + +[[package]] +name = "windows" +version = "0.62.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580" +dependencies = [ + "windows-collections 0.3.2", + "windows-core 0.62.2", + "windows-future 0.3.2", + "windows-numerics 0.3.1", ] [[package]] @@ -9294,6 +9334,15 @@ dependencies = [ "windows-core 0.61.2", ] +[[package]] +name = "windows-collections" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610" +dependencies = [ + "windows-core 0.62.2", +] + [[package]] name = "windows-core" version = "0.61.2" @@ -9328,7 +9377,18 @@ checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e" dependencies = [ "windows-core 0.61.2", "windows-link 0.1.3", - "windows-threading", + "windows-threading 0.1.0", +] + +[[package]] +name = "windows-future" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb" +dependencies = [ + "windows-core 0.62.2", + "windows-link 0.2.1", + "windows-threading 0.2.1", ] [[package]] @@ -9375,6 +9435,16 @@ dependencies = [ "windows-link 0.1.3", ] +[[package]] +name = "windows-numerics" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26" +dependencies = [ + "windows-core 0.62.2", + "windows-link 0.2.1", +] + [[package]] name = "windows-registry" version = "0.5.3" @@ -9548,6 +9618,15 @@ dependencies = [ "windows-link 0.1.3", ] +[[package]] +name = "windows-threading" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37" +dependencies = [ + "windows-link 0.2.1", +] + [[package]] name = "windows-version" version = "0.1.7" @@ -10001,12 +10080,6 @@ dependencies = [ "memchr", ] -[[package]] -name = "winnow" -version = "0.7.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" - [[package]] name = "winnow" version = "1.0.3" @@ -10067,9 +10140,9 @@ checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" [[package]] name = "wry" -version = "0.55.1" +version = "0.56.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "186f9871daa55fd9c016578b810d149de58367113db7fb72b462d2323ce19514" +checksum = "375becb4aded9913f736443cf88000c6311478db69814cc06070465e4cc44c98" dependencies = [ "base64 0.22.1", "block2", @@ -10184,9 +10257,9 @@ dependencies = [ [[package]] name = "xcursor" -version = "0.3.10" +version = "0.3.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bec9e4a500ca8864c5b47b8b482a73d62e4237670e5b5f1d6b9e3cae50f28f2b" +checksum = "163b33ed8786455e2fa5d72f554057ce3f3182425434f756cd39c99839d88e23" [[package]] name = "xkbcommon-dl" diff --git a/Cargo.toml b/Cargo.toml index 30bc31575..4ca535200 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -13,6 +13,8 @@ serde = { version = "1", features = ["derive"] } tracing = "0.1" log = "0.4" tauri = { version = "2.10", default-features = false } +tauri-runtime-wry = "2.11" +tauri-runtime-cef = "0.1" tauri-build = "2.5" tauri-plugin = "2.5" tauri-utils = "2.8" @@ -41,7 +43,9 @@ incremental = false opt-level = "s" [patch.crates-io] -tauri = { git = "https://github.com/tauri-apps/tauri.git", tag = "tauri-cef-v3.0.0-alpha.13" } -tauri-utils = { git = "https://github.com/tauri-apps/tauri.git", tag = "tauri-cef-v3.0.0-alpha.13" } -tauri-plugin = { git = "https://github.com/tauri-apps/tauri.git", tag = "tauri-cef-v3.0.0-alpha.13" } -tauri-build = { git = "https://github.com/tauri-apps/tauri.git", tag = "tauri-cef-v3.0.0-alpha.13" } +tauri = { git = "https://github.com/tauri-apps/tauri.git", tag = "tauri-cef-v3.0.0-alpha.27" } +tauri-utils = { git = "https://github.com/tauri-apps/tauri.git", tag = "tauri-cef-v3.0.0-alpha.27" } +tauri-plugin = { git = "https://github.com/tauri-apps/tauri.git", tag = "tauri-cef-v3.0.0-alpha.27" } +tauri-build = { git = "https://github.com/tauri-apps/tauri.git", tag = "tauri-cef-v3.0.0-alpha.27" } +tauri-runtime-wry = { git = "https://github.com/tauri-apps/tauri.git", tag = "tauri-cef-v3.0.0-alpha.27" } +tauri-runtime-cef = { git = "https://github.com/tauri-apps/tauri.git", tag = "tauri-cef-v3.0.0-alpha.27" } diff --git a/examples/api/README.md b/examples/api/README.md index 60de2fca7..577217bea 100644 --- a/examples/api/README.md +++ b/examples/api/README.md @@ -26,3 +26,20 @@ $ pnpm tauri dev $ pnpm tauri build $ ./src-tauri/target/release/app ``` + +## Running on the CEF runtime + +The webview runtime is selected at build time by the `wry` (default) and `cef` +features of the example, which pick the `tauri-runtime-wry` or +`tauri-runtime-cef` dependency handed to `tauri::Builder::runtime`. Depending on +`tauri-runtime-cef` is also how the Tauri CLI detects a CEF app, which is what +makes it ship the CEF binary distribution and, on macOS, run the app from inside +an `.app` bundle in `tauri dev`: + +```bash +$ pnpm tauri dev --no-default-features --features cef +``` + +The first build downloads the CEF binary distribution (about 1 GB) into +`{user cache}/tauri-cef`, or into `$CEF_PATH` when that is set. The tray icon is +not set up on CEF, which has no tray integration. diff --git a/examples/api/package.json b/examples/api/package.json index fdf9a72df..c0087e1a5 100644 --- a/examples/api/package.json +++ b/examples/api/package.json @@ -36,7 +36,7 @@ "@iconify-json/codicon": "^1.2.49", "@iconify-json/ph": "^1.2.2", "@sveltejs/vite-plugin-svelte": "^7.0.0", - "@tauri-apps/cli-cef": "3.0.0-alpha.6", + "@tauri-apps/cli-cef": "3.0.0-alpha.26", "@unocss/extractor-svelte": "^66.6.7", "svelte": "^5.54.0", "unocss": "^66.6.7", diff --git a/examples/api/src-tauri/Cargo.toml b/examples/api/src-tauri/Cargo.toml index ed1bf0df1..1e70efbce 100644 --- a/examples/api/src-tauri/Cargo.toml +++ b/examples/api/src-tauri/Cargo.toml @@ -43,9 +43,7 @@ tauri-plugin-upload = { path = "../../../plugins/upload", version = "2.3.0" } [dependencies.tauri] workspace = true features = [ - "wry", "common-controls-v6", - "x11", "image-ico", "image-png", "isolation", @@ -54,6 +52,19 @@ features = [ "protocol-asset", ] +# The webview runtime is picked by depending on its crate and handing its +# attributes to `tauri::Builder::runtime`. `macos-private-api` only reaches the +# runtime when it is enabled on the runtime crate as well. +[dependencies.tauri-runtime-wry] +workspace = true +optional = true +features = ["common-controls-v6", "macos-private-api"] + +[dependencies.tauri-runtime-cef] +workspace = true +optional = true +features = ["macos-private-api"] + [target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies] tauri-plugin-cli = { path = "../../../plugins/cli", version = "2.4.1" } tauri-plugin-global-shortcut = { path = "../../../plugins/global-shortcut", version = "2.3.2" } @@ -68,4 +79,7 @@ tauri-plugin-geolocation = { path = "../../../plugins/geolocation/", version = " tauri-plugin-haptics = { path = "../../../plugins/haptics/", version = "2.3.2" } [features] +default = ["wry"] +wry = ["dep:tauri-runtime-wry"] +cef = ["dep:tauri-runtime-cef"] prod = ["tauri/custom-protocol"] diff --git a/examples/api/src-tauri/src/lib.rs b/examples/api/src-tauri/src/lib.rs index 3c58f2c81..464e43c80 100644 --- a/examples/api/src-tauri/src/lib.rs +++ b/examples/api/src-tauri/src/lib.rs @@ -3,7 +3,9 @@ // SPDX-License-Identifier: MIT mod cmd; -#[cfg(desktop)] +// The CEF runtime has no tray icon integration, so the tray is only set up on +// the wry runtime. +#[cfg(all(desktop, not(feature = "cef")))] mod tray; use serde::Serialize; @@ -20,10 +22,19 @@ struct Reply { pub type SetupHook = Box Result<(), Box> + Send>; pub type OnEvent = Box; +// Every CEF application is also its own renderer, GPU, network and utility +// process. This attribute runs the helper side of that and returns before the +// Tauri application is built, for any process Chromium launched with `--type=`. +#[cfg_attr(feature = "cef", tauri_runtime_cef::cef_entry_point)] #[cfg_attr(mobile, tauri::mobile_entry_point)] pub fn run() { + #[cfg(feature = "cef")] + let builder = tauri::Builder::default().runtime(tauri_runtime_cef::Cef::default()); + #[cfg(not(feature = "cef"))] + let builder = tauri::Builder::default().runtime(tauri_runtime_wry::Wry::default()); + #[allow(unused_mut)] - let mut builder = tauri::Builder::default() + let mut builder = builder .plugin( tauri_plugin_log::Builder::default() .level(log::LevelFilter::Info) @@ -43,6 +54,7 @@ pub fn run() { .setup(move |app| { #[cfg(desktop)] { + #[cfg(not(feature = "cef"))] tray::create_tray(app.handle())?; app.handle().plugin(tauri_plugin_cli::init())?; app.handle() @@ -170,7 +182,9 @@ pub fn run() { app.set_activation_policy(tauri::ActivationPolicy::Regular); app.run(move |_app_handle, _event| { - #[cfg(desktop)] + // Only the tray icon keeps this app useful without windows, and there is + // no tray on CEF. + #[cfg(all(desktop, not(feature = "cef")))] if let RunEvent::ExitRequested { code, api, .. } = &_event { if code.is_none() { // Keep the event loop running even if all windows are closed diff --git a/plugins/barcode-scanner/Cargo.toml b/plugins/barcode-scanner/Cargo.toml index 58308c9d5..46d6bc881 100644 --- a/plugins/barcode-scanner/Cargo.toml +++ b/plugins/barcode-scanner/Cargo.toml @@ -29,6 +29,3 @@ serde_json = { workspace = true } tauri = { workspace = true } log = { workspace = true } thiserror = { workspace = true } - -[target.'cfg(target_os = "ios")'.dependencies] -tauri = { workspace = true, features = ["wry"] } diff --git a/plugins/clipboard-manager/Cargo.toml b/plugins/clipboard-manager/Cargo.toml index d95c02c28..4fe19cbae 100644 --- a/plugins/clipboard-manager/Cargo.toml +++ b/plugins/clipboard-manager/Cargo.toml @@ -31,8 +31,6 @@ tauri = { workspace = true } log = { workspace = true } thiserror = { workspace = true } -[target.'cfg(target_os = "ios")'.dependencies] -tauri = { workspace = true, features = ["wry"] } [target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies] arboard = { version = "3", features = ["wayland-data-control"] } diff --git a/plugins/deep-link/examples/app/package.json b/plugins/deep-link/examples/app/package.json index 054104854..ddec3875b 100644 --- a/plugins/deep-link/examples/app/package.json +++ b/plugins/deep-link/examples/app/package.json @@ -14,7 +14,7 @@ "@tauri-apps/plugin-deep-link": "2.4.9" }, "devDependencies": { - "@tauri-apps/cli-cef": "3.0.0-alpha.6", + "@tauri-apps/cli-cef": "3.0.0-alpha.26", "typescript": "^6.0.0", "vite": "^8.0.1" } diff --git a/plugins/deep-link/examples/app/src-tauri/Cargo.toml b/plugins/deep-link/examples/app/src-tauri/Cargo.toml index 130a7fef2..df0e2d806 100644 --- a/plugins/deep-link/examples/app/src-tauri/Cargo.toml +++ b/plugins/deep-link/examples/app/src-tauri/Cargo.toml @@ -19,7 +19,13 @@ tauri-build = { workspace = true } [dependencies] serde = { workspace = true } serde_json = { workspace = true } -tauri = { workspace = true, features = ["wry", "common-controls-v6", "x11"] } +tauri = { workspace = true, features = ["common-controls-v6"] } +# The webview runtime is picked by depending on its crate and handing its +# attributes to `tauri::Builder::runtime`. +tauri-runtime-wry = { workspace = true, optional = true, features = [ + "common-controls-v6", +] } +tauri-runtime-cef = { workspace = true, optional = true } tauri-plugin-deep-link = { path = "../../../" } tauri-plugin-log = { path = "../../../../log" } tauri-plugin-single-instance = { path = "../../../../single-instance", features = [ @@ -28,6 +34,9 @@ tauri-plugin-single-instance = { path = "../../../../single-instance", features log = "0.4" [features] +default = ["wry"] +wry = ["dep:tauri-runtime-wry"] +cef = ["dep:tauri-runtime-cef"] # this feature is used for production builds or when `devUrl` points to the filesystem and the built-in dev server is disabled. # If you use cargo directly instead of tauri's cli you can use this feature flag to switch between tauri's `dev` and `build` modes. # DO NOT REMOVE!! diff --git a/plugins/deep-link/examples/app/src-tauri/src/lib.rs b/plugins/deep-link/examples/app/src-tauri/src/lib.rs index f85527d91..e3e169921 100644 --- a/plugins/deep-link/examples/app/src-tauri/src/lib.rs +++ b/plugins/deep-link/examples/app/src-tauri/src/lib.rs @@ -10,10 +10,19 @@ fn greet(name: &str) -> String { format!("Hello, {name}! You've been greeted from Rust!") } +// Every CEF application is also its own renderer, GPU, network and utility +// process. This attribute runs the helper side of that and returns before the +// Tauri application is built, for any process Chromium launched with `--type=`. +#[cfg_attr(feature = "cef", tauri_runtime_cef::cef_entry_point)] #[cfg_attr(mobile, tauri::mobile_entry_point)] pub fn run() { + #[cfg(feature = "cef")] + let builder = tauri::Builder::default().runtime(tauri_runtime_cef::Cef::default()); + #[cfg(not(feature = "cef"))] + let builder = tauri::Builder::default().runtime(tauri_runtime_wry::Wry::default()); + #[allow(unused_mut)] - let mut builder = tauri::Builder::default(); + let mut builder = builder; #[cfg(desktop)] { diff --git a/plugins/deep-link/package.json b/plugins/deep-link/package.json index b47b11bb3..95321aba7 100644 --- a/plugins/deep-link/package.json +++ b/plugins/deep-link/package.json @@ -28,6 +28,6 @@ "@tauri-apps/api": "^2.11.0" }, "devDependencies": { - "@tauri-apps/cli-cef": "3.0.0-alpha.6" + "@tauri-apps/cli-cef": "3.0.0-alpha.26" } } diff --git a/plugins/dialog/Cargo.toml b/plugins/dialog/Cargo.toml index 7044a941a..b2ae285e9 100644 --- a/plugins/dialog/Cargo.toml +++ b/plugins/dialog/Cargo.toml @@ -27,8 +27,6 @@ ios = { level = "partial", notes = "Does not support folder picker" } [build-dependencies] tauri-plugin = { workspace = true, features = ["build"] } -[dev-dependencies] -tauri = { workspace = true, features = ["wry"] } [dependencies] serde = { workspace = true } @@ -39,8 +37,6 @@ thiserror = { workspace = true } url = { workspace = true } tauri-plugin-fs = { path = "../fs", version = "2.5.1" } -[target.'cfg(target_os = "ios")'.dependencies] -tauri = { workspace = true, features = ["wry"] } [target."cfg(any(target_os = \"macos\", windows, target_os = \"linux\", target_os = \"dragonfly\", target_os = \"freebsd\", target_os = \"openbsd\", target_os = \"netbsd\"))".dependencies] rfd = { version = "0.16", default-features = false, features = [ diff --git a/plugins/geolocation/Cargo.toml b/plugins/geolocation/Cargo.toml index 765b0e92b..c8c480c34 100644 --- a/plugins/geolocation/Cargo.toml +++ b/plugins/geolocation/Cargo.toml @@ -29,8 +29,6 @@ log = { workspace = true } thiserror = { workspace = true } specta = { workspace = true, optional = true } -[target.'cfg(target_os = "ios")'.dependencies] -tauri = { workspace = true, features = ["wry"] } [features] specta = ["dep:specta", "tauri/specta"] diff --git a/plugins/haptics/Cargo.toml b/plugins/haptics/Cargo.toml index dc0dddbc7..7f2a3f971 100644 --- a/plugins/haptics/Cargo.toml +++ b/plugins/haptics/Cargo.toml @@ -29,8 +29,6 @@ log = { workspace = true } thiserror = { workspace = true } specta = { workspace = true, optional = true } -[target.'cfg(target_os = "ios")'.dependencies] -tauri = { workspace = true, features = ["wry"] } [features] specta = ["dep:specta", "tauri/specta"] diff --git a/plugins/notification/Cargo.toml b/plugins/notification/Cargo.toml index cd853c448..e97ea3d8d 100644 --- a/plugins/notification/Cargo.toml +++ b/plugins/notification/Cargo.toml @@ -33,8 +33,6 @@ time = { version = "0.3", features = ["serde", "parsing", "formatting"] } url = { version = "2", features = ["serde"] } serde_repr = "0.1" -[target.'cfg(target_os = "ios")'.dependencies] -tauri = { workspace = true, features = ["wry"] } [target."cfg(windows)".dependencies] win7-notifications = { version = "0.4.5", optional = true } diff --git a/plugins/opener/Cargo.toml b/plugins/opener/Cargo.toml index 7455bc8bd..6d4eed5a0 100644 --- a/plugins/opener/Cargo.toml +++ b/plugins/opener/Cargo.toml @@ -57,6 +57,3 @@ features = ["std", "NSWorkspace"] version = "0.3" default-features = false features = ["std", "NSURL", "NSArray", "NSString"] - -[target.'cfg(target_os = "ios")'.dependencies] -tauri = { workspace = true, features = ["wry"] } diff --git a/plugins/shell/Cargo.toml b/plugins/shell/Cargo.toml index fbbd51f42..f72de7091 100644 --- a/plugins/shell/Cargo.toml +++ b/plugins/shell/Cargo.toml @@ -33,6 +33,3 @@ regex = "1" open = { version = "5", features = ["shellexecute-on-windows"] } encoding_rs = "0.8" os_pipe = "1" - -[target.'cfg(target_os = "ios")'.dependencies] -tauri = { workspace = true, features = ["wry"] } diff --git a/plugins/single-instance/examples/vanilla/package.json b/plugins/single-instance/examples/vanilla/package.json index 23ecd968f..3d0c0b8d5 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-cef": "3.0.0-alpha.6" + "@tauri-apps/cli-cef": "3.0.0-alpha.26" } } diff --git a/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml b/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml index dd9c8d8aa..e08298bf5 100644 --- a/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml +++ b/plugins/single-instance/examples/vanilla/src-tauri/Cargo.toml @@ -10,7 +10,13 @@ rust-version = "1.77.2" [dependencies] serde = { workspace = true } serde_json = { workspace = true } -tauri = { workspace = true, features = ["wry", "common-controls-v6", "x11"] } +tauri = { workspace = true, features = ["common-controls-v6"] } +# The webview runtime is picked by depending on its crate and handing its +# attributes to `tauri::Builder::runtime`. +tauri-runtime-wry = { workspace = true, optional = true, features = [ + "common-controls-v6", +] } +tauri-runtime-cef = { workspace = true, optional = true } tauri-plugin-single-instance = { path = "../../../" } tauri-plugin-cli = { path = "../../../../cli" } @@ -18,4 +24,7 @@ tauri-plugin-cli = { path = "../../../../cli" } tauri-build = { workspace = true } [features] +default = ["wry"] +wry = ["dep:tauri-runtime-wry"] +cef = ["dep:tauri-runtime-cef"] prod = ["tauri/custom-protocol"] diff --git a/plugins/single-instance/examples/vanilla/src-tauri/src/main.rs b/plugins/single-instance/examples/vanilla/src-tauri/src/main.rs index 835857c99..2e9a501c6 100644 --- a/plugins/single-instance/examples/vanilla/src-tauri/src/main.rs +++ b/plugins/single-instance/examples/vanilla/src-tauri/src/main.rs @@ -7,8 +7,17 @@ windows_subsystem = "windows" )] +// Every CEF application is also its own renderer, GPU, network and utility +// process. This attribute runs the helper side of that and returns before the +// Tauri application is built, for any process Chromium launched with `--type=`. +#[cfg_attr(feature = "cef", tauri_runtime_cef::cef_entry_point)] fn main() { - tauri::Builder::default() + #[cfg(feature = "cef")] + let builder = tauri::Builder::default().runtime(tauri_runtime_cef::Cef::default()); + #[cfg(not(feature = "cef"))] + let builder = tauri::Builder::default().runtime(tauri_runtime_wry::Wry::default()); + + builder .plugin( tauri_plugin_single_instance::Builder::new() .callback(move |app, argv, cwd| { diff --git a/plugins/store/Cargo.toml b/plugins/store/Cargo.toml index a9285eb8d..42c539c6c 100644 --- a/plugins/store/Cargo.toml +++ b/plugins/store/Cargo.toml @@ -27,9 +27,3 @@ tracing = { 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/examples/AppSettingsManager/package.json b/plugins/store/examples/AppSettingsManager/package.json index b601b8c46..3124ab389 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-cef": "3.0.0-alpha.6", + "@tauri-apps/cli-cef": "3.0.0-alpha.26", "typescript": "^6.0.0", "vite": "^8.0.1" } diff --git a/plugins/store/examples/AppSettingsManager/src-tauri/Cargo.toml b/plugins/store/examples/AppSettingsManager/src-tauri/Cargo.toml index 9a30f0b16..f7df77a25 100644 --- a/plugins/store/examples/AppSettingsManager/src-tauri/Cargo.toml +++ b/plugins/store/examples/AppSettingsManager/src-tauri/Cargo.toml @@ -13,12 +13,21 @@ edition = "2021" tauri-build = { workspace = true } [dependencies] -tauri = { workspace = true, features = ["wry", "common-controls-v6", "x11"] } +tauri = { workspace = true, features = ["common-controls-v6"] } +# The webview runtime is picked by depending on its crate and handing its +# attributes to `tauri::Builder::runtime`. +tauri-runtime-wry = { workspace = true, optional = true, features = [ + "common-controls-v6", +] } +tauri-runtime-cef = { workspace = true, optional = true } serde = { workspace = true } serde_json = { workspace = true } tauri-plugin-store = { path = "../../../" } [features] +default = ["wry"] +wry = ["dep:tauri-runtime-wry"] +cef = ["dep:tauri-runtime-cef"] # this feature is used for production builds or when `devPath` points to the filesystem # DO NOT REMOVE!! prod = ["tauri/custom-protocol"] diff --git a/plugins/store/examples/AppSettingsManager/src-tauri/src/main.rs b/plugins/store/examples/AppSettingsManager/src-tauri/src/main.rs index a23585bac..03cd23ad1 100644 --- a/plugins/store/examples/AppSettingsManager/src-tauri/src/main.rs +++ b/plugins/store/examples/AppSettingsManager/src-tauri/src/main.rs @@ -12,8 +12,17 @@ use tauri_plugin_store::StoreExt; mod app; use app::settings::AppSettings; +// Every CEF application is also its own renderer, GPU, network and utility +// process. This attribute runs the helper side of that and returns before the +// Tauri application is built, for any process Chromium launched with `--type=`. +#[cfg_attr(feature = "cef", tauri_runtime_cef::cef_entry_point)] fn main() { - tauri::Builder::default() + #[cfg(feature = "cef")] + let builder = tauri::Builder::default().runtime(tauri_runtime_cef::Cef::default()); + #[cfg(not(feature = "cef"))] + let builder = tauri::Builder::default().runtime(tauri_runtime_wry::Wry::default()); + + builder .plugin(tauri_plugin_store::Builder::new().build()) .setup(|app| { // Init store and load it from disk diff --git a/plugins/updater/tests/app-updater/Cargo.toml b/plugins/updater/tests/app-updater/Cargo.toml index 57072824e..12dc6be0a 100644 --- a/plugins/updater/tests/app-updater/Cargo.toml +++ b/plugins/updater/tests/app-updater/Cargo.toml @@ -7,7 +7,8 @@ edition = { workspace = true } tauri-build = { workspace = true } [dependencies] -tauri = { workspace = true, features = ["wry", "common-controls-v6", "x11"] } +tauri = { workspace = true, features = ["common-controls-v6"] } +tauri-runtime-wry = { workspace = true, features = ["common-controls-v6"] } serde = { workspace = true } serde_json = { workspace = true } tauri-plugin-updater = { path = "../.." } diff --git a/plugins/updater/tests/app-updater/src/main.rs b/plugins/updater/tests/app-updater/src/main.rs index bbe398b59..d4867df90 100644 --- a/plugins/updater/tests/app-updater/src/main.rs +++ b/plugins/updater/tests/app-updater/src/main.rs @@ -11,6 +11,7 @@ fn main() { let mut context = tauri::generate_context!(); tauri::Builder::default() + .runtime(tauri_runtime_wry::Wry::default()) .plugin(tauri_plugin_updater::Builder::new().build()) .setup(|app| { let handle = app.handle().clone(); diff --git a/plugins/updater/tests/updater-migration/Cargo.toml b/plugins/updater/tests/updater-migration/Cargo.toml index 680b4e92c..530527fd6 100644 --- a/plugins/updater/tests/updater-migration/Cargo.toml +++ b/plugins/updater/tests/updater-migration/Cargo.toml @@ -7,7 +7,7 @@ edition = { workspace = true } tauri-build = { workspace = true } [dependencies] -tauri = { workspace = true, features = ["wry", "common-controls-v6", "x11"] } +tauri = { workspace = true, features = ["common-controls-v6"] } serde = { workspace = true } serde_json = { workspace = true } tauri-plugin-updater = { path = "../.." } diff --git a/plugins/updater/tests/updater-migration/v2-app/Cargo.toml b/plugins/updater/tests/updater-migration/v2-app/Cargo.toml index 69d60c4f1..3d7c83636 100644 --- a/plugins/updater/tests/updater-migration/v2-app/Cargo.toml +++ b/plugins/updater/tests/updater-migration/v2-app/Cargo.toml @@ -7,7 +7,8 @@ edition = { workspace = true } tauri-build = { workspace = true } [dependencies] -tauri = { workspace = true, features = ["wry", "common-controls-v6", "x11"] } +tauri = { workspace = true, features = ["common-controls-v6"] } +tauri-runtime-wry = { workspace = true, features = ["common-controls-v6"] } serde = { workspace = true } serde_json = { workspace = true } tauri-plugin-updater = { path = "../../.." } diff --git a/plugins/updater/tests/updater-migration/v2-app/src/main.rs b/plugins/updater/tests/updater-migration/v2-app/src/main.rs index b2bbe04be..c79201620 100644 --- a/plugins/updater/tests/updater-migration/v2-app/src/main.rs +++ b/plugins/updater/tests/updater-migration/v2-app/src/main.rs @@ -11,6 +11,7 @@ fn main() { let mut context = tauri::generate_context!(); tauri::Builder::default() + .runtime(tauri_runtime_wry::Wry::default()) .plugin(tauri_plugin_updater::Builder::new().build()) .setup(|app| { println!("version={}", app.package_info().version); diff --git a/plugins/websocket/examples/tauri-app/package.json b/plugins/websocket/examples/tauri-app/package.json index bacb722d0..8462e240e 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-cef": "3.0.0-alpha.6", + "@tauri-apps/cli-cef": "3.0.0-alpha.26", "typescript": "^6.0.0", "vite": "^8.0.1" }, diff --git a/plugins/websocket/examples/tauri-app/src-tauri/Cargo.toml b/plugins/websocket/examples/tauri-app/src-tauri/Cargo.toml index 6b7b284a1..aca5b6c65 100644 --- a/plugins/websocket/examples/tauri-app/src-tauri/Cargo.toml +++ b/plugins/websocket/examples/tauri-app/src-tauri/Cargo.toml @@ -7,7 +7,13 @@ edition = "2021" [dependencies] serde = { workspace = true } serde_json = { workspace = true } -tauri = { workspace = true, features = ["wry", "common-controls-v6", "x11"] } +tauri = { workspace = true, features = ["common-controls-v6"] } +# The webview runtime is picked by depending on its crate and handing its +# attributes to `tauri::Builder::runtime`. +tauri-runtime-wry = { workspace = true, optional = true, features = [ + "common-controls-v6", +] } +tauri-runtime-cef = { workspace = true, optional = true } tokio = { version = "1", features = ["net"] } futures-util = "0.3" tauri-plugin-websocket = { path = "../../../" } @@ -17,4 +23,7 @@ tokio-tungstenite = "0.29" tauri-build = { workspace = true } [features] +default = ["wry"] +wry = ["dep:tauri-runtime-wry"] +cef = ["dep:tauri-runtime-cef"] prod = ["tauri/custom-protocol"] diff --git a/plugins/websocket/examples/tauri-app/src-tauri/src/main.rs b/plugins/websocket/examples/tauri-app/src-tauri/src/main.rs index 8858da82e..70fde0fdd 100644 --- a/plugins/websocket/examples/tauri-app/src-tauri/src/main.rs +++ b/plugins/websocket/examples/tauri-app/src-tauri/src/main.rs @@ -33,9 +33,19 @@ async fn accept_connection(stream: TcpStream) { } } +// Every CEF application is also its own renderer, GPU, network and utility +// process. This attribute runs the helper side of that and returns before the +// Tauri application is built, for any process Chromium launched with `--type=`. +#[cfg_attr(feature = "cef", tauri_runtime_cef::cef_entry_point)] fn main() { tauri::async_runtime::spawn(start_server()); - tauri::Builder::default() + + #[cfg(feature = "cef")] + let builder = tauri::Builder::default().runtime(tauri_runtime_cef::Cef::default()); + #[cfg(not(feature = "cef"))] + let builder = tauri::Builder::default().runtime(tauri_runtime_wry::Wry::default()); + + builder .plugin(tauri_plugin_websocket::init()) .run(tauri::generate_context!()) .expect("error while running tauri application"); diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 896cba014..29a1bd389 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -4,9 +4,6 @@ settings: autoInstallPeers: true excludeLinksFromLockfile: false -overrides: - esbuild@<0.25.0: '>=0.25.0' - importers: .: @@ -55,61 +52,61 @@ importers: version: 2.11.0 '@tauri-apps/plugin-barcode-scanner': specifier: ^2.4.5 - version: link:../../plugins/barcode-scanner + version: 2.4.6 '@tauri-apps/plugin-biometric': specifier: ^2.3.2 - version: link:../../plugins/biometric + version: 2.3.3 '@tauri-apps/plugin-cli': specifier: ^2.4.1 - version: link:../../plugins/cli + version: 2.4.1 '@tauri-apps/plugin-clipboard-manager': specifier: ^2.3.2 - version: link:../../plugins/clipboard-manager + version: 2.3.3 '@tauri-apps/plugin-dialog': specifier: ^2.7.1 - version: link:../../plugins/dialog + version: 2.7.3 '@tauri-apps/plugin-fs': specifier: ^2.5.1 - version: link:../../plugins/fs + version: 2.5.2 '@tauri-apps/plugin-geolocation': specifier: ^2.3.2 - version: link:../../plugins/geolocation + version: 2.3.3 '@tauri-apps/plugin-global-shortcut': specifier: ^2.3.2 - version: link:../../plugins/global-shortcut + version: 2.3.2 '@tauri-apps/plugin-haptics': specifier: ^2.3.2 - version: link:../../plugins/haptics + version: 2.3.3 '@tauri-apps/plugin-http': specifier: ^2.5.9 - version: link:../../plugins/http + version: 2.6.0 '@tauri-apps/plugin-nfc': specifier: ^2.3.5 - version: link:../../plugins/nfc + version: 2.3.6 '@tauri-apps/plugin-notification': specifier: ^2.3.3 - version: link:../../plugins/notification + version: 2.4.0 '@tauri-apps/plugin-opener': specifier: ^2.5.4 - version: link:../../plugins/opener + version: 2.5.5 '@tauri-apps/plugin-os': specifier: ^2.3.2 - version: link:../../plugins/os + version: 2.3.2 '@tauri-apps/plugin-process': specifier: ^2.3.1 - version: link:../../plugins/process + version: 2.3.1 '@tauri-apps/plugin-shell': specifier: ^2.3.5 - version: link:../../plugins/shell + version: 2.3.6 '@tauri-apps/plugin-store': specifier: ^2.4.3 - version: link:../../plugins/store + version: 2.4.4 '@tauri-apps/plugin-updater': specifier: ^2.10.1 - version: link:../../plugins/updater + version: 2.11.0 '@tauri-apps/plugin-upload': specifier: ^2.4.0 - version: link:../../plugins/upload + version: 2.4.1 '@zerodevx/svelte-json-view': specifier: 1.0.11 version: 1.0.11(svelte@5.55.7(@typescript-eslint/types@8.58.2)) @@ -124,8 +121,8 @@ importers: specifier: ^7.0.0 version: 7.0.0(svelte@5.55.7(@typescript-eslint/types@8.58.2))(vite@8.0.16(esbuild@0.28.1)(jiti@2.6.1)(terser@5.46.1)(tsx@4.19.2)) '@tauri-apps/cli-cef': - specifier: 3.0.0-alpha.6 - version: 3.0.0-alpha.6 + specifier: 3.0.0-alpha.26 + version: 3.0.0-alpha.26 '@unocss/extractor-svelte': specifier: ^66.6.7 version: 66.6.7 @@ -176,8 +173,8 @@ importers: version: 2.11.0 devDependencies: '@tauri-apps/cli-cef': - specifier: 3.0.0-alpha.6 - version: 3.0.0-alpha.6 + specifier: 3.0.0-alpha.26 + version: 3.0.0-alpha.26 plugins/deep-link/examples/app: dependencies: @@ -186,11 +183,11 @@ importers: version: 2.11.0 '@tauri-apps/plugin-deep-link': specifier: 2.4.9 - version: link:../.. + version: 2.4.9 devDependencies: '@tauri-apps/cli-cef': - specifier: 3.0.0-alpha.6 - version: 3.0.0-alpha.6 + specifier: 3.0.0-alpha.26 + version: 3.0.0-alpha.26 typescript: specifier: ^6.0.0 version: 6.0.3 @@ -285,8 +282,8 @@ importers: plugins/single-instance/examples/vanilla: devDependencies: '@tauri-apps/cli-cef': - specifier: 3.0.0-alpha.6 - version: 3.0.0-alpha.6 + specifier: 3.0.0-alpha.26 + version: 3.0.0-alpha.26 plugins/sql: dependencies: @@ -303,8 +300,8 @@ importers: plugins/store/examples/AppSettingsManager: devDependencies: '@tauri-apps/cli-cef': - specifier: 3.0.0-alpha.6 - version: 3.0.0-alpha.6 + specifier: 3.0.0-alpha.26 + version: 3.0.0-alpha.26 typescript: specifier: ^6.0.0 version: 6.0.3 @@ -343,8 +340,8 @@ importers: version: link:../.. devDependencies: '@tauri-apps/cli-cef': - specifier: 3.0.0-alpha.6 - version: 3.0.0-alpha.6 + specifier: 3.0.0-alpha.26 + version: 3.0.0-alpha.26 typescript: specifier: ^6.0.0 version: 6.0.3 @@ -372,102 +369,204 @@ packages: '@emnapi/wasi-threads@1.2.1': resolution: {integrity: sha512-uTII7OYF+/Mes/MrcIOYp5yOtSMLBWSIoLPpcgwipoiKbli6k322tcoFsxoIIxPDqW01SQGAgko4EzZi2BNv2w==} + '@esbuild/aix-ppc64@0.23.1': + resolution: {integrity: sha512-6VhYk1diRqrhBAqpJEdjASR/+WVRtfjpqKuNw11cLiaWpAT/Uu+nokB+UJnevzy/P9C/ty6AOe0dwueMrGh/iQ==} + engines: {node: '>=18'} + cpu: [ppc64] + os: [aix] + '@esbuild/aix-ppc64@0.28.1': resolution: {integrity: sha512-Svl7tq8k/08+p6CXPpRjQ1fKX+1odH/BQbb48fV6fj3CWHhsoIOoY87w1oHXm0qEpkIK3ZfVgp0hed3XBXzXMQ==} engines: {node: '>=18'} cpu: [ppc64] os: [aix] + '@esbuild/android-arm64@0.23.1': + resolution: {integrity: sha512-xw50ipykXcLstLeWH7WRdQuysJqejuAGPd30vd1i5zSyKK3WE+ijzHmLKxdiCMtH1pHz78rOg0BKSYOSB/2Khw==} + engines: {node: '>=18'} + cpu: [arm64] + os: [android] + '@esbuild/android-arm64@0.28.1': resolution: {integrity: sha512-34EGEbCIAgosYz6goLcopX6Mo7NyGv9tfwEM2/7Ce2VcVRk568iSvniGWcUXIy7wEDR1wzolcxcriFVrWYcwBg==} engines: {node: '>=18'} cpu: [arm64] os: [android] + '@esbuild/android-arm@0.23.1': + resolution: {integrity: sha512-uz6/tEy2IFm9RYOyvKl88zdzZfwEfKZmnX9Cj1BHjeSGNuGLuMD1kR8y5bteYmwqKm1tj8m4cb/aKEorr6fHWQ==} + engines: {node: '>=18'} + cpu: [arm] + os: [android] + '@esbuild/android-arm@0.28.1': resolution: {integrity: sha512-0k2F129Xdio1TdJfzJ8sy1Q47vUD2NnwdhiAf7drUN1EBTfPf4hsFCtmMgu/6m8JSzsBrlmVjudMBQqOfG8usQ==} engines: {node: '>=18'} cpu: [arm] os: [android] + '@esbuild/android-x64@0.23.1': + resolution: {integrity: sha512-nlN9B69St9BwUoB+jkyU090bru8L0NA3yFvAd7k8dNsVH8bi9a8cUAUSEcEEgTp2z3dbEDGJGfP6VUnkQnlReg==} + engines: {node: '>=18'} + cpu: [x64] + os: [android] + '@esbuild/android-x64@0.28.1': resolution: {integrity: sha512-dbwY7ltSMDWsRatcRpCnES4F+im88OCUgGZjy52shC7GqHRE/cYlxNbB4Z4UpJswpcc4Qxd2oE/ufM0p61IKng==} engines: {node: '>=18'} cpu: [x64] os: [android] + '@esbuild/darwin-arm64@0.23.1': + resolution: {integrity: sha512-YsS2e3Wtgnw7Wq53XXBLcV6JhRsEq8hkfg91ESVadIrzr9wO6jJDMZnCQbHm1Guc5t/CdDiFSSfWP58FNuvT3Q==} + engines: {node: '>=18'} + cpu: [arm64] + os: [darwin] + '@esbuild/darwin-arm64@0.28.1': resolution: {integrity: sha512-TZbWkQY7kvTAXbXUT7uVACR5cMHsDiSz9z7ZKAX/RTq/WJEk3QyRr0wZpNhBDX+/0CtdqUIJlOiodQcta6tY3Q==} engines: {node: '>=18'} cpu: [arm64] os: [darwin] + '@esbuild/darwin-x64@0.23.1': + resolution: {integrity: sha512-aClqdgTDVPSEGgoCS8QDG37Gu8yc9lTHNAQlsztQ6ENetKEO//b8y31MMu2ZaPbn4kVsIABzVLXYLhCGekGDqw==} + engines: {node: '>=18'} + cpu: [x64] + os: [darwin] + '@esbuild/darwin-x64@0.28.1': resolution: {integrity: sha512-zfdzgK9ACBNZLI/CyHTOx81SyNbM6YXn7rxSgX97VjyiPl9W1i4Ka4fgKECEoFCKGpvBj5qArWIGgQjOwkgskQ==} engines: {node: '>=18'} cpu: [x64] os: [darwin] + '@esbuild/freebsd-arm64@0.23.1': + resolution: {integrity: sha512-h1k6yS8/pN/NHlMl5+v4XPfikhJulk4G+tKGFIOwURBSFzE8bixw1ebjluLOjfwtLqY0kewfjLSrO6tN2MgIhA==} + engines: {node: '>=18'} + cpu: [arm64] + os: [freebsd] + '@esbuild/freebsd-arm64@0.28.1': resolution: {integrity: sha512-wG2EA8ENdEI0qhkSZMjfqrdY+ziCYCPMmtZjjIwOmXFjmyzEHn+UUxk5of+SYsjtfs3VpnlC7QLzSI5hY/rOAw==} engines: {node: '>=18'} cpu: [arm64] os: [freebsd] + '@esbuild/freebsd-x64@0.23.1': + resolution: {integrity: sha512-lK1eJeyk1ZX8UklqFd/3A60UuZ/6UVfGT2LuGo3Wp4/z7eRTRYY+0xOu2kpClP+vMTi9wKOfXi2vjUpO1Ro76g==} + engines: {node: '>=18'} + cpu: [x64] + os: [freebsd] + '@esbuild/freebsd-x64@0.28.1': resolution: {integrity: sha512-i7dZ9vQgnvSCzi/rYCXNgtF/U+eKZNJBzu3eTQbRgHnM7tNSizLOkRFAl3qzVc/Op/u5YkHHa4pf/3DOYHthLQ==} engines: {node: '>=18'} cpu: [x64] os: [freebsd] + '@esbuild/linux-arm64@0.23.1': + resolution: {integrity: sha512-/93bf2yxencYDnItMYV/v116zff6UyTjo4EtEQjUBeGiVpMmffDNUyD9UN2zV+V3LRV3/on4xdZ26NKzn6754g==} + engines: {node: '>=18'} + cpu: [arm64] + os: [linux] + '@esbuild/linux-arm64@0.28.1': resolution: {integrity: sha512-yHs+0uc8+nvEAfAfxrWQKK5peSNzBc4PegcMO0EJ2hT71uA7vB8Ihg2e77R2P7SG5uYjPbHlLLmve4LLLRCf0g==} engines: {node: '>=18'} cpu: [arm64] os: [linux] + '@esbuild/linux-arm@0.23.1': + resolution: {integrity: sha512-CXXkzgn+dXAPs3WBwE+Kvnrf4WECwBdfjfeYHpMeVxWE0EceB6vhWGShs6wi0IYEqMSIzdOF1XjQ/Mkm5d7ZdQ==} + engines: {node: '>=18'} + cpu: [arm] + os: [linux] + '@esbuild/linux-arm@0.28.1': resolution: {integrity: sha512-qVXBOHQS+d5Y722GwJzJUtOLlX7km3CraOaGormF1pDtPd2C/l1SHRPgjLunLGe51Sh5YYWKMFDyV4SxgMQYTQ==} engines: {node: '>=18'} cpu: [arm] os: [linux] + '@esbuild/linux-ia32@0.23.1': + resolution: {integrity: sha512-VTN4EuOHwXEkXzX5nTvVY4s7E/Krz7COC8xkftbbKRYAl96vPiUssGkeMELQMOnLOJ8k3BY1+ZY52tttZnHcXQ==} + engines: {node: '>=18'} + cpu: [ia32] + os: [linux] + '@esbuild/linux-ia32@0.28.1': resolution: {integrity: sha512-d1z4ZuP0ajrfz/FhGT4vv278rX8KnPPJx8i5+AtK7TYbx9Le9F1hyzurZpkEyjkGa9dUGhQow4C1NmeGvqxN2w==} engines: {node: '>=18'} cpu: [ia32] os: [linux] + '@esbuild/linux-loong64@0.23.1': + resolution: {integrity: sha512-Vx09LzEoBa5zDnieH8LSMRToj7ir/Jeq0Gu6qJ/1GcBq9GkfoEAoXvLiW1U9J1qE/Y/Oyaq33w5p2ZWrNNHNEw==} + engines: {node: '>=18'} + cpu: [loong64] + os: [linux] + '@esbuild/linux-loong64@0.28.1': resolution: {integrity: sha512-M5sRjUVZrkm1OAPR3dlOYzNmN+loZKGVi1VUQGrwuqLcbR6qeAz+famMhjASeH3YVKvZz+zT1jlh/keC3Rj/lg==} engines: {node: '>=18'} cpu: [loong64] os: [linux] + '@esbuild/linux-mips64el@0.23.1': + resolution: {integrity: sha512-nrFzzMQ7W4WRLNUOU5dlWAqa6yVeI0P78WKGUo7lg2HShq/yx+UYkeNSE0SSfSure0SqgnsxPvmAUu/vu0E+3Q==} + engines: {node: '>=18'} + cpu: [mips64el] + os: [linux] + '@esbuild/linux-mips64el@0.28.1': resolution: {integrity: sha512-mRObBZeHh2OxcBFPWE/FjylkRgZdYuiTR3vaTozquCGOH14iP9oN4x4Ge81CoIDYQrXmIxpFumJBu5MtZpnQJQ==} engines: {node: '>=18'} cpu: [mips64el] os: [linux] + '@esbuild/linux-ppc64@0.23.1': + resolution: {integrity: sha512-dKN8fgVqd0vUIjxuJI6P/9SSSe/mB9rvA98CSH2sJnlZ/OCZWO1DJvxj8jvKTfYUdGfcq2dDxoKaC6bHuTlgcw==} + engines: {node: '>=18'} + cpu: [ppc64] + os: [linux] + '@esbuild/linux-ppc64@0.28.1': resolution: {integrity: sha512-slScBsMAb3GFDcdrCgLwZtPYRoH2H/youv10QiZyRjmsP48fznoveWytSgCI/R0ZcUgpc0ZhIUEx6LHts8yrfQ==} engines: {node: '>=18'} cpu: [ppc64] os: [linux] + '@esbuild/linux-riscv64@0.23.1': + resolution: {integrity: sha512-5AV4Pzp80fhHL83JM6LoA6pTQVWgB1HovMBsLQ9OZWLDqVY8MVobBXNSmAJi//Csh6tcY7e7Lny2Hg1tElMjIA==} + engines: {node: '>=18'} + cpu: [riscv64] + os: [linux] + '@esbuild/linux-riscv64@0.28.1': resolution: {integrity: sha512-kw0owk1o0GFETUJyW0jc0G4Yzs0BHZn0JDZ8JRT088vjJYX777BAs1fDGxAC+q831qOs2DTC96mNsG2opdfyyQ==} engines: {node: '>=18'} cpu: [riscv64] os: [linux] + '@esbuild/linux-s390x@0.23.1': + resolution: {integrity: sha512-9ygs73tuFCe6f6m/Tb+9LtYxWR4c9yg7zjt2cYkjDbDpV/xVn+68cQxMXCjUpYwEkze2RcU/rMnfIXNRFmSoDw==} + engines: {node: '>=18'} + cpu: [s390x] + os: [linux] + '@esbuild/linux-s390x@0.28.1': resolution: {integrity: sha512-/lAIjX8aYFRByhh6L5rYtPEDRqa9de/4V/juOXcta5frjvzXO4/sqEtyytse0g3zZFuWu5cDN0MkLz2qRDD2Ag==} engines: {node: '>=18'} cpu: [s390x] os: [linux] + '@esbuild/linux-x64@0.23.1': + resolution: {integrity: sha512-EV6+ovTsEXCPAp58g2dD68LxoP/wK5pRvgy0J/HxPGB009omFPv3Yet0HiaqvrIrgPTBuC6wCH1LTOY91EO5hQ==} + engines: {node: '>=18'} + cpu: [x64] + os: [linux] + '@esbuild/linux-x64@0.28.1': resolution: {integrity: sha512-u/anNYF2mmVOEDwLtnQ1wOr3EZ9sTNGLWrsYGYwHWzGA3Si84IOkHXlbWTD1NB+9/1lcnweYKO54uhxZydNzfA==} engines: {node: '>=18'} @@ -480,18 +579,36 @@ packages: cpu: [arm64] os: [netbsd] + '@esbuild/netbsd-x64@0.23.1': + resolution: {integrity: sha512-aevEkCNu7KlPRpYLjwmdcuNz6bDFiE7Z8XC4CPqExjTvrHugh28QzUXVOZtiYghciKUacNktqxdpymplil1beA==} + engines: {node: '>=18'} + cpu: [x64] + os: [netbsd] + '@esbuild/netbsd-x64@0.28.1': resolution: {integrity: sha512-aeL6lAnN89Hz43Mlh1G8ARasbuoYvSITDEx0tHh5b7jJnHcssqgjy9Yx430GDpmCa6OyrKoS0aNRjKundRizGg==} engines: {node: '>=18'} cpu: [x64] os: [netbsd] + '@esbuild/openbsd-arm64@0.23.1': + resolution: {integrity: sha512-3x37szhLexNA4bXhLrCC/LImN/YtWis6WXr1VESlfVtVeoFJBRINPJ3f0a/6LV8zpikqoUg4hyXw0sFBt5Cr+Q==} + engines: {node: '>=18'} + cpu: [arm64] + os: [openbsd] + '@esbuild/openbsd-arm64@0.28.1': resolution: {integrity: sha512-MEFJe5C3R8pwXdZ5Y21oo6m7ePiS0d9pWucn99O/wvyJZChoIQKrQDxKrGeW8F5+T0okTHesAmDeiHDTIq0V/Q==} engines: {node: '>=18'} cpu: [arm64] os: [openbsd] + '@esbuild/openbsd-x64@0.23.1': + resolution: {integrity: sha512-aY2gMmKmPhxfU+0EdnN+XNtGbjfQgwZj43k8G3fyrDM/UdZww6xrWxmDkuz2eCZchqVeABjV5BpildOrUbBTqA==} + engines: {node: '>=18'} + cpu: [x64] + os: [openbsd] + '@esbuild/openbsd-x64@0.28.1': resolution: {integrity: sha512-i/ZLIOafE0Z8cI/XANJAixoJL/uRAoS2xOA3rb0xN+KK0K177cMAsQYkzHtBrtMXAKuAc7HGgcWiZ/sRC1Nxgw==} engines: {node: '>=18'} @@ -504,24 +621,48 @@ packages: cpu: [arm64] os: [openharmony] + '@esbuild/sunos-x64@0.23.1': + resolution: {integrity: sha512-RBRT2gqEl0IKQABT4XTj78tpk9v7ehp+mazn2HbUeZl1YMdaGAQqhapjGTCe7uw7y0frDi4gS0uHzhvpFuI1sA==} + engines: {node: '>=18'} + cpu: [x64] + os: [sunos] + '@esbuild/sunos-x64@0.28.1': resolution: {integrity: sha512-BEjgtECkL3vY+SaSQ6nzVfiALUeFxpawyp8Jmf5PtYhf1Ug40N1h/hxlhts+f1FvSvarEigdxS3BlSMI2PJLcQ==} engines: {node: '>=18'} cpu: [x64] os: [sunos] + '@esbuild/win32-arm64@0.23.1': + resolution: {integrity: sha512-4O+gPR5rEBe2FpKOVyiJ7wNDPA8nGzDuJ6gN4okSA1gEOYZ67N8JPk58tkWtdtPeLz7lBnY6I5L3jdsr3S+A6A==} + engines: {node: '>=18'} + cpu: [arm64] + os: [win32] + '@esbuild/win32-arm64@0.28.1': resolution: {integrity: sha512-lCv9eK/H6ZJWbE7bh2nw54CZ9M2nupBxJcTsdk/QQnWkdSjKGuxmmH8/GWrlT1eMmZfn4dGcCjRte397WqfQXA==} engines: {node: '>=18'} cpu: [arm64] os: [win32] + '@esbuild/win32-ia32@0.23.1': + resolution: {integrity: sha512-BcaL0Vn6QwCwre3Y717nVHZbAa4UBEigzFm6VdsVdT/MbZ38xoj1X9HPkZhbmaBGUD1W8vxAfffbDe8bA6AKnQ==} + engines: {node: '>=18'} + cpu: [ia32] + os: [win32] + '@esbuild/win32-ia32@0.28.1': resolution: {integrity: sha512-zvb/mB2bSCoJOpoCBgYKKpX6YM6mJBlBUVUtVj41DlZJVEB6/0CKlRYxP5wWl1C1ILiCoAU5wZZ4q1P3qeS6Eg==} engines: {node: '>=18'} cpu: [ia32] os: [win32] + '@esbuild/win32-x64@0.23.1': + resolution: {integrity: sha512-BHpFFeslkWrXWyUPnbKm+xYYVYruCinGcftSBaa8zoF9hZO4BcSCFUvHVTtzpIY6YzUnYtuEhZ+C9iEXjxnasg==} + engines: {node: '>=18'} + cpu: [x64] + os: [win32] + '@esbuild/win32-x64@0.28.1': resolution: {integrity: sha512-bm4Mowrv+GXMlpWX++EcXw/iLyd1o3+bJkC2DkWXYVvgZCqD/bSj9ctZeAMC3cIxgjRVR2Dufaiu4YPxr5gW1A==} engines: {node: '>=18'} @@ -667,48 +808,56 @@ packages: engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] + libc: [glibc] '@oxc-parser/binding-linux-arm64-musl@0.115.0': resolution: {integrity: sha512-HjsZbJPH9mMd4swJRywVMsDZsJX0hyKb1iNHo5ijRl5yhtbO3lj7ImSrrL1oZ1VEg0te4iKmDGGz/6YPLd1G8w==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] + libc: [musl] '@oxc-parser/binding-linux-ppc64-gnu@0.115.0': resolution: {integrity: sha512-zhhePoBrd7kQx3oClX/W6NldsuCbuMqaN9rRsY+6/WoorAb4j490PG/FjqgAXscWp2uSW2WV9L+ksn0wHrvsrg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ppc64] os: [linux] + libc: [glibc] '@oxc-parser/binding-linux-riscv64-gnu@0.115.0': resolution: {integrity: sha512-t/IRojvUE9XrKu+/H1b8YINug+7Q6FLls5rsm2lxB5mnS8GN/eYAYrPgHkcg9/1SueRDSzGpDYu3lGWTObk1zw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [riscv64] os: [linux] + libc: [glibc] '@oxc-parser/binding-linux-riscv64-musl@0.115.0': resolution: {integrity: sha512-79jBHSSh/YpQRAmvYoaCfpyToRbJ/HBrdB7hxK2ku2JMehjopTVo+xMJss/RV7/ZYqeezgjvKDQzapJbgcjVZA==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [riscv64] os: [linux] + libc: [musl] '@oxc-parser/binding-linux-s390x-gnu@0.115.0': resolution: {integrity: sha512-nA1TpxkhNTIOMMyiSSsa7XIVJVoOU/SsVrHIz3gHvWweB5PHCQfO7w+Lb2EP0lBWokv7HtA/KbF7aLDoXzmuMw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [s390x] os: [linux] + libc: [glibc] '@oxc-parser/binding-linux-x64-gnu@0.115.0': resolution: {integrity: sha512-9iVX789DoC3SaOOG+X6NcF/tVChgLp2vcHffzOC2/Z1JTPlz6bMG2ogvcW6/9s0BG2qvhNQImd+gbWYeQbOwVw==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] + libc: [glibc] '@oxc-parser/binding-linux-x64-musl@0.115.0': resolution: {integrity: sha512-RmQmk+mjCB0nMNfEYhaCxwofLo1Z95ebHw1AGvRiWGCd4zhCNOyskgCbMogIcQzSB3SuEKWgkssyaiQYVAA4hQ==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] + libc: [musl] '@oxc-parser/binding-openharmony-arm64@0.115.0': resolution: {integrity: sha512-viigraWWQhhDvX5aGq+wrQq58k00Xq3MHz/0R4AFMxGlZ8ogNonpEfNc73Q5Ly87Z6sU9BvxEdG0dnYTfVnmew==} @@ -786,36 +935,42 @@ packages: engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] + libc: [glibc] '@rolldown/binding-linux-arm64-musl@1.0.3': resolution: {integrity: sha512-VWkUHwWriDciit80wleYwKILoR/KMvxh/IdwS/paX+ZgpuRpCrKLUdadJbc0NpBEiyhpYawsJ73j9aCvOH+f7Q==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [arm64] os: [linux] + libc: [musl] '@rolldown/binding-linux-ppc64-gnu@1.0.3': resolution: {integrity: sha512-5f1laC0SlIR0yDbFCd8acUhvJIag6N3zC5P7oUPN6wX0aOma+uKJ0wBDH5aq7I1PVI2ttTlhJwzwRIBnLiSGEg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [ppc64] os: [linux] + libc: [glibc] '@rolldown/binding-linux-s390x-gnu@1.0.3': resolution: {integrity: sha512-Iq4ko0r4XsgbrF/LunNgHtAGLRRVE2kXonAXQ/MV0mC6jQpMOhW1SvtZja2EhC/kd05++bP78dsqBeIQyYJ6Yg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [s390x] os: [linux] + libc: [glibc] '@rolldown/binding-linux-x64-gnu@1.0.3': resolution: {integrity: sha512-B8m6tD5+/N5FeNQFbKlLA/2yVq9ycQP1SeedyEYYKWBNR3ZQbkvIUcNnDNM03lO1l5F2roiiFJGgvoLLyZXtSg==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] + libc: [glibc] '@rolldown/binding-linux-x64-musl@1.0.3': resolution: {integrity: sha512-pSdpdUJHkuCxun9LE7jvgUB9qsRgaiyNNCX7m/AvHTcq67AiT/Yhoxvw5zPfhrM8k/BfP8ce/hMOpthKDpEUow==} engines: {node: ^20.19.0 || >=22.12.0} cpu: [x64] os: [linux] + libc: [musl] '@rolldown/binding-openharmony-arm64@1.0.3': resolution: {integrity: sha512-OXXS3RKJgX2uLwM+gYyuH5omcH8fL1LJs96pZGgtetVCahON57+d4SJHzTgZiOjxgGkSnpXpOsWuPDGAKAigEg==} @@ -917,66 +1072,79 @@ packages: resolution: {integrity: sha512-DV6fJoxEYWJOvaZIsok7KrYl0tPvga5OZ2yvKHNNYyk/2roMLqQAbGhr78EQ5YhHpnhLKJD3S1WFusAkmUuV5g==} cpu: [arm] os: [linux] + libc: [glibc] '@rollup/rollup-linux-arm-musleabihf@4.60.3': resolution: {integrity: sha512-mQKoJAzvuOs6F+TZybQO4GOTSMUu7v0WdxEk24krQ/uUxXoPTtHjuaUuPmFhtBcM4K0ons8nrE3JyhTuCFtT/w==} cpu: [arm] os: [linux] + libc: [musl] '@rollup/rollup-linux-arm64-gnu@4.60.3': resolution: {integrity: sha512-Whjj2qoiJ6+OOJMGptTYazaJvjOJm+iKHpXQM1P3LzGjt7Ff++Tp7nH4N8J/BUA7R9IHfDyx4DJIflifwnbmIA==} cpu: [arm64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-arm64-musl@4.60.3': resolution: {integrity: sha512-4YTNHKqGng5+yiZt3mg77nmyuCfmNfX4fPmyUapBcIk+BdwSwmCWGXOUxhXbBEkFHtoN5boLj/5NON+u5QC9tg==} cpu: [arm64] os: [linux] + libc: [musl] '@rollup/rollup-linux-loong64-gnu@4.60.3': resolution: {integrity: sha512-SU3kNlhkpI4UqlUc2VXPGK9o886ZsSeGfMAX2ba2b8DKmMXq4AL7KUrkSWVbb7koVqx41Yczx6dx5PNargIrEA==} cpu: [loong64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-loong64-musl@4.60.3': resolution: {integrity: sha512-6lDLl5h4TXpB1mTf2rQWnAk/LcXrx9vBfu/DT5TIPhvMhRWaZ5MxkIc8u4lJAmBo6klTe1ywXIUHFjylW505sg==} cpu: [loong64] os: [linux] + libc: [musl] '@rollup/rollup-linux-ppc64-gnu@4.60.3': resolution: {integrity: sha512-BMo8bOw8evlup/8G+cj5xWtPyp93xPdyoSN16Zy90Q2QZ0ZYRhCt6ZJSwbrRzG9HApFabjwj2p25TUPDWrhzqQ==} cpu: [ppc64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-ppc64-musl@4.60.3': resolution: {integrity: sha512-E0L8X1dZN1/Rph+5VPF6Xj2G7JJvMACVXtamTJIDrVI44Y3K+G8gQaMEAavbqCGTa16InptiVrX6eM6pmJ+7qA==} cpu: [ppc64] os: [linux] + libc: [musl] '@rollup/rollup-linux-riscv64-gnu@4.60.3': resolution: {integrity: sha512-oZJ/WHaVfHUiRAtmTAeo3DcevNsVvH8mbvodjZy7D5QKvCefO371SiKRpxoDcCxB3PTRTLayWBkvmDQKTcX/sw==} cpu: [riscv64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-riscv64-musl@4.60.3': resolution: {integrity: sha512-Dhbyh7j9FybM3YaTgaHmVALwA8AkUwTPccyCQ79TG9AJUsMQqgN1DDEZNr4+QUfwiWvLDumW5vdwzoeUF+TNxQ==} cpu: [riscv64] os: [linux] + libc: [musl] '@rollup/rollup-linux-s390x-gnu@4.60.3': resolution: {integrity: sha512-cJd1X5XhHHlltkaypz1UcWLA8AcoIi1aWhsvaWDskD1oz2eKCypnqvTQ8ykMNI0RSmm7NkTdSqSSD7zM0xa6Ig==} cpu: [s390x] os: [linux] + libc: [glibc] '@rollup/rollup-linux-x64-gnu@4.60.3': resolution: {integrity: sha512-DAZDBHQfG2oQuhY7mc6I3/qB4LU2fQCjRvxbDwd/Jdvb9fypP4IJ4qmtu6lNjes6B531AI8cg1aKC2di97bUxA==} cpu: [x64] os: [linux] + libc: [glibc] '@rollup/rollup-linux-x64-musl@4.60.3': resolution: {integrity: sha512-cRxsE8c13mZOh3vP+wLDxpQBRrOHDIGOWyDL93Sy0Ga8y515fBcC2pjUfFwUe5T7tqvTvWbCpg1URM/AXdWIXA==} cpu: [x64] os: [linux] + libc: [musl] '@rollup/rollup-openbsd-x64@4.60.3': resolution: {integrity: sha512-QaWcIgRxqEdQdhJqW4DJctsH6HCmo5vHxY0krHSX4jMtOqfzC+dqDGuHM87bu4H8JBeibWx7jFz+h6/4C8wA5Q==} @@ -1023,77 +1191,142 @@ packages: '@tauri-apps/api@2.11.0': resolution: {integrity: sha512-7CinYODhky9lmO23xHnUFv0Xt43fbtWMyxZcLcRBlFkcgXKuEirBvHpmtJ89YMhyeGcq20Wuc47Fa4XjyniywA==} - '@tauri-apps/cli-cef-darwin-arm64@3.0.0-alpha.6': - resolution: {integrity: sha512-j6XHXCku1q82SXSXlQdzT7MbgOBX/ziOD+Z4c+B5D51zsaP3h6kcefpMzs71n9ZUegdw6AXpZpk+c+knOh2trQ==} + '@tauri-apps/cli-cef-darwin-arm64@3.0.0-alpha.26': + resolution: {integrity: sha512-sWXvfZN8iYQtthXDJTUaVBzcToO+pBtkpeDGwWYpbIF+q4HXnNYEiATnqo3Ze8x1FZ+hOPNKwQMcr8OBE1SCIQ==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] - '@tauri-apps/cli-cef-darwin-x64@3.0.0-alpha.6': - resolution: {integrity: sha512-zBNxrXomAXSZPCYspOjvoi8aVAnJtkSOy3cVD+9aYDpf2zZL4R7VQXcY4M76PvqbGUmCOXT9ztzxV2MyWnBoDQ==} + '@tauri-apps/cli-cef-darwin-x64@3.0.0-alpha.26': + resolution: {integrity: sha512-a5FLB6a8TQoxnhvBrKk9MUDF8DdHiZLQHAvN4d7srUknTbJZcCH27h2drj7i6MZVjOIKEw87qwWgDuvhediIyg==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] - '@tauri-apps/cli-cef-linux-arm-gnueabihf@3.0.0-alpha.6': - resolution: {integrity: sha512-EcNXX9xsAZj0BuRXBwliR35XML6B5aIbgH8blbEGAr3pDaSCBnNyS/dpORgSdCKuysLidBT7K8fer5mMtbSoUQ==} + '@tauri-apps/cli-cef-linux-arm-gnueabihf@3.0.0-alpha.26': + resolution: {integrity: sha512-X0y1AHOabWxwAKeA1OtnQ0AWe0gma5ccaI66gkeUTo0/dqBtA97hRMKc/wEpuEZio3QONPWjkaBMX6/1p5tExg==} engines: {node: '>= 10'} cpu: [arm] os: [linux] - '@tauri-apps/cli-cef-linux-arm64-gnu@3.0.0-alpha.6': - resolution: {integrity: sha512-/AwSRWuE5UKGumrXdpRnIBDWVjFAMEMkSFbB/vpFx9PogQ/A0R+i6+zuBh7JPV7FKmyRzVJuNxZ8EmZ319Ir8g==} + '@tauri-apps/cli-cef-linux-arm64-gnu@3.0.0-alpha.26': + resolution: {integrity: sha512-hUqQEl8OP34iPUh3i09Qrq3qtM8ICMf7Lku0jllWNgS4BW8N8G3yor63sGMZ9mUX3/rSPVEd/tjZUo3qCGQ9Jw==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] + libc: [glibc] - '@tauri-apps/cli-cef-linux-arm64-musl@3.0.0-alpha.6': - resolution: {integrity: sha512-OZ5gjROy4/TlaYQ33roxQYcFIFJH+HZMER9gwTkWxfYUC1gTLLhsBeIYUZzWqm1NQiIc07likg081wsHkCRrWw==} + '@tauri-apps/cli-cef-linux-arm64-musl@3.0.0-alpha.26': + resolution: {integrity: sha512-QsP3A/ev6HjA56k0YitmKwHkMEi6SHOPov24fWUDYXdaD8y8h1cA2+6a+R7KC+5fYr+stAxD6FW4pd6EIbrlkg==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] + libc: [musl] - '@tauri-apps/cli-cef-linux-riscv64-gnu@3.0.0-alpha.6': - resolution: {integrity: sha512-r9TQKmN4KfeXiiusn0cppRxljKsf96vTsC1ehYi4beh+6JlmGR4pK7eb+LuOGJscnjurAA9b153fpeYO/O1PTw==} + '@tauri-apps/cli-cef-linux-riscv64-gnu@3.0.0-alpha.26': + resolution: {integrity: sha512-R4WeEtlfm7kWuxcRXYLF7B87ffohLnA0Vg7Z7gi580NcVjIcDfBnT8xZow1r/xSqfLXihUaDcviOG5N3CVBvZw==} engines: {node: '>= 10'} cpu: [riscv64] os: [linux] + libc: [glibc] - '@tauri-apps/cli-cef-linux-x64-gnu@3.0.0-alpha.6': - resolution: {integrity: sha512-9rrMBVlqbNlp8nTJuZIDQ7iKFwGaVMRCNPIsUIZ56DiaCLoP4po+yvR48n+TyRPZYp1sb3q2Nr/5/zI2q/jFAQ==} + '@tauri-apps/cli-cef-linux-x64-gnu@3.0.0-alpha.26': + resolution: {integrity: sha512-U5jjc1nc5MueTN9kbaGZ7VawUd0MOM996eINQdNdAuX6qI7VOzyntk+adqklqIXRa4iyczB7tvS0xZvmkncSzA==} engines: {node: '>= 10'} cpu: [x64] os: [linux] + libc: [glibc] - '@tauri-apps/cli-cef-linux-x64-musl@3.0.0-alpha.6': - resolution: {integrity: sha512-pcFL71xscjEM/03lrH/GiqIr4SwBWlbvaRh8GxDePJqqrQojNn+kTzVvqowaXVbTrNr5rbHbXzY4rC/5/1Tbsw==} + '@tauri-apps/cli-cef-linux-x64-musl@3.0.0-alpha.26': + resolution: {integrity: sha512-xMYOhtx3D9YDHbhAj0OE4BmkGbAPmuPc9g3tku6FSOKDDj5zM5e4wMjcZ+0GNF2wkQMySlWUXqOmztdubzfIgw==} engines: {node: '>= 10'} cpu: [x64] os: [linux] + libc: [musl] - '@tauri-apps/cli-cef-win32-arm64-msvc@3.0.0-alpha.6': - resolution: {integrity: sha512-IrMgveBs0HNO7C7BaZCUHGtO9jPbop/iU/5XWNqBx7uYHJL565+yIlpzWPoXhT3qbt8h8FQFO6SU3N+zfvLipA==} + '@tauri-apps/cli-cef-win32-arm64-msvc@3.0.0-alpha.26': + resolution: {integrity: sha512-s0A7DPVAFvp9a3RjoMFCY9Bw1PNpnyEZYaklD0HDRqb0sALoxZLQ4zHcOxg00LaGKMkb9dsa5qn7OxIrYhly9Q==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] - '@tauri-apps/cli-cef-win32-ia32-msvc@3.0.0-alpha.6': - resolution: {integrity: sha512-qA/VaRdRwdMt9L2oDGNZPur108mUleKRUSCk6X8sVPcnPjzMfN4/aESeOKsW+zHXN/VhZbV3UieEg4IcYeI2RQ==} + '@tauri-apps/cli-cef-win32-ia32-msvc@3.0.0-alpha.26': + resolution: {integrity: sha512-vFRIGfhgI5+RBRv2Wf+Ivkij7n+Jtwd2DJNDhwEsTvhuxlw31FUk02ypuroe/PMEsDthmBXRPpZpeQE56oRPTw==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] - '@tauri-apps/cli-cef-win32-x64-msvc@3.0.0-alpha.6': - resolution: {integrity: sha512-EzlhstDVyvHy3M5ieSoH3VBlikgqQS99vFEDKFoy16mwIWUrTG1LkoSI0mKbqmO8DWIEzeSV17XiCw2XEcYslQ==} + '@tauri-apps/cli-cef-win32-x64-msvc@3.0.0-alpha.26': + resolution: {integrity: sha512-miNXdUbDNkhu/uysLD5X+8v80wjxj9NqSUIUFWC3Udpxqa/Tl4Lpuv7eVqdB1mtLuvJz3AZVydv1h63Hls3Pag==} engines: {node: '>= 10'} cpu: [x64] os: [win32] - '@tauri-apps/cli-cef@3.0.0-alpha.6': - resolution: {integrity: sha512-4Y52FZZuK6rpDDsJgxMp5q85QpQjf7Yo5IvLZs/CUBaIuMkGBDguDRcfkxhMJlu9qM/cLlBRW27OtqNdOW730w==} + '@tauri-apps/cli-cef@3.0.0-alpha.26': + resolution: {integrity: sha512-lq+RJ7EE9sNj0OaWr6dFg+Z4KyC9k6z0maofjmWXNZ9A9O1YC9upN1EZ0EORZUnhDCxvW/3BVC4hlNfkEvACCA==} engines: {node: '>= 10'} hasBin: true + '@tauri-apps/plugin-barcode-scanner@2.4.6': + resolution: {integrity: sha512-9B2u+Sma002p1MzH5kGYFg8dPVNVbIHpyye6PY1A9AOeR7IOUAXS02VaUpnyXqJkUUnF/s2g7MgaB7wY9Ko6cg==} + + '@tauri-apps/plugin-biometric@2.3.3': + resolution: {integrity: sha512-lNPZhN/LL9IGUxdJeUpltuxMZ0qHydhqtNEjgXW+YFLJWpt2WJGDlaGs6iDttj0PArfLYe0/CruAsZ8Anl3CFQ==} + + '@tauri-apps/plugin-cli@2.4.1': + resolution: {integrity: sha512-8JXofQFI5cmiGolh1PlU4hzE2YJgrgB1lyaztyBYiiMCy13luVxBXaXChYPeqMkUo46J1UadxvYdjRjj0E8zaw==} + + '@tauri-apps/plugin-clipboard-manager@2.3.3': + resolution: {integrity: sha512-KnyoTs9gj1yEgDkSPUNjOIOHjJTr5wk8IWcYMOWxYTIJCip6QwlyPW8u2X+6bd6kHM4fAdZNpxoal0gy/TwJbg==} + + '@tauri-apps/plugin-deep-link@2.4.9': + resolution: {integrity: sha512-u0SKOUHnJ1wqeqXsDFq2+kASCBj9xxbG0g9XZWPy9SOmU4wXtp6b/wiYpm6oH6/5fBTQsLqnLhIvqLBRpgHJlA==} + + '@tauri-apps/plugin-dialog@2.7.3': + resolution: {integrity: sha512-CRgE+7TP4tvq9MjBU6f04NLTFIqVMLKHk3hAqlhil00ngK9ACTrXPH3oHpKMProxILodd3YjBoKbMwSI4IEcfA==} + + '@tauri-apps/plugin-fs@2.5.2': + resolution: {integrity: sha512-XXvMSnFiob+G1H+YHCDf+bzWVumseQuEIhzpbOJzevUfL4k0U+sTApZWJHpoLiamggnVPJm5dJ5sDsniRyWxlg==} + + '@tauri-apps/plugin-geolocation@2.3.3': + resolution: {integrity: sha512-8TDI9YS9I2eXj1IwUfeiFY4OLkhVan08vpgHSSTM1tl7p/fNA7APlS6QAgLX9j73zqVp5Pl9HrFHG2gJtIunqg==} + + '@tauri-apps/plugin-global-shortcut@2.3.2': + resolution: {integrity: sha512-UReHNXrLvpEjylE4jb4oCYiy96uRykPUthoCQCmRXYrd5hs5X9DrW+qOn7GLW57EJN4tdK8bgK5twBTz2NOxzA==} + + '@tauri-apps/plugin-haptics@2.3.3': + resolution: {integrity: sha512-NueC58Woi2BMVIrOQHWl+mq5LqqiMDtAgaqk5sJHi7GF1dba+SNWPhKblKjTcjRdFZZ+X+gf4rl/GUhMJDyKOg==} + + '@tauri-apps/plugin-http@2.6.0': + resolution: {integrity: sha512-QYXwbGb4hQ9/8Riv/ejU/kPFFnbBIrBcWwV1LIXv2xBKfoj8lkWfGkd9pkCSsBI/pljPtz+IPqfrE3t3bVl3mg==} + + '@tauri-apps/plugin-nfc@2.3.6': + resolution: {integrity: sha512-H0Fa+M1BSyHtLVw7pGYtpHi6fYgF3eCKQniy5zNs46H77LZJ+2kH4vv5pvfwhbojzjnhfBp+EIMQtv0NZAfggA==} + + '@tauri-apps/plugin-notification@2.4.0': + resolution: {integrity: sha512-xlJXMcUoKOjNupzDue5wrEsa1wytf+l/2gCAPhafHyP683Y3N7J/8clUWLZ3vpnwkpT2C1zcLMMQFjjecIG2xg==} + + '@tauri-apps/plugin-opener@2.5.5': + resolution: {integrity: sha512-xvzGai5aQds8j8R8RsUK/lW6pGG50YgOYIPLzvkqmkwAj7dfySOD7sGtejRzvVdMmv1EQfKVEFh1MvmDp8QR0g==} + + '@tauri-apps/plugin-os@2.3.2': + resolution: {integrity: sha512-n+nXWeuSeF9wcEsSPmRnBEGrRgOy6jjkSU+UVCOV8YUGKb2erhDOxis7IqRXiRVHhY8XMKks00BJ0OAdkpf6+A==} + + '@tauri-apps/plugin-process@2.3.1': + resolution: {integrity: sha512-nCa4fGVaDL/B9ai03VyPOjfAHRHSBz5v6F/ObsB73r/dA3MHHhZtldaDMIc0V/pnUw9ehzr2iEG+XkSEyC0JJA==} + + '@tauri-apps/plugin-shell@2.3.6': + resolution: {integrity: sha512-C2AG+QmBJPK0E3gccLXfRdjTfGBC9DgwzGi/PfYa61ieAZbYvhvOss4OdSGfn/D28N3THGhJZEhf3lozOh/Uqw==} + + '@tauri-apps/plugin-store@2.4.4': + resolution: {integrity: sha512-oxSMaj/QpVfJcBMYX5aOQV94fWvga0MwQMfD6TLlbK2dh+ShPWAzefd8HWXhvOKjPRJdGVAkW7ZGO76JzzjaDA==} + + '@tauri-apps/plugin-updater@2.11.0': + resolution: {integrity: sha512-AE36XkOoSna24G40jZMY15nzAnkXEPL/73tGoseGrtGOHuI/cZwWzHpZFLjKXDPgzYZ435z1gHu28LgrsBwIxQ==} + + '@tauri-apps/plugin-upload@2.4.1': + resolution: {integrity: sha512-YCQdFILmnBRibXipOi7A7qt8cachleHA5L8IWXVNztR+o1vRZEjPWZrrvLeytGHe4+jgW9qOnLP5rZAf0pMxZA==} + '@tybys/wasm-util@0.10.2': resolution: {integrity: sha512-RoBvJ2X0wuKlWFIjrwffGw1IqZHKQqzIchKaadZZfnNpsAYp2mM0h36JtPCjNDAHGgYez/15uMBpfGwchhiMgg==} @@ -1348,6 +1581,11 @@ packages: duplexer@0.1.2: resolution: {integrity: sha512-jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg==} + esbuild@0.23.1: + resolution: {integrity: sha512-VVNz/9Sa0bs5SELtn3f7qhJCDPCF5oMEl5cO9/SSinpE9hbPVvxbd572HH5AKiP7WD8INO53GgfDDhRjkylHEg==} + engines: {node: '>=18'} + hasBin: true + esbuild@0.28.1: resolution: {integrity: sha512-HrJrvZv5ayxBzPfwphOoNzkzOIIlifzk0KJrGK2c8R4+LKpMtpYLQeUdjnwjWv/LZlkH2laZk+4w78pi99D4Vw==} engines: {node: '>=18'} @@ -1570,24 +1808,28 @@ packages: engines: {node: '>= 12.0.0'} cpu: [arm64] os: [linux] + libc: [glibc] lightningcss-linux-arm64-musl@1.32.0: resolution: {integrity: sha512-UpQkoenr4UJEzgVIYpI80lDFvRmPVg6oqboNHfoH4CQIfNA+HOrZ7Mo7KZP02dC6LjghPQJeBsvXhJod/wnIBg==} engines: {node: '>= 12.0.0'} cpu: [arm64] os: [linux] + libc: [musl] lightningcss-linux-x64-gnu@1.32.0: resolution: {integrity: sha512-V7Qr52IhZmdKPVr+Vtw8o+WLsQJYCTd8loIfpDaMRWGUZfBOYEJeyJIkqGIDMZPwPx24pUMfwSxxI8phr/MbOA==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [linux] + libc: [glibc] lightningcss-linux-x64-musl@1.32.0: resolution: {integrity: sha512-bYcLp+Vb0awsiXg/80uCRezCYHNg1/l3mt0gzHnWV9XP1W5sKa5/TCdGWaR/zBM2PeF/HbsQv/j2URNOiVuxWg==} engines: {node: '>= 12.0.0'} cpu: [x64] os: [linux] + libc: [musl] lightningcss-win32-arm64-msvc@1.32.0: resolution: {integrity: sha512-8SbC8BR40pS6baCM8sbtYDSwEVQd4JlFTOlaD3gWGHfThTcABnNDBda6eTZeqbofalIJhFx0qKzgHJmcPTnGdw==} @@ -1974,81 +2216,153 @@ snapshots: tslib: 2.8.1 optional: true + '@esbuild/aix-ppc64@0.23.1': + optional: true + '@esbuild/aix-ppc64@0.28.1': optional: true + '@esbuild/android-arm64@0.23.1': + optional: true + '@esbuild/android-arm64@0.28.1': optional: true + '@esbuild/android-arm@0.23.1': + optional: true + '@esbuild/android-arm@0.28.1': optional: true + '@esbuild/android-x64@0.23.1': + optional: true + '@esbuild/android-x64@0.28.1': optional: true + '@esbuild/darwin-arm64@0.23.1': + optional: true + '@esbuild/darwin-arm64@0.28.1': optional: true + '@esbuild/darwin-x64@0.23.1': + optional: true + '@esbuild/darwin-x64@0.28.1': optional: true + '@esbuild/freebsd-arm64@0.23.1': + optional: true + '@esbuild/freebsd-arm64@0.28.1': optional: true + '@esbuild/freebsd-x64@0.23.1': + optional: true + '@esbuild/freebsd-x64@0.28.1': optional: true + '@esbuild/linux-arm64@0.23.1': + optional: true + '@esbuild/linux-arm64@0.28.1': optional: true + '@esbuild/linux-arm@0.23.1': + optional: true + '@esbuild/linux-arm@0.28.1': optional: true + '@esbuild/linux-ia32@0.23.1': + optional: true + '@esbuild/linux-ia32@0.28.1': optional: true + '@esbuild/linux-loong64@0.23.1': + optional: true + '@esbuild/linux-loong64@0.28.1': optional: true + '@esbuild/linux-mips64el@0.23.1': + optional: true + '@esbuild/linux-mips64el@0.28.1': optional: true + '@esbuild/linux-ppc64@0.23.1': + optional: true + '@esbuild/linux-ppc64@0.28.1': optional: true + '@esbuild/linux-riscv64@0.23.1': + optional: true + '@esbuild/linux-riscv64@0.28.1': optional: true + '@esbuild/linux-s390x@0.23.1': + optional: true + '@esbuild/linux-s390x@0.28.1': optional: true + '@esbuild/linux-x64@0.23.1': + optional: true + '@esbuild/linux-x64@0.28.1': optional: true '@esbuild/netbsd-arm64@0.28.1': optional: true + '@esbuild/netbsd-x64@0.23.1': + optional: true + '@esbuild/netbsd-x64@0.28.1': optional: true + '@esbuild/openbsd-arm64@0.23.1': + optional: true + '@esbuild/openbsd-arm64@0.28.1': optional: true + '@esbuild/openbsd-x64@0.23.1': + optional: true + '@esbuild/openbsd-x64@0.28.1': optional: true '@esbuild/openharmony-arm64@0.28.1': optional: true + '@esbuild/sunos-x64@0.23.1': + optional: true + '@esbuild/sunos-x64@0.28.1': optional: true + '@esbuild/win32-arm64@0.23.1': + optional: true + '@esbuild/win32-arm64@0.28.1': optional: true + '@esbuild/win32-ia32@0.23.1': + optional: true + '@esbuild/win32-ia32@0.28.1': optional: true + '@esbuild/win32-x64@0.23.1': + optional: true + '@esbuild/win32-x64@0.28.1': optional: true @@ -2395,52 +2709,132 @@ snapshots: '@tauri-apps/api@2.11.0': {} - '@tauri-apps/cli-cef-darwin-arm64@3.0.0-alpha.6': + '@tauri-apps/cli-cef-darwin-arm64@3.0.0-alpha.26': optional: true - '@tauri-apps/cli-cef-darwin-x64@3.0.0-alpha.6': + '@tauri-apps/cli-cef-darwin-x64@3.0.0-alpha.26': optional: true - '@tauri-apps/cli-cef-linux-arm-gnueabihf@3.0.0-alpha.6': + '@tauri-apps/cli-cef-linux-arm-gnueabihf@3.0.0-alpha.26': optional: true - '@tauri-apps/cli-cef-linux-arm64-gnu@3.0.0-alpha.6': + '@tauri-apps/cli-cef-linux-arm64-gnu@3.0.0-alpha.26': optional: true - '@tauri-apps/cli-cef-linux-arm64-musl@3.0.0-alpha.6': + '@tauri-apps/cli-cef-linux-arm64-musl@3.0.0-alpha.26': optional: true - '@tauri-apps/cli-cef-linux-riscv64-gnu@3.0.0-alpha.6': + '@tauri-apps/cli-cef-linux-riscv64-gnu@3.0.0-alpha.26': optional: true - '@tauri-apps/cli-cef-linux-x64-gnu@3.0.0-alpha.6': + '@tauri-apps/cli-cef-linux-x64-gnu@3.0.0-alpha.26': optional: true - '@tauri-apps/cli-cef-linux-x64-musl@3.0.0-alpha.6': + '@tauri-apps/cli-cef-linux-x64-musl@3.0.0-alpha.26': optional: true - '@tauri-apps/cli-cef-win32-arm64-msvc@3.0.0-alpha.6': + '@tauri-apps/cli-cef-win32-arm64-msvc@3.0.0-alpha.26': optional: true - '@tauri-apps/cli-cef-win32-ia32-msvc@3.0.0-alpha.6': + '@tauri-apps/cli-cef-win32-ia32-msvc@3.0.0-alpha.26': optional: true - '@tauri-apps/cli-cef-win32-x64-msvc@3.0.0-alpha.6': + '@tauri-apps/cli-cef-win32-x64-msvc@3.0.0-alpha.26': optional: true - '@tauri-apps/cli-cef@3.0.0-alpha.6': + '@tauri-apps/cli-cef@3.0.0-alpha.26': optionalDependencies: - '@tauri-apps/cli-cef-darwin-arm64': 3.0.0-alpha.6 - '@tauri-apps/cli-cef-darwin-x64': 3.0.0-alpha.6 - '@tauri-apps/cli-cef-linux-arm-gnueabihf': 3.0.0-alpha.6 - '@tauri-apps/cli-cef-linux-arm64-gnu': 3.0.0-alpha.6 - '@tauri-apps/cli-cef-linux-arm64-musl': 3.0.0-alpha.6 - '@tauri-apps/cli-cef-linux-riscv64-gnu': 3.0.0-alpha.6 - '@tauri-apps/cli-cef-linux-x64-gnu': 3.0.0-alpha.6 - '@tauri-apps/cli-cef-linux-x64-musl': 3.0.0-alpha.6 - '@tauri-apps/cli-cef-win32-arm64-msvc': 3.0.0-alpha.6 - '@tauri-apps/cli-cef-win32-ia32-msvc': 3.0.0-alpha.6 - '@tauri-apps/cli-cef-win32-x64-msvc': 3.0.0-alpha.6 + '@tauri-apps/cli-cef-darwin-arm64': 3.0.0-alpha.26 + '@tauri-apps/cli-cef-darwin-x64': 3.0.0-alpha.26 + '@tauri-apps/cli-cef-linux-arm-gnueabihf': 3.0.0-alpha.26 + '@tauri-apps/cli-cef-linux-arm64-gnu': 3.0.0-alpha.26 + '@tauri-apps/cli-cef-linux-arm64-musl': 3.0.0-alpha.26 + '@tauri-apps/cli-cef-linux-riscv64-gnu': 3.0.0-alpha.26 + '@tauri-apps/cli-cef-linux-x64-gnu': 3.0.0-alpha.26 + '@tauri-apps/cli-cef-linux-x64-musl': 3.0.0-alpha.26 + '@tauri-apps/cli-cef-win32-arm64-msvc': 3.0.0-alpha.26 + '@tauri-apps/cli-cef-win32-ia32-msvc': 3.0.0-alpha.26 + '@tauri-apps/cli-cef-win32-x64-msvc': 3.0.0-alpha.26 + + '@tauri-apps/plugin-barcode-scanner@2.4.6': + dependencies: + '@tauri-apps/api': 2.11.0 + + '@tauri-apps/plugin-biometric@2.3.3': + dependencies: + '@tauri-apps/api': 2.11.0 + + '@tauri-apps/plugin-cli@2.4.1': + dependencies: + '@tauri-apps/api': 2.11.0 + + '@tauri-apps/plugin-clipboard-manager@2.3.3': + dependencies: + '@tauri-apps/api': 2.11.0 + + '@tauri-apps/plugin-deep-link@2.4.9': + dependencies: + '@tauri-apps/api': 2.11.0 + + '@tauri-apps/plugin-dialog@2.7.3': + dependencies: + '@tauri-apps/api': 2.11.0 + + '@tauri-apps/plugin-fs@2.5.2': + dependencies: + '@tauri-apps/api': 2.11.0 + + '@tauri-apps/plugin-geolocation@2.3.3': + dependencies: + '@tauri-apps/api': 2.11.0 + + '@tauri-apps/plugin-global-shortcut@2.3.2': + dependencies: + '@tauri-apps/api': 2.11.0 + + '@tauri-apps/plugin-haptics@2.3.3': + dependencies: + '@tauri-apps/api': 2.11.0 + + '@tauri-apps/plugin-http@2.6.0': + dependencies: + '@tauri-apps/api': 2.11.0 + + '@tauri-apps/plugin-nfc@2.3.6': + dependencies: + '@tauri-apps/api': 2.11.0 + + '@tauri-apps/plugin-notification@2.4.0': + dependencies: + '@tauri-apps/api': 2.11.0 + + '@tauri-apps/plugin-opener@2.5.5': + dependencies: + '@tauri-apps/api': 2.11.0 + + '@tauri-apps/plugin-os@2.3.2': + dependencies: + '@tauri-apps/api': 2.11.0 + + '@tauri-apps/plugin-process@2.3.1': + dependencies: + '@tauri-apps/api': 2.11.0 + + '@tauri-apps/plugin-shell@2.3.6': + dependencies: + '@tauri-apps/api': 2.11.0 + + '@tauri-apps/plugin-store@2.4.4': + dependencies: + '@tauri-apps/api': 2.11.0 + + '@tauri-apps/plugin-updater@2.11.0': + dependencies: + '@tauri-apps/api': 2.11.0 + + '@tauri-apps/plugin-upload@2.4.1': + dependencies: + '@tauri-apps/api': 2.11.0 '@tybys/wasm-util@0.10.2': dependencies: @@ -2758,6 +3152,34 @@ snapshots: duplexer@0.1.2: {} + esbuild@0.23.1: + optionalDependencies: + '@esbuild/aix-ppc64': 0.23.1 + '@esbuild/android-arm': 0.23.1 + '@esbuild/android-arm64': 0.23.1 + '@esbuild/android-x64': 0.23.1 + '@esbuild/darwin-arm64': 0.23.1 + '@esbuild/darwin-x64': 0.23.1 + '@esbuild/freebsd-arm64': 0.23.1 + '@esbuild/freebsd-x64': 0.23.1 + '@esbuild/linux-arm': 0.23.1 + '@esbuild/linux-arm64': 0.23.1 + '@esbuild/linux-ia32': 0.23.1 + '@esbuild/linux-loong64': 0.23.1 + '@esbuild/linux-mips64el': 0.23.1 + '@esbuild/linux-ppc64': 0.23.1 + '@esbuild/linux-riscv64': 0.23.1 + '@esbuild/linux-s390x': 0.23.1 + '@esbuild/linux-x64': 0.23.1 + '@esbuild/netbsd-x64': 0.23.1 + '@esbuild/openbsd-arm64': 0.23.1 + '@esbuild/openbsd-x64': 0.23.1 + '@esbuild/sunos-x64': 0.23.1 + '@esbuild/win32-arm64': 0.23.1 + '@esbuild/win32-ia32': 0.23.1 + '@esbuild/win32-x64': 0.23.1 + optional: true + esbuild@0.28.1: optionalDependencies: '@esbuild/aix-ppc64': 0.28.1 @@ -3296,7 +3718,7 @@ snapshots: tsx@4.19.2: dependencies: - esbuild: 0.28.1 + esbuild: 0.23.1 get-tsconfig: 4.14.0 optionalDependencies: fsevents: 2.3.3