Skip to content

Commit

Permalink
chore: merge rspack_binding_values to node_binding
Browse files Browse the repository at this point in the history
  • Loading branch information
SyMind committed Feb 12, 2025
1 parent 7fca533 commit 4b17353
Show file tree
Hide file tree
Showing 103 changed files with 1,271 additions and 1,126 deletions.
136 changes: 55 additions & 81 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,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_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" }
rspack_collection = { version = "0.2.0", path = "crates/rspack_collection" }
Expand Down
65 changes: 60 additions & 5 deletions crates/node_binding/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -9,14 +9,10 @@ version = "0.2.0"
[lib]
crate-type = ["cdylib"]

[features]
plugin = ["rspack_binding_values/plugin"]

[dependencies]
anyhow = { workspace = true }
ropey = { workspace = true }
rspack_allocator = { workspace = true }
rspack_binding_values = { workspace = true }
rspack_collections = { workspace = true }
rspack_core = { workspace = true }
rspack_error = { workspace = true }
Expand All @@ -39,11 +35,70 @@ cow-utils = { workspace = true }
tracing = { workspace = true }
tracing-subscriber = { workspace = true }

napi = { workspace = true }
napi = { workspace = true, features = ["async", "tokio_rt", "serde-json", "anyhow"] }
napi-derive = { workspace = true }

color-backtrace = "0.6.1"

derive_more = { workspace = true, features = ["debug"] }
futures = { workspace = true }
glob = { workspace = true }
heck = { workspace = true }
pollster = { workspace = true }
rspack_cacheable = { workspace = true }
rspack_ids = { workspace = true }
rspack_napi_macros = { workspace = true }
rspack_regex = { workspace = true }
rustc-hash = { workspace = true }
serde = { workspace = true }
serde_json = { workspace = true }
swc_core = { workspace = true, default-features = false, features = ["ecma_transforms_react"] }
tokio = { workspace = true, features = ["rt", "rt-multi-thread", "macros", "test-util", "parking_lot"] }


rspack_loader_lightningcss = { workspace = true }
rspack_loader_preact_refresh = { workspace = true }
rspack_loader_react_refresh = { workspace = true }
rspack_loader_runner = { workspace = true }
rspack_loader_swc = { workspace = true }
rspack_loader_testing = { workspace = true }
rspack_plugin_asset = { workspace = true }
rspack_plugin_banner = { workspace = true }
rspack_plugin_context_replacement = { workspace = true }
rspack_plugin_copy = { workspace = true }
rspack_plugin_css = { workspace = true }
rspack_plugin_devtool = { workspace = true }
rspack_plugin_dll = { workspace = true }
rspack_plugin_dynamic_entry = { workspace = true }
rspack_plugin_ensure_chunk_conditions = { workspace = true }
rspack_plugin_entry = { workspace = true }
rspack_plugin_externals = { workspace = true }
rspack_plugin_extract_css = { workspace = true }
rspack_plugin_hmr = { workspace = true }
rspack_plugin_ignore = { workspace = true }
rspack_plugin_json = { workspace = true }
rspack_plugin_lazy_compilation = { workspace = true }
rspack_plugin_library = { workspace = true }
rspack_plugin_lightning_css_minimizer = { workspace = true }
rspack_plugin_limit_chunk_count = { workspace = true }
rspack_plugin_merge_duplicate_chunks = { workspace = true }
rspack_plugin_mf = { workspace = true }
rspack_plugin_no_emit_on_errors = { workspace = true }
rspack_plugin_progress = { workspace = true }
rspack_plugin_real_content_hash = { workspace = true }
rspack_plugin_remove_duplicate_modules = { workspace = true }
rspack_plugin_remove_empty_chunks = { workspace = true }
rspack_plugin_runtime = { workspace = true }
rspack_plugin_runtime_chunk = { workspace = true }
rspack_plugin_schemes = { workspace = true }
rspack_plugin_size_limits = { workspace = true }
rspack_plugin_split_chunks = { workspace = true }
rspack_plugin_swc_js_minimizer = { workspace = true }
rspack_plugin_warn_sensitive_module = { workspace = true }
rspack_plugin_wasm = { workspace = true }
rspack_plugin_web_worker_template = { workspace = true }
rspack_plugin_worker = { workspace = true }


[build-dependencies]
napi-build = { workspace = true }
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,14 @@ impl JsChunkGraph {
Ok(
modules
.iter()
.map(|module| JsModuleWrapper::new(module.as_ref(), compilation.id(), Some(compilation)))
.map(|module| {
JsModuleWrapper::new(
module.as_ref(),
compilation.id(),
compilation.compiler_id(),
Some(compilation),
)
})
.collect::<Vec<_>>(),
)
}
Expand All @@ -59,7 +66,14 @@ impl JsChunkGraph {
modules
.iter()
.filter_map(|module| module_graph.module_by_identifier(module))
.map(|module| JsModuleWrapper::new(module.as_ref(), compilation.id(), Some(compilation)))
.map(|module| {
JsModuleWrapper::new(
module.as_ref(),
compilation.id(),
compilation.compiler_id(),
Some(compilation),
)
})
.collect::<Vec<_>>(),
)
}
Expand Down Expand Up @@ -114,7 +128,14 @@ impl JsChunkGraph {
SourceType::from(source_type.as_str()),
&compilation.get_module_graph(),
)
.map(|module| JsModuleWrapper::new(module, compilation.id(), Some(compilation)))
.map(|module| {
JsModuleWrapper::new(
module,
compilation.id(),
compilation.compiler_id(),
Some(compilation),
)
})
.collect(),
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,12 @@ impl JsChunkGroup {
js_origins.push(JsChunkGroupOrigin {
module: origin.module.and_then(|module_id| {
compilation.module_by_identifier(&module_id).map(|module| {
JsModuleWrapper::new(module.as_ref(), self.compilation_id, Some(compilation))
JsModuleWrapper::new(
module.as_ref(),
self.compilation_id,
compilation.compiler_id(),
Some(compilation),
)
})
}),
request: match &origin.request {
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,12 @@ impl JsCompilation {
.keys()
.filter_map(|module_id| {
compilation.module_by_identifier(module_id).map(|module| {
JsModuleWrapper::new(module.as_ref(), compilation.id(), Some(compilation))
JsModuleWrapper::new(
module.as_ref(),
compilation.id(),
compilation.compiler_id(),
Some(compilation),
)
})
})
.collect::<Vec<_>>(),
Expand All @@ -197,7 +202,12 @@ impl JsCompilation {
.iter()
.filter_map(|module_id| {
compilation.module_by_identifier(module_id).map(|module| {
JsModuleWrapper::new(module.as_ref(), compilation.id(), Some(compilation))
JsModuleWrapper::new(
module.as_ref(),
compilation.id(),
compilation.compiler_id(),
Some(compilation),
)
})
})
.collect::<Vec<_>>(),
Expand Down Expand Up @@ -577,14 +587,17 @@ impl JsCompilation {

callbackify(env, f, async {
let compilation_id = compilation.id();
let compiler_id = compilation.compiler_id();

let mut modules = compilation
.rebuild_module(
IdentifierSet::from_iter(module_identifiers.into_iter().map(ModuleIdentifier::from)),
|modules| {
modules
.into_iter()
.map(|module| JsModuleWrapper::new(module.as_ref(), compilation_id, None))
.map(|module| {
JsModuleWrapper::new(module.as_ref(), compilation_id, compiler_id, None)
})
.collect::<Vec<_>>()
},
)
Expand Down Expand Up @@ -743,9 +756,19 @@ impl JsCompilation {
match module_graph.module_graph_module_by_dependency_id(&dependency_id) {
Some(module) => match module_graph.module_by_identifier(&module.module_identifier) {
Some(module) => {
let js_module =
JsModuleWrapper::new(module.as_ref(), compilation.id(), Some(compilation));
(Either::B(()), Either::B(js_module))
let dependency = module_graph.dependency_by_id(&dependency_id).unwrap();
let js_dependency = JsDependencyWrapper::new(
dependency.as_ref(),
compilation.id(),
Some(&compilation),
);
let js_module = JsModuleWrapper::new(
module.as_ref(),
compilation.id(),
compilation.compiler_id(),
Some(compilation),
);
Either::B((js_dependency, js_module))
}
None => (
Either::A(format!(
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
Loading

0 comments on commit 4b17353

Please sign in to comment.