refactor: split make phase (#12186)

* refactor: split make phase

* chore: fix cargo check

* Update crates/rspack_core/src/compiler/rebuild.rs

Co-authored-by: Copilot <[email protected]>

---------

Co-authored-by: Copilot <[email protected]>

Author: hardfist

crates/rspack_binding_api/src/compilation/mod.rs

@@ -205,7 +205,7 @@ impl JsCompilation {
 
     Ok(
       compilation
-        .make_artifact
+        .build_module_graph_artifact
         .built_modules()
         .filter_map(|module_id| {
           compilation

crates/rspack_core/src/cache/disable.rs

@@ -1,5 +1,5 @@
 use super::Cache;
-use crate::compilation::make::MakeArtifact;
+use crate::compilation::build_module_graph::BuildModuleGraphArtifact;
 
 /// Disable cache implementation
 ///
@@ -9,7 +9,7 @@ pub struct DisableCache;
 
 #[async_trait::async_trait]
 impl Cache for DisableCache {
-  async fn before_make(&mut self, make_artifact: &mut MakeArtifact) {
+  async fn before_build_module_graph(&mut self, make_artifact: &mut BuildModuleGraphArtifact) {
     *make_artifact = Default::default();
   }
 }

crates/rspack_core/src/cache/mod.rs

@@ -8,7 +8,8 @@ use rspack_fs::{IntermediateFileSystem, ReadableFileSystem};
 
 use self::{disable::DisableCache, memory::MemoryCache, persistent::PersistentCache};
 use crate::{
-  Compilation, CompilerOptions, ExperimentCacheOptions, compilation::make::MakeArtifact,
+  Compilation, CompilerOptions, ExperimentCacheOptions,
+  compilation::build_module_graph::BuildModuleGraphArtifact,
 };
 
 /// Cache trait
@@ -31,8 +32,8 @@ pub trait Cache: Debug + Send + Sync {
   }
   async fn after_compile(&mut self, _compilation: &Compilation) {}
 
-  async fn before_make(&mut self, _make_artifact: &mut MakeArtifact) {}
-  async fn after_make(&mut self, _make_artifact: &MakeArtifact) {}
+  async fn before_build_module_graph(&mut self, _make_artifact: &mut BuildModuleGraphArtifact) {}
+  async fn after_build_module_graph(&mut self, _make_artifact: &BuildModuleGraphArtifact) {}
 }
 
 pub fn new_cache(

crates/rspack_core/src/cache/persistent/mod.rs

@@ -23,7 +23,7 @@ use self::{
 use super::Cache;
 use crate::{
   Compilation, CompilerOptions, Logger,
-  compilation::make::{MakeArtifact, MakeArtifactState},
+  compilation::build_module_graph::{BuildModuleGraphArtifact, BuildModuleGraphArtifactState},
 };
 
 #[derive(Debug, Clone, Hash)]
@@ -186,17 +186,20 @@ impl Cache for PersistentCache {
     }
   }
 
-  async fn before_make(&mut self, make_artifact: &mut MakeArtifact) {
+  async fn before_build_module_graph(&mut self, make_artifact: &mut BuildModuleGraphArtifact) {
     // TODO When does not need to pass variables through make_artifact.state, use compilation.is_rebuild to check
-    if matches!(make_artifact.state, MakeArtifactState::Uninitialized) {
+    if matches!(
+      make_artifact.state,
+      BuildModuleGraphArtifactState::Uninitialized
+    ) {
       match self.make_occasion.recovery().await {
         Ok(artifact) => *make_artifact = artifact,
         Err(err) => self.warnings.push(err.to_string()),
       }
     }
   }
 
-  async fn after_make(&mut self, make_artifact: &MakeArtifact) {
+  async fn after_build_module_graph(&mut self, make_artifact: &BuildModuleGraphArtifact) {
     self.make_occasion.save(make_artifact);
   }
 }

crates/rspack_core/src/cache/persistent/occasion/make/mod.rs

@@ -10,7 +10,7 @@ use rustc_hash::FxHashSet;
 use super::super::{Storage, cacheable_context::CacheableContext};
 use crate::{
   FactorizeInfo, ModuleGraph,
-  compilation::make::{MakeArtifact, MakeArtifactState},
+  compilation::build_module_graph::{BuildModuleGraphArtifact, BuildModuleGraphArtifactState},
   utils::{FileCounter, ResourceId},
 };
 
@@ -27,8 +27,8 @@ impl MakeOccasion {
   }
 
   #[tracing::instrument(name = "Cache::Occasion::Make::save", skip_all)]
-  pub fn save(&self, artifact: &MakeArtifact) {
-    let MakeArtifact {
+  pub fn save(&self, artifact: &BuildModuleGraphArtifact) {
+    let BuildModuleGraphArtifact {
       // write all of field here to avoid forget to update occasion when add new fields
       // for module graph
       module_graph_partial,
@@ -69,7 +69,7 @@ impl MakeOccasion {
   }
 
   #[tracing::instrument(name = "Cache::Occasion::Make::recovery", skip_all)]
-  pub async fn recovery(&self) -> Result<MakeArtifact> {
+  pub async fn recovery(&self) -> Result<BuildModuleGraphArtifact> {
     let (partial, module_to_lazy_make, entry_dependencies) =
       module_graph::recovery_module_graph(&self.storage, &self.context).await?;
 
@@ -108,14 +108,14 @@ impl MakeOccasion {
       }
     }
 
-    Ok(MakeArtifact {
+    Ok(BuildModuleGraphArtifact {
       // write all of field here to avoid forget to update occasion when add new fields
       // temporary data set to default
       affected_modules: Default::default(),
       affected_dependencies: Default::default(),
       issuer_update_modules: Default::default(),
 
-      state: MakeArtifactState::Initialized,
+      state: BuildModuleGraphArtifactState::Initialized,
       module_graph_partial: partial,
       module_to_lazy_make,
 

crates/rspack_core/src/cache/persistent/occasion/make/module_graph.rs

@@ -15,7 +15,7 @@ use crate::{
   DependencyId, DependencyParents, ExportsInfoData, ModuleGraph, ModuleGraphConnection,
   ModuleGraphModule, ModuleGraphPartial, ModuleIdentifier, RayonConsumer,
   cache::persistent::cacheable_context::CacheableContext,
-  compilation::make::{LazyDependencies, ModuleToLazyMake},
+  compilation::build_module_graph::{LazyDependencies, ModuleToLazyMake},
 };
 
 const SCOPE: &str = "occasion_make_module_graph";

crates/rspack_core/src/compilation/make/artifact.rs renamed to crates/rspack_core/src/compilation/build_module_graph/artifact.rs

@@ -6,7 +6,7 @@ use rustc_hash::FxHashSet as HashSet;
 
 use crate::{
   BuildDependency, DependencyId, FactorizeInfo, ModuleGraph, ModuleGraphPartial, ModuleIdentifier,
-  compilation::make::ModuleToLazyMake,
+  compilation::build_module_graph::ModuleToLazyMake,
   incremental_info::IncrementalInfo,
   utils::{FileCounter, ResourceId},
 };
@@ -17,21 +17,21 @@ use crate::{
 /// Make stage will update `MakeArtifact.state` to `Initialized`, and incremental rebuild will reuse
 /// the previous MakeArtifact, so persistent cache will never recovery again.
 #[derive(Debug, Default)]
-pub enum MakeArtifactState {
+pub enum BuildModuleGraphArtifactState {
   #[default]
   Uninitialized,
   Initialized,
 }
 
 /// Make Artifact, including all side effects of the make stage.
 #[derive(Debug, Default)]
-pub struct MakeArtifact {
-  // temporary data, used by subsequent steps of make, should be reset when rebuild.
-  /// Make stage affected modules.
+pub struct BuildModuleGraphArtifact {
+  // temporary data, used by subsequent steps of BuildModuleGraph, should be reset when rebuild.
+  /// BuildModuleGraph stage affected modules.
   ///
   /// This field will contain added modules, updated modules, removed modules.
   pub affected_modules: IncrementalInfo<ModuleIdentifier, BuildHasherDefault<IdentifierHasher>>,
-  /// Make stage affected dependencies.
+  /// BuildModuleGraph stage affected dependencies.
   ///
   /// This field will contain added dependencies, updated dependencies, removed dependencies.
   pub affected_dependencies: IncrementalInfo<DependencyId>,
@@ -44,8 +44,8 @@ pub struct MakeArtifact {
   /// Field to mark whether artifact has been initialized.
   ///
   /// Only Default::default() is Uninitialized, `update_module_graph` will set this field to Initialized
-  /// Persistent cache will update MakeArtifact and set force_build_deps to this field when this is Uninitialized.
-  pub state: MakeArtifactState,
+  /// Persistent cache will update BuildModuleGraphArtifact and set force_build_deps to this field when this is Uninitialized.
+  pub state: BuildModuleGraphArtifactState,
   /// Module graph data
   pub module_graph_partial: ModuleGraphPartial,
   pub module_to_lazy_make: ModuleToLazyMake,
@@ -67,7 +67,7 @@ pub struct MakeArtifact {
   pub build_dependencies: FileCounter,
 }
 
-impl MakeArtifact {
+impl BuildModuleGraphArtifact {
   pub fn get_module_graph(&self) -> ModuleGraph<'_> {
     ModuleGraph::new([Some(&self.module_graph_partial), None], None)
   }

crates/rspack_core/src/compilation/make/graph_updater/cutout/fix_build_meta.rs renamed to crates/rspack_core/src/compilation/build_module_graph/graph_updater/cutout/fix_build_meta.rs

@@ -1,7 +1,7 @@
 use rspack_collections::{IdentifierMap, IdentifierSet};
 use rspack_error::Diagnosable;
 
-use super::MakeArtifact;
+use super::BuildModuleGraphArtifact;
 use crate::{BuildMeta, Module};
 
 /// A toolkit for cutout to fix build meta
@@ -14,7 +14,11 @@ pub struct FixBuildMeta {
 }
 
 impl FixBuildMeta {
-  pub fn analyze_force_build_modules(&mut self, artifact: &MakeArtifact, ids: &IdentifierSet) {
+  pub fn analyze_force_build_modules(
+    &mut self,
+    artifact: &BuildModuleGraphArtifact,
+    ids: &IdentifierSet,
+  ) {
     let module_graph = artifact.get_module_graph();
     for module_identifier in ids {
       let module = module_graph
@@ -26,7 +30,7 @@ impl FixBuildMeta {
     }
   }
 
-  pub fn fix_artifact(self, artifact: &mut MakeArtifact) {
+  pub fn fix_artifact(self, artifact: &mut BuildModuleGraphArtifact) {
     let mut module_graph = artifact.get_module_graph_mut();
     for (id, build_meta) in self.origin_module_build_meta {
       if let Some(module) = module_graph.module_by_identifier_mut(&id)

crates/rspack_core/src/compilation/make/graph_updater/cutout/fix_issuers.rs renamed to crates/rspack_core/src/compilation/build_module_graph/graph_updater/cutout/fix_issuers.rs

@@ -3,7 +3,7 @@ use std::collections::VecDeque;
 use rspack_collections::{IdentifierMap, IdentifierSet};
 use rustc_hash::FxHashSet as HashSet;
 
-use super::MakeArtifact;
+use super::BuildModuleGraphArtifact;
 use crate::{DependencyId, ModuleGraph, ModuleIdentifier, ModuleIssuer};
 
 /// Result of IssuerHelper.is_issuer.
@@ -116,7 +116,11 @@ impl FixIssuers {
   /// This function will
   /// 1. save the issuer of force_build_module to self.force_build_module_issuers.
   /// 2. add force_build_module and the child module whose issuer is this force_build_module to self.need_check_modules.
-  pub fn analyze_force_build_modules(&mut self, artifact: &MakeArtifact, ids: &IdentifierSet) {
+  pub fn analyze_force_build_modules(
+    &mut self,
+    artifact: &BuildModuleGraphArtifact,
+    ids: &IdentifierSet,
+  ) {
     let module_graph = artifact.get_module_graph();
     for module_identifier in ids {
       let mgm = module_graph
@@ -157,7 +161,7 @@ impl FixIssuers {
   /// this function will add the dependency target module to self.need_check_modules
   pub fn analyze_force_build_dependencies(
     &mut self,
-    artifact: &MakeArtifact,
+    artifact: &BuildModuleGraphArtifact,
     ids: &HashSet<DependencyId>,
   ) {
     let module_graph = artifact.get_module_graph();
@@ -201,7 +205,7 @@ impl FixIssuers {
   /// 4. return the module with invalid issuer and its parents.
   fn apply_force_build_module_issuer(
     self,
-    artifact: &mut MakeArtifact,
+    artifact: &mut BuildModuleGraphArtifact,
   ) -> IdentifierMap<Vec<Option<ModuleIdentifier>>> {
     let Self {
       mut force_build_module_issuers,
@@ -249,7 +253,7 @@ impl FixIssuers {
   ///
   /// After this step, the issuer of all module are valid and we can use IssuerHelper in next steps.
   fn try_set_first_incoming(
-    artifact: &mut MakeArtifact,
+    artifact: &mut BuildModuleGraphArtifact,
     need_update_issuer_modules: IdentifierMap<Vec<Option<ModuleIdentifier>>>,
   ) -> IdentifierMap<Vec<Option<ModuleIdentifier>>> {
     let mut queue = VecDeque::with_capacity(need_update_issuer_modules.len());
@@ -345,7 +349,7 @@ impl FixIssuers {
   ///    - any module set issuer success should check if the current module affects modules in `need_clean_cycle_modules`.
   /// 4. return need_clean_cycle_modules but remove cycle_paths info.
   fn set_available_issuer(
-    artifact: &mut MakeArtifact,
+    artifact: &mut BuildModuleGraphArtifact,
     helper: &mut IssuerHelper,
     need_check_available_modules: IdentifierMap<Vec<Option<ModuleIdentifier>>>,
   ) -> IdentifierMap<IdentifierSet> {
@@ -405,7 +409,7 @@ impl FixIssuers {
   /// - if a module can be modified to be an available issuer, then starting from the current module,
   ///   re-update the issuers of all checked modules.
   fn clean_cycle_module(
-    artifact: &mut MakeArtifact,
+    artifact: &mut BuildModuleGraphArtifact,
     helper: &mut IssuerHelper,
     clean_modules: IdentifierMap<IdentifierSet>,
   ) -> IdentifierMap<Vec<Option<ModuleIdentifier>>> {
@@ -519,7 +523,7 @@ impl FixIssuers {
   }
 
   /// fix artifact module graph issuers
-  pub fn fix_artifact(self, artifact: &mut MakeArtifact) {
+  pub fn fix_artifact(self, artifact: &mut BuildModuleGraphArtifact) {
     let mut need_update_issuer_modules = self.apply_force_build_module_issuer(artifact);
 
     let mut helper = IssuerHelper::default();

crates/rspack_core/src/compilation/make/graph_updater/cutout/mod.rs renamed to crates/rspack_core/src/compilation/build_module_graph/graph_updater/cutout/mod.rs

@@ -5,7 +5,7 @@ use rspack_collections::IdentifierSet;
 use rustc_hash::FxHashSet as HashSet;
 
 use self::{fix_build_meta::FixBuildMeta, fix_issuers::FixIssuers};
-use super::{MakeArtifact, UpdateParam};
+use super::{BuildModuleGraphArtifact, UpdateParam};
 use crate::{BuildDependency, Compilation, ResourceId};
 
 /// Cutout module graph.
@@ -28,7 +28,7 @@ impl Cutout {
   pub fn cutout_artifact(
     &mut self,
     compilation: &Compilation,
-    artifact: &mut MakeArtifact,
+    artifact: &mut BuildModuleGraphArtifact,
     params: Vec<UpdateParam>,
   ) -> HashSet<BuildDependency> {
     // the entry dependencies after update module graph
@@ -156,7 +156,7 @@ impl Cutout {
   }
 
   /// Fix artifact, the last step to incrementally update MakeArtifact.
-  pub fn fix_artifact(self, artifact: &mut MakeArtifact) {
+  pub fn fix_artifact(self, artifact: &mut BuildModuleGraphArtifact) {
     let Self {
       fix_issuers,
       fix_build_meta,