From 24128dd318e2b3eddf051991755198fcc701a2d8 Mon Sep 17 00:00:00 2001 From: James Brunton Date: Tue, 24 Feb 2026 18:43:40 +0000 Subject: [PATCH] Sync up Tauri versions (#5789) --- .github/workflows/tauri-build.yml | 3 ++ frontend/package-lock.json | 6 +-- frontend/package.json | 10 ++-- frontend/src-tauri/Cargo.lock | 85 +++++++++++++++++++++---------- frontend/src-tauri/Cargo.toml | 2 +- 5 files changed, 70 insertions(+), 36 deletions(-) diff --git a/.github/workflows/tauri-build.yml b/.github/workflows/tauri-build.yml index a0bcdaf23..4d0cb5e8c 100644 --- a/.github/workflows/tauri-build.yml +++ b/.github/workflows/tauri-build.yml @@ -19,6 +19,9 @@ on: - "frontend/src-tauri/**" - "frontend/src/desktop/**" - "frontend/tsconfig.desktop.json" + - "frontend/package.json" + - "frontend/package-lock.json" + - "frontend/vite.config.ts" - ".github/workflows/tauri-build.yml" push: branches: [main] diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 606b5e546..a8c5b79cd 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -50,11 +50,11 @@ "@supabase/supabase-js": "^2.47.13", "@tailwindcss/postcss": "^4.1.13", "@tanstack/react-virtual": "^3.13.12", - "@tauri-apps/api": "^2.9.1", + "@tauri-apps/api": "^2.10.1", "@tauri-apps/plugin-dialog": "^2.6.0", "@tauri-apps/plugin-fs": "^2.4.5", - "@tauri-apps/plugin-http": "^2.5.6", - "@tauri-apps/plugin-shell": "^2.3.4", + "@tauri-apps/plugin-http": "^2.5.7", + "@tauri-apps/plugin-shell": "^2.3.5", "autoprefixer": "^10.4.21", "axios": "^1.13.2", "globals": "^17.1.0", diff --git a/frontend/package.json b/frontend/package.json index 6f43944f2..cd15321ff 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -6,6 +6,7 @@ "proxy": "http://localhost:8080", "dependencies": { "@atlaskit/pragmatic-drag-and-drop": "^1.7.7", + "@cantoo/pdf-lib": "^2.5.3", "@dnd-kit/core": "^6.3.1", "@embedpdf/core": "^2.6.2", "@embedpdf/engines": "^2.6.2", @@ -13,9 +14,9 @@ "@embedpdf/plugin-annotation": "^2.6.2", "@embedpdf/plugin-attachment": "^2.6.2", "@embedpdf/plugin-bookmark": "^2.6.2", + "@embedpdf/plugin-document-manager": "^2.6.2", "@embedpdf/plugin-export": "^2.6.2", "@embedpdf/plugin-history": "^2.6.2", - "@embedpdf/plugin-document-manager": "^2.6.2", "@embedpdf/plugin-interaction-manager": "^2.6.2", "@embedpdf/plugin-pan": "^2.6.2", "@embedpdf/plugin-print": "^2.6.2", @@ -45,11 +46,11 @@ "@supabase/supabase-js": "^2.47.13", "@tailwindcss/postcss": "^4.1.13", "@tanstack/react-virtual": "^3.13.12", - "@tauri-apps/api": "^2.9.1", + "@tauri-apps/api": "^2.10.1", "@tauri-apps/plugin-dialog": "^2.6.0", "@tauri-apps/plugin-fs": "^2.4.5", - "@tauri-apps/plugin-http": "^2.5.6", - "@tauri-apps/plugin-shell": "^2.3.4", + "@tauri-apps/plugin-http": "^2.5.7", + "@tauri-apps/plugin-shell": "^2.3.5", "autoprefixer": "^10.4.21", "axios": "^1.13.2", "globals": "^17.1.0", @@ -57,7 +58,6 @@ "i18next-browser-languagedetector": "^8.2.0", "jszip": "^3.10.1", "license-report": "^6.8.0", - "@cantoo/pdf-lib": "^2.5.3", "pdfjs-dist": "^5.4.149", "peerjs": "^1.5.5", "posthog-js": "^1.268.0", diff --git a/frontend/src-tauri/Cargo.lock b/frontend/src-tauri/Cargo.lock index 7029acb12..cd0f2449f 100644 --- a/frontend/src-tauri/Cargo.lock +++ b/frontend/src-tauri/Cargo.lock @@ -1902,9 +1902,9 @@ dependencies = [ [[package]] name = "ico" -version = "0.4.0" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc50b891e4acf8fe0e71ef88ec43ad82ee07b3810ad09de10f1d01f072ed4b98" +checksum = "3e795dff5605e0f04bff85ca41b51a96b83e80b281e96231bcaaf1ac35103371" dependencies = [ "byteorder", "png", @@ -3499,7 +3499,6 @@ dependencies = [ "cookie_store 0.22.0", "encoding_rs", "futures-core", - "futures-util", "h2 0.4.13", "http 1.4.0", "http-body 1.0.1", @@ -3521,6 +3520,39 @@ dependencies = [ "sync_wrapper 1.0.2", "tokio", "tokio-rustls 0.26.4", + "tower", + "tower-http", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", + "webpki-roots 1.0.5", +] + +[[package]] +name = "reqwest" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ab3f43e3283ab1488b624b44b0e988d0acea0b3214e694730a055cb6b2efa801" +dependencies = [ + "base64 0.22.1", + "bytes", + "futures-core", + "futures-util", + "http 1.4.0", + "http-body 1.0.1", + "http-body-util", + "hyper 1.8.1", + "hyper-util", + "js-sys", + "log", + "percent-encoding", + "pin-project-lite", + "serde", + "serde_json", + "sync_wrapper 1.0.2", + "tokio", "tokio-util", "tower", "tower-http", @@ -3530,7 +3562,6 @@ dependencies = [ "wasm-bindgen-futures", "wasm-streams", "web-sys", - "webpki-roots 1.0.5", ] [[package]] @@ -4486,9 +4517,9 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.9.5" +version = "2.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a3868da5508446a7cd08956d523ac3edf0a8bc20bf7e4038f9a95c2800d2033" +checksum = "463ae8677aa6d0f063a900b9c41ecd4ac2b7ca82f0b058cc4491540e55b20129" dependencies = [ "anyhow", "bytes", @@ -4514,7 +4545,7 @@ dependencies = [ "percent-encoding", "plist", "raw-window-handle", - "reqwest 0.12.28", + "reqwest 0.13.2", "serde", "serde_json", "serde_repr", @@ -4537,9 +4568,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.5.3" +version = "2.5.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17fcb8819fd16463512a12f531d44826ce566f486d7ccd211c9c8cebdaec4e08" +checksum = "ca7bd893329425df750813e95bd2b643d5369d929438da96d5bbb7cc2c918f74" dependencies = [ "anyhow", "cargo_toml", @@ -4559,9 +4590,9 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9fa9844cefcf99554a16e0a278156ae73b0d8680bbc0e2ad1e4287aadd8489cf" +checksum = "aac423e5859d9f9ccdd32e3cf6a5866a15bedbf25aa6630bcb2acde9468f6ae3" dependencies = [ "base64 0.22.1", "brotli", @@ -4586,9 +4617,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.5.2" +version = "2.5.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3764a12f886d8245e66b7ee9b43ccc47883399be2019a61d80cf0f4117446fde" +checksum = "1b6a1bd2861ff0c8766b1d38b32a6a410f6dc6532d4ef534c47cfb2236092f59" dependencies = [ "heck 0.5.0", "proc-macro2", @@ -4799,9 +4830,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.9.2" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f766fe9f3d1efc4b59b17e7a891ad5ed195fa8d23582abb02e6c9a01137892" +checksum = "b885ffeac82b00f1f6fd292b6e5aabfa7435d537cef57d11e38a489956535651" dependencies = [ "cookie", "dpi", @@ -4824,9 +4855,9 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.9.3" +version = "2.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "187a3f26f681bdf028f796ccf57cf478c1ee422c50128e5a0a6ebeb3f5910065" +checksum = "5204682391625e867d16584fedc83fc292fb998814c9f7918605c789cd876314" dependencies = [ "gtk", "http 1.4.0", @@ -4851,9 +4882,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "2.8.1" +version = "2.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76a423c51176eb3616ee9b516a9fa67fed5f0e78baaba680e44eb5dd2cc37490" +checksum = "fcd169fccdff05eff2c1033210b9b94acd07a47e6fa9a3431cf09cfd4f01c87e" dependencies = [ "anyhow", "brotli", @@ -5582,9 +5613,9 @@ dependencies = [ [[package]] name = "wasm-streams" -version = "0.4.2" +version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" +checksum = "9d1ec4f6517c9e11ae630e200b2b65d193279042e28edd4a2cda233e46670bbb" dependencies = [ "futures-util", "js-sys", @@ -5615,9 +5646,9 @@ dependencies = [ [[package]] name = "webkit2gtk" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76b1bc1e54c581da1e9f179d0b38512ba358fb1af2d634a1affe42e37172361a" +checksum = "a1027150013530fb2eaf806408df88461ae4815a45c541c8975e61d6f2fc4793" dependencies = [ "bitflags 1.3.2", "cairo-rs", @@ -5639,9 +5670,9 @@ dependencies = [ [[package]] name = "webkit2gtk-sys" -version = "2.0.1" +version = "2.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62daa38afc514d1f8f12b8693d30d5993ff77ced33ce30cd04deebc267a6d57c" +checksum = "916a5f65c2ef0dfe12fff695960a2ec3d4565359fdbb2e9943c974e06c734ea5" dependencies = [ "bitflags 1.3.2", "cairo-sys-rs", @@ -6346,9 +6377,9 @@ checksum = "9edde0db4769d2dc68579893f2306b26c6ecfbe0ef499b013d731b7b9247e0b9" [[package]] name = "wry" -version = "0.53.5" +version = "0.54.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728b7d4c8ec8d81cab295e0b5b8a4c263c0d41a785fb8f8c4df284e5411140a2" +checksum = "bb26159b420aa77684589a744ae9a9461a95395b848764ad12290a14d960a11a" dependencies = [ "base64 0.22.1", "block2", diff --git a/frontend/src-tauri/Cargo.toml b/frontend/src-tauri/Cargo.toml index f25f63d88..75b38a553 100644 --- a/frontend/src-tauri/Cargo.toml +++ b/frontend/src-tauri/Cargo.toml @@ -24,7 +24,7 @@ tauri-build = { version = "2.5.3", features = [] } serde_json = "1.0" serde = { version = "1.0", features = ["derive"] } log = "0.4" -tauri = { version = "2.9.0", features = [ "devtools"] } +tauri = { version = "2.10.1", features = [ "devtools"] } tauri-plugin-log = "2.8.0" tauri-plugin-shell = "2.3.4" tauri-plugin-fs = "2.4.5"