Skip to content

Commit a4d9759

Browse files
committed
fix module rule use entry func arguments
1 parent 7969ce0 commit a4d9759

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

crates/rspack_core/src/normal_module_factory.rs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -417,13 +417,16 @@ impl NormalModuleFactory {
417417
let rule_use = match &rule.r#use {
418418
ModuleRuleUse::Array(array_use) => Cow::Borrowed(array_use),
419419
ModuleRuleUse::Func(func_use) => {
420+
let resource_data_for_rules = match_resource_data.as_ref().unwrap_or(&resource_data);
420421
let context = FuncUseCtx {
421422
// align with webpack https://github.com/webpack/webpack/blob/899f06934391baede59da3dcd35b5ef51c675dbe/lib/NormalModuleFactory.js#L576
422-
// resource shouldn't contain query otherwise it will cause duplicate query in https://github.com/unjs/unplugin/blob/62fdc5ae361d86a6ec39eaef5d8f01e12c6a794d/src/utils.ts#L58
423-
resource: resource_data.resource_path.clone().map(|x| x.to_string()),
424-
real_resource: Some(user_request.clone()),
423+
resource: resource_data_for_rules
424+
.resource_path
425+
.as_ref()
426+
.map(|x| x.to_string()),
427+
resource_query: resource_data_for_rules.resource_query.clone(),
428+
real_resource: resource_data.resource_path.as_ref().map(|p| p.to_string()),
425429
issuer: data.issuer.clone(),
426-
resource_query: resource_data.resource_query.clone(),
427430
};
428431
Cow::Owned(func_use(context).await?)
429432
}

0 commit comments

Comments
 (0)