diff --git a/Cargo.lock b/Cargo.lock index 660bf05b..89d9730b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -28,7 +28,7 @@ dependencies = [ "serde", "serde_json", "tauri", - "tauri-build 2.3.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tauri-build 2.3.0", "tauri-plugin-cli", "tauri-plugin-deep-link", "tauri-plugin-dialog", @@ -5242,7 +5242,7 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "tauri" -version = "2.6.2" +version = "2.7.0" dependencies = [ "anyhow", "bytes", @@ -5282,11 +5282,11 @@ dependencies = [ "specta", "swift-rs", "tauri", - "tauri-build 2.3.0", + "tauri-build 2.3.1", "tauri-macros", "tauri-runtime", "tauri-runtime-wry", - "tauri-utils 2.5.0", + "tauri-utils 2.6.0", "thiserror 2.0.12", "tokio", "tracing", @@ -5300,28 +5300,6 @@ dependencies = [ "windows", ] -[[package]] -name = "tauri-build" -version = "2.3.0" -dependencies = [ - "anyhow", - "cargo_toml", - "dirs", - "glob", - "heck 0.5.0", - "json-patch", - "quote", - "schemars 0.8.22", - "semver", - "serde", - "serde_json", - "tauri-codegen", - "tauri-utils 2.5.0", - "tauri-winres", - "toml 0.8.23", - "walkdir", -] - [[package]] name = "tauri-build" version = "2.3.0" @@ -5338,7 +5316,29 @@ dependencies = [ "semver", "serde", "serde_json", - "tauri-utils 2.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tauri-utils 2.5.0", + "tauri-winres", + "toml 0.8.23", + "walkdir", +] + +[[package]] +name = "tauri-build" +version = "2.3.1" +dependencies = [ + "anyhow", + "cargo_toml", + "dirs", + "glob", + "heck 0.5.0", + "json-patch", + "quote", + "schemars 0.8.22", + "semver", + "serde", + "serde_json", + "tauri-codegen", + "tauri-utils 2.6.0", "tauri-winres", "toml 0.8.23", "walkdir", @@ -5346,7 +5346,7 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "2.3.0" +version = "2.3.1" dependencies = [ "base64 0.22.1", "brotli", @@ -5361,7 +5361,7 @@ dependencies = [ "serde_json", "sha2", "syn 2.0.104", - "tauri-utils 2.5.0", + "tauri-utils 2.6.0", "thiserror 2.0.12", "time", "url", @@ -5371,14 +5371,14 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "2.3.1" +version = "2.3.2" dependencies = [ "heck 0.5.0", "proc-macro2", "quote", "syn 2.0.104", "tauri-codegen", - "tauri-utils 2.5.0", + "tauri-utils 2.6.0", ] [[package]] @@ -5393,7 +5393,7 @@ dependencies = [ "schemars 0.8.22", "serde", "serde_json", - "tauri-utils 2.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tauri-utils 2.5.0", "toml 0.8.23", "walkdir", ] @@ -5423,7 +5423,7 @@ dependencies = [ "serde_json", "tauri", "tauri-plugin", - "tauri-utils 2.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tauri-utils 2.5.0", "thiserror 2.0.12", "tracing", "url", @@ -5465,7 +5465,7 @@ dependencies = [ "serde_repr", "tauri", "tauri-plugin", - "tauri-utils 2.5.0 (registry+https://github.com/rust-lang/crates.io-index)", + "tauri-utils 2.5.0", "thiserror 2.0.12", "toml 0.8.23", "url", @@ -5716,7 +5716,7 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "2.7.0" +version = "2.7.1" dependencies = [ "cookie", "dpi", @@ -5728,7 +5728,7 @@ dependencies = [ "raw-window-handle", "serde", "serde_json", - "tauri-utils 2.5.0", + "tauri-utils 2.6.0", "thiserror 2.0.12", "url", "windows", @@ -5736,7 +5736,7 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "2.7.1" +version = "2.7.2" dependencies = [ "gtk", "http", @@ -5751,7 +5751,7 @@ dependencies = [ "softbuffer", "tao", "tauri-runtime", - "tauri-utils 2.5.0", + "tauri-utils 2.6.0", "tracing", "url", "webkit2gtk", @@ -5760,47 +5760,6 @@ dependencies = [ "wry", ] -[[package]] -name = "tauri-utils" -version = "2.5.0" -dependencies = [ - "aes-gcm", - "anyhow", - "brotli", - "cargo_metadata", - "ctor", - "dunce", - "getrandom 0.3.3", - "glob", - "html5ever", - "http", - "infer", - "json-patch", - "json5", - "kuchikiki", - "log", - "memchr", - "phf 0.11.3", - "proc-macro2", - "quote", - "regex", - "schemars 0.8.22", - "semver", - "serde", - "serde-untagged", - "serde_json", - "serde_with", - "serial_test", - "serialize-to-javascript", - "swift-rs", - "thiserror 2.0.12", - "toml 0.8.23", - "url", - "urlpattern", - "uuid", - "walkdir", -] - [[package]] name = "tauri-utils" version = "2.5.0" @@ -5838,6 +5797,47 @@ dependencies = [ "walkdir", ] +[[package]] +name = "tauri-utils" +version = "2.6.0" +dependencies = [ + "aes-gcm", + "anyhow", + "brotli", + "cargo_metadata", + "ctor", + "dunce", + "getrandom 0.3.3", + "glob", + "html5ever", + "http", + "infer", + "json-patch", + "json5", + "kuchikiki", + "log", + "memchr", + "phf 0.11.3", + "proc-macro2", + "quote", + "regex", + "schemars 0.8.22", + "semver", + "serde", + "serde-untagged", + "serde_json", + "serde_with", + "serial_test", + "serialize-to-javascript", + "swift-rs", + "thiserror 2.0.12", + "toml 0.8.23", + "url", + "urlpattern", + "uuid", + "walkdir", +] + [[package]] name = "tauri-winres" version = "0.3.1" diff --git a/apps/readest-app/package.json b/apps/readest-app/package.json index a342991a..e284177a 100644 --- a/apps/readest-app/package.json +++ b/apps/readest-app/package.json @@ -98,7 +98,7 @@ "devDependencies": { "@next/bundle-analyzer": "^15.4.2", "@tailwindcss/typography": "^0.5.16", - "@tauri-apps/cli": "2.6.2", + "@tauri-apps/cli": "2.7.0", "@types/cors": "^2.8.17", "@types/cssbeautify": "^0.3.5", "@types/node": "^22.10.1", diff --git a/apps/readest-app/src-tauri/Cargo.toml b/apps/readest-app/src-tauri/Cargo.toml index 65b10682..1713869e 100644 --- a/apps/readest-app/src-tauri/Cargo.toml +++ b/apps/readest-app/src-tauri/Cargo.toml @@ -15,7 +15,7 @@ name = "readestlib" crate-type = ["staticlib", "cdylib", "lib"] [build-dependencies] -tauri-build = { version = "2.1.1", features = [] } +tauri-build = { version = "2.3.0", features = [] } [dependencies] serde_json = "1.0" diff --git a/packages/tauri b/packages/tauri index 8f1fcc14..b45b75a1 160000 --- a/packages/tauri +++ b/packages/tauri @@ -1 +1 @@ -Subproject commit 8f1fcc1479eb911dabd1303b717198fbd1612cc4 +Subproject commit b45b75a13f7d8e0e8c181e1e723d82f219ec15bf diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 978a5bc3..4a3d0833 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -205,8 +205,8 @@ importers: specifier: ^0.5.16 version: 0.5.16(tailwindcss@3.4.17(ts-node@10.9.2(@types/node@22.15.31)(typescript@5.7.2))) '@tauri-apps/cli': - specifier: 2.6.2 - version: 2.6.2 + specifier: 2.7.0 + version: 2.7.0 '@types/cors': specifier: ^2.8.17 version: 2.8.17 @@ -2604,74 +2604,74 @@ packages: '@tauri-apps/api@2.6.0': resolution: {integrity: sha512-hRNcdercfgpzgFrMXWwNDBN0B7vNzOzRepy6ZAmhxi5mDLVPNrTpo9MGg2tN/F7JRugj4d2aF7E1rtPXAHaetg==} - '@tauri-apps/cli-darwin-arm64@2.6.2': - resolution: {integrity: sha512-YlvT+Yb7u2HplyN2Cf/nBplCQARC/I4uedlYHlgtxg6rV7xbo9BvG1jLOo29IFhqA2rOp5w1LtgvVGwsOf2kxw==} + '@tauri-apps/cli-darwin-arm64@2.7.0': + resolution: {integrity: sha512-4sSrBlZuGb78UKkVQHdexzrYCamsiFQXFFuh9EI8vdq9PgTG8oXByQNIMx+p01HB594kLhaySrgozst6EFPoVQ==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] - '@tauri-apps/cli-darwin-x64@2.6.2': - resolution: {integrity: sha512-21gdPWfv1bP8rkTdCL44in70QcYcPaDM70L+y78N8TkBuC+/+wqnHcwwjzb+mUyck6UoEw2DORagSI/oKKUGJw==} + '@tauri-apps/cli-darwin-x64@2.7.0': + resolution: {integrity: sha512-Uec0pKyw5/w4UmcRLyPt/+JG4dsIKj0TeKtF3PDz4EAGOevjSBaLIgu8aC62s3wKLCtDydTdIMMQ1ENHTJgfPA==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] - '@tauri-apps/cli-linux-arm-gnueabihf@2.6.2': - resolution: {integrity: sha512-MW8Y6HqHS5yzQkwGoLk/ZyE1tWpnz/seDoY4INsbvUZdknuUf80yn3H+s6eGKtT/0Bfqon/W9sY7pEkgHRPQgA==} + '@tauri-apps/cli-linux-arm-gnueabihf@2.7.0': + resolution: {integrity: sha512-ZE7y/3MW9i1DccnHyktBDbryMWVFdnIfdqQoJ40iBzQGoBIQk4DonA5zROcqw0qGRTsXfTRnVjIXnh5eLkoCzQ==} engines: {node: '>= 10'} cpu: [arm] os: [linux] - '@tauri-apps/cli-linux-arm64-gnu@2.6.2': - resolution: {integrity: sha512-9PdINTUtnyrnQt9hvC4y1m0NoxKSw/wUB9OTBAQabPj8WLAdvySWiUpEiqJjwLhlu4T6ltXZRpNTEzous3/RXg==} + '@tauri-apps/cli-linux-arm64-gnu@2.7.0': + resolution: {integrity: sha512-cWGl8OL+FjPWib+K8YK1S6o2Z34+f2LxnFRziTPdHwrdlVNO2xYkJmrT6X3PyHtccf/IByicxVvjkExLlpZ4+A==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-arm64-musl@2.6.2': - resolution: {integrity: sha512-LrcJTRr7FrtQlTDkYaRXIGo/8YU/xkWmBPC646WwKNZ/S6yqCiDcOMoPe7Cx4ZvcG6sK6LUCLQMfaSNEL7PT0A==} + '@tauri-apps/cli-linux-arm64-musl@2.7.0': + resolution: {integrity: sha512-MftwAsMDw9dmKosbHdSHyCa0jgKjt9UslJsRpXym8dmbw+gzD3YrY41GORq0HbCYImC5rS/qQf9eELoLcqY/BQ==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-riscv64-gnu@2.6.2': - resolution: {integrity: sha512-GnTshO/BaZ9KGIazz2EiFfXGWgLur5/pjqklRA/ck42PGdUQJhV/Ao7A7TdXPjqAzpFxNo6M/Hx0GCH2iMS7IA==} + '@tauri-apps/cli-linux-riscv64-gnu@2.7.0': + resolution: {integrity: sha512-QwL4YhckgtozR7wlXOTRKijkgViz4B0OeXqhsIrhQock2HDxqCh5VqhGQ9LRJ6HsXY1JkAYZQUAFvcBj2DHUXQ==} engines: {node: '>= 10'} cpu: [riscv64] os: [linux] - '@tauri-apps/cli-linux-x64-gnu@2.6.2': - resolution: {integrity: sha512-QDG3WeJD6UJekmrtVPCJRzlKgn9sGzhvD58oAw5gIU+DRovgmmG2U1jH9fS361oYGjWWO7d/KM9t0kugZzi4lQ==} + '@tauri-apps/cli-linux-x64-gnu@2.7.0': + resolution: {integrity: sha512-4MwN2sqUEYGKjwcs0afPp79DkiydAfkGNdBTPfvNrDUmhbT6JE95RhYyzfZLfXNinsdB4nbZmYGEPIv5NpK2KQ==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-linux-x64-musl@2.6.2': - resolution: {integrity: sha512-TNVTDDtnWzuVqWBFdZ4+8ZTg17tc21v+CT5XBQ+KYCoYtCrIaHpW04fS5Tmudi+vYdBwoPDfwpKEB6LhCeFraQ==} + '@tauri-apps/cli-linux-x64-musl@2.7.0': + resolution: {integrity: sha512-N1hygCRW0X4msCpdG3/UXb+Z8wpc4lYRqlkhbbxLOjzHwjuLS+86GYAvRLe7JIePVXVUI5BfX1HeurdbWWINTg==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-win32-arm64-msvc@2.6.2': - resolution: {integrity: sha512-z77C1oa/hMLO/jM1JF39tK3M3v9nou7RsBnQoOY54z5WPcpVAbS0XdFhXB7sSN72BOiO3moDky9lQANQz6L3CA==} + '@tauri-apps/cli-win32-arm64-msvc@2.7.0': + resolution: {integrity: sha512-sqVDkwvUsuHeUVlMXpkXPo4gWFXuOcNbme0xPQ1r07hqBxYJlqwDY9XS0sC/7XljnO6anJaSr8FJkuixnIqyUQ==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] - '@tauri-apps/cli-win32-ia32-msvc@2.6.2': - resolution: {integrity: sha512-TmD8BbzbjluBw8+QEIWUVmFa9aAluSkT1N937n1mpYLXcPbTpbunqRFiIznTwupoJNJIdtpF/t7BdZDRh5rrcg==} + '@tauri-apps/cli-win32-ia32-msvc@2.7.0': + resolution: {integrity: sha512-2sZFAZZC8fwc65d5ACrTUgKPYbZgd3DAN5gI4WzCyTQgPqLq/7CWD25Wt7+scTV7FhT1zjL88hI10yPsEE0kkA==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] - '@tauri-apps/cli-win32-x64-msvc@2.6.2': - resolution: {integrity: sha512-ItB8RCKk+nCmqOxOvbNtltz6x1A4QX6cSM21kj3NkpcnjT9rHSMcfyf8WVI2fkoMUJR80iqCblUX6ARxC3lj6w==} + '@tauri-apps/cli-win32-x64-msvc@2.7.0': + resolution: {integrity: sha512-mGqRRpqdZ5iKLaQwP1paz89koLVrE/mUOrq6boftHDxF8K1sU/9Um/E7SLrkfeICiWbVG5yY7j2N/j8/D80blw==} engines: {node: '>= 10'} cpu: [x64] os: [win32] - '@tauri-apps/cli@2.6.2': - resolution: {integrity: sha512-s1/eyBHxk0wG1blLeOY2IDjgZcxVrkxU5HFL8rNDwjYGr0o7yr3RAtwmuUPhz13NO+xGAL1bJZaLFBdp+5joKg==} + '@tauri-apps/cli@2.7.0': + resolution: {integrity: sha512-ozyxKm5YvivvLyrgHKyl6L+6y1/TkkeoA0cppPqxDv+ldbbtYiXx7dH8/G20tINh7dE+omSimN36i9M1ClGxtQ==} engines: {node: '>= 10'} hasBin: true @@ -9575,52 +9575,52 @@ snapshots: '@tauri-apps/api@2.6.0': {} - '@tauri-apps/cli-darwin-arm64@2.6.2': + '@tauri-apps/cli-darwin-arm64@2.7.0': optional: true - '@tauri-apps/cli-darwin-x64@2.6.2': + '@tauri-apps/cli-darwin-x64@2.7.0': optional: true - '@tauri-apps/cli-linux-arm-gnueabihf@2.6.2': + '@tauri-apps/cli-linux-arm-gnueabihf@2.7.0': optional: true - '@tauri-apps/cli-linux-arm64-gnu@2.6.2': + '@tauri-apps/cli-linux-arm64-gnu@2.7.0': optional: true - '@tauri-apps/cli-linux-arm64-musl@2.6.2': + '@tauri-apps/cli-linux-arm64-musl@2.7.0': optional: true - '@tauri-apps/cli-linux-riscv64-gnu@2.6.2': + '@tauri-apps/cli-linux-riscv64-gnu@2.7.0': optional: true - '@tauri-apps/cli-linux-x64-gnu@2.6.2': + '@tauri-apps/cli-linux-x64-gnu@2.7.0': optional: true - '@tauri-apps/cli-linux-x64-musl@2.6.2': + '@tauri-apps/cli-linux-x64-musl@2.7.0': optional: true - '@tauri-apps/cli-win32-arm64-msvc@2.6.2': + '@tauri-apps/cli-win32-arm64-msvc@2.7.0': optional: true - '@tauri-apps/cli-win32-ia32-msvc@2.6.2': + '@tauri-apps/cli-win32-ia32-msvc@2.7.0': optional: true - '@tauri-apps/cli-win32-x64-msvc@2.6.2': + '@tauri-apps/cli-win32-x64-msvc@2.7.0': optional: true - '@tauri-apps/cli@2.6.2': + '@tauri-apps/cli@2.7.0': optionalDependencies: - '@tauri-apps/cli-darwin-arm64': 2.6.2 - '@tauri-apps/cli-darwin-x64': 2.6.2 - '@tauri-apps/cli-linux-arm-gnueabihf': 2.6.2 - '@tauri-apps/cli-linux-arm64-gnu': 2.6.2 - '@tauri-apps/cli-linux-arm64-musl': 2.6.2 - '@tauri-apps/cli-linux-riscv64-gnu': 2.6.2 - '@tauri-apps/cli-linux-x64-gnu': 2.6.2 - '@tauri-apps/cli-linux-x64-musl': 2.6.2 - '@tauri-apps/cli-win32-arm64-msvc': 2.6.2 - '@tauri-apps/cli-win32-ia32-msvc': 2.6.2 - '@tauri-apps/cli-win32-x64-msvc': 2.6.2 + '@tauri-apps/cli-darwin-arm64': 2.7.0 + '@tauri-apps/cli-darwin-x64': 2.7.0 + '@tauri-apps/cli-linux-arm-gnueabihf': 2.7.0 + '@tauri-apps/cli-linux-arm64-gnu': 2.7.0 + '@tauri-apps/cli-linux-arm64-musl': 2.7.0 + '@tauri-apps/cli-linux-riscv64-gnu': 2.7.0 + '@tauri-apps/cli-linux-x64-gnu': 2.7.0 + '@tauri-apps/cli-linux-x64-musl': 2.7.0 + '@tauri-apps/cli-win32-arm64-msvc': 2.7.0 + '@tauri-apps/cli-win32-ia32-msvc': 2.7.0 + '@tauri-apps/cli-win32-x64-msvc': 2.7.0 '@tauri-apps/plugin-cli@2.4.0': dependencies: