diff --git a/crates/rspack_core/src/compilation/build_chunk_graph/artifact.rs b/crates/rspack_core/src/artifacts/build_chunk_graph_artifact.rs similarity index 100% rename from crates/rspack_core/src/compilation/build_chunk_graph/artifact.rs rename to crates/rspack_core/src/artifacts/build_chunk_graph_artifact.rs diff --git a/crates/rspack_core/src/compilation/build_module_graph/artifact.rs b/crates/rspack_core/src/artifacts/build_module_graph_artifact.rs similarity index 100% rename from crates/rspack_core/src/compilation/build_module_graph/artifact.rs rename to crates/rspack_core/src/artifacts/build_module_graph_artifact.rs diff --git a/crates/rspack_core/src/artifacts/mod.rs b/crates/rspack_core/src/artifacts/mod.rs index 211fef3e38c6..da73ee8bdd0a 100644 --- a/crates/rspack_core/src/artifacts/mod.rs +++ b/crates/rspack_core/src/artifacts/mod.rs @@ -1,4 +1,6 @@ mod async_modules_artifact; +mod build_chunk_graph_artifact; +mod build_module_graph_artifact; mod cgc_runtime_requirements_artifact; mod cgm_hash_artifact; mod cgm_runtime_requirement_artifact; @@ -15,6 +17,9 @@ mod module_static_cache_artifact; mod side_effects_do_optimize_artifact; pub use async_modules_artifact::AsyncModulesArtifact; +pub(crate) use build_chunk_graph_artifact::use_code_splitting_cache; +pub use build_chunk_graph_artifact::*; +pub use build_module_graph_artifact::*; pub use cgc_runtime_requirements_artifact::CgcRuntimeRequirementsArtifact; pub use cgm_hash_artifact::*; pub use cgm_runtime_requirement_artifact::*; diff --git a/crates/rspack_core/src/compilation/build_chunk_graph/mod.rs b/crates/rspack_core/src/compilation/build_chunk_graph/mod.rs index e64652e1f4e7..d79742e8793f 100644 --- a/crates/rspack_core/src/compilation/build_chunk_graph/mod.rs +++ b/crates/rspack_core/src/compilation/build_chunk_graph/mod.rs @@ -4,7 +4,6 @@ use tracing::instrument; use crate::{Compilation, incremental::IncrementalPasses}; -pub(crate) mod artifact; pub(crate) mod code_splitter; pub(crate) mod incremental; pub(crate) mod pass; diff --git a/crates/rspack_core/src/compilation/build_chunk_graph/pass.rs b/crates/rspack_core/src/compilation/build_chunk_graph/pass.rs index f6a5380e1368..1c99b4ca5f6a 100644 --- a/crates/rspack_core/src/compilation/build_chunk_graph/pass.rs +++ b/crates/rspack_core/src/compilation/build_chunk_graph/pass.rs @@ -1,11 +1,7 @@ use rspack_error::Result; use crate::{ - compilation::{ - Compilation, - build_chunk_graph::{artifact::use_code_splitting_cache, build_chunk_graph}, - }, - logger::Logger, + Compilation, build_chunk_graph::build_chunk_graph, logger::Logger, use_code_splitting_cache, }; pub async fn build_chunk_graph_pass(compilation: &mut Compilation) -> Result<()> { diff --git a/crates/rspack_core/src/compilation/build_module_graph/mod.rs b/crates/rspack_core/src/compilation/build_module_graph/mod.rs index 9afcfecd0800..21f245bdb9af 100644 --- a/crates/rspack_core/src/compilation/build_module_graph/mod.rs +++ b/crates/rspack_core/src/compilation/build_module_graph/mod.rs @@ -1,4 +1,3 @@ -mod artifact; mod graph_updater; mod lazy_barrel_artifact; mod module_executor; @@ -10,13 +9,13 @@ use rspack_util::tracing_preset::TRACING_BENCH_TARGET; use tracing::instrument; pub use self::{ - artifact::{BuildModuleGraphArtifact, BuildModuleGraphArtifactState}, graph_updater::{UpdateParam, update_module_graph}, lazy_barrel_artifact::{ ForwardId, ForwardedIdSet, HasLazyDependencies, LazyDependencies, LazyUntil, ModuleToLazyMake, }, module_executor::{ExecuteModuleId, ExecutedRuntimeModule, ModuleExecutor}, }; +pub use crate::{BuildModuleGraphArtifact, BuildModuleGraphArtifactState}; use crate::{Compilation, logger::Logger}; pub async fn build_module_graph_pass(compilation: &mut Compilation) -> Result<()> { diff --git a/crates/rspack_core/src/compilation/mod.rs b/crates/rspack_core/src/compilation/mod.rs index 18be47aa53b3..d30ba2de0f44 100644 --- a/crates/rspack_core/src/compilation/mod.rs +++ b/crates/rspack_core/src/compilation/mod.rs @@ -62,21 +62,20 @@ use tracing::instrument; use ustr::Ustr; use crate::{ - AsyncModulesArtifact, BindingCell, BoxDependency, BoxModule, CacheCount, CacheOptions, - CgcRuntimeRequirementsArtifact, CgmHashArtifact, CgmRuntimeRequirementsArtifact, Chunk, - ChunkByUkey, ChunkContentHash, ChunkGraph, ChunkGroupByUkey, ChunkGroupUkey, ChunkHashesArtifact, - ChunkKind, ChunkNamedIdArtifact, ChunkRenderArtifact, ChunkRenderCacheArtifact, - ChunkRenderResult, ChunkUkey, CodeGenerationJob, CodeGenerationResult, CodeGenerationResults, - CompilationLogger, CompilationLogging, CompilerOptions, CompilerPlatform, ConcatenationScope, - DependenciesDiagnosticsArtifact, DependencyCodeGeneration, DependencyTemplate, - DependencyTemplateType, DependencyType, DerefOption, Entry, EntryData, EntryOptions, - EntryRuntime, Entrypoint, ExecuteModuleId, Filename, ImportPhase, ImportVarMap, + AsyncModulesArtifact, BindingCell, BoxDependency, BoxModule, BuildChunkGraphArtifact, CacheCount, + CacheOptions, CgcRuntimeRequirementsArtifact, CgmHashArtifact, CgmRuntimeRequirementsArtifact, + Chunk, ChunkByUkey, ChunkContentHash, ChunkGraph, ChunkGroupByUkey, ChunkGroupUkey, + ChunkHashesArtifact, ChunkKind, ChunkNamedIdArtifact, ChunkRenderArtifact, + ChunkRenderCacheArtifact, ChunkRenderResult, ChunkUkey, CodeGenerationJob, CodeGenerationResult, + CodeGenerationResults, CompilationLogger, CompilationLogging, CompilerOptions, CompilerPlatform, + ConcatenationScope, DependenciesDiagnosticsArtifact, DependencyCodeGeneration, + DependencyTemplate, DependencyTemplateType, DependencyType, DerefOption, Entry, EntryData, + EntryOptions, EntryRuntime, Entrypoint, ExecuteModuleId, Filename, ImportPhase, ImportVarMap, ImportedByDeferModulesArtifact, MemoryGCStorage, ModuleFactory, ModuleGraph, ModuleGraphCacheArtifact, ModuleIdentifier, ModuleIdsArtifact, ModuleStaticCacheArtifact, PathData, ResolverFactory, RuntimeGlobals, RuntimeKeyMap, RuntimeMode, RuntimeModule, RuntimeSpec, RuntimeSpecMap, RuntimeTemplate, SharedPluginDriver, SideEffectsOptimizeArtifact, SourceType, Stats, ValueCacheVersions, - build_chunk_graph::artifact::BuildChunkGraphArtifact, compilation::build_module_graph::{ BuildModuleGraphArtifact, ModuleExecutor, UpdateParam, update_module_graph, },