perf: reuse js module between compilation (#9265)

Cargo.toml

@@ -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" }

crates/node_binding/Cargo.toml

@@ -6,17 +6,17 @@ name        = "rspack_node"
 publish     = false
 repository  = "https://github.com/web-infra-dev/rspack"
 version     = "0.2.0"
+
 [lib]
 crate-type = ["cdylib"]
 
 [features]
-plugin = ["rspack_binding_values/plugin"]
+plugin = ["rspack_loader_swc/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 }
@@ -39,11 +39,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_chunk            = { workspace = true }
+rspack_plugin_schemes                  = { workspace = true }
+rspack_plugin_size_limits              = { workspace = true }
+rspack_plugin_split_chunks             = { workspace = true }
+rspack_plugin_sri                      = { 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 }

crates/rspack_binding_values/src/chunk_graph.rs → crates/node_binding/src/chunk_graph.rs

@@ -42,7 +42,7 @@ impl JsChunkGraph {
     Ok(
       modules
         .iter()
-        .map(|module| JsModuleWrapper::new(module.as_ref(), compilation.id(), Some(compilation)))
+        .map(|module| JsModuleWrapper::new(module.identifier(), None, compilation.compiler_id()))
         .collect::<Vec<_>>(),
     )
   }
@@ -59,7 +59,7 @@ 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.identifier(), None, compilation.compiler_id()))
         .collect::<Vec<_>>(),
     )
   }
@@ -114,7 +114,7 @@ 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.identifier(), None, compilation.compiler_id()))
         .collect(),
     )
   }

crates/rspack_binding_values/src/chunk_group.rs → crates/node_binding/src/chunk_group.rs

@@ -11,7 +11,6 @@ use crate::{JsChunkWrapper, JsModule, JsModuleWrapper};
 #[napi]
 pub struct JsChunkGroup {
   chunk_group_ukey: ChunkGroupUkey,
-  compilation_id: CompilationId,
   compilation: NonNull<Compilation>,
 }
 
@@ -71,7 +70,7 @@ 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.identifier(), None, compilation.compiler_id())
           })
         }),
         request: match &origin.request {
@@ -212,7 +211,6 @@ impl ToNapiValue for JsChunkGroupWrapper {
         std::collections::hash_map::Entry::Vacant(entry) => {
           let js_module = JsChunkGroup {
             chunk_group_ukey: val.chunk_group_ukey,
-            compilation_id: val.compilation_id,
             compilation: val.compilation,
           };
           let r = entry.insert(OneShotRef::new(env, js_module)?);

crates/rspack_binding_values/src/compilation/mod.rs → crates/node_binding/src/compilation/mod.rs

@@ -180,7 +180,7 @@ 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.identifier(), None, compilation.compiler_id())
           })
         })
         .collect::<Vec<_>>(),
@@ -197,7 +197,7 @@ 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.identifier(), None, compilation.compiler_id())
           })
         })
         .collect::<Vec<_>>(),
@@ -576,23 +576,20 @@ impl JsCompilation {
     let compilation = self.as_mut()?;
 
     callbackify(env, f, async {
-      let compilation_id = compilation.id();
+      let compiler_id = compilation.compiler_id();
 
-      let mut modules = compilation
+      let 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.identifier(), None, compiler_id))
               .collect::<Vec<_>>()
           },
         )
         .await
         .map_err(|e| Error::new(napi::Status::GenericFailure, format!("{e}")))?;
-      modules
-        .iter_mut()
-        .for_each(|module| module.attach(compilation));
 
       Ok(modules)
     })
@@ -744,7 +741,7 @@ impl JsCompilation {
             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));
+                  JsModuleWrapper::new(module.identifier(), None, compilation.compiler_id());
                 (Either::B(()), Either::B(js_module))
               }
               None => (