fix: context passed in is not correct

web-infra-dev · Jun 27, 2024 · ef6b53d · ef6b53d
1 parent 3909556
commit ef6b53d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/crates/rspack_core/src/compiler/make/repair/factorize.rs b/crates/rspack_core/src/compiler/make/repair/factorize.rs
@@ -40,9 +40,13 @@ impl Task<MakeTaskContext> for FactorizeTask {
     let dependency = self.dependency;
     //    let dep_id = *dependency.id();
 
-    let context = if let Some(context) = dependency.get_context() {
+    let context = if let Some(context) = dependency.get_context()
+      && !context.is_empty()
+    {
       context
-    } else if let Some(context) = &self.original_module_context {
+    } else if let Some(context) = &self.original_module_context
+      && !context.is_empty()
+    {
       context
     } else {
       &self.options.context

diff --git a/crates/rspack_core/src/normal_module_factory.rs b/crates/rspack_core/src/normal_module_factory.rs
@@ -269,7 +269,6 @@ impl NormalModuleFactory {
     let resource_data = if scheme.is_some() {
       // resource with scheme
       let mut resource_data = ResourceData::new(unresolved_resource.to_owned(), "".into());
-      // resource with scheme
       plugin_driver
         .normal_module_factory_hooks
         .resolve_for_scheme