From aeb68ce01d7d7545f2912d23212add786ba41252 Mon Sep 17 00:00:00 2001
From: Hana <andywangsy@gmail.com>
Date: Tue, 19 Mar 2024 17:25:50 +0800
Subject: [PATCH] fix clone

---
 Cargo.lock | 55 +++++++++++++++++++++++++++++-------------------------
 Cargo.toml |  6 +++---
 2 files changed, 33 insertions(+), 28 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 39dcd63d37e..80cce63f3b9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2113,31 +2113,17 @@ version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7843ec2de400bcbc6a6328c958dc38e5359da6e93e72e37bc5246bf1ae776389"
 
-[[package]]
-name = "napi"
-version = "2.16.0"
-source = "git+https://github.com/h-a-n-a/napi-rs?branch=rspack#459372f20ec4d069d1e909a3508900012cf9e477"
-dependencies = [
- "anyhow",
- "bitflags 2.4.2",
- "ctor",
- "napi-derive",
- "napi-sys",
- "once_cell",
- "serde",
- "serde_json",
- "tokio",
-]
-
 [[package]]
 name = "napi-build"
 version = "2.1.2"
-source = "git+https://github.com/h-a-n-a/napi-rs?branch=rspack#459372f20ec4d069d1e909a3508900012cf9e477"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2f9130fccc5f763cf2069b34a089a18f0d0883c66aceb81f2fad541a3d823c43"
 
 [[package]]
 name = "napi-derive"
 version = "2.16.0"
-source = "git+https://github.com/h-a-n-a/napi-rs?branch=rspack#459372f20ec4d069d1e909a3508900012cf9e477"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05bb7c37e3c1dda9312fdbe4a9fc7507fca72288ba154ec093e2d49114e727ce"
 dependencies = [
  "cfg-if",
  "convert_case",
@@ -2150,7 +2136,8 @@ dependencies = [
 [[package]]
 name = "napi-derive-backend"
 version = "1.0.62"
-source = "git+https://github.com/h-a-n-a/napi-rs?branch=rspack#459372f20ec4d069d1e909a3508900012cf9e477"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f785a8b8d7b83e925f5aa6d2ae3c159d17fe137ac368dc185bef410e7acdaeb4"
 dependencies = [
  "convert_case",
  "once_cell",
@@ -2161,10 +2148,28 @@ dependencies = [
  "syn 2.0.52",
 ]
 
+[[package]]
+name = "napi-h"
+version = "2.16.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8122073a4a01e851f0a9bbc4322b8f8cdf6f9faafc260f005cfd782098aff4fb"
+dependencies = [
+ "anyhow",
+ "bitflags 2.4.2",
+ "ctor",
+ "napi-derive",
+ "napi-sys",
+ "once_cell",
+ "serde",
+ "serde_json",
+ "tokio",
+]
+
 [[package]]
 name = "napi-sys"
 version = "2.3.0"
-source = "git+https://github.com/h-a-n-a/napi-rs?branch=rspack#459372f20ec4d069d1e909a3508900012cf9e477"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2503fa6af34dc83fb74888df8b22afe933b58d37daf7d80424b1c60c68196b8b"
 dependencies = [
  "libloading",
 ]
@@ -3026,8 +3031,8 @@ dependencies = [
  "better_scoped_tls",
  "derivative",
  "glob",
- "napi",
  "napi-derive",
+ "napi-h",
  "rspack_binding_values",
  "rspack_core",
  "rspack_error",
@@ -3081,8 +3086,8 @@ name = "rspack_binding_values"
 version = "0.1.0"
 dependencies = [
  "futures",
- "napi",
  "napi-derive",
+ "napi-h",
  "rspack_core",
  "rspack_error",
  "rspack_identifier",
@@ -3186,9 +3191,9 @@ name = "rspack_fs_node"
 version = "0.1.0"
 dependencies = [
  "futures",
- "napi",
  "napi-build",
  "napi-derive",
+ "napi-h",
  "rspack_fs",
  "rspack_napi",
 ]
@@ -3312,7 +3317,7 @@ dependencies = [
 name = "rspack_napi"
 version = "0.1.0"
 dependencies = [
- "napi",
+ "napi-h",
  "rspack_error",
  "rspack_regex",
  "tokio",
@@ -3324,9 +3329,9 @@ version = "0.1.0"
 dependencies = [
  "async-trait",
  "color-backtrace",
- "napi",
  "napi-build",
  "napi-derive",
+ "napi-h",
  "rspack_allocator",
  "rspack_binding_options",
  "rspack_binding_values",
diff --git a/Cargo.toml b/Cargo.toml
index 8eb5ff2ed3a..62a5bfa682e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -50,9 +50,9 @@ ustr               = { package = "ustr-fxhash", version = "1.0.0" }
 xxhash-rust        = { version = "0.8.10" }
 
 # Pinned
-napi              = { git = "https://github.com/h-a-n-a/napi-rs", branch = "rspack" }
-napi-build        = { git = "https://github.com/h-a-n-a/napi-rs", branch = "rspack" }
-napi-derive       = { git = "https://github.com/h-a-n-a/napi-rs", branch = "rspack" }
+napi              = { package = "napi-h", version = "2.16.1" }
+napi-build        = { version = "2" }
+napi-derive       = { version = "2" }
 tikv-jemallocator = { version = "=0.5.4", features = ["disable_initial_exec_tls"] }
 
 # Must be pinned with the same swc versions