From 626121e7bfaf4f65d75a7ecc3378ee014a092fa9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 13 Nov 2023 23:58:27 -0300 Subject: [PATCH] chore(deps) Update Tauri CLI (1.x) (#8193) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Lucas Nogueira --- .github/workflows/test-cli-rs.yml | 4 +- .github/workflows/test-core.yml | 4 +- renovate.json | 14 ++- tooling/cli/Cargo.lock | 89 +++++++++++++------ tooling/cli/Cargo.toml | 4 +- tooling/cli/node/Cargo.toml | 6 +- .../jest/fixtures/app/src-tauri/Cargo.toml | 2 +- 7 files changed, 81 insertions(+), 42 deletions(-) diff --git a/.github/workflows/test-cli-rs.yml b/.github/workflows/test-cli-rs.yml index 26e98e820..56c4b0cb0 100644 --- a/.github/workflows/test-cli-rs.yml +++ b/.github/workflows/test-cli-rs.yml @@ -50,8 +50,8 @@ jobs: with: workspaces: tooling/cli - - name: build CLI + - name: test CLI uses: actions-rs/cargo@v1 with: - command: build + command: test args: --manifest-path ./tooling/cli/Cargo.toml diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml index dc91cfca2..382339ff3 100644 --- a/.github/workflows/test-core.yml +++ b/.github/workflows/test-core.yml @@ -85,13 +85,14 @@ jobs: - name: Downgrade crates with MSRV conflict # The --precise flag can only be used once per invocation. run: | - cargo update -p system-deps:6.1.2 --precise 6.1.1 + cargo update -p system-deps:6.2.0 --precise 6.1.1 cargo update -p toml:0.7.8 --precise 0.7.3 cargo update -p toml_edit:0.19.15 --precise 0.19.8 cargo update -p embed-resource --precise 2.3.0 cargo update -p toml_datetime --precise 0.6.1 cargo update -p serde_spanned --precise 0.6.1 cargo update -p winnow --precise 0.4.1 + cargo update -p plist --precise 1.5.1 cargo update -p time --precise 0.3.15 cargo update -p ignore --precise 0.4.18 cargo update -p raw-window-handle --precise 0.5.0 @@ -113,6 +114,7 @@ jobs: cargo update -p regex --precise 1.9.6 cargo update -p bstr --precise 1.6.2 cargo update -p backtrace --precise 0.3.68 + cargo update -p blocking --precise 1.4.1 - name: test run: cargo test --target ${{ matrix.platform.target }} ${{ matrix.features.args }} diff --git a/renovate.json b/renovate.json index e6f17cbe0..ea668600d 100644 --- a/renovate.json +++ b/renovate.json @@ -12,11 +12,6 @@ "packagePatterns": ["*"], "enabled": false }, - { - "matchPackagePatterns": ["cargo_toml", "minisign"], - "matchManagers": ["cargo"], - "enabled": false - }, { "enabled": true, "paths": ["core/tauri/**"], @@ -26,7 +21,8 @@ "lockFileMaintenance": { "enabled": true }, - "rebaseConflictedPrs": false + "rebaseConflictedPrs": false, + "ignoreDeps": ["cargo_toml", "toml"] }, { "enabled": true, @@ -37,7 +33,8 @@ "lockFileMaintenance": { "enabled": true }, - "rebaseConflictedPrs": false + "rebaseConflictedPrs": false, + "ignoreDeps": ["cargo_toml"] }, { "enabled": true, @@ -82,7 +79,8 @@ "enabled": true }, "rebaseConflictedPrs": false, - "matchManagers": ["cargo"] + "matchManagers": ["cargo"], + "ignoreDeps": ["minisign"] }, { "enabled": true, diff --git a/tooling/cli/Cargo.lock b/tooling/cli/Cargo.lock index 8e03dc3a2..453b4339d 100644 --- a/tooling/cli/Cargo.lock +++ b/tooling/cli/Cargo.lock @@ -241,9 +241,9 @@ dependencies = [ [[package]] name = "base64" -version = "0.21.4" +version = "0.21.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2" +checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9" [[package]] name = "base64ct" @@ -532,6 +532,15 @@ version = "0.8.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +[[package]] +name = "core2" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b49ba7ef1ad6107f8824dbe97de947cbaac53c44e7f9756a1fba0d37c1eec505" +dependencies = [ + "memchr", +] + [[package]] name = "cpufeatures" version = "0.2.9" @@ -711,6 +720,12 @@ dependencies = [ "syn 2.0.38", ] +[[package]] +name = "dary_heap" +version = "0.3.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7762d17f1241643615821a8455a0b2c3e803784b058693d990b11f2dce25a0ca" + [[package]] name = "data-encoding" version = "2.4.0" @@ -1187,6 +1202,15 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +[[package]] +name = "hashbrown" +version = "0.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "43a3c133739dddd0d2990f9a4bdf8eb4b21ef50e4851ca85ab661199821d510e" +dependencies = [ + "ahash", +] + [[package]] name = "hashbrown" version = "0.14.1" @@ -1635,32 +1659,36 @@ checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b" [[package]] name = "libflate" -version = "1.4.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5ff4ae71b685bbad2f2f391fe74f6b7659a34871c08b210fdc039e43bee07d18" +checksum = "9f7d5654ae1795afc7ff76f4365c2c8791b0feb18e8996a96adad8ffd7c3b2bf" dependencies = [ "adler32", + "core2", "crc32fast", + "dary_heap", "libflate_lz77", ] [[package]] name = "libflate_lz77" -version = "1.2.0" +version = "2.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a52d3a8bfc85f250440e4424db7d857e241a3aebbbe301f3eb606ab15c39acbf" +checksum = "be5f52fb8c451576ec6b79d3f4deb327398bc05bbdbd99021a6e77a4c855d524" dependencies = [ + "core2", + "hashbrown 0.13.2", "rle-decode-fast", ] [[package]] name = "libloading" -version = "0.7.4" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b67380fd3b2fbe7527a606e18729d21c6f3951633d0500574c4dc22d2d638b9f" +checksum = "c571b676ddfc9a8c12f1f3d3085a7b163966a8fd8098a90640953ce5f6170161" dependencies = [ "cfg-if", - "winapi", + "windows-sys 0.48.0", ] [[package]] @@ -1764,9 +1792,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a" [[package]] name = "minisign" -version = "0.7.3" +version = "0.7.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b23ef13ff1d745b1e52397daaa247e333c607f3cff96d4df2b798dc252db974b" +checksum = "d2b6f58413c6cee060115673578e47271838f3c87cb9322c61a3bcd6d740b7d2" dependencies = [ "getrandom 0.2.10", "rpassword", @@ -1797,9 +1825,9 @@ dependencies = [ [[package]] name = "napi" -version = "2.13.3" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd063c93b900149304e3ba96ce5bf210cd4f81ef5eb80ded0d100df3e85a3ac0" +checksum = "f9d90182620f32fe34b6ac9b52cba898af26e94c7f5abc01eb4094c417ae2e6c" dependencies = [ "bitflags 2.4.1", "ctor 0.2.5", @@ -1810,15 +1838,15 @@ dependencies = [ [[package]] name = "napi-build" -version = "2.0.1" +version = "2.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e" +checksum = "d4b4532cf86bfef556348ac65e561e3123879f0e7566cca6d43a6ff5326f13df" [[package]] name = "napi-derive" -version = "2.13.0" +version = "2.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da1c6a8fa84d549aa8708fcd062372bf8ec6e849de39016ab921067d21bde367" +checksum = "3619fa472d23cd5af94d63a2bae454a77a8863251f40230fbf59ce20eafa8a86" dependencies = [ "cfg-if", "convert_case 0.6.0", @@ -1830,9 +1858,9 @@ dependencies = [ [[package]] name = "napi-derive-backend" -version = "1.0.52" +version = "1.0.54" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20bbc7c69168d06a848f925ec5f0e0997f98e8c8d4f2cc30157f0da51c009e17" +checksum = "ecd3ea4b54020c73d591a49cd192f6334c5f37f71a63ead54dbc851fa991ef00" dependencies = [ "convert_case 0.6.0", "once_cell", @@ -1845,9 +1873,9 @@ dependencies = [ [[package]] name = "napi-sys" -version = "2.2.3" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "166b5ef52a3ab5575047a9fe8d4a030cdd0f63c96f071cd6907674453b07bae3" +checksum = "2503fa6af34dc83fb74888df8b22afe933b58d37daf7d80424b1c60c68196b8b" dependencies = [ "libloading", ] @@ -3438,7 +3466,7 @@ dependencies = [ "tauri-utils", "tokio", "toml 0.8.2", - "toml_edit", + "toml_edit 0.21.0", "unicode-width", "ureq", "url", @@ -3694,14 +3722,14 @@ dependencies = [ "serde", "serde_spanned", "toml_datetime", - "toml_edit", + "toml_edit 0.20.2", ] [[package]] name = "toml_datetime" -version = "0.6.3" +version = "0.6.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b" +checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1" dependencies = [ "serde", ] @@ -3719,6 +3747,17 @@ dependencies = [ "winnow", ] +[[package]] +name = "toml_edit" +version = "0.21.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d34d383cd00a163b4a5b85053df514d45bc330f6de7737edfe0a93311d1eaa03" +dependencies = [ + "indexmap 2.0.2", + "toml_datetime", + "winnow", +] + [[package]] name = "tower" version = "0.4.13" diff --git a/tooling/cli/Cargo.toml b/tooling/cli/Cargo.toml index b94ea2e3d..76136e10f 100644 --- a/tooling/cli/Cargo.toml +++ b/tooling/cli/Cargo.toml @@ -50,7 +50,7 @@ serde_json = "1.0" notify = "6.1" notify-debouncer-mini = "0.4" shared_child = "1.0" -toml_edit = "0.20" +toml_edit = "0.21" json-patch = "1.2" tauri-utils = { version = "1.5.0", path = "../../core/tauri-utils", features = [ "isolation", "schema", "config-json5", "config-toml" ] } toml = "0.8" @@ -58,7 +58,7 @@ jsonschema = "0.17" handlebars = "4.4" include_dir = "0.7" minisign = "=0.7.3" -base64 = "0.21.4" +base64 = "0.21.5" ureq = { version = "2.8", default-features = false, features = [ "gzip" ] } os_info = "3" semver = "1.0" diff --git a/tooling/cli/node/Cargo.toml b/tooling/cli/node/Cargo.toml index 79618c4f6..2af60d570 100644 --- a/tooling/cli/node/Cargo.toml +++ b/tooling/cli/node/Cargo.toml @@ -8,13 +8,13 @@ crate-type = ["cdylib"] [dependencies] # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix -napi = { version = "2.13", default-features = false, features = ["napi4"] } -napi-derive = "2.13" +napi = { version = "2.14", default-features = false, features = ["napi4"] } +napi-derive = "2.14" tauri-cli = { path = "..", default-features = false } log = "0.4.20" [build-dependencies] -napi-build = "2.0" +napi-build = "2.1" [features] default = ["tauri-cli/default"] diff --git a/tooling/cli/node/test/jest/fixtures/app/src-tauri/Cargo.toml b/tooling/cli/node/test/jest/fixtures/app/src-tauri/Cargo.toml index 99a4984ed..a292dc23a 100644 --- a/tooling/cli/node/test/jest/fixtures/app/src-tauri/Cargo.toml +++ b/tooling/cli/node/test/jest/fixtures/app/src-tauri/Cargo.toml @@ -24,7 +24,7 @@ icon = [ tauri-build = { path = "../../../../../../../../core/tauri-build", features = [] } [dependencies] -serde_json = "1.0.107" +serde_json = "1.0.108" serde = "1.0" serde_derive = "1.0" tauri = { path = "../../../../../../../../core/tauri", features = ["api-all"] }