Use napi-rs 2

parcel-bundler · Apr 25, 2022 · 32a0d25 · 32a0d25
1 parent 21c0ffe
commit 32a0d25
Show file tree

Hide file tree

Showing 12 changed files with 83 additions and 242 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/package.json b/package.json
@@ -38,7 +38,7 @@
   "devDependencies": {
     "@babel/core": "^7.12.0",
     "@khanacademy/flow-to-ts": "^0.5.2",
-    "@napi-rs/cli": "1.0.4",
+    "@napi-rs/cli": "^2.6.2",
     "@parcel/babel-register": "2.5.0",
     "@types/node": "^15.12.4",
     "cross-env": "^7.0.0",

diff --git a/packages/optimizers/image/Cargo.toml b/packages/optimizers/image/Cargo.toml
@@ -7,8 +7,8 @@ version = "0.1.0"
 crate-type = ["cdylib"]
 
 [dependencies]
-napi = "1"
-napi-derive = "1"
+napi = {version = "2.2.0", default-features = false, features = ["napi4", "compat-mode"]}
+napi-derive = "2"
 oxipng = "5.0.0"
 mozjpeg-sys = "1.0.0"
 libc = "0.2"

diff --git a/packages/optimizers/image/package.json b/packages/optimizers/image/package.json
@@ -39,7 +39,7 @@
     "detect-libc": "^1.0.3"
   },
   "devDependencies": {
-    "@napi-rs/cli": "1.0.4",
+    "@napi-rs/cli": "^2.6.2",
     "tiny-benchy": "^1.0.2"
   }
 }
diff --git a/packages/transformers/js/napi/Cargo.toml b/packages/transformers/js/napi/Cargo.toml
@@ -8,8 +8,8 @@ edition = "2018"
 crate-type = ["cdylib"]
 
 [dependencies]
-napi = { version = "1", features = ["serde-json"] }
-napi-derive = "1"
+napi = {version = "2.2.0", default-features = false, features = ["napi4", "compat-mode", "serde-json"]}
+napi-derive = "2"
 parcel-js-swc-core = { path = "../core" }
 
 [target.'cfg(target_os = "macos")'.dependencies]

diff --git a/packages/transformers/js/package.json b/packages/transformers/js/package.json
@@ -43,7 +43,7 @@
     "semver": "^5.7.1"
   },
   "devDependencies": {
-    "@napi-rs/cli": "1.0.4"
+    "@napi-rs/cli": "^2.6.2"
   },
   "peerDependencies": {
     "@parcel/core": "^2.5.0"

diff --git a/packages/utils/fs-search/Cargo.toml b/packages/utils/fs-search/Cargo.toml
@@ -7,8 +7,8 @@ version = "0.1.0"
 crate-type = ["cdylib"]
 
 [dependencies]
-napi = "1"
-napi-derive = "1"
+napi = "2"
+napi-derive = "2"
 
 [build-dependencies]
 napi-build = "1"
diff --git a/packages/utils/fs-search/package.json b/packages/utils/fs-search/package.json
@@ -31,6 +31,6 @@
     "detect-libc": "^1.0.3"
   },
   "devDependencies": {
-    "@napi-rs/cli": "1.0.4"
+    "@napi-rs/cli": "^2.6.2"
   }
 }
diff --git a/packages/utils/hash/Cargo.toml b/packages/utils/hash/Cargo.toml
@@ -7,8 +7,8 @@ version = "0.1.0"
 crate-type = ["cdylib"]
 
 [dependencies]
-napi = "1"
-napi-derive = "1"
+napi = "2"
+napi-derive = "2"
 xxhash-rust = { version = "0.8.2", features = ["xxh3"] }
 
 [build-dependencies]

diff --git a/packages/utils/hash/package.json b/packages/utils/hash/package.json
@@ -36,7 +36,7 @@
     "xxhash-wasm": "^0.4.2"
   },
   "devDependencies": {
-    "@napi-rs/cli": "1.0.4",
+    "@napi-rs/cli": "^2.6.2",
     "tiny-benchy": "^1.0.2"
   }
 }
diff --git a/packages/utils/hash/src/lib.rs b/packages/utils/hash/src/lib.rs
@@ -67,9 +67,9 @@ fn init(mut exports: JsObject, env: Env) -> Result<()> {
   exports.create_named_method("hashString", hash_string)?;
   exports.create_named_method("hashBuffer", hash_buffer)?;
 
-  let write_string_method = Property::new(&env, "writeString")?.with_method(write_string);
-  let write_buffer_method = Property::new(&env, "writeBuffer")?.with_method(write_buffer);
-  let finish_method = Property::new(&env, "finish")?.with_method(finish);
+  let write_string_method = Property::new("writeString")?.with_method(write_string);
+  let write_buffer_method = Property::new("writeBuffer")?.with_method(write_buffer);
+  let finish_method = Property::new("finish")?.with_method(finish);
   let hash_class = env.define_class(
     "Hash",
     constructor,