Merge pull request #673 from napi-rs/upgrade-deps

Brooooooklyn · web-flow · commit 066aa2f3d242 · 2023-04-24T09:31:46.000+08:00
feat(*): upgrade dependencies
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -111,7 +111,7 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
         if: ${{ !matrix.settings.docker }}
         with:
-          toolchain: nightly-2023-03-01
+          toolchain: nightly-2023-04-23
           targets: ${{ matrix.settings.target }}
 
       - name: Cache cargo registry
diff --git a/.github/workflows/lint.yaml b/.github/workflows/lint.yaml
@@ -23,7 +23,7 @@ jobs:
       - name: Install
         uses: dtolnay/rust-toolchain@stable
         with:
-          toolchain: nightly-2023-03-01
+          toolchain: nightly-2023-04-23
           components: rustfmt, clippy
 
       - name: 'Install dependencies'
diff --git a/Cargo.toml b/Cargo.toml
@@ -13,7 +13,7 @@ members = [
 ]
 
 [profile.release]
-codegen-units = 1
-lto = true
+codegen-units   = 1
+lto             = true
 overflow-checks = false
-strip = 'symbols'
+strip           = 'symbols'
diff --git a/crates/alloc/Cargo.toml b/crates/alloc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 edition = "2021"
-name = "global_alloc"
+name    = "global_alloc"
 version = "0.1.0"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
