Skip to content

feat!: use defer_options for build_module_artifact #12578

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
hardfist merged 3 commits into from
Dec 30, 2025
Merged

feat!: use defer_options for build_module_artifact #12578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
cc5d3de
refactor: use defer_options for build_module_artifact
hardfist Dec 29, 2025
c07e397
chore: fix panic
hardfist Dec 30, 2025
55deb1c
chore: fix fmt
hardfist Dec 30, 2025
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
101 changes: 55 additions & 46 deletions crates/rspack_core/src/compilation/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ use std::{
collections::{VecDeque, hash_map},
fmt::{self, Debug},
hash::{BuildHasherDefault, Hash},
mem,
sync::{
Arc,
atomic::{AtomicBool, AtomicU32, Ordering},
Expand Down Expand Up @@ -297,7 +296,7 @@ pub struct Compilation {

pub modified_files: ArcPathSet,
pub removed_files: ArcPathSet,
pub build_module_graph_artifact: BuildModuleGraphArtifact,
pub build_module_graph_artifact: DerefOption<BuildModuleGraphArtifact>,
pub input_filesystem: Arc<dyn ReadableFileSystem>,

pub intermediate_filesystem: Arc<dyn IntermediateFileSystem>,
Expand Down Expand Up @@ -427,7 +426,7 @@ impl Compilation {
module_executor,
in_finish_make: AtomicBool::new(false),

build_module_graph_artifact: BuildModuleGraphArtifact::default(),
build_module_graph_artifact: DerefOption::new(BuildModuleGraphArtifact::default()),
modified_files,
removed_files,
input_filesystem,
Expand Down Expand Up @@ -458,14 +457,17 @@ impl Compilation {
);
}
pub fn swap_build_module_graph_artifact(&mut self, make_artifact: &mut BuildModuleGraphArtifact) {
mem::swap(&mut self.build_module_graph_artifact, make_artifact);
self.build_module_graph_artifact.swap(make_artifact);
}
pub fn get_module_graph(&self) -> &ModuleGraph {
self.build_module_graph_artifact.get_module_graph()
}

// FIXME: find a better way to do this.
// it will return None during make phase since mg is incomplete
pub fn module_by_identifier(&self, identifier: &ModuleIdentifier) -> Option<&BoxModule> {
if self.build_module_graph_artifact.is_none() {
return None;
}
if let Some(module) = self.get_module_graph().module_by_identifier(identifier) {
return Some(module);
};
Expand Down Expand Up @@ -657,21 +659,23 @@ impl Compilation {
self.add_entry(entry, options).await?;
}

let make_artifact = mem::take(&mut self.build_module_graph_artifact);
self.build_module_graph_artifact = update_module_graph(
self,
make_artifact,
vec![UpdateParam::BuildEntry(
self
.entries
.values()
.flat_map(|item| item.all_dependencies())
.chain(self.global_entry.all_dependencies())
.copied()
.collect(),
)],
)
.await?;
let make_artifact = self.build_module_graph_artifact.take();
self.build_module_graph_artifact = DerefOption::new(
update_module_graph(
self,
make_artifact,
vec![UpdateParam::BuildEntry(
self
.entries
.values()
.flat_map(|item| item.all_dependencies())
.chain(self.global_entry.all_dependencies())
.copied()
.collect(),
)],
)
.await?,
);
Ok(())
}

Expand Down Expand Up @@ -706,21 +710,23 @@ impl Compilation {

// Recheck entry and clean useless entry
// This should before finish_modules hook is called, ensure providedExports effects on new added modules
let make_artifact = mem::take(&mut self.build_module_graph_artifact);
self.build_module_graph_artifact = update_module_graph(
self,
make_artifact,
vec![UpdateParam::BuildEntry(
self
.entries
.values()
.flat_map(|item| item.all_dependencies())
.chain(self.global_entry.all_dependencies())
.copied()
.collect(),
)],
)
.await?;
let make_artifact = self.build_module_graph_artifact.take();
self.build_module_graph_artifact = DerefOption::new(
update_module_graph(
self,
make_artifact,
vec![UpdateParam::BuildEntry(
self
.entries
.values()
.flat_map(|item| item.all_dependencies())
.chain(self.global_entry.all_dependencies())
.copied()
.collect(),
)],
)
.await?,
);
Ok(())
}

Expand Down Expand Up @@ -1016,8 +1022,8 @@ impl Compilation {
self.module_executor = Some(module_executor);
}

let artifact = std::mem::take(&mut self.build_module_graph_artifact);
self.build_module_graph_artifact = build_module_graph(self, artifact).await?;
let artifact = self.build_module_graph_artifact.take();
self.build_module_graph_artifact = DerefOption::new(build_module_graph(self, artifact).await?);

self.in_finish_make.store(true, Ordering::Release);

Expand All @@ -1029,17 +1035,19 @@ impl Compilation {
module_identifiers: IdentifierSet,
f: impl Fn(Vec<&BoxModule>) -> T,
) -> Result<T> {
let artifact = std::mem::take(&mut self.build_module_graph_artifact);
let artifact = self.build_module_graph_artifact.take();

// https://github.com/webpack/webpack/blob/19ca74127f7668aaf60d59f4af8fcaee7924541a/lib/Compilation.js#L2462C21-L2462C25
self.module_graph_cache_artifact.unfreeze();

self.build_module_graph_artifact = update_module_graph(
self,
artifact,
vec![UpdateParam::ForceBuildModules(module_identifiers.clone())],
)
.await?;
self.build_module_graph_artifact = DerefOption::new(
update_module_graph(
self,
artifact,
vec![UpdateParam::ForceBuildModules(module_identifiers.clone())],
)
.await?,
);

let module_graph = self.get_module_graph();
Ok(f(module_identifiers
Expand Down Expand Up @@ -1434,8 +1442,9 @@ impl Compilation {
pub async fn finish_build_module_graph(&mut self) -> Result<()> {
self.in_finish_make.store(false, Ordering::Release);
// clean up the entry deps
let make_artifact = std::mem::take(&mut self.build_module_graph_artifact);
self.build_module_graph_artifact = finish_build_module_graph(self, make_artifact).await?;
let make_artifact = self.build_module_graph_artifact.take();
self.build_module_graph_artifact =
DerefOption::new(finish_build_module_graph(self, make_artifact).await?);
// sync assets to module graph from module_executor
if let Some(module_executor) = &mut self.module_executor {
let mut module_executor = std::mem::take(module_executor);
Expand Down
3 changes: 3 additions & 0 deletions crates/rspack_core/src/utils/deref_option.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@ impl<T> DerefOption<T> {
pub fn new(value: T) -> Self {
Self(Some(value))
}
pub fn is_none(&self) -> bool {
self.0.is_none()
}
pub fn take(&mut self) -> T {
self
.0
Expand Down
Loading