fix

web-infra-dev · Nov 13, 2024 · 67e7e90 · 67e7e90
1 parent 1b22167
commit 67e7e90
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 26 deletions.
diff --git a/crates/rspack_binding_values/src/dependency.rs b/crates/rspack_binding_values/src/dependency.rs
@@ -16,12 +16,6 @@ pub struct JsDependency {
 }
 
 impl JsDependency {
-  fn attach(&mut self, compilation: NonNull<Compilation>) {
-    if self.compilation.is_none() {
-      self.compilation = Some(compilation);
-    }
-  }
-
   fn as_ref(&mut self) -> napi::Result<&dyn Dependency> {
     if let Some(compilation) = self.compilation {
       let compilation = unsafe { compilation.as_ref() };
@@ -166,11 +160,9 @@ impl ToNapiValue for JsDependencyWrapper {
         std::collections::hash_map::Entry::Occupied(occupied_entry) => {
           let r = occupied_entry.get();
           let instance = r.from_napi_mut_ref()?;
-          if let Some(compilation) = val.compilation {
-            instance.attach(compilation);
-          } else {
-            instance.dependency = val.dependency;
-          }
+          instance.compilation = val.compilation;
+          instance.dependency = val.dependency;
+
           ToNapiValue::to_napi_value(env, r)
         }
         std::collections::hash_map::Entry::Vacant(vacant_entry) => {

diff --git a/crates/rspack_binding_values/src/module.rs b/crates/rspack_binding_values/src/module.rs
@@ -29,12 +29,6 @@ pub struct JsModule {
 }
 
 impl JsModule {
-  fn attach(&mut self, compilation: NonNull<Compilation>) {
-    if self.compilation.is_none() {
-      self.compilation = Some(compilation);
-    }
-  }
-
   fn as_ref(&mut self) -> napi::Result<&'static dyn Module> {
     if let Some(compilation) = self.compilation {
       let compilation = unsafe { compilation.as_ref() };
@@ -359,11 +353,8 @@ impl ToNapiValue for JsModuleWrapper {
         std::collections::hash_map::Entry::Occupied(entry) => {
           let r = entry.get();
           let instance = r.from_napi_mut_ref()?;
-          if let Some(compilation) = val.compilation {
-            instance.attach(compilation);
-          } else {
-            instance.module = val.module;
-          }
+          instance.compilation = val.compilation;
+          instance.module = val.module;
           ToNapiValue::to_napi_value(env, r)
         }
         std::collections::hash_map::Entry::Vacant(entry) => {

diff --git a/packages/rspack-test-tools/tests/configCases/compilation/rebuild-module/rspack.config.js b/packages/rspack-test-tools/tests/configCases/compilation/rebuild-module/rspack.config.js
@@ -27,10 +27,9 @@ class Plugin {
 						});
 					});
 
-					console.log('newModule.originalSource().source()', newModule.originalSource())
-					// expect(
-					// 	newModule.originalSource().source().includes("a = 2")
-					// ).toBe(true);
+					expect(
+						newModule.originalSource().source().includes("a = 2")
+					).toBe(true);
 				}
 			});
 		});