From 6526c7c999233e7543bfef69fbb9fb66f2b38aaa Mon Sep 17 00:00:00 2001 From: Jonas Kruckenberg Date: Mon, 14 Nov 2022 10:59:32 +0100 Subject: [PATCH] wip --- .github/workflows/test.yml | 2 +- Cargo.lock | 56 ++++++++++-------- Cargo.toml | 2 +- examples/test/dist/index.html | 6 +- ... => tauri-sys-test-ui-94e40ba9adfa8fe6.js} | 50 ++++++++++------ ...tauri-sys-test-ui-94e40ba9adfa8fe6_bg.wasm | Bin 0 -> 1593879 bytes ...tauri-sys-test-ui-f3731bf7a986379f_bg.wasm | Bin 1540975 -> 0 bytes examples/test/src-tauri/Cargo.toml | 4 +- examples/test/src/app.rs | 4 +- examples/test/src/main.rs | 2 +- src/process.rs | 8 +-- 11 files changed, 76 insertions(+), 58 deletions(-) rename examples/test/dist/{tauri-sys-test-ui-f3731bf7a986379f.js => tauri-sys-test-ui-94e40ba9adfa8fe6.js} (96%) create mode 100644 examples/test/dist/tauri-sys-test-ui-94e40ba9adfa8fe6_bg.wasm delete mode 100644 examples/test/dist/tauri-sys-test-ui-f3731bf7a986379f_bg.wasm diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 72d37e7..36a1d83 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -40,7 +40,7 @@ jobs: - name: Install Tauri CLI run: | cd examples/test - wget -qO- https://github.com/tauri-apps/tauri/releases/download/cli.rs-v1.1.1/cargo-tauri-x86_64-unknown-linux-gnu.tgz | tar -xzf- -C ~/.cargo/bin + wget -qO- https://github.com/tauri-apps/tauri/releases/download/cli.rs-v1.2.0/cargo-tauri-x86_64-unknown-linux-gnu.tgz | tar -xzf- -C ~/.cargo/bin - name: Install Trunk run: | cd examples/test diff --git a/Cargo.lock b/Cargo.lock index cec30af..db5c319 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -208,12 +208,11 @@ dependencies = [ [[package]] name = "cargo_toml" -version = "0.11.8" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e72c3ff59e3b7d24630206bb63a73af65da4ed5df1f76ee84dfafb9fee2ba60e" +checksum = "aa0e3586af56b3bfa51fca452bd56e8dbbbd5d8d81cbf0b7e4e35b695b537eb8" dependencies = [ "serde", - "serde_derive", "toml", ] @@ -578,6 +577,12 @@ dependencies = [ "dtoa", ] +[[package]] +name = "dunce" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bd4b30a6560bbd9b4620f4de34c3f14f60848e58a9b7216801afcb4c7b31c3c" + [[package]] name = "embed_plist" version = "1.2.2" @@ -1250,9 +1255,9 @@ dependencies = [ [[package]] name = "jni" -version = "0.19.0" +version = "0.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec" +checksum = "039022cdf4d7b1cf548d31f60ae783138e5fd42013f6271049d7df7afadef96c" dependencies = [ "cesu8", "combine", @@ -2749,9 +2754,9 @@ dependencies = [ [[package]] name = "tao" -version = "0.14.0" +version = "0.15.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "43336f5d1793543ba96e2a1e75f3a5c7dcd592743be06a0ab3a190f4fcb4b934" +checksum = "42c460173627564bde252ca5ebf346ba5b37c5cee1a445782bacc8e9b8d38b5e" dependencies = [ "bitflags", "cairo-rs", @@ -2806,9 +2811,9 @@ dependencies = [ [[package]] name = "tauri" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efbf22abd61d95ca9b2becd77f9db4c093892f73e8a07d21d8b0b2bf71a7bcea" +checksum = "ac135e45c2923bd91edbb95a0d656f8d025389697e34d6d79166952bfa79c61c" dependencies = [ "anyhow", "attohttpc", @@ -2859,9 +2864,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0991fb306849897439dbd4a72e4cbed2413e2eb26cb4b3ba220b94edba8b4b88" +checksum = "ef796f49abc98e6de0abe1b655120addc9d82363d8fc2304e71a4177c25e783c" dependencies = [ "anyhow", "cargo_toml", @@ -2875,9 +2880,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "356fa253e40ae4d6ff02075011f2f2bb4066f5c9d8c1e16ca6912d7b75903ba6" +checksum = "afcb77cf7bfe3d8f886e73a7fa6157587d015c599671180b76595c1aef175ba8" dependencies = [ "base64", "brotli", @@ -2901,9 +2906,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6051fd6940ddb22af452340d03c66a3e2f5d72e0788d4081d91e31528ccdc4d" +checksum = "f24f481b0b2acfc288ac78755f00ebea53992c7365a165af64cb5ae00806edea" dependencies = [ "heck 0.4.0", "proc-macro2", @@ -2915,14 +2920,13 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d49439a5ea47f474572b854972f42eda2e02a470be5ca9609cc83bb66945abe2" +checksum = "5fc5d54c476defa5436e70e0d0a06e3cb0f49b6f863895995d5e3769411769cf" dependencies = [ "gtk", "http", "http-range", - "infer", "rand 0.8.5", "raw-window-handle", "serde", @@ -2936,9 +2940,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.11.1" +version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28dce920995fd49907aa9bea7249ed1771454f11f7611924c920a1f75fb614d4" +checksum = "d78c55091701426c2519c7e9f1dc2dd33e533af4e75eae89cedc6995409351a2" dependencies = [ "cocoa", "gtk", @@ -2962,7 +2966,6 @@ dependencies = [ "semver 1.0.14", "serde", "serde-wasm-bindgen", - "tauri", "tauri-sys", "thiserror", "url", @@ -2996,15 +2999,16 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "1.1.1" +version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e8fdae6f29cef959809a3c3afef510c5b715a446a597ab8b791497585363f39" +checksum = "d64c9a09ba1538b8e67ae8c78c10904f36ce38d364bf7f089ec807032a826b02" dependencies = [ "brotli", "ctor", "glob", "heck 0.4.0", "html5ever", + "infer", "json-patch", "kuchiki", "memchr", @@ -3850,15 +3854,16 @@ dependencies = [ [[package]] name = "wry" -version = "0.21.1" +version = "0.22.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff5c1352b4266fdf92c63479d2f58ab4cd29dc4e78fbc1b62011ed1227926945" +checksum = "923d297b203eae65b095af16c02978b7932be1968012b4da7138390edf34dea5" dependencies = [ "base64", "block", "cocoa", "core-graphics", "crossbeam-channel", + "dunce", "gdk", "gio", "glib", @@ -3874,6 +3879,7 @@ dependencies = [ "serde", "serde_json", "sha2", + "soup2", "tao", "thiserror", "url", diff --git a/Cargo.toml b/Cargo.toml index 655c997..c496dd2 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -18,7 +18,7 @@ semver = { version = "1.0.14", optional = true, features = ["serde"] } [dev-dependencies] wasm-bindgen-test = "0.3.33" tauri-sys = { path = ".", features = ["all"] } -tauri = "1.1.1" +# tauri = "1.1.1" [package.metadata.docs.rs] all-features = true diff --git a/examples/test/dist/index.html b/examples/test/dist/index.html index 299ceb8..9c3587c 100644 --- a/examples/test/dist/index.html +++ b/examples/test/dist/index.html @@ -2,10 +2,10 @@ Tauri + Yew App - - + + -