refactor: merge binding crates into rspack_binding_values

web-infra-dev · Dec 18, 2024 · 856ac99 · 856ac99
1 parent 27aed6f
commit 856ac99
Show file tree

Hide file tree

Showing 61 changed files with 1,133 additions and 185 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -28,7 +28,6 @@ pnpm-lock.yaml
 /crates/node_binding
 /crates/rspack_ast_viewer
 /crates/rspack_base64
-/crates/rspack_binding_options
 /crates/rspack_core
 /crates/rspack_core/src/compiler/make @jerrykingxyz
 /crates/rspack_error

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -319,7 +319,7 @@ jobs:
 
       - name: Run test
         # reason for excluding https://github.com/napi-rs/napi-rs/issues/2200
-        run: cargo test --workspace --exclude rspack_binding_options --exclude rspack_node -- --nocapture
+        run: cargo test --workspace --exclude rspack_node -- --nocapture
 
   rust_test_miri:
     name: Rust test miri
@@ -350,7 +350,7 @@ jobs:
         env:
           MIRIFLAGS: -Zmiri-tree-borrows -Zmiri-disable-isolation
         # reason for excluding https://github.com/napi-rs/napi-rs/issues/2200
-        run: cargo miri test --workspace --exclude rspack_binding_options --exclude rspack_node -- --nocapture
+        run: cargo miri test --workspace --exclude rspack_node -- --nocapture
 
   run_rust_benchmark:
     name: Run rust benchmark

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -110,7 +110,6 @@ rspack_allocator                       = { version = "0.2.0", path = "crates/rsp
 rspack_ast                             = { version = "0.2.0", path = "crates/rspack_ast" }
 rspack_base64                          = { version = "0.2.0", path = "crates/rspack_base64" }
 rspack_binding                         = { version = "0.2.0", path = "crates/rspack_binding" }
-rspack_binding_options                 = { version = "0.2.0", path = "crates/rspack_binding_options" }
 rspack_binding_values                  = { version = "0.2.0", path = "crates/rspack_binding_values" }
 rspack_builtin                         = { version = "0.2.0", path = "crates/rspack_builtin" }
 rspack_cacheable                       = { version = "0.2.0", path = "crates/rspack_cacheable" }

diff --git a/crates/node_binding/Cargo.toml b/crates/node_binding/Cargo.toml
@@ -10,13 +10,11 @@ version     = "0.2.0"
 crate-type = ["cdylib"]
 
 [features]
-default = []
-plugin  = ["rspack_binding_options/plugin"]
+plugin = ["rspack_binding_values/plugin"]
 
 [dependencies]
 ropey                    = { workspace = true }
 rspack_allocator         = { workspace = true }
-rspack_binding_options   = { workspace = true }
 rspack_binding_values    = { workspace = true }
 rspack_collections       = { workspace = true }
 rspack_core              = { workspace = true }