Skip to content
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

chore: move modern module library finish_modules to finish_make #9426

Merged
merged 2 commits into from
Feb 21, 2025
Merged

chore: move modern module library finish_modules to finish_make #9426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3c19f22
chore: move modern module library finish_modules to finish_make
ahabhgk Feb 21, 2025
6ba4488
cmt
ahabhgk Feb 21, 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
4 changes: 4 additions & 0 deletions crates/rspack_core/src/compiler/compilation.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1250,6 +1250,10 @@ impl Compilation {
}

let start = logger.time("finish modules");
// finish_modules means the module graph (modules, connections, dependencies) are
// frozen and start to optimize (provided exports, infer async, etc.) based on the
// module graph, so any kind of change that affect these should be done before the
// finish_modules
plugin_driver
.compilation_hooks
.finish_modules
Expand Down
18 changes: 9 additions & 9 deletions crates/rspack_plugin_library/src/modern_module_library_plugin.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@ use rspack_collections::IdentifierMap;
use rspack_core::rspack_sources::{ConcatSource, RawStringSource, SourceExt};
use rspack_core::{
merge_runtime, to_identifier, ApplyContext, BoxDependency, ChunkUkey,
CodeGenerationExportsFinalNames, Compilation, CompilationFinishModules,
CompilationOptimizeChunkModules, CompilationParams, CompilerCompilation, CompilerOptions,
ConcatenatedModule, ConcatenatedModuleExportsDefinitions, DependenciesBlock, Dependency,
DependencyId, LibraryOptions, ModuleGraph, ModuleIdentifier, Plugin, PluginContext,
CodeGenerationExportsFinalNames, Compilation, CompilationOptimizeChunkModules, CompilationParams,
CompilerCompilation, CompilerFinishMake, CompilerOptions, ConcatenatedModule,
ConcatenatedModuleExportsDefinitions, DependenciesBlock, Dependency, DependencyId,
LibraryOptions, ModuleGraph, ModuleIdentifier, Plugin, PluginContext,
};
use rspack_error::{error_bail, Result};
use rspack_hash::RspackHash;
Expand Down Expand Up @@ -212,8 +212,8 @@ fn render_startup(
Ok(())
}

#[plugin_hook(CompilationFinishModules for ModernModuleLibraryPlugin, stage = Compilation::PROCESS_ASSETS_STAGE_ADDITIONS)]
async fn finish_modules(&self, compilation: &mut Compilation) -> Result<()> {
#[plugin_hook(CompilerFinishMake for ModernModuleLibraryPlugin)]
async fn finish_make(&self, compilation: &mut Compilation) -> Result<()> {
let mut mg = compilation.get_module_graph_mut();
let modules = mg.modules();
let module_ids = modules.keys().cloned().collect::<Vec<_>>();
Expand Down Expand Up @@ -457,9 +457,9 @@ impl Plugin for ModernModuleLibraryPlugin {
.tap(optimize_chunk_modules::new(self));
ctx
.context
.compilation_hooks
.finish_modules
.tap(finish_modules::new(self));
.compiler_hooks
.finish_make
.tap(finish_make::new(self));

Ok(())
}
Expand Down
Loading