From 8a052bbed61d5cb346b5039100f65d0b07f7ab58 Mon Sep 17 00:00:00 2001 From: GyDi Date: Wed, 9 Mar 2022 01:50:37 +0800 Subject: [PATCH] chore: update tauri version --- package.json | 4 +- src-tauri/Cargo.lock | 69 +++++++++++--------------- src-tauri/Cargo.toml | 4 +- yarn.lock | 112 +++++++++++++++++++++++-------------------- 4 files changed, 91 insertions(+), 98 deletions(-) diff --git a/package.json b/package.json index a8d6c8b..6439356 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "@emotion/styled": "^11.8.1", "@mui/icons-material": "^5.4.4", "@mui/material": "^5.4.4", - "@tauri-apps/api": "^1.0.0-rc.1", + "@tauri-apps/api": "^1.0.0-rc.2", "ahooks": "^3.1.13", "axios": "^0.26.0", "dayjs": "^1.10.8", @@ -32,7 +32,7 @@ }, "devDependencies": { "@actions/github": "^5.0.0", - "@tauri-apps/cli": "^1.0.0-rc.5", + "@tauri-apps/cli": "^1.0.0-rc.7", "@types/fs-extra": "^9.0.13", "@types/js-cookie": "^3.0.1", "@types/react": "^17.0.0", diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock index 7e872eb..31111be 100644 --- a/src-tauri/Cargo.lock +++ b/src-tauri/Cargo.lock @@ -317,27 +317,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c4872d67bab6358e59559027aa3b9157c53d9358c51423c17554809a8858e0f8" -[[package]] -name = "bzip2" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6afcd980b5f3a45017c57e57a2fcccbb351cc43a356ce117ef760ef8052b89b0" -dependencies = [ - "bzip2-sys", - "libc", -] - -[[package]] -name = "bzip2-sys" -version = "0.1.11+1.0.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "736a955f3fa7875102d57c82b8cac37ec45224a07fd32d58f9f7a186b6cd4cdc" -dependencies = [ - "cc", - "libc", - "pkg-config", -] - [[package]] name = "cache-padded" version = "1.2.0" @@ -2235,6 +2214,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "915b1b472bc21c53464d6c8461c9d3af805ba1ef837e1cac254428f4a77177b1" dependencies = [ "malloc_buf", + "objc_exception", ] [[package]] @@ -2248,6 +2228,15 @@ dependencies = [ "objc_id", ] +[[package]] +name = "objc_exception" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ad970fb455818ad6cba4c122ad012fae53ae8b4795f86378bce65e4f6bab2ca4" +dependencies = [ + "cc", +] + [[package]] name = "objc_id" version = "0.1.1" @@ -3538,9 +3527,9 @@ dependencies = [ [[package]] name = "tauri" -version = "1.0.0-rc.3" +version = "1.0.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0c4a4ffd1f9b02cc3e974ce902f8132fb3d08ec6cce4ca193f97d921f5bce4" +checksum = "1112a78b3de89c41e01b671d62f24038d324c6cb61708896ee16f533b655c82e" dependencies = [ "anyhow", "attohttpc", @@ -3558,6 +3547,7 @@ dependencies = [ "gtk", "http", "ignore", + "memchr", "minisign-verify", "once_cell", "open", @@ -3584,14 +3574,15 @@ dependencies = [ "tokio", "url", "uuid", + "windows", "zip", ] [[package]] name = "tauri-build" -version = "1.0.0-rc.3" +version = "1.0.0-rc.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "855e47d8cfb2219fc14d2eed2c09bfb35f9ecd71a40ca2084aeeee2d23e0b60d" +checksum = "d7e31905edc1b40f369beccbbfb30b2e44c2f2bb1ffc06a3778d844af4a81da8" dependencies = [ "anyhow", "cargo_toml", @@ -3602,12 +3593,14 @@ dependencies = [ [[package]] name = "tauri-codegen" -version = "1.0.0-rc.2" +version = "1.0.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eef4656d174ba982198266da0c016573fe6c7c760e4290f05c8c384fe180007e" +checksum = "fbcba93e945eb73ee232621763a1295247d0155867bb72e815ab107a10a7cf97" dependencies = [ "base64", "blake3", + "ico", + "png 0.16.8", "proc-macro2", "quote", "regex", @@ -3623,9 +3616,9 @@ dependencies = [ [[package]] name = "tauri-macros" -version = "1.0.0-rc.2" +version = "1.0.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0993f5a867e321d26200b2d6394cdf482bd6cc5a0e4691bcabf811544f51cd4" +checksum = "ed251657dcdd21922e0146af5f8a3b9ccf92707d4a42add615c250ff92a6838d" dependencies = [ "heck 0.4.0", "proc-macro2", @@ -3637,9 +3630,9 @@ dependencies = [ [[package]] name = "tauri-runtime" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "851cd65e2c9df4dd70a4f9e115fb2441ac89f1c80df79de0c15a448b4acd7768" +checksum = "ae0442d935c2d168541d74be51c4d4f176b1c00ee6bf052f07c1aa5f688ba497" dependencies = [ "gtk", "http", @@ -3656,14 +3649,11 @@ dependencies = [ [[package]] name = "tauri-runtime-wry" -version = "0.3.2" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0184f95e065fb80afadf53f0a5f87a75af2da774d0524fe8cb2976fbec4a0bf2" +checksum = "643aaa56237304264804dbf34748b21042eadda71d2e964bced1651c19cc0314" dependencies = [ "gtk", - "ico", - "infer", - "png 0.16.8", "tauri-runtime", "tauri-utils", "uuid", @@ -3674,9 +3664,9 @@ dependencies = [ [[package]] name = "tauri-utils" -version = "1.0.0-rc.2" +version = "1.0.0-rc.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ad38ad698838886bf22ecb91c4b3d1ce178fdff7901ac7bff370103a4f51e59" +checksum = "21f11483d205c77d1ec398e80566485101696335983e69832cc6c41ab1e07266" dependencies = [ "ctor", "glob", @@ -4768,11 +4758,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" dependencies = [ "byteorder", - "bzip2", "crc32fast", - "flate2", "thiserror", - "time", ] [[package]] diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml index dacf392..271ae80 100644 --- a/src-tauri/Cargo.toml +++ b/src-tauri/Cargo.toml @@ -10,7 +10,7 @@ edition = "2021" build = "build.rs" [build-dependencies] -tauri-build = { version = "1.0.0-rc.3", features = [] } +tauri-build = { version = "1.0.0-rc.4", features = [] } [dependencies] anyhow = "1.0" @@ -21,7 +21,7 @@ chrono = "0.4.19" serde_json = "1.0" serde_yaml = "0.8" serde = { version = "1.0", features = ["derive"] } -tauri = { version = "1.0.0-rc.3", features = ["shell-all", "system-tray", "updater", "window-all"] } +tauri = { version = "1.0.0-rc.4", features = ["shell-all", "system-tray", "updater", "window-all"] } window-shadows = { git = "https://github.com/tauri-apps/window-shadows" } window-vibrancy = { git = "https://github.com/tauri-apps/window-vibrancy" } diff --git a/yarn.lock b/yarn.lock index 618cad2..6d242cc 100644 --- a/yarn.lock +++ b/yarn.lock @@ -572,66 +572,72 @@ estree-walker "^2.0.1" picomatch "^2.2.2" -"@tauri-apps/api@^1.0.0-rc.1": - version "1.0.0-rc.1" - resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-1.0.0-rc.1.tgz#ce26a0fe30d8980a4682d50015eec28ed4a23c1e" - integrity sha512-VBUOmfT8ea02JB/Qr+FHeaLnug5BRA7ro2pX47q0GZCbZsU9b+iPnOXl0ShJwT0melR7B6iamyhDwkHStMVfQA== +"@tauri-apps/api@^1.0.0-rc.2": + version "1.0.0-rc.2" + resolved "https://registry.yarnpkg.com/@tauri-apps/api/-/api-1.0.0-rc.2.tgz#bac494a6b8868e05f86184d2ee1ccc8477470363" + integrity sha512-JhUDCJpfxmf/S1R+yHmJGsher4CGi07Qv4fYeucB7naeFZ7yTQe7S1CHKUZaRYpurGSdwOF3my9k0LyGmpAGYw== dependencies: - type-fest "2.11.2" + type-fest "2.12.0" -"@tauri-apps/cli-darwin-arm64@1.0.0-rc.5": - version "1.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.0.0-rc.5.tgz#9374be8c96afa1cf77b5647bc81fe1a05006757d" - integrity sha512-X+3EIAUGfoL8uE6PBADZC8FcUISe4JPQCxXgaVv6ehoZGoCh/pFJF7AvBGTQxbnvngqM7Xce4Lmh63Io2/5ggw== +"@tauri-apps/cli-darwin-arm64@1.0.0-rc.7": + version "1.0.0-rc.7" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-1.0.0-rc.7.tgz#c7d190ea7496381bf456494e93dd8b35005a0e78" + integrity sha512-fb1plxZZHDG0KwZOoAl6tuisFU+oZFtNtqK3V2KL+4hz75DyH6BfsrgjyYSecJrtQejL2cHi8q7vUsU+EeLopw== -"@tauri-apps/cli-darwin-x64@1.0.0-rc.5": - version "1.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.0.0-rc.5.tgz#4db1dd56a228bfafe5b3f64c7661abbe5606e804" - integrity sha512-fEpgOdAvKdq9C5/yip8RnwP1VS+nRrtKdzzplu4jY6njDVH/Vom8mg+EfXkCY5RveCaoskJMFgUvt10IGeZHBA== +"@tauri-apps/cli-darwin-x64@1.0.0-rc.7": + version "1.0.0-rc.7" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-1.0.0-rc.7.tgz#b152f333ea081674e8e6c45d1c3ff1850bff854c" + integrity sha512-FOFPNsYUgCDaxEK+9oQ3vv9bMD3XVcOKdh1vo/DImzZNO6fQkcsDC8zlmA+Q4axd+X8kvu0iti1fK8Vl7HIUEA== -"@tauri-apps/cli-linux-arm-gnueabihf@1.0.0-rc.5": - version "1.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.0.0-rc.5.tgz#0f1ff84c534908a54fbe63b45004abc6d4f03f4d" - integrity sha512-V7sWSBrpLyvkQxpkHIM8JltYqQhiTpThySDjO8POtrTqkRwM5BXORcCYhxTAKCedecfYK/RNUJ6Q0t7+3jS6DQ== +"@tauri-apps/cli-linux-arm-gnueabihf@1.0.0-rc.7": + version "1.0.0-rc.7" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-1.0.0-rc.7.tgz#14fb37a337526200dbbe9b49dabd221b81682b02" + integrity sha512-tFzcJtNHy5AInU3E7kKDyhg4Qb7csu3uZ3FhGfORmGvQAiNQFpGV3ypC230RQYa3sxxRMbn8vjUAZMlU6JArbA== -"@tauri-apps/cli-linux-arm64-gnu@1.0.0-rc.5": - version "1.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.0.0-rc.5.tgz#c5d2f1dd962d80a1958261229778b410b86254d4" - integrity sha512-HhM+2FInxtUAI/41LF4fDEzmhLQUq6DOoo7fLN94vgWlhsPyWZoDGP9pA043XbO86+4OX5JZUW1SnTVXMwEaMA== +"@tauri-apps/cli-linux-arm64-gnu@1.0.0-rc.7": + version "1.0.0-rc.7" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-1.0.0-rc.7.tgz#43e7a38018258ad2bf665bb61e0328688b345355" + integrity sha512-QAoNUJMmoCv/mDZsfEZOOTeEPYuxtMgCgqTDqMd0H8S0Y3Cu2D/Q2fwVl0s9pMb6wLD2GJ2FEneySEMhMxt7Pg== -"@tauri-apps/cli-linux-arm64-musl@1.0.0-rc.5": - version "1.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.0.0-rc.5.tgz#f485db9ca5402f5d2c4585801a3aaa4519bd67e8" - integrity sha512-DhHdKOhf3+peA/sM0c9CpxK89cp8GVwOB5osFW55fxBZbD0mJFeL2SzjkgfGFqFu6Ci/ZiibQGfEp8XTC8OsYA== +"@tauri-apps/cli-linux-arm64-musl@1.0.0-rc.7": + version "1.0.0-rc.7" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-1.0.0-rc.7.tgz#37ebcfc7d1431dd698f529fa57248adadd94b3b4" + integrity sha512-ieLyACtbY7ezReTnjWLw/kKDXRCbnbrUjQ+hltSmHaRuV51nX+I2rmFO5e7VPdj406jvyKwfSPuBC34bHxt3Og== -"@tauri-apps/cli-linux-x64-gnu@1.0.0-rc.5": - version "1.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.0.0-rc.5.tgz#e468939585bc98e80ec827d0a3d8ba06a7cc38e8" - integrity sha512-pZzsOHRGG/mdcn7fF/yOIOdeVzGxZUtZqvlGSd90ZM9Ps3//uYGCBHoNTbeSwp/V6+D0KVDaSCbm9lYlHoXcdA== +"@tauri-apps/cli-linux-x64-gnu@1.0.0-rc.7": + version "1.0.0-rc.7" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-1.0.0-rc.7.tgz#b47239c4f10b3fe8e1e2f031f639125ededc6d79" + integrity sha512-wPAZctuFpurACxdCrjw+aaSuFReuIvv1nalVezfqA78AlsCk785yF2YVjoZr5bT8a9+6F+t8uNi3l6Vp5oNqwQ== -"@tauri-apps/cli-linux-x64-musl@1.0.0-rc.5": - version "1.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.0.0-rc.5.tgz#a1308e93850555f2b6c97b5d7cdbbb9afaa803e2" - integrity sha512-COwWCbOhEjBlzGRGTa0ESO4/AiC0cBZ2UEPExRn++S+kWSPJ2vsyMdCLu3hiMy1ABSIRcQ4Vc68M1iVkLhOHHw== +"@tauri-apps/cli-linux-x64-musl@1.0.0-rc.7": + version "1.0.0-rc.7" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-1.0.0-rc.7.tgz#9e62494cf80aed170f389d84b2b23f354e8ce748" + integrity sha512-/AxuXFC2d1V8KpZJ6cFDcD5QqPFIZFXC/tAJlnTW75VnHgjat9TYP3BdSOuEA81ZLs9tV4PQF40tNnUSzfRYMg== -"@tauri-apps/cli-win32-x64-msvc@1.0.0-rc.5": - version "1.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.0.0-rc.5.tgz#d15c95143d9123d10c510e28ba90df5349b68ecd" - integrity sha512-zzizUmPWvnWjj+IUCk36kVjS9j1Bg5JmnwOW5QdX26+a64q5vocmVimCgrfZ5STw3sDFXE++S55ghpzhhH5o+g== +"@tauri-apps/cli-win32-ia32-msvc@1.0.0-rc.7": + version "1.0.0-rc.7" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-1.0.0-rc.7.tgz#71c2f9498f4d03fd2c0ca6137a2be7db95a006f3" + integrity sha512-C4M2rHXlYVPSHGl2Iax1rfiNM5GPSRP1JHxW7/4jH9FfW6mVFcjULZAyVMRfOMQEQ9bYXbVnSTPbhG2Fm0jPxQ== -"@tauri-apps/cli@^1.0.0-rc.5": - version "1.0.0-rc.5" - resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-1.0.0-rc.5.tgz#db8ca22c9f55f5400d1c6addd78ee1df5dc15a29" - integrity sha512-Q3D0R5YdZRA5EcL206hwwKCyXpet2mRDcfaRTU/IXwF73bS4AMja+JdAGfO2cyHuSvXd+b//Cgbei2zCG8M6hw== +"@tauri-apps/cli-win32-x64-msvc@1.0.0-rc.7": + version "1.0.0-rc.7" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-1.0.0-rc.7.tgz#6d719f70a0789f2a179d160c302996ce81194099" + integrity sha512-lpstJKOtP+ahhjbutapA02TpvfNTZqXwhmA1fvqxDu6BYVezFn7ZiGG5HwdXlkiRDfbwZwBd1evdkV3MxwY1NQ== + +"@tauri-apps/cli@^1.0.0-rc.7": + version "1.0.0-rc.7" + resolved "https://registry.yarnpkg.com/@tauri-apps/cli/-/cli-1.0.0-rc.7.tgz#0eb73718f6ebddc159b0b54f6fd6dfc26d110b36" + integrity sha512-g7lUsI2iFiB2JuPFr209vWNqOnxCOGXN6yBttMRY+94UUXZOeWlKxYYpSabyjSr7EbfAUNzjITYmE4urdtmB+A== optionalDependencies: - "@tauri-apps/cli-darwin-arm64" "1.0.0-rc.5" - "@tauri-apps/cli-darwin-x64" "1.0.0-rc.5" - "@tauri-apps/cli-linux-arm-gnueabihf" "1.0.0-rc.5" - "@tauri-apps/cli-linux-arm64-gnu" "1.0.0-rc.5" - "@tauri-apps/cli-linux-arm64-musl" "1.0.0-rc.5" - "@tauri-apps/cli-linux-x64-gnu" "1.0.0-rc.5" - "@tauri-apps/cli-linux-x64-musl" "1.0.0-rc.5" - "@tauri-apps/cli-win32-x64-msvc" "1.0.0-rc.5" + "@tauri-apps/cli-darwin-arm64" "1.0.0-rc.7" + "@tauri-apps/cli-darwin-x64" "1.0.0-rc.7" + "@tauri-apps/cli-linux-arm-gnueabihf" "1.0.0-rc.7" + "@tauri-apps/cli-linux-arm64-gnu" "1.0.0-rc.7" + "@tauri-apps/cli-linux-arm64-musl" "1.0.0-rc.7" + "@tauri-apps/cli-linux-x64-gnu" "1.0.0-rc.7" + "@tauri-apps/cli-linux-x64-musl" "1.0.0-rc.7" + "@tauri-apps/cli-win32-ia32-msvc" "1.0.0-rc.7" + "@tauri-apps/cli-win32-x64-msvc" "1.0.0-rc.7" "@types/fs-extra@^9.0.13": version "9.0.13" @@ -1863,10 +1869,10 @@ tunnel@0.0.6: resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c" integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg== -type-fest@2.11.2: - version "2.11.2" - resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.11.2.tgz#5534a919858bc517492cd3a53a673835a76d2e71" - integrity sha512-reW2Y2Mpn0QNA/5fvtm5doROLwDPu2zOm5RtY7xQQS05Q7xgC8MOZ3yPNaP9m/s/sNjjFQtHo7VCNqYW2iI+Ig== +type-fest@2.12.0: + version "2.12.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-2.12.0.tgz#ce342f58cab9114912f54b493d60ab39c3fc82b6" + integrity sha512-Qe5GRT+n/4GoqCNGGVp5Snapg1Omq3V7irBJB3EaKsp7HWDo5Gv2d/67gfNyV+d5EXD+x/RF5l1h4yJ7qNkcGA== typescript@^4.5.5: version "4.6.2"