From 5c137365c60790e8d4037d449e8237aa3fffdab0 Mon Sep 17 00:00:00 2001 From: Lucas Fernandes Nogueira Date: Fri, 20 Oct 2023 13:50:18 -0300 Subject: [PATCH] chore: update to tauri alpha.16, api alpha.9 (#673) Co-authored-by: Amr Bashir --- .changes/alpha.16.md | 5 + .changes/api-alpha.9.md | 27 + .changes/msrv-1.70.md | 30 + .eslintignore | 2 + .github/workflows/test-rust.yml | 44 +- .prettierignore | 1 + .scripts/ci/check-license-header.js | 1 + Cargo.lock | 310 +-- Cargo.toml | 6 +- README.md | 2 +- examples/api/package.json | 20 +- .../AppIcon.appiconset/Contents.json | 154 +- .../gen/apple/Assets.xcassets/Contents.json | 8 +- examples/api/src/views/Communication.svelte | 2 +- examples/api/src/views/FileSystem.svelte | 2 +- package.json | 32 +- plugins/authenticator/README.md | 2 +- plugins/authenticator/guest-js/index.ts | 46 +- plugins/authenticator/package.json | 2 +- plugins/authenticator/src/api-iife.js | 2 +- plugins/autostart/README.md | 2 +- plugins/autostart/guest-js/index.ts | 12 +- plugins/autostart/package.json | 2 +- plugins/autostart/src/api-iife.js | 2 +- plugins/barcode-scanner/guest-js/index.ts | 2 +- plugins/barcode-scanner/package.json | 2 +- plugins/barcode-scanner/src/api-iife.js | 2 +- plugins/cli/README.md | 2 +- plugins/cli/guest-js/index.ts | 8 +- plugins/cli/package.json | 2 +- plugins/cli/src/api-iife.js | 2 +- plugins/clipboard-manager/README.md | 2 +- plugins/clipboard-manager/guest-js/index.ts | 12 +- plugins/clipboard-manager/package.json | 2 +- plugins/clipboard-manager/src/api-iife.js | 2 +- plugins/deep-link/README.md | 2 +- plugins/deep-link/examples/app/package.json | 8 +- .../examples/app/src-tauri/Cargo.toml | 2 +- plugins/deep-link/guest-js/index.ts | 2 +- plugins/deep-link/package.json | 2 +- plugins/deep-link/src/api-iife.js | 2 +- plugins/dialog/README.md | 2 +- plugins/dialog/guest-js/index.ts | 16 +- plugins/dialog/package.json | 2 +- plugins/dialog/src/api-iife.js | 2 +- plugins/dialog/src/init.js | 4 +- plugins/dialog/test/tauri.conf.json | 2 +- plugins/fs/README.md | 2 +- plugins/fs/guest-js/index.ts | 52 +- plugins/fs/package.json | 2 +- plugins/fs/src/api-iife.js | 2 +- plugins/global-shortcut/README.md | 2 +- plugins/global-shortcut/guest-js/index.ts | 2 +- plugins/global-shortcut/package.json | 2 +- plugins/global-shortcut/src/api-iife.js | 2 +- plugins/http/README.md | 2 +- plugins/http/guest-js/index.ts | 23 +- plugins/http/package.json | 2 +- plugins/http/src/api-iife.js | 2 +- plugins/localhost/README.md | 2 +- plugins/log/README.md | 2 +- plugins/log/guest-js/index.ts | 8 +- plugins/log/package.json | 2 +- plugins/log/src/api-iife.js | 2 +- plugins/log/src/lib.rs | 2 +- plugins/notification/README.md | 2 +- plugins/notification/guest-js/index.ts | 2 +- .../{src/init.js => guest-js/init.ts} | 40 +- plugins/notification/package.json | 2 +- plugins/notification/rollup.config.mjs | 25 +- plugins/notification/src/api-iife.js | 2 +- plugins/notification/src/init-iife.js | 1 + plugins/notification/src/lib.rs | 2 +- plugins/notification/test/tauri.conf.json | 2 +- plugins/os/README.md | 2 +- plugins/os/guest-js/index.ts | 20 +- plugins/os/package.json | 2 +- plugins/os/src/api-iife.js | 2 +- plugins/persisted-scope/README.md | 2 +- plugins/positioner/README.md | 2 +- plugins/positioner/guest-js/index.ts | 8 +- plugins/positioner/package.json | 2 +- plugins/positioner/src/api-iife.js | 2 +- plugins/process/README.md | 2 +- plugins/process/guest-js/index.ts | 10 +- plugins/process/package.json | 2 +- plugins/process/src/api-iife.js | 2 +- plugins/shell/README.md | 2 +- plugins/shell/guest-js/index.ts | 2 +- plugins/shell/package.json | 2 +- plugins/shell/src/api-iife.js | 2 +- plugins/shell/src/init.js | 2 +- plugins/shell/src/lib.rs | 2 +- plugins/single-instance/README.md | 2 +- .../examples/vanilla/package.json | 2 +- .../examples/vanilla/src-tauri/Cargo.toml | 2 +- plugins/sql/README.md | 2 +- plugins/sql/guest-js/index.ts | 27 +- plugins/sql/package.json | 2 +- plugins/sql/src/api-iife.js | 2 +- plugins/store/README.md | 2 +- plugins/store/guest-js/index.ts | 30 +- plugins/store/package.json | 2 +- plugins/store/src/api-iife.js | 2 +- plugins/stronghold/README.md | 2 +- plugins/stronghold/guest-js/index.ts | 215 +- plugins/stronghold/package.json | 2 +- plugins/stronghold/src/api-iife.js | 2 +- plugins/updater/README.md | 2 +- plugins/updater/guest-js/index.ts | 2 +- plugins/updater/package.json | 2 +- plugins/updater/src/api-iife.js | 2 +- .../updater/tests/app-updater/tauri.conf.json | 2 +- plugins/upload/README.md | 2 +- plugins/upload/guest-js/index.ts | 2 +- plugins/upload/package.json | 2 +- plugins/upload/src/api-iife.js | 2 +- plugins/websocket/Cargo.toml | 2 +- plugins/websocket/README.md | 2 +- .../examples/svelte-app/package.json | 16 +- .../examples/svelte-app/src-tauri/Cargo.toml | 2 +- plugins/websocket/guest-js/index.ts | 18 +- plugins/websocket/package.json | 2 +- plugins/websocket/src/api-iife.js | 2 +- plugins/websocket/src/lib.rs | 19 +- plugins/window-state/README.md | 2 +- plugins/window-state/guest-js/index.ts | 10 +- plugins/window-state/package.json | 2 +- plugins/window-state/src/api-iife.js | 2 +- pnpm-lock.yaml | 1795 ++++++++--------- shared/template/README.md | 2 +- shared/template/package.json | 2 +- 132 files changed, 1565 insertions(+), 1688 deletions(-) create mode 100644 .changes/alpha.16.md create mode 100644 .changes/api-alpha.9.md create mode 100644 .changes/msrv-1.70.md rename plugins/notification/{src/init.js => guest-js/init.ts} (65%) create mode 100644 plugins/notification/src/init-iife.js diff --git a/.changes/alpha.16.md b/.changes/alpha.16.md new file mode 100644 index 000000000..c2126e377 --- /dev/null +++ b/.changes/alpha.16.md @@ -0,0 +1,5 @@ +--- +"log-plugin": patch +--- + +Update to tauri@2.0.0-alpha.16. diff --git a/.changes/api-alpha.9.md b/.changes/api-alpha.9.md new file mode 100644 index 000000000..b042bcf5b --- /dev/null +++ b/.changes/api-alpha.9.md @@ -0,0 +1,27 @@ +--- +"authenticator-js": patch +"autostart-js": patch +"barcode-scanner-js": patch +"cli-js": patch +"clipboard-manager-js": patch +"deep-link-js": patch +"dialog-js": patch +"fs-js": patch +"global-shortcut-js": patch +"http-js": patch +"log-js": patch +"notification-js": patch +"os-js": patch +"positioner-js": patch +"process-js": patch +"shell-js": patch +"sql-js": patch +"store-js": patch +"stronghold-js": patch +"updater-js": patch +"upload-js": patch +"websocket-js": patch +"window-state-js": patch +--- + +Update to @tauri-apps/api v2.0.0-alpha.16. diff --git a/.changes/msrv-1.70.md b/.changes/msrv-1.70.md new file mode 100644 index 000000000..43aa61baa --- /dev/null +++ b/.changes/msrv-1.70.md @@ -0,0 +1,30 @@ +--- +"authenticator": patch +"autostart": patch +"barcode-scanner": patch +"cli": patch +"clipboard-manager": patch +"deep-link": patch +"dialog": patch +"fs": patch +"global-shortcut": patch +"http": patch +"localhost": patch +"log-plugin": patch +"notification": patch +"os": patch +"persisted-scope": patch +"positioner": patch +"process": patch +"shell": patch +"single-instance": patch +"sql": patch +"store": patch +"stronghold": patch +"updater": patch +"upload": patch +"websocket": patch +"window-state": patch +--- + +Update MSRV to 1.70. diff --git a/.eslintignore b/.eslintignore index 329feacba..d7526cfb2 100644 --- a/.eslintignore +++ b/.eslintignore @@ -1,6 +1,8 @@ target node_modules dist +build/ dist-js api-iife.js +init-iife.js init.js \ No newline at end of file diff --git a/.github/workflows/test-rust.yml b/.github/workflows/test-rust.yml index 854e11867..69576040f 100644 --- a/.github/workflows/test-rust.yml +++ b/.github/workflows/test-rust.yml @@ -130,31 +130,31 @@ jobs: - { target: x86_64-pc-windows-msvc, os: windows-latest, - cross: false, + runner: 'cargo', command: "test", } - { target: x86_64-unknown-linux-gnu, os: ubuntu-latest, - cross: false, + runner: 'cargo', command: "test", } - { target: x86_64-apple-darwin, os: macos-latest, - cross: false, + runner: 'cargo', command: "test", } - { target: aarch64-apple-ios, os: macos-latest, - cross: false, + runner: 'cargo', command: "build", } - { target: aarch64-linux-android, os: ubuntu-latest, - cross: true, + runner: 'cross', command: "build", } @@ -175,13 +175,13 @@ jobs: echo "VCPKG_ROOT=$env:VCPKG_INSTALLATION_ROOT" | Out-File -FilePath $env:GITHUB_ENV -Append vcpkg install openssl:x64-windows-static-md - - uses: dtolnay/rust-toolchain@1.65.0 + - uses: dtolnay/rust-toolchain@1.70.0 with: targets: ${{ matrix.platform.target }} - uses: Swatinem/rust-cache@v2 with: - key: ${{ matrix.package }} + key: cache-${{ matrix.package }} - name: create dummy dist working-directory: examples/api @@ -192,34 +192,18 @@ jobs: run: | cargo update -p time@0.3.24 --precise 0.3.23 + - name: install cross + if: ${{ matrix.platform.runner == 'cross' }} + run: cargo install cross --git https://github.com/cross-rs/cross + - name: test ${{ matrix.package }} if: matrix.package != 'tauri-plugin-sql' - uses: actions-rs/cargo@v1 - with: - use-cross: ${{ matrix.platform.cross }} - command: ${{ matrix.platform.command }} - args: --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets - - - name: test ${{ matrix.package }} --all-features - if: ${{ !contains(fromJSON('["tauri-plugin-http", "tauri-plugin-upload", "tauri-plugin-updater", "tauri-plugin-websocket", "tauri-plugin-sql"]'), matrix.package) }} - uses: actions-rs/cargo@v1 - with: - use-cross: ${{ matrix.platform.cross }} - command: ${{ matrix.platform.command }} - args: --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets --all-features + run: ${{ matrix.platform.runner }} ${{ matrix.platform.command }} --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets - name: test ${{ matrix.package }} mysql if: matrix.package == 'tauri-plugin-sql' - uses: actions-rs/cargo@v1 - with: - use-cross: ${{ matrix.platform.cross }} - command: ${{ matrix.platform.command }} - args: --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets --features mysql + run: ${{ matrix.platform.runner }} ${{ matrix.platform.command }} --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets --features mysql - name: test ${{ matrix.package }} postgres if: matrix.package == 'tauri-plugin-sql' - uses: actions-rs/cargo@v1 - with: - use-cross: ${{ matrix.platform.cross }} - command: ${{ matrix.platform.command }} - args: --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets --features postgres + run: ${{ matrix.platform.runner }} ${{ matrix.platform.command }} --package ${{ matrix.package }} --target ${{ matrix.platform.target }} --all-targets --features postgres diff --git a/.prettierignore b/.prettierignore index 630daf67e..c2d3ae570 100644 --- a/.prettierignore +++ b/.prettierignore @@ -7,4 +7,5 @@ Cargo.lock .build build api-iife.js +init-iife.js intermediates/ \ No newline at end of file diff --git a/.scripts/ci/check-license-header.js b/.scripts/ci/check-license-header.js index a322957d1..225e90ba9 100644 --- a/.scripts/ci/check-license-header.js +++ b/.scripts/ci/check-license-header.js @@ -21,6 +21,7 @@ const ignore = [ "dist-js", ".svelte-kit", "api-iife.js", + "init-iife.js", ".build", ]; diff --git a/Cargo.lock b/Cargo.lock index de3ba4dda..c4303eb93 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1234,12 +1234,12 @@ dependencies = [ [[package]] name = "ctor" -version = "0.1.26" +version = "0.2.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d2301688392eb071b0bf1a37be05c469d3cc4dbbd95df672fe28ab021e6a096" +checksum = "37e366bff8cd32dd8754b0991fb66b279dc48f598c3a18914852a6673deef583" dependencies = [ "quote", - "syn 1.0.109", + "syn 2.0.28", ] [[package]] @@ -2054,7 +2054,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0176e0459c2e4a1fe232f984bca6890e681076abb9934f6cea7c326f3fc47818" dependencies = [ "libc", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -2619,15 +2619,6 @@ dependencies = [ "hashbrown 0.14.0", ] -[[package]] -name = "infer" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a898e4b7951673fce96614ce5751d13c40fc5674bc2d759288e46c3ab62598b3" -dependencies = [ - "cfb", -] - [[package]] name = "infer" version = "0.15.0" @@ -3762,7 +3753,7 @@ dependencies = [ "libc", "redox_syscall 0.3.5", "smallvec", - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -3832,9 +3823,17 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fabbf1ead8a5bcbc20f5f8b939ee3f5b0f6f281b6ad3468b84656b658b455259" dependencies = [ - "phf_macros 0.10.0", "phf_shared 0.10.0", - "proc-macro-hack", +] + +[[package]] +name = "phf" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ade2d8b8f33c7333b51bcf0428d37e217e9f32192ae4772156f65063b8ce03dc" +dependencies = [ + "phf_macros 0.11.2", + "phf_shared 0.11.2", ] [[package]] @@ -3877,6 +3876,16 @@ dependencies = [ "rand 0.8.5", ] +[[package]] +name = "phf_generator" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "48e4cc64c2ad9ebe670cb8fd69dd50ae301650392e81c05f9bfcb2d5bdbc24b0" +dependencies = [ + "phf_shared 0.11.2", + "rand 0.8.5", +] + [[package]] name = "phf_macros" version = "0.8.0" @@ -3893,16 +3902,15 @@ dependencies = [ [[package]] name = "phf_macros" -version = "0.10.0" +version = "0.11.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "58fdf3184dd560f160dd73922bea2d5cd6e8f064bf4b13110abd81b03697b4e0" +checksum = "3444646e286606587e49f3bcf1679b8cef1dc2c5ecc29ddacaffc305180d464b" dependencies = [ - "phf_generator 0.10.0", - "phf_shared 0.10.0", - "proc-macro-hack", + "phf_generator 0.11.2", + "phf_shared 0.11.2", "proc-macro2", "quote", - "syn 1.0.109", + "syn 2.0.28", ] [[package]] @@ -3923,6 +3931,15 @@ dependencies = [ "siphasher", ] +[[package]] +name = "phf_shared" +version = "0.11.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90fcb95eef784c2ac79119d1dd819e162b5da872ce6f3c3abe1e8ca1c082f72b" +dependencies = [ + "siphasher", +] + [[package]] name = "pin-project" version = "1.1.2" @@ -4180,13 +4197,13 @@ dependencies = [ [[package]] name = "quinn-proto" -version = "0.10.2" +version = "0.10.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8c8bb234e70c863204303507d841e7fa2295e95c822b2bb4ca8ebf57f17b1cb" +checksum = "2c78e758510582acc40acb90458401172d41f1016f8c9dde89e49677afb7eec1" dependencies = [ "bytes 1.4.0", "rand 0.8.5", - "ring", + "ring 0.16.20", "rustc-hash", "rustls", "slab", @@ -4488,11 +4505,25 @@ dependencies = [ "libc", "once_cell", "spin 0.5.2", - "untrusted", + "untrusted 0.7.1", "web-sys", "winapi", ] +[[package]] +name = "ring" +version = "0.17.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9babe80d5c16becf6594aa32ad2be8fe08498e7ae60b77de8df700e67f191d7e" +dependencies = [ + "cc", + "getrandom 0.2.10", + "libc", + "spin 0.9.8", + "untrusted 0.9.0", + "windows-sys 0.48.0", +] + [[package]] name = "rsa" version = "0.9.2" @@ -4583,13 +4614,13 @@ dependencies = [ [[package]] name = "rustls" -version = "0.21.5" +version = "0.21.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "79ea77c539259495ce8ca47f53e66ae0330a8819f67e23ac96ca02f50e7b7d36" +checksum = "cd8d6c9f025a446bc4d18ad9632e69aec8f287aa84499ee335599fabd20c3fd8" dependencies = [ "log", - "ring", - "rustls-webpki 0.101.2", + "ring 0.16.20", + "rustls-webpki", "sct", ] @@ -4616,22 +4647,12 @@ dependencies = [ [[package]] name = "rustls-webpki" -version = "0.100.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6207cd5ed3d8dca7816f8f3725513a34609c0c765bf652b8c3cb4cfd87db46b" -dependencies = [ - "ring", - "untrusted", -] - -[[package]] -name = "rustls-webpki" -version = "0.101.2" +version = "0.101.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "513722fd73ad80a71f72b61009ea1b584bcfa1483ca93949c8f290298837fa59" +checksum = "3c7d5dece342910d9ba34d259310cae3e0154b873b35408b787b59bce53d34fe" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -4700,8 +4721,8 @@ version = "0.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d53dcdb7c9f8158937a7981b48accfd39a43af418591a5d008c7b22b5e1b7ca4" dependencies = [ - "ring", - "untrusted", + "ring 0.16.20", + "untrusted 0.7.1", ] [[package]] @@ -5525,7 +5546,7 @@ dependencies = [ "url", "uuid", "windows 0.48.0", - "windows-implement", + "windows-implement 0.48.0", "x11-dl", "zbus", ] @@ -5560,9 +5581,9 @@ checksum = "1d2faeef5759ab89935255b1a4cd98e0baf99d1085e37d36599c625dac49ae8e" [[package]] name = "tauri" -version = "2.0.0-alpha.15" +version = "2.0.0-alpha.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cd8f1dc82ad6bf8a689b131febee60020e84193b7fdb9c21bbb344c3d9f25de4" +checksum = "350fce27e96fda5a5741ae200ebf775cc3423c682154224cfbd78066db777fc6" dependencies = [ "anyhow", "bytes 1.4.0", @@ -5570,6 +5591,7 @@ dependencies = [ "dirs-next", "embed_plist", "futures-util", + "getrandom 0.2.10", "glib", "glob", "gtk", @@ -5577,7 +5599,7 @@ dependencies = [ "http", "http-range", "ico", - "infer 0.15.0", + "infer", "jni", "libc", "log", @@ -5587,7 +5609,6 @@ dependencies = [ "once_cell", "percent-encoding", "png", - "rand 0.8.5", "raw-window-handle", "reqwest", "serde", @@ -5608,14 +5629,15 @@ dependencies = [ "uuid", "webkit2gtk", "webview2-com", + "window-vibrancy", "windows 0.48.0", ] [[package]] name = "tauri-build" -version = "2.0.0-alpha.9" +version = "2.0.0-alpha.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "59048e05398d7d53e2d73d7f7fd14fbab53ec9f90f4b91e3c08f263e07ffc569" +checksum = "55e3fe1435d7bcf64d15182815f5e1b0b05ec71cd365ed5055204efb5436ebc4" dependencies = [ "anyhow", "cargo_toml", @@ -5635,9 +5657,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.0.0-alpha.8" +version = "2.0.0-alpha.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d8acf40451edf9ccd16d110cb10e9959fec6ccca286c5cc66b859878f8aa9a7b" +checksum = "ff206ba5a7de8f20068f36d5fa49756a9fd375a156a2332278273b6d0dc57033" dependencies = [ "base64 0.21.2", "brotli", @@ -5661,9 +5683,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.0.0-alpha.8" +version = "2.0.0-alpha.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7037ba4260be47f4d6dab8c781bd15910ef1d3c16c74bf3e3c47e69c250ab82" +checksum = "d29a29d42cca831a9d9c8be91412ef6416813e7307e8dcfd1df38f3b13f3cc73" dependencies = [ "heck", "proc-macro2", @@ -6054,9 +6076,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "1.0.0-alpha.2" +version = "1.0.0-alpha.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34b124f7731f3981deba3b643b2f1c8eaff59f3d6929edb401e1fc929ad93df" +checksum = "c373492a8e2d369c638bff48fc07abbe7292f8ddb867bc3b992fb7ea10006212" dependencies = [ "gtk", "http", @@ -6067,26 +6089,23 @@ dependencies = [ "tauri-utils", "thiserror", "url", - "uuid", "windows 0.48.0", ] [[package]] name = "tauri-runtime-wry" -version = "1.0.0-alpha.3" +version = "1.0.0-alpha.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7b94248fbaf1169c1fb085a2c43f49af3de650f6972a64d6f2bdf876c60949d5" +checksum = "ef7b8a49504f67c65a55188013439edf815356a6f8e2a9d2ed005120a201c98f" dependencies = [ "cocoa 0.24.1", "gtk", "http", "jni", "percent-encoding", - "rand 0.8.5", "raw-window-handle", "tauri-runtime", "tauri-utils", - "uuid", "webkit2gtk", "webview2-com", "windows 0.48.0", @@ -6095,9 +6114,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.0.0-alpha.8" +version = "2.0.0-alpha.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "931ead8db578bc2f9aee6636345fe5b900cfa2b9985a1783913200fab5e607f1" +checksum = "4b821e0e6b5b94c6bde3c95568f5161eb70939a7b0d511f79c0cf85fed3b29c9" dependencies = [ "aes-gcm 0.10.2", "brotli", @@ -6107,12 +6126,12 @@ dependencies = [ "glob", "heck", "html5ever", - "infer 0.12.0", + "infer", "json-patch", "kuchikiki", "log", "memchr", - "phf 0.10.1", + "phf 0.11.2", "proc-macro2", "quote", "semver", @@ -6123,7 +6142,7 @@ dependencies = [ "thiserror", "url", "walkdir", - "windows 0.48.0", + "windows 0.51.1", ] [[package]] @@ -6360,9 +6379,9 @@ dependencies = [ [[package]] name = "tokio-tungstenite" -version = "0.19.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec509ac96e9a0c43427c74f003127d953a265737636129424288d27cb5c4b12c" +checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c" dependencies = [ "futures-util", "log", @@ -6372,7 +6391,7 @@ dependencies = [ "tokio-native-tls", "tokio-rustls", "tungstenite", - "webpki-roots 0.23.1", + "webpki-roots 0.25.2", ] [[package]] @@ -6573,9 +6592,9 @@ checksum = "3528ecfd12c466c6f163363caf2d02a71161dd5e1cc6ae7b34207ea2d42d81ed" [[package]] name = "tungstenite" -version = "0.19.0" +version = "0.20.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15fba1a6d6bb030745759a9a2a588bfe8490fc8b4751a277db3a0be1c9ebbf67" +checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9" dependencies = [ "byteorder", "bytes 1.4.0", @@ -6590,7 +6609,6 @@ dependencies = [ "thiserror", "url", "utf-8", - "webpki", ] [[package]] @@ -6694,6 +6712,12 @@ version = "0.7.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a156c684c91ea7d62626509bce3cb4e1d9ed5c4d978f7b4352658f96a4c26b4a" +[[package]] +name = "untrusted" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1" + [[package]] name = "url" version = "2.4.0" @@ -6970,12 +6994,12 @@ dependencies = [ [[package]] name = "webpki" -version = "0.22.0" +version = "0.22.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f095d78192e208183081cc07bc5515ef55216397af48b873e5edcd72637fa1bd" +checksum = "ed63aea5ce73d0ff405984102c42de94fc55a6b75765d621c65262469b3c9b53" dependencies = [ - "ring", - "untrusted", + "ring 0.17.3", + "untrusted 0.9.0", ] [[package]] @@ -6989,21 +7013,18 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.23.1" +version = "0.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b03058f88386e5ff5310d9111d53f48b17d732b401aeb83a8d5190f2ac459338" +checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" dependencies = [ - "rustls-webpki 0.100.1", + "rustls-webpki", ] [[package]] name = "webpki-roots" -version = "0.24.0" +version = "0.25.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b291546d5d9d1eab74f069c77749f2cb8504a12caa20f0f2de93ddbf6f411888" -dependencies = [ - "rustls-webpki 0.101.2", -] +checksum = "14247bb57be4f377dfb94c72830b8ce8fc6beac03cf4bf7b9732eadd414123fc" [[package]] name = "websocket-example" @@ -7028,8 +7049,8 @@ dependencies = [ "webview2-com-macros", "webview2-com-sys", "windows 0.48.0", - "windows-implement", - "windows-interface", + "windows-implement 0.48.0", + "windows-interface 0.48.0", ] [[package]] @@ -7138,6 +7159,18 @@ dependencies = [ "windows-sys 0.42.0", ] +[[package]] +name = "window-vibrancy" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5931735e675b972fada30c7a402915d4d827aa5ef6c929c133d640c4b785e963" +dependencies = [ + "cocoa 0.25.0", + "objc", + "raw-window-handle", + "windows-sys 0.48.0", +] + [[package]] name = "windows" version = "0.36.1" @@ -7179,9 +7212,21 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" dependencies = [ - "windows-implement", - "windows-interface", - "windows-targets 0.48.1", + "windows-implement 0.48.0", + "windows-interface 0.48.0", + "windows-targets 0.48.5", +] + +[[package]] +name = "windows" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ca229916c5ee38c2f2bc1e9d8f04df975b4bd93f9955dc69fabb5d91270045c9" +dependencies = [ + "windows-core", + "windows-implement 0.51.1", + "windows-interface 0.51.1", + "windows-targets 0.48.5", ] [[package]] @@ -7194,6 +7239,15 @@ dependencies = [ "windows-tokens", ] +[[package]] +name = "windows-core" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1f8cf84f35d2db49a46868f947758c7a1138116f7fac3bc844f43ade1292e64" +dependencies = [ + "windows-targets 0.48.5", +] + [[package]] name = "windows-implement" version = "0.48.0" @@ -7205,6 +7259,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "windows-implement" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fb2b158efec5af20d8846836622f50a87e6556b9153a42772fa047f773c0e555" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.28", +] + [[package]] name = "windows-interface" version = "0.48.0" @@ -7216,6 +7281,17 @@ dependencies = [ "syn 1.0.109", ] +[[package]] +name = "windows-interface" +version = "0.51.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0546e63e1ce64c04403d2311fa0e3ab5ae3a367bd524b4a38d8d8d18c70cfa76" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.28", +] + [[package]] name = "windows-metadata" version = "0.48.0" @@ -7265,7 +7341,7 @@ version = "0.48.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" dependencies = [ - "windows-targets 0.48.1", + "windows-targets 0.48.5", ] [[package]] @@ -7285,17 +7361,17 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.48.1" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "05d4b17490f70499f20b9e791dcf6a299785ce8af4d709018206dc5b4953e95f" +checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" dependencies = [ - "windows_aarch64_gnullvm 0.48.0", - "windows_aarch64_msvc 0.48.0", - "windows_i686_gnu 0.48.0", - "windows_i686_msvc 0.48.0", - "windows_x86_64_gnu 0.48.0", - "windows_x86_64_gnullvm 0.48.0", - "windows_x86_64_msvc 0.48.0", + "windows_aarch64_gnullvm 0.48.5", + "windows_aarch64_msvc 0.48.5", + "windows_i686_gnu 0.48.5", + "windows_i686_msvc 0.48.5", + "windows_x86_64_gnu 0.48.5", + "windows_x86_64_gnullvm 0.48.5", + "windows_x86_64_msvc 0.48.5", ] [[package]] @@ -7312,9 +7388,9 @@ checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "91ae572e1b79dba883e0d315474df7305d12f569b400fcf90581b06062f7e1bc" +checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_msvc" @@ -7336,9 +7412,9 @@ checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43" [[package]] name = "windows_aarch64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b2ef27e0d7bdfcfc7b868b317c1d32c641a6fe4629c171b8928c7b08d98d7cf3" +checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_i686_gnu" @@ -7360,9 +7436,9 @@ checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f" [[package]] name = "windows_i686_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "622a1962a7db830d6fd0a69683c80a18fda201879f0f447f065a3b7467daa241" +checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_msvc" @@ -7384,9 +7460,9 @@ checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060" [[package]] name = "windows_i686_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4542c6e364ce21bf45d69fdd2a8e455fa38d316158cfd43b3ac1c5b1b19f8e00" +checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_x86_64_gnu" @@ -7408,9 +7484,9 @@ checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36" [[package]] name = "windows_x86_64_gnu" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca2b8a661f7628cbd23440e50b05d705db3686f894fc9580820623656af974b1" +checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnullvm" @@ -7420,9 +7496,9 @@ checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3" [[package]] name = "windows_x86_64_gnullvm" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7896dbc1f41e08872e9d5e8f8baa8fdd2677f29468c4e156210174edc7f7b953" +checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_msvc" @@ -7444,9 +7520,9 @@ checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0" [[package]] name = "windows_x86_64_msvc" -version = "0.48.0" +version = "0.48.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a515f5799fe4961cb532f983ce2b23082366b898e52ffbce459c86f67c8378a" +checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "winnow" @@ -7522,7 +7598,7 @@ dependencies = [ "webkit2gtk-sys", "webview2-com", "windows 0.48.0", - "windows-implement", + "windows-implement 0.48.0", ] [[package]] diff --git a/Cargo.toml b/Cargo.toml index e7f01db55..5dbff89b4 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,8 +5,8 @@ resolver = "2" [workspace.dependencies] serde = { version = "1", features = ["derive"] } log = "0.4" -tauri = "2.0.0-alpha.15" -tauri-build = "2.0.0-alpha.9" +tauri = "2.0.0-alpha.16" +tauri-build = "2.0.0-alpha.10" serde_json = "1" thiserror = "1" @@ -14,7 +14,7 @@ thiserror = "1" edition = "2021" authors = [ "Tauri Programme within The Commons Conservancy" ] license = "Apache-2.0 OR MIT" -rust-version = "1.65" +rust-version = "1.70" # default to small, optimized release binaries [profile.release] diff --git a/README.md b/README.md index 1fdcf4471..cb36fb3a9 100644 --- a/README.md +++ b/README.md @@ -16,4 +16,4 @@ | [websocket](plugins/websocket) | Open a WebSocket connection using a Rust client in JS. | ✅ | ✅ | ✅ | ? | ? | | [window-state](plugins/window-state) | Persist window sizes and positions. | ✅ | ✅ | ✅ | ? | ? | -_This repo and all plugins require a Rust version of at least **1.65**_ +_This repo and all plugins require a Rust version of at least **1.70**_ diff --git a/examples/api/package.json b/examples/api/package.json index f5a9407db..499d6b0dd 100644 --- a/examples/api/package.json +++ b/examples/api/package.json @@ -9,7 +9,7 @@ "serve": "vite preview" }, "dependencies": { - "@tauri-apps/api": "2.0.0-alpha.8", + "@tauri-apps/api": "2.0.0-alpha.9", "@tauri-apps/plugin-barcode-scanner": "2.0.0-alpha.0", "@tauri-apps/plugin-cli": "2.0.0-alpha.1", "@tauri-apps/plugin-clipboard-manager": "2.0.0-alpha.1", @@ -22,17 +22,17 @@ "@tauri-apps/plugin-process": "2.0.0-alpha.1", "@tauri-apps/plugin-shell": "2.0.0-alpha.1", "@tauri-apps/plugin-updater": "2.0.0-alpha.1", - "@zerodevx/svelte-json-view": "1.0.5" + "@zerodevx/svelte-json-view": "1.0.7" }, "devDependencies": { - "@iconify-json/codicon": "^1.1.26", - "@iconify-json/ph": "^1.1.5", - "@sveltejs/vite-plugin-svelte": "^2.4.1", - "@tauri-apps/cli": "2.0.0-alpha.15", - "@unocss/extractor-svelte": "^0.53.1", + "@iconify-json/codicon": "^1.1.31", + "@iconify-json/ph": "^1.1.6", + "@sveltejs/vite-plugin-svelte": "^2.4.6", + "@tauri-apps/cli": "2.0.0-alpha.16", + "@unocss/extractor-svelte": "^0.56.5", "internal-ip": "^8.0.0", - "svelte": "^3.59.1", - "unocss": "^0.53.1", - "vite": "^4.3.9" + "svelte": "^4.2.2", + "unocss": "^0.56.5", + "vite": "^4.5.0" } } diff --git a/examples/api/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/Contents.json b/examples/api/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/Contents.json index 90eea7ec7..dd3b8bcc5 100644 --- a/examples/api/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/examples/api/src-tauri/gen/apple/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,116 +1,116 @@ { - "images" : [ + "images": [ { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "AppIcon-20x20@2x.png", - "scale" : "2x" + "size": "20x20", + "idiom": "iphone", + "filename": "AppIcon-20x20@2x.png", + "scale": "2x" }, { - "size" : "20x20", - "idiom" : "iphone", - "filename" : "AppIcon-20x20@3x.png", - "scale" : "3x" + "size": "20x20", + "idiom": "iphone", + "filename": "AppIcon-20x20@3x.png", + "scale": "3x" }, { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "AppIcon-29x29@2x-1.png", - "scale" : "2x" + "size": "29x29", + "idiom": "iphone", + "filename": "AppIcon-29x29@2x-1.png", + "scale": "2x" }, { - "size" : "29x29", - "idiom" : "iphone", - "filename" : "AppIcon-29x29@3x.png", - "scale" : "3x" + "size": "29x29", + "idiom": "iphone", + "filename": "AppIcon-29x29@3x.png", + "scale": "3x" }, { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "AppIcon-40x40@2x.png", - "scale" : "2x" + "size": "40x40", + "idiom": "iphone", + "filename": "AppIcon-40x40@2x.png", + "scale": "2x" }, { - "size" : "40x40", - "idiom" : "iphone", - "filename" : "AppIcon-40x40@3x.png", - "scale" : "3x" + "size": "40x40", + "idiom": "iphone", + "filename": "AppIcon-40x40@3x.png", + "scale": "3x" }, { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "AppIcon-60x60@2x.png", - "scale" : "2x" + "size": "60x60", + "idiom": "iphone", + "filename": "AppIcon-60x60@2x.png", + "scale": "2x" }, { - "size" : "60x60", - "idiom" : "iphone", - "filename" : "AppIcon-60x60@3x.png", - "scale" : "3x" + "size": "60x60", + "idiom": "iphone", + "filename": "AppIcon-60x60@3x.png", + "scale": "3x" }, { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "AppIcon-20x20@1x.png", - "scale" : "1x" + "size": "20x20", + "idiom": "ipad", + "filename": "AppIcon-20x20@1x.png", + "scale": "1x" }, { - "size" : "20x20", - "idiom" : "ipad", - "filename" : "AppIcon-20x20@2x-1.png", - "scale" : "2x" + "size": "20x20", + "idiom": "ipad", + "filename": "AppIcon-20x20@2x-1.png", + "scale": "2x" }, { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "AppIcon-29x29@1x.png", - "scale" : "1x" + "size": "29x29", + "idiom": "ipad", + "filename": "AppIcon-29x29@1x.png", + "scale": "1x" }, { - "size" : "29x29", - "idiom" : "ipad", - "filename" : "AppIcon-29x29@2x.png", - "scale" : "2x" + "size": "29x29", + "idiom": "ipad", + "filename": "AppIcon-29x29@2x.png", + "scale": "2x" }, { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "AppIcon-40x40@1x.png", - "scale" : "1x" + "size": "40x40", + "idiom": "ipad", + "filename": "AppIcon-40x40@1x.png", + "scale": "1x" }, { - "size" : "40x40", - "idiom" : "ipad", - "filename" : "AppIcon-40x40@2x-1.png", - "scale" : "2x" + "size": "40x40", + "idiom": "ipad", + "filename": "AppIcon-40x40@2x-1.png", + "scale": "2x" }, { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "AppIcon-76x76@1x.png", - "scale" : "1x" + "size": "76x76", + "idiom": "ipad", + "filename": "AppIcon-76x76@1x.png", + "scale": "1x" }, { - "size" : "76x76", - "idiom" : "ipad", - "filename" : "AppIcon-76x76@2x.png", - "scale" : "2x" + "size": "76x76", + "idiom": "ipad", + "filename": "AppIcon-76x76@2x.png", + "scale": "2x" }, { - "size" : "83.5x83.5", - "idiom" : "ipad", - "filename" : "AppIcon-83.5x83.5@2x.png", - "scale" : "2x" + "size": "83.5x83.5", + "idiom": "ipad", + "filename": "AppIcon-83.5x83.5@2x.png", + "scale": "2x" }, { - "size" : "1024x1024", - "idiom" : "ios-marketing", - "filename" : "AppIcon-512@2x.png", - "scale" : "1x" + "size": "1024x1024", + "idiom": "ios-marketing", + "filename": "AppIcon-512@2x.png", + "scale": "1x" } ], - "info" : { - "version" : 1, - "author" : "xcode" + "info": { + "version": 1, + "author": "xcode" } -} \ No newline at end of file +} diff --git a/examples/api/src-tauri/gen/apple/Assets.xcassets/Contents.json b/examples/api/src-tauri/gen/apple/Assets.xcassets/Contents.json index da4a164c9..97a8662eb 100644 --- a/examples/api/src-tauri/gen/apple/Assets.xcassets/Contents.json +++ b/examples/api/src-tauri/gen/apple/Assets.xcassets/Contents.json @@ -1,6 +1,6 @@ { - "info" : { - "version" : 1, - "author" : "xcode" + "info": { + "version": 1, + "author": "xcode" } -} \ No newline at end of file +} diff --git a/examples/api/src/views/Communication.svelte b/examples/api/src/views/Communication.svelte index 43ec30f72..d795a1140 100644 --- a/examples/api/src/views/Communication.svelte +++ b/examples/api/src/views/Communication.svelte @@ -1,6 +1,6 @@