From d5ac76b53c7f35253db84ddfbf4ecf975ff6307d Mon Sep 17 00:00:00 2001 From: Amr Bashir Date: Tue, 21 Mar 2023 18:40:21 +0200 Subject: [PATCH] chore(deps): update napi-rs, closes #6502 (#6513) --- .changes/napi-rs.md | 5 ++++ tooling/cli/Cargo.lock | 53 ++++++++++++++++++----------------- tooling/cli/node/Cargo.toml | 4 +-- tooling/cli/node/package.json | 2 +- tooling/cli/node/yarn.lock | 8 +++--- 5 files changed, 39 insertions(+), 33 deletions(-) create mode 100644 .changes/napi-rs.md diff --git a/.changes/napi-rs.md b/.changes/napi-rs.md new file mode 100644 index 000000000..cb47e3862 --- /dev/null +++ b/.changes/napi-rs.md @@ -0,0 +1,5 @@ +--- +'cli.js': 'patch' +--- + +Update `napi-rs` dependencies to latest to fix CLI hanging up forever. diff --git a/tooling/cli/Cargo.lock b/tooling/cli/Cargo.lock index c1d51b8de..23a1dbf76 100644 --- a/tooling/cli/Cargo.lock +++ b/tooling/cli/Cargo.lock @@ -124,7 +124,7 @@ checksum = "86ea188f25f0255d8f92797797c97ebf5631fa88178beb1a46fdf5622c9a00e4" dependencies = [ "proc-macro2", "quote", - "syn 2.0.3", + "syn 2.0.4", ] [[package]] @@ -1637,9 +1637,9 @@ dependencies = [ [[package]] name = "io-lifetimes" -version = "1.0.8" +version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0dd6da19f25979c7270e70fa95ab371ec3b701cd0eefc47667a09785b3c59155" +checksum = "09270fd4fa1111bc614ed2246c7ef56239a3063d5be0d1ec3b589c505d400aeb" dependencies = [ "hermit-abi 0.3.1", "libc", @@ -2109,9 +2109,9 @@ dependencies = [ [[package]] name = "mime" -version = "0.3.16" +version = "0.3.17" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a60c7ce501c71e03a9c9c0d35b861413ae925bd979cc7a4e30d060069aaac8d" +checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a" [[package]] name = "minimal-lexical" @@ -2162,12 +2162,13 @@ dependencies = [ [[package]] name = "napi" -version = "2.11.4" +version = "2.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e46a2274a0b01c5d80576b193ae573ddd1c10bf9739c80cf50029d69438eed8" +checksum = "564ad12389dd08b0f5e95b9e8b5e88e5e42a234d326639cfa7b0fe643562e0d7" dependencies = [ - "bitflags 1.3.2", + "bitflags 2.0.2", "ctor", + "napi-derive", "napi-sys", "once_cell", ] @@ -2180,9 +2181,9 @@ checksum = "882a73d9ef23e8dc2ebbffb6a6ae2ef467c0f18ac10711e4cc59c5485d41df0e" [[package]] name = "napi-derive" -version = "2.11.2" +version = "2.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e367c72b3f0243d490f0cf4feed9a28e40e4e9cba16912951dbeccf6c607576" +checksum = "a8f63dc8e483a8ce6821932d6357ad95e79b33b0a352f482f9033c5eb2d49caf" dependencies = [ "convert_case 0.6.0", "napi-derive-backend", @@ -2193,9 +2194,9 @@ dependencies = [ [[package]] name = "napi-derive-backend" -version = "1.0.45" +version = "1.0.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2cf4ba5f1f6d51b9b5e2d809e229201f3aa14f198d58ec9ba4ecf82dbabb381" +checksum = "68f0ee68701b2bc3657cf2c4f01faaf3391cb1746db20e6887e8c816d271c7d9" dependencies = [ "convert_case 0.6.0", "once_cell", @@ -2452,9 +2453,9 @@ checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf" [[package]] name = "openssl-src" -version = "111.25.1+1.1.1t" +version = "111.25.2+1.1.1t" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ef9a9cc6ea7d9d5e7c4a913dc4b48d0e359eddf01af1dfec96ba7064b4aba10" +checksum = "320708a054ad9b3bf314688b5db87cf4d6683d64cfc835e2337924ae62bf4431" dependencies = [ "cc", ] @@ -2484,9 +2485,9 @@ dependencies = [ [[package]] name = "os_info" -version = "3.6.0" +version = "3.7.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c424bc68d15e0778838ac013b5b3449544d8133633d8016319e7e05a820b8c0" +checksum = "006e42d5b888366f1880eda20371fedde764ed2213dc8496f49622fa0c99cd5e" dependencies = [ "log", "serde", @@ -3018,9 +3019,9 @@ checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848" [[package]] name = "reqwest" -version = "0.11.14" +version = "0.11.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "21eed90ec8570952d53b772ecf8f206aa1ec9a3d76b2521c56c42973f2d91ee9" +checksum = "0ba30cc2c0cd02af1222ed216ba659cdb2f879dfe3181852fe7c50b1d0005949" dependencies = [ "base64 0.21.0", "bytes", @@ -3109,9 +3110,9 @@ dependencies = [ [[package]] name = "rustix" -version = "0.36.10" +version = "0.36.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2fe885c3a125aa45213b68cc1472a49880cb5923dc23f522ad2791b882228778" +checksum = "db4165c9963ab29e422d6c26fbc1d37f15bace6b2810221f9d925023480fcf0e" dependencies = [ "bitflags 1.3.2", "errno", @@ -3327,7 +3328,7 @@ checksum = "e801c1712f48475582b7696ac71e0ca34ebb30e09338425384269d9717c62cad" dependencies = [ "proc-macro2", "quote", - "syn 2.0.3", + "syn 2.0.4", ] [[package]] @@ -3645,9 +3646,9 @@ dependencies = [ [[package]] name = "syn" -version = "2.0.3" +version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8234ae35e70582bfa0f1fedffa6daa248e41dd045310b19800c4a36382c8f60" +checksum = "2c622ae390c9302e214c31013517c2061ecb2699935882c60a9b37f82f8625ae" dependencies = [ "proc-macro2", "quote", @@ -3947,7 +3948,7 @@ checksum = "f9456a42c5b0d803c8cd86e73dd7cc9edd429499f37a3550d286d5e86720569f" dependencies = [ "proc-macro2", "quote", - "syn 2.0.3", + "syn 2.0.4", ] [[package]] @@ -4258,9 +4259,9 @@ dependencies = [ [[package]] name = "unicode-bidi" -version = "0.3.12" +version = "0.3.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d502c968c6a838ead8e69b2ee18ec708802f99db92a0d156705ec9ef801993b" +checksum = "92888ba5573ff080736b3648696b70cafad7d250551175acbaa4e0385b3e1460" [[package]] name = "unicode-ident" diff --git a/tooling/cli/node/Cargo.toml b/tooling/cli/node/Cargo.toml index 8fcf1c490..df9b19aa6 100644 --- a/tooling/cli/node/Cargo.toml +++ b/tooling/cli/node/Cargo.toml @@ -11,8 +11,8 @@ openssl-vendored = ["tauri-cli/openssl-vendored"] [dependencies] # Default enable napi4 feature, see https://nodejs.org/api/n-api.html#node-api-version-matrix -napi = { version = "2.10", default-features = false, features = ["napi4"] } -napi-derive = "2.10" +napi = { version = "2.12", default-features = false, features = ["napi4"] } +napi-derive = "2.12" tauri-cli = { path = ".." } log = "0.4.17" diff --git a/tooling/cli/node/package.json b/tooling/cli/node/package.json index 1747a80ad..0ea71f4de 100644 --- a/tooling/cli/node/package.json +++ b/tooling/cli/node/package.json @@ -37,7 +37,7 @@ } }, "devDependencies": { - "@napi-rs/cli": "2.14.4", + "@napi-rs/cli": "2.15.1", "cross-env": "7.0.3", "cross-spawn": "7.0.3", "fs-extra": "11.1.0", diff --git a/tooling/cli/node/yarn.lock b/tooling/cli/node/yarn.lock index 005dc5002..b2877b5c4 100644 --- a/tooling/cli/node/yarn.lock +++ b/tooling/cli/node/yarn.lock @@ -698,10 +698,10 @@ "@jridgewell/resolve-uri" "^3.0.3" "@jridgewell/sourcemap-codec" "^1.4.10" -"@napi-rs/cli@2.14.4": - version "2.14.4" - resolved "https://registry.yarnpkg.com/@napi-rs/cli/-/cli-2.14.4.tgz#afd6121d9f25f2c36c86172424e26415e5283d03" - integrity sha512-JvnJWFGhqjDV+D5MD9HCPH7Bc8uxwyPbpA8jsS5mtAp9+3IhVxpqhQc+eqmJrDAPO9z3a8qAdNnBf9+ZI9bIQg== +"@napi-rs/cli@2.15.1": + version "2.15.1" + resolved "https://registry.yarnpkg.com/@napi-rs/cli/-/cli-2.15.1.tgz#0dec638ab3c1fcb9e596dc3b215632d0e3d89254" + integrity sha512-vlxm4zIjRMjhvk7+W+x2qIxi0JYOVeKd1YbDnhuQCAs5ckM/t3/ln+ASUN7msv3vgJmgHYJijBJH5+ZSKCws3w== "@sinclair/typebox@^0.25.16": version "0.25.21"