Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions crates/rspack_core/src/context_module.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ use std::{borrow::Cow, hash::Hash, sync::Arc};

use cow_utils::CowUtils;
use derive_more::Debug;
use futures::future::BoxFuture;
use indoc::formatdoc;
use itertools::Itertools;
use rspack_cacheable::{
Expand Down Expand Up @@ -160,8 +161,11 @@ pub enum FakeMapValue {
Map(HashMap<String, FakeNamespaceObjectMode>),
}

pub type ResolveContextModuleDependencies =
Arc<dyn Fn(ContextModuleOptions) -> Result<Vec<ContextElementDependency>> + Send + Sync>;
pub type ResolveContextModuleDependencies = Arc<
dyn Fn(ContextModuleOptions) -> BoxFuture<'static, Result<Vec<ContextElementDependency>>>
+ Send
+ Sync,
>;

#[impl_source_map_config]
#[cacheable]
Expand Down Expand Up @@ -958,7 +962,7 @@ impl Module for ContextModule {
_: Option<&Compilation>,
) -> Result<BuildResult> {
let resolve_dependencies = &self.resolve_dependencies;
let context_element_dependencies = resolve_dependencies(self.options.clone())?;
let context_element_dependencies = resolve_dependencies(self.options.clone()).await?;

let mut dependencies: Vec<BoxDependency> = vec![];
let mut blocks = vec![];
Expand Down
69 changes: 38 additions & 31 deletions crates/rspack_core/src/context_module_factory.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
use std::{borrow::Cow, sync::Arc};

use async_recursion::async_recursion;
use cow_utils::CowUtils;
use derive_more::Debug;
use rspack_error::{Result, ToStringResultToRspackResultExt, error};
Expand Down Expand Up @@ -122,34 +123,36 @@ impl ContextModuleFactory {
plugin_driver: SharedPluginDriver,
) -> Self {
let resolve_dependencies: ResolveContextModuleDependencies = Arc::new(move |options| {
tracing::trace!("resolving context module path {}", options.resource);
let resolver_factory = resolver_factory.clone();
Box::pin(async move {
tracing::trace!("resolving context module path {}", options.resource);
let resolver = &resolver_factory.get(ResolveOptionsWithDependencyType {
resolve_options: options
.resolve_options
.clone()
.map(|r| Box::new(Arc::unwrap_or_clone(r))),
resolve_to_context: false,
dependency_category: options.context_options.category,
});
let mut context_element_dependencies = vec![];
visit_dirs(
options.resource.as_str(),
&options.resource,
&mut context_element_dependencies,
&options,
&resolver.options(),
resolver.inner_fs(),
)
.await?;
context_element_dependencies.sort_by_cached_key(|d| d.user_request.clone());

let resolver = &resolver_factory.get(ResolveOptionsWithDependencyType {
resolve_options: options
.resolve_options
.clone()
.map(|r| Box::new(Arc::unwrap_or_clone(r))),
resolve_to_context: false,
dependency_category: options.context_options.category,
});

let mut context_element_dependencies = vec![];
visit_dirs(
options.resource.as_str(),
&options.resource,
&mut context_element_dependencies,
&options,
&resolver.options(),
resolver.inner_fs(),
)?;
context_element_dependencies.sort_by_cached_key(|d| d.user_request.clone());

tracing::trace!(
"resolving dependencies for {:?}",
context_element_dependencies
);
tracing::trace!(
"resolving dependencies for {:?}",
context_element_dependencies
);

Ok(context_element_dependencies)
Ok(context_element_dependencies)
})
});

Self {
Expand Down Expand Up @@ -400,7 +403,8 @@ impl ContextModuleFactory {
}
}

fn visit_dirs(
#[async_recursion]
async fn visit_dirs(
ctx: &str,
dir: &Utf8Path,
dependencies: &mut Vec<ContextElementDependency>,
Expand All @@ -409,15 +413,16 @@ fn visit_dirs(
fs: Arc<dyn ReadableFileSystem>,
) -> Result<()> {
if !fs
.metadata_sync(dir)
.metadata(dir)
.await
.map(|m| m.is_directory)
.unwrap_or(false)
{
return Ok(());
}
let include = &options.context_options.include;
let exclude = &options.context_options.exclude;
for filename in fs.read_dir_sync(dir)? {
for filename in fs.read_dir(dir).await? {
let path = dir.join(&filename);
let path_str = path.as_str();

Expand All @@ -429,7 +434,8 @@ fn visit_dirs(
}

if fs
.metadata_sync(&path)
.metadata(&path)
.await
.map(|m| m.is_directory)
.unwrap_or(false)
{
Expand All @@ -441,7 +447,8 @@ fn visit_dirs(
options,
resolve_options,
fs.clone(),
)?;
)
.await?;
}
} else if filename.starts_with('.') {
// ignore hidden files
Expand Down
73 changes: 38 additions & 35 deletions crates/rspack_plugin_module_replacement/src/context_replacement.rs
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ use std::sync::Arc;

use rspack_core::{
AfterResolveResult, BeforeResolveResult, ContextElementDependency,
ContextModuleFactoryAfterResolve, ContextModuleFactoryBeforeResolve, DependencyId,
DependencyType, Plugin,
ContextModuleFactoryAfterResolve, ContextModuleFactoryBeforeResolve, ContextModuleOptions,
DependencyId, DependencyType, Plugin,
};
use rspack_error::Result;
use rspack_hook::{plugin, plugin_hook};
Expand Down Expand Up @@ -88,40 +88,43 @@ async fn cmf_after_resolve(&self, mut result: AfterResolveResult) -> Result<Afte
data.reg_exp = Some(new_content_reg_exp.clone());
}
if let Some(new_content_create_context_map) = &self.new_content_create_context_map {
let new_content_create_context_map = new_content_create_context_map.clone();
data.resolve_dependencies = Arc::new(move |options| {
let deps = new_content_create_context_map
.iter()
.map(|(key, value)| {
let request = format!(
"{}{}{}",
value,
options.resource_query.clone(),
options.resource_fragment.clone(),
);
let new_content_create_context_map = Arc::new(new_content_create_context_map.clone());
data.resolve_dependencies = Arc::new(move |options: ContextModuleOptions| {
let new_content_create_context_map = new_content_create_context_map.clone();
Box::pin(async move {
let deps = new_content_create_context_map
.iter()
.map(|(key, value)| {
let request = format!(
"{}{}{}",
value,
options.resource_query.clone(),
options.resource_fragment.clone(),
);

let resource_identifier = ContextElementDependency::create_resource_identifier(
options.resource.as_str(),
&request,
options.context_options.attributes.as_ref(),
);
ContextElementDependency {
id: DependencyId::new(),
request,
user_request: key.to_string(),
category: options.context_options.category,
context: options.resource.clone().into(),
layer: options.layer.clone(),
options: options.context_options.clone(),
resource_identifier,
attributes: options.context_options.attributes.clone(),
referenced_exports: options.context_options.referenced_exports.clone(),
dependency_type: DependencyType::ContextElement(options.type_prefix),
factorize_info: Default::default(),
}
})
.collect::<Vec<_>>();
Ok(deps)
let resource_identifier = ContextElementDependency::create_resource_identifier(
options.resource.as_str(),
&request,
options.context_options.attributes.as_ref(),
);
ContextElementDependency {
id: DependencyId::new(),
request,
user_request: key.to_string(),
category: options.context_options.category,
context: options.resource.clone().into(),
layer: options.layer.clone(),
options: options.context_options.clone(),
resource_identifier,
attributes: options.context_options.attributes.clone(),
referenced_exports: options.context_options.referenced_exports.clone(),
dependency_type: DependencyType::ContextElement(options.type_prefix),
factorize_info: Default::default(),
}
})
.collect::<Vec<_>>();
Ok(deps)
})
});
}
// if let Some(new_content_callback) = &self.new_content_callback {
Expand Down
Loading