diff --git a/package.json b/package.json
@@ -25,29 +25,29 @@
   },
   "devDependencies": {
     "@napi-rs/cli": "2.15.2",
-    "@swc-node/core": "^1.10.1",
-    "@swc-node/register": "^1.6.2",
-    "@swc/core": "^1.3.37",
+    "@swc-node/core": "^1.10.3",
+    "@swc-node/register": "^1.6.4",
+    "@swc/core": "^1.3.53",
     "@taplo/cli": "^0.5.2",
-    "@types/node": "^18.14.6",
-    "@typescript-eslint/eslint-plugin": "^5.54.0",
-    "@typescript-eslint/parser": "^5.54.0",
+    "@types/node": "^18.16.0",
+    "@typescript-eslint/eslint-plugin": "^5.59.0",
+    "@typescript-eslint/parser": "^5.59.0",
     "ava": "^5.2.0",
     "benchmark": "^2.1.4",
     "codecov": "^3.8.3",
     "cross-env": "^7.0.3",
-    "eslint": "^8.35.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint": "^8.39.0",
+    "eslint-config-prettier": "^8.8.0",
     "eslint-plugin-import": "^2.27.5",
     "eslint-plugin-prettier": "^4.2.1",
     "husky": "^8.0.3",
-    "lerna": "^6.5.1",
-    "lint-staged": "^13.1.2",
+    "lerna": "^6.6.1",
+    "lint-staged": "^13.2.1",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.8.4",
+    "prettier": "^2.8.8",
     "ts-node": "^10.9.1",
     "tslib": "^2.5.0",
-    "typescript": "^4.9.5"
+    "typescript": "^5.0.4"
   },
   "lint-staged": {
     "*.@(js|ts|tsx)": [
diff --git a/packages/argon2/Cargo.toml b/packages/argon2/Cargo.toml
@@ -1,15 +1,15 @@
 [package]
 edition = "2021"
-name = "node-rs_argon2"
+name    = "node-rs_argon2"
 version = "0.0.0"
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
-argon2 = { version = "0.4", features = ["parallel"] }
-napi = { version = "2", default-features = false, features = ["napi3"] }
+argon2 = "0.5"
 global_alloc = { path = "../../crates/alloc" }
+napi = { version = "2", default-features = false, features = ["napi3"] }
 napi-derive = { version = "2", default-features = false, features = [
   "type-def",
 ] }
diff --git a/packages/argon2/index.js b/packages/argon2/index.js
@@ -1,3 +1,9 @@
+/* tslint:disable */
+/* eslint-disable */
+/* prettier-ignore */
+
+/* auto-generated by NAPI-RS */
+
 const { existsSync, readFileSync } = require('fs')
 const { join } = require('path')
 
diff --git a/packages/argon2/package.json b/packages/argon2/package.json
@@ -48,12 +48,13 @@
   "scripts": {
     "artifacts": "napi artifacts -d ../../artifacts",
     "bench": "cross-env NODE_ENV=production node benchmark/argon2.js",
-    "build": "napi build --platform --release --pipe \"prettier -w\"",
-    "build:debug": "napi build --platform --pipe \"prettier -w\"",
+    "build": "napi build --platform --release",
+    "build:debug": "napi build --platform",
     "prepublishOnly": "napi prepublish",
     "version": "napi version"
   },
   "devDependencies": {
-    "argon2": "^0.30.3"
+    "argon2": "^0.30.3",
+    "cross-env": "^7.0.3"
   }
 }
diff --git a/packages/argon2/src/lib.rs b/packages/argon2/src/lib.rs
@@ -199,7 +199,7 @@ impl Task for RawHashTask {
         let generated_salt = SaltString::generate(&mut OsRng);
         hasher.hash_password_into(
           self.password.as_slice(),
-          generated_salt.as_bytes(),
+          generated_salt.as_str().as_bytes(),
           &mut output,
         )
       }
diff --git a/packages/bcrypt/Cargo.toml b/packages/bcrypt/Cargo.toml
@@ -1,20 +1,20 @@
 [package]
 authors = ["LongYinan <lynweklm@gmail.com>"]
 edition = "2021"
-name = "node-rs-bcrypt"
+name    = "node-rs-bcrypt"
 version = "0.1.0"
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
-bcrypt = "0.14"
-blowfish = { version = "0.9", features = ["bcrypt"] }
+base64       = { version = "0.21" }
+bcrypt       = "0.14"
+blowfish     = { version = "0.9", features = ["bcrypt"] }
+getrandom    = "0.2"
 global_alloc = { path = "../../crates/alloc" }
-napi = { version = "2", default-features = false, features = ["napi3"] }
-napi-derive = { version = "2" }
-getrandom = "0.2"
-base64 = { version = "0.20" }
+napi         = { version = "2", default-features = false, features = ["napi3"] }
+napi-derive  = { version = "2" }
 
 [dev-dependencies]
 quickcheck = "1.0"
diff --git a/packages/bcrypt/binding.js b/packages/bcrypt/binding.js
@@ -1,3 +1,9 @@
+/* tslint:disable */
+/* eslint-disable */
+/* prettier-ignore */
+
+/* auto-generated by NAPI-RS */
+
 const { existsSync, readFileSync } = require('fs')
 const { join } = require('path')
 
diff --git a/packages/bcrypt/package.json b/packages/bcrypt/package.json
@@ -58,8 +58,8 @@
   "scripts": {
     "artifacts": "napi artifacts -d ../../artifacts",
     "bench": "cross-env NODE_ENV=production node benchmark/bcrypt.js",
-    "build": "napi build --platform --release --js binding.js --dts binding.d.ts --pipe \"prettier -w\"",
-    "build:debug": "napi build --platform --pipe \"prettier -w\"",
+    "build": "napi build --platform --release --js binding.js --dts binding.d.ts",
+    "build:debug": "napi build --platform",
     "prepublishOnly": "napi prepublish",
     "version": "napi version"
   },
@@ -69,7 +69,8 @@
   "devDependencies": {
     "@types/bcrypt": "^5.0.0",
     "bcrypt": "^5.1.0",
-    "bcryptjs": "^2.4.3"
+    "bcryptjs": "^2.4.3",
+    "cross-env": "^7.0.3"
   },
   "funding": {
     "type": "github",
diff --git a/packages/bcrypt/src/salt_task.rs b/packages/bcrypt/src/salt_task.rs
@@ -1,3 +1,4 @@
+use base64::engine::Engine;
 use getrandom::getrandom;
 use napi::{Env, Error, Result, Status, Task};
 use napi_derive::napi;
@@ -16,14 +17,11 @@ pub(crate) fn gen_salt() -> bcrypt::BcryptResult<[u8; 16]> {
 #[inline]
 pub(crate) fn format_salt(rounds: u32, version: &Version, salt: &[u8; 16]) -> String {
   let mut base64_string = String::new();
-  base64::encode_engine_string(
-    salt,
-    &mut base64_string,
-    &base64::engine::fast_portable::FastPortable::from(
-      &base64::alphabet::BCRYPT,
-      base64::engine::fast_portable::PAD,
-    ),
+  let engine = base64::engine::general_purpose::GeneralPurpose::new(
+    &base64::alphabet::BCRYPT,
+    base64::engine::general_purpose::PAD,
   );
+  engine.encode_string(salt, &mut base64_string);
   format!("${version}${rounds:0>2}${base64_string}")
 }
 
diff --git a/packages/crc32/Cargo.toml b/packages/crc32/Cargo.toml
@@ -1,18 +1,18 @@
 [package]
 authors = ["LongYinan <lynweklm@gmail.com>"]
 edition = "2021"
-name = "node-rs-crc32"
+name    = "node-rs-crc32"
 version = "0.1.0"
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
-crc32c = { version = "0.6" }
-crc32fast = { version = "1.3", features = ["nightly"] }
+crc32c       = { version = "0.6" }
+crc32fast    = { version = "1.3", features = ["nightly"] }
 global_alloc = { path = "../../crates/alloc" }
-napi = { version = "2", default-features = false, features = ["napi3"] }
-napi-derive = { version = "2", default-features = false }
+napi         = { version = "2", default-features = false, features = ["napi3"] }
+napi-derive  = { version = "2", default-features = false }
 
 [build-dependencies]
 napi-build = "2"
diff --git a/packages/deno-lint/package.json b/packages/deno-lint/package.json
@@ -73,7 +73,7 @@
     "typanion": "^3.12.1"
   },
   "devDependencies": {
-    "@types/webpack": "^5.28.0"
+    "@types/webpack": "^5.28.1"
   },
   "funding": {
     "type": "github",
diff --git a/packages/jieba/Cargo.toml b/packages/jieba/Cargo.toml
@@ -1,18 +1,18 @@
 [package]
 authors = ["LongYinan <lynweklm@gmail.com>"]
 edition = "2021"
-name = "node-rs-jieba"
+name    = "node-rs-jieba"
 version = "0.1.0"
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
 global_alloc = { path = "../../crates/alloc" }
-jieba-rs = { version = "0.6", features = ["default-dict", "tfidf", "textrank"] }
-napi = { version = "2", default-features = false, features = ["napi3"] }
-napi-derive = { version = "2" }
-once_cell = "1"
+jieba-rs     = { version = "0.6", features = ["default-dict", "tfidf", "textrank"] }
+napi         = { version = "2", default-features = false, features = ["napi3"] }
+napi-derive  = { version = "2" }
+once_cell    = "1"
 
 [build-dependencies]
 napi-build = "2"
diff --git a/packages/jsonwebtoken/Cargo.toml b/packages/jsonwebtoken/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 authors = ["Francesco Benedetto"]
 edition = "2021"
-name = "node-rs-jsonwebtoken"
+name    = "node-rs-jsonwebtoken"
 version = "0.1.0"
 
 [lib]
@@ -15,9 +15,9 @@ napi = { version = "2", default-features = false, features = [
   "serde-json",
 ] }
 napi-derive = { version = "2" }
+rand = "0.8"
 serde = "1.0"
 serde_json = "1.0"
-rand = "0.8"
 
 [build-dependencies]
 napi-build = "2"
diff --git a/packages/xxhash/Cargo.toml b/packages/xxhash/Cargo.toml
@@ -1,17 +1,17 @@
 [package]
 authors = ["LongYinan <lynweklm@gmail.com>"]
 edition = "2021"
-name = "xxhash"
+name    = "xxhash"
 version = "0.1.0"
 
 [lib]
 crate-type = ["cdylib"]
 
 [dependencies]
 global_alloc = { path = "../../crates/alloc" }
-napi = { version = "2", default-features = false, features = ["napi6"] }
-napi-derive = { version = "2" }
-xxhash-rust = { version = "0.8", features = ["xxh32", "xxh64", "xxh3"] }
+napi         = { version = "2", default-features = false, features = ["napi6"] }
+napi-derive  = { version = "2" }
+xxhash-rust  = { version = "0.8", features = ["xxh32", "xxh64", "xxh3"] }
 
 [build-dependencies]
 napi-build = "2"
diff --git a/packages/xxhash/package.json b/packages/xxhash/package.json
@@ -64,7 +64,7 @@
   },
   "devDependencies": {
     "@types/xxhashjs": "^0.2.2",
-    "webpack": "^5.75.0",
+    "webpack": "^5.80.0",
     "xxhash": "^0.3.0",
     "xxhashjs": "^0.2.2"
   },
diff --git a/rust-toolchain b/rust-toolchain
@@ -1 +1 @@
-nightly-2023-03-01
+nightly-2023-04-23
diff --git a/tsconfig.json b/tsconfig.json
@@ -16,8 +16,6 @@
     "removeComments": true,
     "strict": true,
     "skipLibCheck": true,
-    "suppressImplicitAnyIndexErrors": true,
-    "suppressExcessPropertyErrors": true,
     "forceConsistentCasingInFileNames": true,
     "target": "ES2018",
     "inlineSourceMap": true,
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -199,7 +199,7 @@ impl Task for RawHashTask {`
`199`	`199`	`let generated_salt = SaltString::generate(&mut OsRng);`
`200`	`200`	`hasher.hash_password_into(`
`201`	`201`	`self.password.as_slice(),`
`202`		`- generated_salt.as_bytes(),`
	`202`	`+ generated_salt.as_str().as_bytes(),`
`203`	`203`	`&mut output,`
`204`	`204`	`)`
`205`	`205`	`}`