diff --git a/package.json b/package.json index b8dc3419..43c66e0e 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ }, "devDependencies": { "@h3poteto/tauri-snap-packager": "0.2.1", - "@tauri-apps/cli": "^2.2.2", + "@tauri-apps/cli": "^2.2.4", "@types/jest": "^29.5.14", "@types/node": "^22.10.2", "@types/parse-link-header": "^2.0.3", diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index f407ddb6..6e70af01 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -88,8 +88,8 @@ importers: specifier: 0.2.1 version: 0.2.1 '@tauri-apps/cli': - specifier: ^2.2.2 - version: 2.2.2 + specifier: ^2.2.4 + version: 2.2.4 '@types/jest': specifier: ^29.5.14 version: 29.5.14 @@ -679,68 +679,68 @@ packages: '@tauri-apps/api@2.2.0': resolution: {integrity: sha512-R8epOeZl1eJEl603aUMIGb4RXlhPjpgxbGVEaqY+0G5JG9vzV/clNlzTeqc+NLYXVqXcn8mb4c5b9pJIUDEyAg==} - '@tauri-apps/cli-darwin-arm64@2.2.2': - resolution: {integrity: sha512-JMXbX5hGrLOzJbjisd7gBe25PmHouXA1+f4yVWg5PRlgxW7pla7krOzhu2mchFlMVDr8aLwhMLgohvvx+raXag==} + '@tauri-apps/cli-darwin-arm64@2.2.4': + resolution: {integrity: sha512-+sMLkQBFebn/UENyaXpyQqRkdFQie8RdEvYVz0AGthm2p0lMVlWiBmc4ImBJmfo8569zVeDX8B+5OWt4/AuZzA==} engines: {node: '>= 10'} cpu: [arm64] os: [darwin] - '@tauri-apps/cli-darwin-x64@2.2.2': - resolution: {integrity: sha512-i2gxKXev+Ed0UWeq0xSiyRjSkzzBbu9MCOhs/QVv1YuV+097K/fF89f+a4v5JJftCq2IOHhSKH23KyTJBLnNKQ==} + '@tauri-apps/cli-darwin-x64@2.2.4': + resolution: {integrity: sha512-6fJvXVtQJh7H8q9sll2XC2wO5bpn7bzeh+MQxpcLq6F8SE02sFuNDLN+AqX0DQnuYV0V6jdzM2+bTYOlc1FBsw==} engines: {node: '>= 10'} cpu: [x64] os: [darwin] - '@tauri-apps/cli-linux-arm-gnueabihf@2.2.2': - resolution: {integrity: sha512-iC2HndsN5smmbvEDUQFyTHyYHSgx7OwJ6puyXLLpkAHnQDo4TGSPxIlPeZFSZmEoaJEmHLdG3j1LcFWOKrxWQg==} + '@tauri-apps/cli-linux-arm-gnueabihf@2.2.4': + resolution: {integrity: sha512-QU6Ac6tx79iqkxsDUQesCBNq8RrVSkP9HhVzS2reKthK3xbdTCwNUXoRlfhudKMVrIxV4K7uTwUV99eAnwbm5Q==} engines: {node: '>= 10'} cpu: [arm] os: [linux] - '@tauri-apps/cli-linux-arm64-gnu@2.2.2': - resolution: {integrity: sha512-YzK30tleUzWxfIp1davc5RhvmNZxiZQkUnQ4zajGJZ99zxNk8kwvv8nYSC3/J2R8sYpnuv+7CzNyIwA2s6yH+w==} + '@tauri-apps/cli-linux-arm64-gnu@2.2.4': + resolution: {integrity: sha512-uZhp312s6VgJJDgUg+HuHZnhjGg93OT+q/aZMoccdZVQ6dvwH8kJzIkKt9zL1U126AXXoesb1EyYmsAruxaUKA==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-arm64-musl@2.2.2': - resolution: {integrity: sha512-nOw2apBzOCTiH1fLOjL42ajHNhMzdp640CX5RrWkDYdyVO7YbGmWzrN26PPXohScScXVjSjtDDxdeQV1gHCxhg==} + '@tauri-apps/cli-linux-arm64-musl@2.2.4': + resolution: {integrity: sha512-k6JCXd9E+XU0J48nVcFr3QO//bzKg/gp8ZKagBfI2wBpHOk14CnHNBQKNs11nMQUwko4bnPeqj4llcdkbmwIbw==} engines: {node: '>= 10'} cpu: [arm64] os: [linux] - '@tauri-apps/cli-linux-x64-gnu@2.2.2': - resolution: {integrity: sha512-Tmm4qVY8yxSugi8sCko1dyZxyPGK8m3tWm+b1J0DXwzxqaoMqNXuYGxkwtUdkznPXEfQSD8OGBfwjXNmVGE91Q==} + '@tauri-apps/cli-linux-x64-gnu@2.2.4': + resolution: {integrity: sha512-bUBPU46OF1pNfM6SsGbUlkCBh/pTzvFlEdUpDISsS40v9NVt+kqCy3tHzLGB412E3lSlA6FnshB6HxkdRRdTtg==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-linux-x64-musl@2.2.2': - resolution: {integrity: sha512-AwAcaCUhmwzOFPvje80g2BAhnkoEpXdl1E0Uk+lvr9makHM0+aV++M5jibD97yxKnK5NrQ9YXPH5Sn6CdncgUg==} + '@tauri-apps/cli-linux-x64-musl@2.2.4': + resolution: {integrity: sha512-vOrpsQDiMtP8q/ZeXfXqgNi3G4Yv5LVX2vI5XkB2yvVuVF1Dvky/hcCJfi9tZQD+IpeiYxjuj7+SxHp82eQ/kA==} engines: {node: '>= 10'} cpu: [x64] os: [linux] - '@tauri-apps/cli-win32-arm64-msvc@2.2.2': - resolution: {integrity: sha512-u7TnwuUAN+eX6R2kDfSM8fsUFiBzNqq9PnAOsQ2qbwbHGbu7mHfGO1OFgnIzBt1C9FolFbENk2pzjiL4R9baXQ==} + '@tauri-apps/cli-win32-arm64-msvc@2.2.4': + resolution: {integrity: sha512-iEP/Cq0ts4Ln4Zh2NSC01lkYEAhr+LotbG4U2z+gxHfCdMrtYYtYdG05C2mpeIxShzL7uEIQb/lhVRBMd7robg==} engines: {node: '>= 10'} cpu: [arm64] os: [win32] - '@tauri-apps/cli-win32-ia32-msvc@2.2.2': - resolution: {integrity: sha512-9KScbGKU6GfHThEYWdlO0+COW/8SDfIXbYgEvEcfZztE4VedHBbI0XfU+l+aS8nJN+fvYX+DtvY0tpDwyo0G4A==} + '@tauri-apps/cli-win32-ia32-msvc@2.2.4': + resolution: {integrity: sha512-YBbqF0wyHUT00zAGZTTbEbz/C5JDGPnT1Nodor96+tzEU6qAPRYfe5eFe/rpRARbalkpw1UkcVP0Ay8gnksAiA==} engines: {node: '>= 10'} cpu: [ia32] os: [win32] - '@tauri-apps/cli-win32-x64-msvc@2.2.2': - resolution: {integrity: sha512-ko8OWCLwFaHfdBaKbRX/C5btNt61v17qKOSQPksuc5PVvY0tAoci09612nEMlYiogZKEtn7VAqSdRAG6h0tz+g==} + '@tauri-apps/cli-win32-x64-msvc@2.2.4': + resolution: {integrity: sha512-MMago/SfWZbUFrwFmPCXmmbb42h7u8Y5jvLvnK2mOpOfCAsei2tLO4hx+Inoai0l2DByuYO4Ef1xDyP6shCsZQ==} engines: {node: '>= 10'} cpu: [x64] os: [win32] - '@tauri-apps/cli@2.2.2': - resolution: {integrity: sha512-5fVEdP4t4BT0ymvXZAM78kB0S/TaiRDLDoSRWGxVy1e7XCwuKyST5m6ybeyw/h/soK/91tbf+W3xXXy7XzkT4A==} + '@tauri-apps/cli@2.2.4': + resolution: {integrity: sha512-pihbuHEWJa9SEcN7JdEbMa0oq28MTTbk0nNNnRG8/irNQTKcjwM+KzxG2wuYZYbsXQVqwSu7PstdIEAnXqYHkw==} engines: {node: '>= 10'} hasBin: true @@ -3408,48 +3408,48 @@ snapshots: '@tauri-apps/api@2.2.0': {} - '@tauri-apps/cli-darwin-arm64@2.2.2': + '@tauri-apps/cli-darwin-arm64@2.2.4': optional: true - '@tauri-apps/cli-darwin-x64@2.2.2': + '@tauri-apps/cli-darwin-x64@2.2.4': optional: true - '@tauri-apps/cli-linux-arm-gnueabihf@2.2.2': + '@tauri-apps/cli-linux-arm-gnueabihf@2.2.4': optional: true - '@tauri-apps/cli-linux-arm64-gnu@2.2.2': + '@tauri-apps/cli-linux-arm64-gnu@2.2.4': optional: true - '@tauri-apps/cli-linux-arm64-musl@2.2.2': + '@tauri-apps/cli-linux-arm64-musl@2.2.4': optional: true - '@tauri-apps/cli-linux-x64-gnu@2.2.2': + '@tauri-apps/cli-linux-x64-gnu@2.2.4': optional: true - '@tauri-apps/cli-linux-x64-musl@2.2.2': + '@tauri-apps/cli-linux-x64-musl@2.2.4': optional: true - '@tauri-apps/cli-win32-arm64-msvc@2.2.2': + '@tauri-apps/cli-win32-arm64-msvc@2.2.4': optional: true - '@tauri-apps/cli-win32-ia32-msvc@2.2.2': + '@tauri-apps/cli-win32-ia32-msvc@2.2.4': optional: true - '@tauri-apps/cli-win32-x64-msvc@2.2.2': + '@tauri-apps/cli-win32-x64-msvc@2.2.4': optional: true - '@tauri-apps/cli@2.2.2': + '@tauri-apps/cli@2.2.4': optionalDependencies: - '@tauri-apps/cli-darwin-arm64': 2.2.2 - '@tauri-apps/cli-darwin-x64': 2.2.2 - '@tauri-apps/cli-linux-arm-gnueabihf': 2.2.2 - '@tauri-apps/cli-linux-arm64-gnu': 2.2.2 - '@tauri-apps/cli-linux-arm64-musl': 2.2.2 - '@tauri-apps/cli-linux-x64-gnu': 2.2.2 - '@tauri-apps/cli-linux-x64-musl': 2.2.2 - '@tauri-apps/cli-win32-arm64-msvc': 2.2.2 - '@tauri-apps/cli-win32-ia32-msvc': 2.2.2 - '@tauri-apps/cli-win32-x64-msvc': 2.2.2 + '@tauri-apps/cli-darwin-arm64': 2.2.4 + '@tauri-apps/cli-darwin-x64': 2.2.4 + '@tauri-apps/cli-linux-arm-gnueabihf': 2.2.4 + '@tauri-apps/cli-linux-arm64-gnu': 2.2.4 + '@tauri-apps/cli-linux-arm64-musl': 2.2.4 + '@tauri-apps/cli-linux-x64-gnu': 2.2.4 + '@tauri-apps/cli-linux-x64-musl': 2.2.4 + '@tauri-apps/cli-win32-arm64-msvc': 2.2.4 + '@tauri-apps/cli-win32-ia32-msvc': 2.2.4 + '@tauri-apps/cli-win32-x64-msvc': 2.2.4 '@tauri-apps/plugin-clipboard-manager@2.2.0': dependencies: diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 0a6cf8f4..223d060b 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -540,12 +540,12 @@ dependencies = [ [[package]] name = "cargo_toml" -version = "0.17.2" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a969e13a7589e9e3e4207e153bae624ade2b5622fb4684a4923b23ec3d57719" +checksum = "5fbd1fe9db3ebf71b89060adaf7b0504c2d6a425cf061313099547e382c2e472" dependencies = [ "serde", - "toml 0.8.2", + "toml 0.8.19", ] [[package]] @@ -1904,7 +1904,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bb0228f477c0900c880fd78c8759b95c7636dbd7842707f49e132378aa2acdc" dependencies = [ "heck 0.4.0", - "proc-macro-crate 2.0.2", + "proc-macro-crate 2.0.0", "proc-macro-error", "proc-macro2", "quote", @@ -3273,7 +3273,7 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56" dependencies = [ - "proc-macro-crate 2.0.2", + "proc-macro-crate 1.2.1", "proc-macro2", "quote", "syn 2.0.87", @@ -4040,11 +4040,10 @@ dependencies = [ [[package]] name = "proc-macro-crate" -version = "2.0.2" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24" +checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8" dependencies = [ - "toml_datetime", "toml_edit 0.20.2", ] @@ -5648,9 +5647,9 @@ dependencies = [ [[package]] name = "tauri" -version = "2.2.0" +version = "2.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2e2e3349fbb2be7af9fad1b43d61ac83ba55ab48d47fbe1b2732f0c8211610a9" +checksum = "b2133243fd7dc4932bac10ad18d45043e5cdb69e1bbd1df6f57336ad2c372cca" dependencies = [ "anyhow", "bytes", @@ -5699,9 +5698,9 @@ dependencies = [ [[package]] name = "tauri-build" -version = "2.0.4" +version = "2.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b274ec7239ada504deb615f1c8abd7ba99631e879709e6f10e5d17217058d976" +checksum = "8e950124f6779c6cf98e3260c7a6c8488a74aa6350dd54c6950fdaa349bca2df" dependencies = [ "anyhow", "cargo_toml", @@ -5715,7 +5714,7 @@ dependencies = [ "serde_json", "tauri-utils", "tauri-winres", - "toml 0.8.2", + "toml 0.8.19", "walkdir", ] @@ -5773,7 +5772,7 @@ dependencies = [ "serde", "serde_json", "tauri-utils", - "toml 0.8.2", + "toml 0.8.19", "walkdir", ] @@ -5828,7 +5827,7 @@ dependencies = [ "tauri-plugin", "tauri-utils", "thiserror 2.0.3", - "toml 0.8.2", + "toml 0.8.19", "url", "uuid", ] @@ -6028,7 +6027,7 @@ dependencies = [ "serde_with", "swift-rs", "thiserror 2.0.3", - "toml 0.8.2", + "toml 0.8.19", "url", "urlpattern", "uuid", @@ -6337,21 +6336,21 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.2" +version = "0.8.19" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d" +checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e" dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit 0.20.2", + "toml_edit 0.22.22", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41" dependencies = [ "serde", ] @@ -6374,12 +6373,23 @@ name = "toml_edit" version = "0.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338" +dependencies = [ + "indexmap 2.5.0", + "toml_datetime", + "winnow 0.5.40", +] + +[[package]] +name = "toml_edit" +version = "0.22.22" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5" dependencies = [ "indexmap 2.5.0", "serde", "serde_spanned", "toml_datetime", - "winnow 0.5.40", + "winnow 0.6.24", ] [[package]] @@ -7491,6 +7501,15 @@ dependencies = [ "memchr", ] +[[package]] +name = "winnow" +version = "0.6.24" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8d71a593cc5c42ad7876e2c1fda56f314f3754c084128833e64f1345ff8a03a" +dependencies = [ + "memchr", +] + [[package]] name = "winreg" version = "0.10.1" diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index 6903cb0f..dbfaa44a 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -12,12 +12,12 @@ rust-version = "1.57" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [build-dependencies] -tauri-build = { version = "2.0.4", features = [] } +tauri-build = { version = "2.0.5", features = [] } [dependencies] serde_json = "1.0.135" serde = { version = "1.0.217", features = ["derive"] } -tauri = { version = "2.2.0", features = ["image-png"] } +tauri = { version = "2.2.1", features = ["image-png"] } sqlx = { version = "0.8.2", features = ["runtime-tokio-rustls", "sqlite", "migrate"] } tokio = { version = "1.42.0", features = ["full"] } futures = "0.3.31"