chore(deps): update wry (#1278)

* chore(deps): update wry

* fix: clippy
This commit is contained in:
Lucas Fernandes Nogueira 2021-02-24 00:43:21 -03:00 committed by GitHub
parent 35c75b4197
commit 9f099912c1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
13 changed files with 477 additions and 547 deletions

View File

@ -67,13 +67,11 @@ async function invoke<T>(args: any): Promise<T> {
Reflect.deleteProperty(window, callback)
}, true)
window.__TAURI_INVOKE_HANDLER__(
JSON.stringify({
callback,
error,
...args
})
)
window.__TAURI_INVOKE_HANDLER__({
callback,
error,
...args
})
})
}

View File

@ -91,7 +91,7 @@ class WebviewWindowHandle {
return false
}
_emitTauriEvent(event: string): void { }
_emitTauriEvent(event: string): void {}
}
class WebviewWindow extends WebviewWindowHandle {

View File

@ -118,7 +118,17 @@ if (!String.prototype.startsWith) {
if (window.__TAURI_INVOKE_HANDLER__) {
window.__TAURI_INVOKE_HANDLER__(
JSON.stringify(
_objectSpread(
{
callback: callback,
error: error,
},
args
)
);
} else {
window.addEventListener("DOMContentLoaded", function () {
window.__TAURI_INVOKE_HANDLER__(
_objectSpread(
{
callback: callback,
@ -126,20 +136,6 @@ if (!String.prototype.startsWith) {
},
args
)
)
);
} else {
window.addEventListener("DOMContentLoaded", function () {
window.__TAURI_INVOKE_HANDLER__(
JSON.stringify(
_objectSpread(
{
callback: callback,
error: error,
},
args
)
)
);
});
}

View File

@ -136,11 +136,9 @@
})
setTimeout(function () {
window.__TAURI_INVOKE_HANDLER__(
JSON.stringify({
cmd: 'exit'
})
)
window.__TAURI_INVOKE_HANDLER__({
cmd: 'exit'
})
}, 15000)
</script>
</body>

View File

@ -32,7 +32,7 @@ thiserror = "1.0.23"
once_cell = "1.5.2"
tauri-api = { version = "0.7.5", path = "../tauri-api" }
tauri-macros = { version = "0.1", path = "../tauri-macros" }
wry = { git = "https://github.com/tauri-apps/wry", rev = "e6cc7f0825220a0117827b6f0a366f60ce7420ea" }
wry = { git = "https://github.com/tauri-apps/wry", rev = "e0b63d2d9179e4f79ff57affc59338372cefae8b" }
rand = "0.8"
[target."cfg(target_os = \"windows\")".dependencies]

View File

@ -258,7 +258,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b036167e76041694579972c28cf4877b4f92da222560ddb49008937b6a6727c"
dependencies = [
"log",
"nix",
"nix 0.18.0",
]
[[package]]
@ -374,16 +374,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]]
name = "const-sha1"
name = "com"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb58b6451e8c2a812ad979ed1d83378caa5e927eef2622017a45f251457c2c9d"
checksum = "5a30a2b2a013da986dc5cc3eda3d19c0d59d53f835be1b2356eb8d00f000c793"
dependencies = [
"com_macros",
]
[[package]]
name = "const_fn"
version = "0.4.5"
name = "com_macros"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6"
checksum = "7606b05842fea68ddcc89e8053b8860ebcb2a0ba8d6abfe3a148e5d5a8d3f0c1"
dependencies = [
"com_macros_support",
"proc-macro2",
"syn 1.0.60",
]
[[package]]
name = "com_macros_support"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97e9a6d20f4ac8830e309a455d7e9416e65c6af5a97c88c55fbb4c2012e107da"
dependencies = [
"proc-macro2",
"quote 1.0.9",
"syn 1.0.60",
]
[[package]]
name = "constant_time_eq"
@ -505,27 +524,28 @@ dependencies = [
[[package]]
name = "crossbeam-epoch"
version = "0.9.1"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d"
checksum = "d60ab4a8dba064f2fbb5aa270c28da5cf4bbd0e72dae1140a6b0353a779dbe00"
dependencies = [
"cfg-if 1.0.0",
"const_fn",
"crossbeam-utils",
"lazy_static",
"loom",
"memoffset",
"scopeguard",
]
[[package]]
name = "crossbeam-utils"
version = "0.8.1"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
checksum = "bae8f328835f8f5a6ceb6a7842a7f2d0c03692adb5c889347235d59194731fe3"
dependencies = [
"autocfg",
"cfg-if 1.0.0",
"lazy_static",
"loom",
]
[[package]]
@ -565,9 +585,9 @@ dependencies = [
[[package]]
name = "dbus"
version = "0.9.1"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b1334c0161ddfccd239ac81b188d62015b049c986c5cd0b7f9447cf2c54f4a3"
checksum = "f597e08dfa79b593f23bbfc7840b23b2c5aa2e3a98d8e68b67b5b9ff800dc0db"
dependencies = [
"libc",
"libdbus-sys",
@ -750,9 +770,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
[[package]]
name = "futures"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da9052a1a50244d8d5aa9bf55cbc2fb6f357c86cc52e46c62ed390a7180cf150"
checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1"
dependencies = [
"futures-channel",
"futures-core",
@ -765,9 +785,9 @@ dependencies = [
[[package]]
name = "futures-channel"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2d31b7ec7efab6eefc7c57233bb10b847986139d88cc2f5a02a1ae6871a1846"
checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939"
dependencies = [
"futures-core",
"futures-sink",
@ -775,15 +795,15 @@ dependencies = [
[[package]]
name = "futures-core"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79e5145dde8da7d1b3892dad07a9c98fc04bc39892b1ecc9692cf53e2b780a65"
checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94"
[[package]]
name = "futures-executor"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e9e59fdc009a4b3096bf94f740a0f2424c082521f20a9b08c5c07c48d90fd9b9"
checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1"
dependencies = [
"futures-core",
"futures-task",
@ -792,15 +812,15 @@ dependencies = [
[[package]]
name = "futures-io"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28be053525281ad8259d47e4de5de657b25e7bac113458555bb4b70bc6870500"
checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59"
[[package]]
name = "futures-macro"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c287d25add322d9f9abdcdc5927ca398917996600182178774032e9f8258fedd"
checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7"
dependencies = [
"proc-macro-hack",
"proc-macro2",
@ -810,24 +830,21 @@ dependencies = [
[[package]]
name = "futures-sink"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "caf5c69029bda2e743fddd0582d1083951d65cc9539aebf8812f36c3491342d6"
checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3"
[[package]]
name = "futures-task"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13de07eb8ea81ae445aca7b69f5f7bf15d7bf4912d8ca37d6645c77ae8a58d86"
dependencies = [
"once_cell",
]
checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80"
[[package]]
name = "futures-util"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "632a8cd0f2a4b3fdea1657f08bde063848c3bd00f9bbf6e256b8be78802e624b"
checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1"
dependencies = [
"futures-channel",
"futures-core",
@ -908,6 +925,19 @@ dependencies = [
"system-deps",
]
[[package]]
name = "generator"
version = "0.6.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9fed24fd1e18827652b4d55652899a1e9da8e54d91624dc3437a5bc3a9f9a9c"
dependencies = [
"cc",
"libc",
"log",
"rustversion",
"winapi 0.3.9",
]
[[package]]
name = "getrandom"
version = "0.1.16"
@ -1389,6 +1419,17 @@ dependencies = [
"cfg-if 1.0.0",
]
[[package]]
name = "loom"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d44c73b4636e497b4917eb21c33539efa3816741a2d3ff26c6316f1b529481a4"
dependencies = [
"cfg-if 1.0.0",
"generator",
"scoped-tls",
]
[[package]]
name = "mac-notification-sys"
version = "0.3.0"
@ -1502,9 +1543,9 @@ dependencies = [
[[package]]
name = "mio"
version = "0.7.8"
version = "0.7.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc250d6848c90d719ea2ce34546fb5df7af1d3fd189d10bf7bad80bfcebecd95"
checksum = "a5dede4e2065b3842b8b0af444119f3aa331cc7cc2dd20388bfb0f5d5a38823a"
dependencies = [
"libc",
"log",
@ -1633,6 +1674,18 @@ dependencies = [
"libc",
]
[[package]]
name = "nix"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
dependencies = [
"bitflags 1.2.1",
"cc",
"cfg-if 1.0.0",
"libc",
]
[[package]]
name = "nom"
version = "6.1.2"
@ -1773,9 +1826,9 @@ checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4"
[[package]]
name = "once_cell"
version = "1.5.2"
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
checksum = "4ad167a2f54e832b82dbe003a046280dceffe5227b5f79e08e363a29638cfddd"
[[package]]
name = "openssl"
@ -2326,6 +2379,12 @@ dependencies = [
"owned_ttf_parser",
]
[[package]]
name = "rustversion"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"
[[package]]
name = "ryu"
version = "1.0.5"
@ -2464,12 +2523,6 @@ dependencies = [
"serde",
]
[[package]]
name = "sha1"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
[[package]]
name = "siphasher"
version = "0.3.3"
@ -2501,7 +2554,7 @@ dependencies = [
"lazy_static",
"log",
"memmap2",
"nix",
"nix 0.18.0",
"wayland-client",
"wayland-cursor",
"wayland-protocols",
@ -2533,12 +2586,6 @@ dependencies = [
"system-deps",
]
[[package]]
name = "squote"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fccf17fd09e2455ea796d2ad267b64fa2c5cbd8701b2a93b555d2aa73449f7d"
[[package]]
name = "strsim"
version = "0.9.3"
@ -2899,7 +2946,7 @@ dependencies = [
"bytes",
"libc",
"memchr",
"mio 0.7.8",
"mio 0.7.9",
"num_cpus",
"pin-project-lite",
]
@ -2945,9 +2992,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
[[package]]
name = "tracing"
version = "0.1.24"
version = "0.1.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f77d3842f76ca899ff2dbcf231c5c65813dea431301d6eb686279c15c4464f12"
checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f"
dependencies = [
"cfg-if 1.0.0",
"pin-project-lite",
@ -3190,14 +3237,14 @@ checksum = "dd4945e4943ae02d15c13962b38a5b1e81eadd4b71214eee75af64a4d6a4fd64"
[[package]]
name = "wayland-client"
version = "0.28.3"
version = "0.28.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdbdbe01d03b2267809f3ed99495b37395387fde789e0f2ebb78e8b43f75b6d7"
checksum = "08a77fffb1b00e092274ecb3319217d63f9b886af3ec0d9d4fc8ad70be565816"
dependencies = [
"bitflags 1.2.1",
"downcast-rs",
"libc",
"nix",
"nix 0.20.0",
"scoped-tls",
"wayland-commons",
"wayland-scanner",
@ -3206,11 +3253,11 @@ dependencies = [
[[package]]
name = "wayland-commons"
version = "0.28.3"
version = "0.28.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "480450f76717edd64ad04a4426280d737fc3d10a236b982df7b1aee19f0e2d56"
checksum = "7ffbfeb84b9125a5ba01d1ac65ee326681e5586241b433dc47f7970963b7f1d8"
dependencies = [
"nix",
"nix 0.20.0",
"once_cell",
"smallvec",
"wayland-sys",
@ -3218,20 +3265,20 @@ dependencies = [
[[package]]
name = "wayland-cursor"
version = "0.28.3"
version = "0.28.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6eb122c160223a7660feeaf949d0100281d1279acaaed3720eb3c9894496e5f"
checksum = "ee1caa137e948346eae0c4c306382dd680d421b7113166c43d51f32b31d12c19"
dependencies = [
"nix",
"nix 0.20.0",
"wayland-client",
"xcursor",
]
[[package]]
name = "wayland-protocols"
version = "0.28.3"
version = "0.28.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "319a82b4d3054dd25acc32d9aee0f84fa95b63bc983fffe4703b6b8d47e01a30"
checksum = "6f800517a39484545a92be714715a40c526ff789659ea80e38d72e37a9d07a2c"
dependencies = [
"bitflags 1.2.1",
"wayland-client",
@ -3241,9 +3288,9 @@ dependencies = [
[[package]]
name = "wayland-scanner"
version = "0.28.3"
version = "0.28.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7010ba5767b3fcd350decc59055390b4ebe6bd1b9279a9feb1f1888987f1133d"
checksum = "0d16f991e1b85cf57c1703c2725a65e2c58b2f86e987559ae17f7d36b9b757eb"
dependencies = [
"proc-macro2",
"quote 1.0.9",
@ -3252,9 +3299,9 @@ dependencies = [
[[package]]
name = "wayland-sys"
version = "0.28.3"
version = "0.28.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6793834e0c35d11fd96a97297abe03d37be627e1847da52e17d7e0e3b51cc099"
checksum = "21b0ff7a7d7f0a540cb62e9e5ecb70dac2c8ce7e6e37d3d456817443aaee6ef3"
dependencies = [
"dlib",
"lazy_static",
@ -3326,6 +3373,29 @@ dependencies = [
"soup-sys",
]
[[package]]
name = "webview2"
version = "0.1.0-beta.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c0fa7367f4de0e4bca5730a297027f15d2e1f06227809efa47621eb55f08610"
dependencies = [
"com",
"once_cell",
"webview2-sys",
"widestring",
"winapi 0.3.9",
]
[[package]]
name = "webview2-sys"
version = "0.1.0-beta.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b53f9c920933ddff6481d525c3e0d14327843c82074c44522b97dcf6da5ad456"
dependencies = [
"com",
"winapi 0.3.9",
]
[[package]]
name = "weezl"
version = "0.1.4"
@ -3391,82 +3461,6 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8577253c781c3aa634017840854139a65a51de658fb61577e5c91e995ebdd18e"
dependencies = [
"const-sha1",
"windows_gen",
"windows_macros",
"windows_winmd",
]
[[package]]
name = "windows_gen"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de23e2765bf82678467efef4ccdeb150a2456b2b01688fbd7c86292c1c931ee7"
dependencies = [
"proc-macro2",
"quote 1.0.9",
"rayon",
"sha1",
"squote",
"syn 1.0.60",
"windows_gen_macros",
"windows_winmd",
]
[[package]]
name = "windows_gen_macros"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "878ecff0c53decca3851547869b5473081198cfe97405b14412be9283a05ae34"
dependencies = [
"proc-macro2",
"quote 1.0.9",
"syn 1.0.60",
]
[[package]]
name = "windows_macros"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aaedcc12658411370a43f9c194c40ed4bae0047c39e48ebf67e92d241a97f0c7"
dependencies = [
"proc-macro2",
"quote 1.0.9",
"rayon",
"squote",
"syn 1.0.60",
"windows_gen",
"windows_winmd",
]
[[package]]
name = "windows_winmd"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40a0769bcad04692eb69e92ff93ce49c89ca5aeda188e98f5cc9b8502b41d6c0"
dependencies = [
"serde",
"serde_json",
"windows_winmd_macros",
]
[[package]]
name = "windows_winmd_macros"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f67ec9020d1bbfeaa8847ababe33b8dc190d683624cd72a48a4a117de50d6559"
dependencies = [
"proc-macro2",
"quote 1.0.9",
"syn 1.0.60",
]
[[package]]
name = "winit"
version = "0.24.0"
@ -3527,9 +3521,9 @@ dependencies = [
[[package]]
name = "winrt-notification"
version = "0.2.3"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbb7be3ae1e636358057de917d0b41ce7612e27b2dec18cb0048abc52a10c6b1"
checksum = "57790eb281688a4682dab44df2a1ba8b78373233bd71cb291c3e75fecb1a01c4"
dependencies = [
"strum 0.8.0",
"strum_macros 0.8.0",
@ -3540,10 +3534,10 @@ dependencies = [
[[package]]
name = "wry"
version = "0.4.1"
source = "git+https://github.com/tauri-apps/wry?rev=e6cc7f0825220a0117827b6f0a366f60ce7420ea#e6cc7f0825220a0117827b6f0a366f60ce7420ea"
version = "0.5.1"
source = "git+https://github.com/tauri-apps/wry?rev=e0b63d2d9179e4f79ff57affc59338372cefae8b#e0b63d2d9179e4f79ff57affc59338372cefae8b"
dependencies = [
"cc",
"cairo-rs",
"cocoa",
"core-graphics 0.22.2",
"gdk",
@ -3553,6 +3547,7 @@ dependencies = [
"gtk",
"image",
"libc",
"mime_guess",
"objc",
"once_cell",
"serde",
@ -3560,7 +3555,8 @@ dependencies = [
"thiserror",
"url",
"webkit2gtk",
"windows",
"webview2",
"winapi 0.3.9",
"winit",
]

View File

@ -118,7 +118,17 @@ if (!String.prototype.startsWith) {
if (window.__TAURI_INVOKE_HANDLER__) {
window.__TAURI_INVOKE_HANDLER__(
JSON.stringify(
_objectSpread(
{
callback: callback,
error: error,
},
args
)
);
} else {
window.addEventListener("DOMContentLoaded", function () {
window.__TAURI_INVOKE_HANDLER__(
_objectSpread(
{
callback: callback,
@ -126,20 +136,6 @@ if (!String.prototype.startsWith) {
},
args
)
)
);
} else {
window.addEventListener("DOMContentLoaded", function () {
window.__TAURI_INVOKE_HANDLER__(
JSON.stringify(
_objectSpread(
{
callback: callback,
error: error,
},
args
)
)
);
});
}

View File

@ -237,7 +237,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b036167e76041694579972c28cf4877b4f92da222560ddb49008937b6a6727c"
dependencies = [
"log",
"nix",
"nix 0.18.0",
]
[[package]]
@ -321,10 +321,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]]
name = "const-sha1"
name = "com"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb58b6451e8c2a812ad979ed1d83378caa5e927eef2622017a45f251457c2c9d"
checksum = "5a30a2b2a013da986dc5cc3eda3d19c0d59d53f835be1b2356eb8d00f000c793"
dependencies = [
"com_macros",
]
[[package]]
name = "com_macros"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7606b05842fea68ddcc89e8053b8860ebcb2a0ba8d6abfe3a148e5d5a8d3f0c1"
dependencies = [
"com_macros_support",
"proc-macro2",
"syn 1.0.60",
]
[[package]]
name = "com_macros_support"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97e9a6d20f4ac8830e309a455d7e9416e65c6af5a97c88c55fbb4c2012e107da"
dependencies = [
"proc-macro2",
"quote 1.0.9",
"syn 1.0.60",
]
[[package]]
name = "constant_time_eq"
@ -507,9 +532,9 @@ dependencies = [
[[package]]
name = "dbus"
version = "0.9.1"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b1334c0161ddfccd239ac81b188d62015b049c986c5cd0b7f9447cf2c54f4a3"
checksum = "f597e08dfa79b593f23bbfc7840b23b2c5aa2e3a98d8e68b67b5b9ff800dc0db"
dependencies = [
"libc",
"libdbus-sys",
@ -692,9 +717,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
[[package]]
name = "futures"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da9052a1a50244d8d5aa9bf55cbc2fb6f357c86cc52e46c62ed390a7180cf150"
checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1"
dependencies = [
"futures-channel",
"futures-core",
@ -707,9 +732,9 @@ dependencies = [
[[package]]
name = "futures-channel"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2d31b7ec7efab6eefc7c57233bb10b847986139d88cc2f5a02a1ae6871a1846"
checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939"
dependencies = [
"futures-core",
"futures-sink",
@ -717,15 +742,15 @@ dependencies = [
[[package]]
name = "futures-core"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79e5145dde8da7d1b3892dad07a9c98fc04bc39892b1ecc9692cf53e2b780a65"
checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94"
[[package]]
name = "futures-executor"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e9e59fdc009a4b3096bf94f740a0f2424c082521f20a9b08c5c07c48d90fd9b9"
checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1"
dependencies = [
"futures-core",
"futures-task",
@ -734,15 +759,15 @@ dependencies = [
[[package]]
name = "futures-io"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28be053525281ad8259d47e4de5de657b25e7bac113458555bb4b70bc6870500"
checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59"
[[package]]
name = "futures-macro"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c287d25add322d9f9abdcdc5927ca398917996600182178774032e9f8258fedd"
checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7"
dependencies = [
"proc-macro-hack",
"proc-macro2",
@ -752,24 +777,21 @@ dependencies = [
[[package]]
name = "futures-sink"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "caf5c69029bda2e743fddd0582d1083951d65cc9539aebf8812f36c3491342d6"
checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3"
[[package]]
name = "futures-task"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13de07eb8ea81ae445aca7b69f5f7bf15d7bf4912d8ca37d6645c77ae8a58d86"
dependencies = [
"once_cell",
]
checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80"
[[package]]
name = "futures-util"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "632a8cd0f2a4b3fdea1657f08bde063848c3bd00f9bbf6e256b8be78802e624b"
checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1"
dependencies = [
"futures-channel",
"futures-core",
@ -852,14 +874,14 @@ dependencies = [
[[package]]
name = "generator"
version = "0.6.23"
version = "0.6.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8cdc09201b2e8ca1b19290cf7e65de2246b8e91fb6874279722189c4de7b94dc"
checksum = "a9fed24fd1e18827652b4d55652899a1e9da8e54d91624dc3437a5bc3a9f9a9c"
dependencies = [
"cc",
"libc",
"log",
"rustc_version",
"rustversion",
"winapi 0.3.9",
]
@ -1478,9 +1500,9 @@ dependencies = [
[[package]]
name = "mio"
version = "0.7.8"
version = "0.7.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc250d6848c90d719ea2ce34546fb5df7af1d3fd189d10bf7bad80bfcebecd95"
checksum = "a5dede4e2065b3842b8b0af444119f3aa331cc7cc2dd20388bfb0f5d5a38823a"
dependencies = [
"libc",
"log",
@ -1609,6 +1631,18 @@ dependencies = [
"libc",
]
[[package]]
name = "nix"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
dependencies = [
"bitflags 1.2.1",
"cc",
"cfg-if 1.0.0",
"libc",
]
[[package]]
name = "nom"
version = "6.1.2"
@ -1749,9 +1783,9 @@ checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4"
[[package]]
name = "once_cell"
version = "1.5.2"
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
checksum = "4ad167a2f54e832b82dbe003a046280dceffe5227b5f79e08e363a29638cfddd"
[[package]]
name = "openssl"
@ -2286,15 +2320,6 @@ version = "0.1.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e3bad0ee36814ca07d7968269dd4b7ec89ec2da10c4bb613928d3077083c232"
[[package]]
name = "rustc_version"
version = "0.2.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a"
dependencies = [
"semver 0.9.0",
]
[[package]]
name = "rusttype"
version = "0.9.2"
@ -2305,6 +2330,12 @@ dependencies = [
"owned_ttf_parser",
]
[[package]]
name = "rustversion"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"
[[package]]
name = "ryu"
version = "1.0.5"
@ -2371,30 +2402,15 @@ dependencies = [
"libc",
]
[[package]]
name = "semver"
version = "0.9.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403"
dependencies = [
"semver-parser 0.7.0",
]
[[package]]
name = "semver"
version = "0.11.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f301af10236f6df4160f7c3f04eec6dbc70ace82d23326abad5edee88801c6b6"
dependencies = [
"semver-parser 0.10.2",
"semver-parser",
]
[[package]]
name = "semver-parser"
version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
[[package]]
name = "semver-parser"
version = "0.10.2"
@ -2458,12 +2474,6 @@ dependencies = [
"serde",
]
[[package]]
name = "sha1"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
[[package]]
name = "siphasher"
version = "0.3.3"
@ -2495,7 +2505,7 @@ dependencies = [
"lazy_static",
"log",
"memmap2",
"nix",
"nix 0.18.0",
"wayland-client",
"wayland-cursor",
"wayland-protocols",
@ -2527,12 +2537,6 @@ dependencies = [
"system-deps",
]
[[package]]
name = "squote"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fccf17fd09e2455ea796d2ad267b64fa2c5cbd8701b2a93b555d2aa73449f7d"
[[package]]
name = "strsim"
version = "0.9.3"
@ -2701,7 +2705,7 @@ dependencies = [
"rand 0.8.3",
"reqwest",
"rfd",
"semver 0.11.0",
"semver",
"serde",
"serde_json",
"serde_repr",
@ -2868,7 +2872,7 @@ dependencies = [
"bytes",
"libc",
"memchr",
"mio 0.7.8",
"mio 0.7.9",
"num_cpus",
"pin-project-lite",
]
@ -2914,9 +2918,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
[[package]]
name = "tracing"
version = "0.1.24"
version = "0.1.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f77d3842f76ca899ff2dbcf231c5c65813dea431301d6eb686279c15c4464f12"
checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f"
dependencies = [
"cfg-if 1.0.0",
"pin-project-lite",
@ -3147,14 +3151,14 @@ checksum = "dd4945e4943ae02d15c13962b38a5b1e81eadd4b71214eee75af64a4d6a4fd64"
[[package]]
name = "wayland-client"
version = "0.28.3"
version = "0.28.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdbdbe01d03b2267809f3ed99495b37395387fde789e0f2ebb78e8b43f75b6d7"
checksum = "08a77fffb1b00e092274ecb3319217d63f9b886af3ec0d9d4fc8ad70be565816"
dependencies = [
"bitflags 1.2.1",
"downcast-rs",
"libc",
"nix",
"nix 0.20.0",
"scoped-tls",
"wayland-commons",
"wayland-scanner",
@ -3163,11 +3167,11 @@ dependencies = [
[[package]]
name = "wayland-commons"
version = "0.28.3"
version = "0.28.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "480450f76717edd64ad04a4426280d737fc3d10a236b982df7b1aee19f0e2d56"
checksum = "7ffbfeb84b9125a5ba01d1ac65ee326681e5586241b433dc47f7970963b7f1d8"
dependencies = [
"nix",
"nix 0.20.0",
"once_cell",
"smallvec",
"wayland-sys",
@ -3175,20 +3179,20 @@ dependencies = [
[[package]]
name = "wayland-cursor"
version = "0.28.3"
version = "0.28.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6eb122c160223a7660feeaf949d0100281d1279acaaed3720eb3c9894496e5f"
checksum = "ee1caa137e948346eae0c4c306382dd680d421b7113166c43d51f32b31d12c19"
dependencies = [
"nix",
"nix 0.20.0",
"wayland-client",
"xcursor",
]
[[package]]
name = "wayland-protocols"
version = "0.28.3"
version = "0.28.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "319a82b4d3054dd25acc32d9aee0f84fa95b63bc983fffe4703b6b8d47e01a30"
checksum = "6f800517a39484545a92be714715a40c526ff789659ea80e38d72e37a9d07a2c"
dependencies = [
"bitflags 1.2.1",
"wayland-client",
@ -3198,9 +3202,9 @@ dependencies = [
[[package]]
name = "wayland-scanner"
version = "0.28.3"
version = "0.28.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7010ba5767b3fcd350decc59055390b4ebe6bd1b9279a9feb1f1888987f1133d"
checksum = "0d16f991e1b85cf57c1703c2725a65e2c58b2f86e987559ae17f7d36b9b757eb"
dependencies = [
"proc-macro2",
"quote 1.0.9",
@ -3209,9 +3213,9 @@ dependencies = [
[[package]]
name = "wayland-sys"
version = "0.28.3"
version = "0.28.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6793834e0c35d11fd96a97297abe03d37be627e1847da52e17d7e0e3b51cc099"
checksum = "21b0ff7a7d7f0a540cb62e9e5ecb70dac2c8ce7e6e37d3d456817443aaee6ef3"
dependencies = [
"dlib",
"lazy_static",
@ -3283,6 +3287,29 @@ dependencies = [
"soup-sys",
]
[[package]]
name = "webview2"
version = "0.1.0-beta.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c0fa7367f4de0e4bca5730a297027f15d2e1f06227809efa47621eb55f08610"
dependencies = [
"com",
"once_cell",
"webview2-sys",
"widestring",
"winapi 0.3.9",
]
[[package]]
name = "webview2-sys"
version = "0.1.0-beta.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b53f9c920933ddff6481d525c3e0d14327843c82074c44522b97dcf6da5ad456"
dependencies = [
"com",
"winapi 0.3.9",
]
[[package]]
name = "weezl"
version = "0.1.4"
@ -3348,82 +3375,6 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8577253c781c3aa634017840854139a65a51de658fb61577e5c91e995ebdd18e"
dependencies = [
"const-sha1",
"windows_gen",
"windows_macros",
"windows_winmd",
]
[[package]]
name = "windows_gen"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de23e2765bf82678467efef4ccdeb150a2456b2b01688fbd7c86292c1c931ee7"
dependencies = [
"proc-macro2",
"quote 1.0.9",
"rayon",
"sha1",
"squote",
"syn 1.0.60",
"windows_gen_macros",
"windows_winmd",
]
[[package]]
name = "windows_gen_macros"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "878ecff0c53decca3851547869b5473081198cfe97405b14412be9283a05ae34"
dependencies = [
"proc-macro2",
"quote 1.0.9",
"syn 1.0.60",
]
[[package]]
name = "windows_macros"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aaedcc12658411370a43f9c194c40ed4bae0047c39e48ebf67e92d241a97f0c7"
dependencies = [
"proc-macro2",
"quote 1.0.9",
"rayon",
"squote",
"syn 1.0.60",
"windows_gen",
"windows_winmd",
]
[[package]]
name = "windows_winmd"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40a0769bcad04692eb69e92ff93ce49c89ca5aeda188e98f5cc9b8502b41d6c0"
dependencies = [
"serde",
"serde_json",
"windows_winmd_macros",
]
[[package]]
name = "windows_winmd_macros"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f67ec9020d1bbfeaa8847ababe33b8dc190d683624cd72a48a4a117de50d6559"
dependencies = [
"proc-macro2",
"quote 1.0.9",
"syn 1.0.60",
]
[[package]]
name = "winit"
version = "0.24.0"
@ -3484,9 +3435,9 @@ dependencies = [
[[package]]
name = "winrt-notification"
version = "0.2.3"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbb7be3ae1e636358057de917d0b41ce7612e27b2dec18cb0048abc52a10c6b1"
checksum = "57790eb281688a4682dab44df2a1ba8b78373233bd71cb291c3e75fecb1a01c4"
dependencies = [
"strum 0.8.0",
"strum_macros 0.8.0",
@ -3497,10 +3448,10 @@ dependencies = [
[[package]]
name = "wry"
version = "0.4.1"
source = "git+https://github.com/tauri-apps/wry?rev=e6cc7f0825220a0117827b6f0a366f60ce7420ea#e6cc7f0825220a0117827b6f0a366f60ce7420ea"
version = "0.5.1"
source = "git+https://github.com/tauri-apps/wry?rev=e0b63d2d9179e4f79ff57affc59338372cefae8b#e0b63d2d9179e4f79ff57affc59338372cefae8b"
dependencies = [
"cc",
"cairo-rs",
"cocoa",
"core-graphics 0.22.2",
"gdk",
@ -3510,6 +3461,7 @@ dependencies = [
"gtk",
"image",
"libc",
"mime_guess",
"objc",
"once_cell",
"serde",
@ -3517,7 +3469,8 @@ dependencies = [
"thiserror",
"url",
"webkit2gtk",
"windows",
"webview2",
"winapi 0.3.9",
"winit",
]

File diff suppressed because one or more lines are too long

View File

@ -245,7 +245,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0b036167e76041694579972c28cf4877b4f92da222560ddb49008937b6a6727c"
dependencies = [
"log",
"nix",
"nix 0.18.0",
]
[[package]]
@ -329,16 +329,35 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b"
[[package]]
name = "const-sha1"
name = "com"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fb58b6451e8c2a812ad979ed1d83378caa5e927eef2622017a45f251457c2c9d"
checksum = "5a30a2b2a013da986dc5cc3eda3d19c0d59d53f835be1b2356eb8d00f000c793"
dependencies = [
"com_macros",
]
[[package]]
name = "const_fn"
version = "0.4.5"
name = "com_macros"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28b9d6de7f49e22cf97ad17fc4036ece69300032f45f78f30b4a4482cdc3f4a6"
checksum = "7606b05842fea68ddcc89e8053b8860ebcb2a0ba8d6abfe3a148e5d5a8d3f0c1"
dependencies = [
"com_macros_support",
"proc-macro2",
"syn 1.0.60",
]
[[package]]
name = "com_macros_support"
version = "0.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "97e9a6d20f4ac8830e309a455d7e9416e65c6af5a97c88c55fbb4c2012e107da"
dependencies = [
"proc-macro2",
"quote 1.0.9",
"syn 1.0.60",
]
[[package]]
name = "constant_time_eq"
@ -460,27 +479,28 @@ dependencies = [
[[package]]
name = "crossbeam-epoch"
version = "0.9.1"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a1aaa739f95311c2c7887a76863f500026092fb1dce0161dab577e559ef3569d"
checksum = "d60ab4a8dba064f2fbb5aa270c28da5cf4bbd0e72dae1140a6b0353a779dbe00"
dependencies = [
"cfg-if 1.0.0",
"const_fn",
"crossbeam-utils",
"lazy_static",
"loom",
"memoffset",
"scopeguard",
]
[[package]]
name = "crossbeam-utils"
version = "0.8.1"
version = "0.8.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "02d96d1e189ef58269ebe5b97953da3274d83a93af647c2ddd6f9dab28cedb8d"
checksum = "bae8f328835f8f5a6ceb6a7842a7f2d0c03692adb5c889347235d59194731fe3"
dependencies = [
"autocfg",
"cfg-if 1.0.0",
"lazy_static",
"loom",
]
[[package]]
@ -520,9 +540,9 @@ dependencies = [
[[package]]
name = "dbus"
version = "0.9.1"
version = "0.9.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b1334c0161ddfccd239ac81b188d62015b049c986c5cd0b7f9447cf2c54f4a3"
checksum = "f597e08dfa79b593f23bbfc7840b23b2c5aa2e3a98d8e68b67b5b9ff800dc0db"
dependencies = [
"libc",
"libdbus-sys",
@ -705,9 +725,9 @@ checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
[[package]]
name = "futures"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "da9052a1a50244d8d5aa9bf55cbc2fb6f357c86cc52e46c62ed390a7180cf150"
checksum = "7f55667319111d593ba876406af7c409c0ebb44dc4be6132a783ccf163ea14c1"
dependencies = [
"futures-channel",
"futures-core",
@ -720,9 +740,9 @@ dependencies = [
[[package]]
name = "futures-channel"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f2d31b7ec7efab6eefc7c57233bb10b847986139d88cc2f5a02a1ae6871a1846"
checksum = "8c2dd2df839b57db9ab69c2c9d8f3e8c81984781937fe2807dc6dcf3b2ad2939"
dependencies = [
"futures-core",
"futures-sink",
@ -730,15 +750,15 @@ dependencies = [
[[package]]
name = "futures-core"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "79e5145dde8da7d1b3892dad07a9c98fc04bc39892b1ecc9692cf53e2b780a65"
checksum = "15496a72fabf0e62bdc3df11a59a3787429221dd0710ba8ef163d6f7a9112c94"
[[package]]
name = "futures-executor"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e9e59fdc009a4b3096bf94f740a0f2424c082521f20a9b08c5c07c48d90fd9b9"
checksum = "891a4b7b96d84d5940084b2a37632dd65deeae662c114ceaa2c879629c9c0ad1"
dependencies = [
"futures-core",
"futures-task",
@ -747,15 +767,15 @@ dependencies = [
[[package]]
name = "futures-io"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "28be053525281ad8259d47e4de5de657b25e7bac113458555bb4b70bc6870500"
checksum = "d71c2c65c57704c32f5241c1223167c2c3294fd34ac020c807ddbe6db287ba59"
[[package]]
name = "futures-macro"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c287d25add322d9f9abdcdc5927ca398917996600182178774032e9f8258fedd"
checksum = "ea405816a5139fb39af82c2beb921d52143f556038378d6db21183a5c37fbfb7"
dependencies = [
"proc-macro-hack",
"proc-macro2",
@ -765,24 +785,21 @@ dependencies = [
[[package]]
name = "futures-sink"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "caf5c69029bda2e743fddd0582d1083951d65cc9539aebf8812f36c3491342d6"
checksum = "85754d98985841b7d4f5e8e6fbfa4a4ac847916893ec511a2917ccd8525b8bb3"
[[package]]
name = "futures-task"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13de07eb8ea81ae445aca7b69f5f7bf15d7bf4912d8ca37d6645c77ae8a58d86"
dependencies = [
"once_cell",
]
checksum = "fa189ef211c15ee602667a6fcfe1c1fd9e07d42250d2156382820fba33c9df80"
[[package]]
name = "futures-util"
version = "0.3.12"
version = "0.3.13"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "632a8cd0f2a4b3fdea1657f08bde063848c3bd00f9bbf6e256b8be78802e624b"
checksum = "1812c7ab8aedf8d6f2701a43e1243acdbcc2b36ab26e2ad421eb99ac963d96d1"
dependencies = [
"futures-channel",
"futures-core",
@ -863,6 +880,19 @@ dependencies = [
"system-deps",
]
[[package]]
name = "generator"
version = "0.6.24"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a9fed24fd1e18827652b4d55652899a1e9da8e54d91624dc3437a5bc3a9f9a9c"
dependencies = [
"cc",
"libc",
"log",
"rustversion",
"winapi 0.3.9",
]
[[package]]
name = "getrandom"
version = "0.1.16"
@ -1344,6 +1374,17 @@ dependencies = [
"cfg-if 1.0.0",
]
[[package]]
name = "loom"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d44c73b4636e497b4917eb21c33539efa3816741a2d3ff26c6316f1b529481a4"
dependencies = [
"cfg-if 1.0.0",
"generator",
"scoped-tls",
]
[[package]]
name = "mac-notification-sys"
version = "0.3.0"
@ -1457,9 +1498,9 @@ dependencies = [
[[package]]
name = "mio"
version = "0.7.8"
version = "0.7.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dc250d6848c90d719ea2ce34546fb5df7af1d3fd189d10bf7bad80bfcebecd95"
checksum = "a5dede4e2065b3842b8b0af444119f3aa331cc7cc2dd20388bfb0f5d5a38823a"
dependencies = [
"libc",
"log",
@ -1588,6 +1629,18 @@ dependencies = [
"libc",
]
[[package]]
name = "nix"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fa9b4819da1bc61c0ea48b63b7bc8604064dd43013e7cc325df098d49cd7c18a"
dependencies = [
"bitflags 1.2.1",
"cc",
"cfg-if 1.0.0",
"libc",
]
[[package]]
name = "nom"
version = "6.1.2"
@ -1728,9 +1781,9 @@ checksum = "a9a7ab5d64814df0fe4a4b5ead45ed6c5f181ee3ff04ba344313a6c80446c5d4"
[[package]]
name = "once_cell"
version = "1.5.2"
version = "1.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "13bd41f508810a131401606d54ac32a467c97172d74ba7662562ebba5ad07fa0"
checksum = "4ad167a2f54e832b82dbe003a046280dceffe5227b5f79e08e363a29638cfddd"
[[package]]
name = "openssl"
@ -2275,6 +2328,12 @@ dependencies = [
"owned_ttf_parser",
]
[[package]]
name = "rustversion"
version = "1.0.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cb5d2a036dc6d2d8fd16fde3498b04306e29bd193bf306a57427019b823d5acd"
[[package]]
name = "ryu"
version = "1.0.5"
@ -2413,12 +2472,6 @@ dependencies = [
"serde",
]
[[package]]
name = "sha1"
version = "0.6.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "2579985fda508104f7587689507983eadd6a6e84dd35d6d115361f530916fa0d"
[[package]]
name = "siphasher"
version = "0.3.3"
@ -2450,7 +2503,7 @@ dependencies = [
"lazy_static",
"log",
"memmap2",
"nix",
"nix 0.18.0",
"wayland-client",
"wayland-cursor",
"wayland-protocols",
@ -2482,12 +2535,6 @@ dependencies = [
"system-deps",
]
[[package]]
name = "squote"
version = "0.1.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1fccf17fd09e2455ea796d2ad267b64fa2c5cbd8701b2a93b555d2aa73449f7d"
[[package]]
name = "strsim"
version = "0.9.3"
@ -2823,7 +2870,7 @@ dependencies = [
"bytes",
"libc",
"memchr",
"mio 0.7.8",
"mio 0.7.9",
"num_cpus",
"pin-project-lite",
]
@ -2869,9 +2916,9 @@ checksum = "360dfd1d6d30e05fda32ace2c8c70e9c0a9da713275777f5a4dbb8a1893930c6"
[[package]]
name = "tracing"
version = "0.1.24"
version = "0.1.25"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f77d3842f76ca899ff2dbcf231c5c65813dea431301d6eb686279c15c4464f12"
checksum = "01ebdc2bb4498ab1ab5f5b73c5803825e60199229ccba0698170e3be0e7f959f"
dependencies = [
"cfg-if 1.0.0",
"pin-project-lite",
@ -3102,14 +3149,14 @@ checksum = "dd4945e4943ae02d15c13962b38a5b1e81eadd4b71214eee75af64a4d6a4fd64"
[[package]]
name = "wayland-client"
version = "0.28.3"
version = "0.28.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bdbdbe01d03b2267809f3ed99495b37395387fde789e0f2ebb78e8b43f75b6d7"
checksum = "08a77fffb1b00e092274ecb3319217d63f9b886af3ec0d9d4fc8ad70be565816"
dependencies = [
"bitflags 1.2.1",
"downcast-rs",
"libc",
"nix",
"nix 0.20.0",
"scoped-tls",
"wayland-commons",
"wayland-scanner",
@ -3118,11 +3165,11 @@ dependencies = [
[[package]]
name = "wayland-commons"
version = "0.28.3"
version = "0.28.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "480450f76717edd64ad04a4426280d737fc3d10a236b982df7b1aee19f0e2d56"
checksum = "7ffbfeb84b9125a5ba01d1ac65ee326681e5586241b433dc47f7970963b7f1d8"
dependencies = [
"nix",
"nix 0.20.0",
"once_cell",
"smallvec",
"wayland-sys",
@ -3130,20 +3177,20 @@ dependencies = [
[[package]]
name = "wayland-cursor"
version = "0.28.3"
version = "0.28.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6eb122c160223a7660feeaf949d0100281d1279acaaed3720eb3c9894496e5f"
checksum = "ee1caa137e948346eae0c4c306382dd680d421b7113166c43d51f32b31d12c19"
dependencies = [
"nix",
"nix 0.20.0",
"wayland-client",
"xcursor",
]
[[package]]
name = "wayland-protocols"
version = "0.28.3"
version = "0.28.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "319a82b4d3054dd25acc32d9aee0f84fa95b63bc983fffe4703b6b8d47e01a30"
checksum = "6f800517a39484545a92be714715a40c526ff789659ea80e38d72e37a9d07a2c"
dependencies = [
"bitflags 1.2.1",
"wayland-client",
@ -3153,9 +3200,9 @@ dependencies = [
[[package]]
name = "wayland-scanner"
version = "0.28.3"
version = "0.28.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7010ba5767b3fcd350decc59055390b4ebe6bd1b9279a9feb1f1888987f1133d"
checksum = "0d16f991e1b85cf57c1703c2725a65e2c58b2f86e987559ae17f7d36b9b757eb"
dependencies = [
"proc-macro2",
"quote 1.0.9",
@ -3164,9 +3211,9 @@ dependencies = [
[[package]]
name = "wayland-sys"
version = "0.28.3"
version = "0.28.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6793834e0c35d11fd96a97297abe03d37be627e1847da52e17d7e0e3b51cc099"
checksum = "21b0ff7a7d7f0a540cb62e9e5ecb70dac2c8ce7e6e37d3d456817443aaee6ef3"
dependencies = [
"dlib",
"lazy_static",
@ -3238,6 +3285,29 @@ dependencies = [
"soup-sys",
]
[[package]]
name = "webview2"
version = "0.1.0-beta.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6c0fa7367f4de0e4bca5730a297027f15d2e1f06227809efa47621eb55f08610"
dependencies = [
"com",
"once_cell",
"webview2-sys",
"widestring",
"winapi 0.3.9",
]
[[package]]
name = "webview2-sys"
version = "0.1.0-beta.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b53f9c920933ddff6481d525c3e0d14327843c82074c44522b97dcf6da5ad456"
dependencies = [
"com",
"winapi 0.3.9",
]
[[package]]
name = "weezl"
version = "0.1.4"
@ -3303,82 +3373,6 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
[[package]]
name = "windows"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8577253c781c3aa634017840854139a65a51de658fb61577e5c91e995ebdd18e"
dependencies = [
"const-sha1",
"windows_gen",
"windows_macros",
"windows_winmd",
]
[[package]]
name = "windows_gen"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "de23e2765bf82678467efef4ccdeb150a2456b2b01688fbd7c86292c1c931ee7"
dependencies = [
"proc-macro2",
"quote 1.0.9",
"rayon",
"sha1",
"squote",
"syn 1.0.60",
"windows_gen_macros",
"windows_winmd",
]
[[package]]
name = "windows_gen_macros"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "878ecff0c53decca3851547869b5473081198cfe97405b14412be9283a05ae34"
dependencies = [
"proc-macro2",
"quote 1.0.9",
"syn 1.0.60",
]
[[package]]
name = "windows_macros"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "aaedcc12658411370a43f9c194c40ed4bae0047c39e48ebf67e92d241a97f0c7"
dependencies = [
"proc-macro2",
"quote 1.0.9",
"rayon",
"squote",
"syn 1.0.60",
"windows_gen",
"windows_winmd",
]
[[package]]
name = "windows_winmd"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40a0769bcad04692eb69e92ff93ce49c89ca5aeda188e98f5cc9b8502b41d6c0"
dependencies = [
"serde",
"serde_json",
"windows_winmd_macros",
]
[[package]]
name = "windows_winmd_macros"
version = "0.2.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f67ec9020d1bbfeaa8847ababe33b8dc190d683624cd72a48a4a117de50d6559"
dependencies = [
"proc-macro2",
"quote 1.0.9",
"syn 1.0.60",
]
[[package]]
name = "winit"
version = "0.24.0"
@ -3439,9 +3433,9 @@ dependencies = [
[[package]]
name = "winrt-notification"
version = "0.2.3"
version = "0.2.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dbb7be3ae1e636358057de917d0b41ce7612e27b2dec18cb0048abc52a10c6b1"
checksum = "57790eb281688a4682dab44df2a1ba8b78373233bd71cb291c3e75fecb1a01c4"
dependencies = [
"strum 0.8.0",
"strum_macros 0.8.0",
@ -3452,10 +3446,10 @@ dependencies = [
[[package]]
name = "wry"
version = "0.4.1"
source = "git+https://github.com/tauri-apps/wry?rev=e6cc7f0825220a0117827b6f0a366f60ce7420ea#e6cc7f0825220a0117827b6f0a366f60ce7420ea"
version = "0.5.1"
source = "git+https://github.com/tauri-apps/wry?rev=e0b63d2d9179e4f79ff57affc59338372cefae8b#e0b63d2d9179e4f79ff57affc59338372cefae8b"
dependencies = [
"cc",
"cairo-rs",
"cocoa",
"core-graphics 0.22.2",
"gdk",
@ -3465,6 +3459,7 @@ dependencies = [
"gtk",
"image",
"libc",
"mime_guess",
"objc",
"once_cell",
"serde",
@ -3472,7 +3467,8 @@ dependencies = [
"thiserror",
"url",
"webkit2gtk",
"windows",
"webview2",
"winapi 0.3.9",
"winit",
]

View File

@ -277,10 +277,10 @@ pub(super) fn build_webview<A: ApplicationExt + 'static>(
let webview_manager_ = webview_manager.clone();
let tauri_invoke_handler = crate::Callback::<A::Dispatcher> {
name: "__TAURI_INVOKE_HANDLER__".to_string(),
function: Box::new(move |_, _, arg| {
let arg = arg.into_iter().next().unwrap_or_else(String::new);
function: Box::new(move |_, arg| {
let arg = arg.into_iter().next().unwrap_or(JsonValue::Null);
let webview_manager = webview_manager_.clone();
match serde_json::from_str::<Message>(&arg) {
match serde_json::from_value::<Message>(arg) {
Ok(message) => {
let application = application.clone();
let callback = message.callback.to_string();
@ -320,7 +320,6 @@ pub(super) fn build_webview<A: ApplicationExt + 'static>(
}
}
}
0
}),
};
(webview_builder, vec![tauri_invoke_handler])

View File

@ -2,6 +2,8 @@ pub mod wry;
use crate::plugin::PluginStore;
use serde_json::Value as JsonValue;
/// A icon definition.
pub enum Icon {
/// Icon from file path.
@ -162,7 +164,7 @@ pub struct Callback<D> {
/// Function name to bind.
pub name: String,
/// Function callback handler.
pub function: Box<dyn FnMut(D, i32, Vec<String>) -> i32 + Send>,
pub function: Box<dyn FnMut(D, Vec<JsonValue>) + Send>,
}
/// Webview dispatcher. A thread-safe handle to the webview API.

View File

@ -197,12 +197,12 @@ impl ApplicationDispatcherExt for WryDispatcher {
let app_dispatcher = app_dispatcher.clone();
let callback = wry::Callback {
name: callback.name.to_string(),
function: Box::new(move |dispatcher, seq, req| {
function: Box::new(move |dispatcher, _, req| {
(callback.function)(
Self(Arc::new(Mutex::new(dispatcher)), app_dispatcher.clone()),
seq,
req,
)
);
Ok(())
}),
};
wry_callbacks.push(callback);
@ -212,7 +212,7 @@ impl ApplicationDispatcherExt for WryDispatcher {
.1
.lock()
.unwrap()
.add_window(attributes, Some(wry_callbacks))
.add_window(attributes, Some(wry_callbacks), None)
.map_err(|_| crate::Error::FailedToSendMessage)?;
Ok(Self(
Arc::new(Mutex::new(window_dispatcher)),
@ -449,12 +449,12 @@ impl ApplicationExt for WryApplication {
let app_dispatcher = app_dispatcher.clone();
let callback = wry::Callback {
name: callback.name.to_string(),
function: Box::new(move |dispatcher, seq, req| {
function: Box::new(move |dispatcher, _, req| {
(callback.function)(
WryDispatcher(Arc::new(Mutex::new(dispatcher)), app_dispatcher.clone()),
seq,
req,
)
);
Ok(())
}),
};
wry_callbacks.push(callback);
@ -462,7 +462,7 @@ impl ApplicationExt for WryApplication {
let dispatcher = self
.inner
.add_window(webview_builder.finish()?, Some(wry_callbacks))
.add_window(webview_builder.finish()?, Some(wry_callbacks), None)
.map_err(|_| crate::Error::CreateWebview)?;
Ok(WryDispatcher(
Arc::new(Mutex::new(dispatcher)),