Skip to content

Commit 8c8a402

Browse files
authored
refactor: move all artifacts together (#12755)
1 parent cc18589 commit 8c8a402

File tree

7 files changed

+16
-18
lines changed

7 files changed

+16
-18
lines changed

crates/rspack_core/src/compilation/build_chunk_graph/artifact.rs renamed to crates/rspack_core/src/artifacts/build_chunk_graph_artifact.rs

File renamed without changes.

crates/rspack_core/src/compilation/build_module_graph/artifact.rs renamed to crates/rspack_core/src/artifacts/build_module_graph_artifact.rs

File renamed without changes.

crates/rspack_core/src/artifacts/mod.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
11
mod async_modules_artifact;
2+
mod build_chunk_graph_artifact;
3+
mod build_module_graph_artifact;
24
mod cgc_runtime_requirements_artifact;
35
mod cgm_hash_artifact;
46
mod cgm_runtime_requirement_artifact;
@@ -15,6 +17,9 @@ mod module_static_cache_artifact;
1517
mod side_effects_do_optimize_artifact;
1618

1719
pub use async_modules_artifact::AsyncModulesArtifact;
20+
pub(crate) use build_chunk_graph_artifact::use_code_splitting_cache;
21+
pub use build_chunk_graph_artifact::*;
22+
pub use build_module_graph_artifact::*;
1823
pub use cgc_runtime_requirements_artifact::CgcRuntimeRequirementsArtifact;
1924
pub use cgm_hash_artifact::*;
2025
pub use cgm_runtime_requirement_artifact::*;

crates/rspack_core/src/compilation/build_chunk_graph/mod.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
use tracing::instrument;
55

66
use crate::{Compilation, incremental::IncrementalPasses};
7-
pub(crate) mod artifact;
87
pub(crate) mod code_splitter;
98
pub(crate) mod incremental;
109
pub(crate) mod pass;

crates/rspack_core/src/compilation/build_chunk_graph/pass.rs

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
use rspack_error::Result;
22

33
use crate::{
4-
compilation::{
5-
Compilation,
6-
build_chunk_graph::{artifact::use_code_splitting_cache, build_chunk_graph},
7-
},
8-
logger::Logger,
4+
Compilation, build_chunk_graph::build_chunk_graph, logger::Logger, use_code_splitting_cache,
95
};
106

117
pub async fn build_chunk_graph_pass(compilation: &mut Compilation) -> Result<()> {

crates/rspack_core/src/compilation/build_module_graph/mod.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
mod artifact;
21
mod graph_updater;
32
mod lazy_barrel_artifact;
43
mod module_executor;
@@ -10,13 +9,13 @@ use rspack_util::tracing_preset::TRACING_BENCH_TARGET;
109
use tracing::instrument;
1110

1211
pub use self::{
13-
artifact::{BuildModuleGraphArtifact, BuildModuleGraphArtifactState},
1412
graph_updater::{UpdateParam, update_module_graph},
1513
lazy_barrel_artifact::{
1614
ForwardId, ForwardedIdSet, HasLazyDependencies, LazyDependencies, LazyUntil, ModuleToLazyMake,
1715
},
1816
module_executor::{ExecuteModuleId, ExecutedRuntimeModule, ModuleExecutor},
1917
};
18+
pub use crate::{BuildModuleGraphArtifact, BuildModuleGraphArtifactState};
2019
use crate::{Compilation, logger::Logger};
2120

2221
pub async fn build_module_graph_pass(compilation: &mut Compilation) -> Result<()> {

crates/rspack_core/src/compilation/mod.rs

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -62,21 +62,20 @@ use tracing::instrument;
6262
use ustr::Ustr;
6363

6464
use crate::{
65-
AsyncModulesArtifact, BindingCell, BoxDependency, BoxModule, CacheCount, CacheOptions,
66-
CgcRuntimeRequirementsArtifact, CgmHashArtifact, CgmRuntimeRequirementsArtifact, Chunk,
67-
ChunkByUkey, ChunkContentHash, ChunkGraph, ChunkGroupByUkey, ChunkGroupUkey, ChunkHashesArtifact,
68-
ChunkKind, ChunkNamedIdArtifact, ChunkRenderArtifact, ChunkRenderCacheArtifact,
69-
ChunkRenderResult, ChunkUkey, CodeGenerationJob, CodeGenerationResult, CodeGenerationResults,
70-
CompilationLogger, CompilationLogging, CompilerOptions, CompilerPlatform, ConcatenationScope,
71-
DependenciesDiagnosticsArtifact, DependencyCodeGeneration, DependencyTemplate,
72-
DependencyTemplateType, DependencyType, DerefOption, Entry, EntryData, EntryOptions,
73-
EntryRuntime, Entrypoint, ExecuteModuleId, Filename, ImportPhase, ImportVarMap,
65+
AsyncModulesArtifact, BindingCell, BoxDependency, BoxModule, BuildChunkGraphArtifact, CacheCount,
66+
CacheOptions, CgcRuntimeRequirementsArtifact, CgmHashArtifact, CgmRuntimeRequirementsArtifact,
67+
Chunk, ChunkByUkey, ChunkContentHash, ChunkGraph, ChunkGroupByUkey, ChunkGroupUkey,
68+
ChunkHashesArtifact, ChunkKind, ChunkNamedIdArtifact, ChunkRenderArtifact,
69+
ChunkRenderCacheArtifact, ChunkRenderResult, ChunkUkey, CodeGenerationJob, CodeGenerationResult,
70+
CodeGenerationResults, CompilationLogger, CompilationLogging, CompilerOptions, CompilerPlatform,
71+
ConcatenationScope, DependenciesDiagnosticsArtifact, DependencyCodeGeneration,
72+
DependencyTemplate, DependencyTemplateType, DependencyType, DerefOption, Entry, EntryData,
73+
EntryOptions, EntryRuntime, Entrypoint, ExecuteModuleId, Filename, ImportPhase, ImportVarMap,
7474
ImportedByDeferModulesArtifact, MemoryGCStorage, ModuleFactory, ModuleGraph,
7575
ModuleGraphCacheArtifact, ModuleIdentifier, ModuleIdsArtifact, ModuleStaticCacheArtifact,
7676
PathData, ResolverFactory, RuntimeGlobals, RuntimeKeyMap, RuntimeMode, RuntimeModule,
7777
RuntimeSpec, RuntimeSpecMap, RuntimeTemplate, SharedPluginDriver, SideEffectsOptimizeArtifact,
7878
SourceType, Stats, ValueCacheVersions,
79-
build_chunk_graph::artifact::BuildChunkGraphArtifact,
8079
compilation::build_module_graph::{
8180
BuildModuleGraphArtifact, ModuleExecutor, UpdateParam, update_module_graph,
8281
},

0 commit comments

Comments
 (0)