Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 5 additions & 2 deletions crates/rspack_core/src/compilation/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ define_hook!(CompilationRuntimeRequirementInChunk: SeriesBail(compilation: &mut
define_hook!(CompilationAdditionalTreeRuntimeRequirements: Series(compilation: &mut Compilation, chunk_ukey: &ChunkUkey, runtime_requirements: &mut RuntimeGlobals));
define_hook!(CompilationRuntimeRequirementInTree: SeriesBail(compilation: &mut Compilation, chunk_ukey: &ChunkUkey, all_runtime_requirements: &RuntimeGlobals, runtime_requirements: &RuntimeGlobals, runtime_requirements_mut: &mut RuntimeGlobals));
define_hook!(CompilationOptimizeCodeGeneration: Series(compilation: &mut Compilation));
define_hook!(CompilationAfterCodeGeneration: Series(compilation: &mut Compilation));
define_hook!(CompilationAfterCodeGeneration: Series(compilation: &Compilation, diagnostics: &mut Vec<Diagnostic>));
define_hook!(CompilationChunkHash: Series(compilation: &Compilation, chunk_ukey: &ChunkUkey, hasher: &mut RspackHash),tracing=false);
define_hook!(CompilationContentHash: Series(compilation: &Compilation, chunk_ukey: &ChunkUkey, hashes: &mut HashMap<SourceType, RspackHash>));
define_hook!(CompilationDependentFullHash: SeriesBail(compilation: &Compilation, chunk_ukey: &ChunkUkey) -> bool);
Expand Down Expand Up @@ -1893,12 +1893,15 @@ impl Compilation {
};
self.code_generation(code_generation_modules).await?;

let mut diagnostics = vec![];
plugin_driver
.compilation_hooks
.after_code_generation
.call(self)
.call(self, &mut diagnostics)
.await
.map_err(|e| e.wrap_err("caused by plugins in Compilation.hooks.afterCodeGeneration"))?;
self.extend_diagnostics(diagnostics);

logger.time_end(start);

let start = logger.time("runtime requirements");
Expand Down
8 changes: 6 additions & 2 deletions crates/rspack_plugin_esm_library/src/link.rs
Original file line number Diff line number Diff line change
Expand Up @@ -139,7 +139,11 @@ impl EsmLibraryPlugin {
}
}

pub(crate) async fn link(&self, compilation: &mut Compilation) -> Result<()> {
pub(crate) async fn link(
&self,
compilation: &Compilation,
diagnostics: &mut Vec<Diagnostic>,
) -> Result<()> {
let module_graph = compilation.get_module_graph();

// codegen uses self.concatenated_modules_map_for_codegen which has hold another Arc, so
Expand Down Expand Up @@ -247,7 +251,7 @@ impl EsmLibraryPlugin {

// link imported specifier with exported symbol
let mut needed_namespace_objects_by_ukey = UkeyMap::default();
compilation.extend_diagnostics(self.link_imports_and_exports(
diagnostics.extend(self.link_imports_and_exports(
compilation,
&mut link,
&mut concate_modules_map,
Expand Down
10 changes: 7 additions & 3 deletions crates/rspack_plugin_esm_library/src/plugin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ use rspack_core::{
ParserOptions, Plugin, PrefetchExportsInfoMode, RuntimeGlobals, get_target, is_esm_dep_like,
rspack_sources::{ReplaceSource, Source},
};
use rspack_error::Result;
use rspack_error::{Diagnostic, Result};
use rspack_hook::{plugin, plugin_hook};
use rspack_plugin_javascript::{
JavascriptModulesRenderChunkContent, JsPlugin, RenderSource,
Expand Down Expand Up @@ -303,7 +303,11 @@ async fn concatenation_scope(
}

#[plugin_hook(CompilationAfterCodeGeneration for EsmLibraryPlugin)]
async fn after_code_generation(&self, compilation: &mut Compilation) -> Result<()> {
async fn after_code_generation(
&self,
compilation: &Compilation,
diagnostics: &mut Vec<Diagnostic>,
) -> Result<()> {
let mut chunk_ids_to_ukey = FxHashMap::default();

for chunk_ukey in compilation.chunk_by_ukey.keys() {
Expand All @@ -316,7 +320,7 @@ async fn after_code_generation(&self, compilation: &mut Compilation) -> Result<(

*self.chunk_ids_to_ukey.borrow_mut() = chunk_ids_to_ukey;

self.link(compilation).await?;
self.link(compilation, diagnostics).await?;
Ok(())
}

Expand Down
6 changes: 5 additions & 1 deletion crates/rspack_plugin_rsdoctor/src/plugin.rs
Original file line number Diff line number Diff line change
Expand Up @@ -418,7 +418,11 @@ async fn module_ids(
}

#[plugin_hook(CompilationAfterCodeGeneration for RsdoctorPlugin, stage = 9999)]
async fn after_code_generation(&self, compilation: &mut Compilation) -> Result<()> {
async fn after_code_generation(
&self,
compilation: &Compilation,
_diagnostics: &mut Vec<Diagnostic>,
) -> Result<()> {
if !self.has_module_graph_feature(RsdoctorPluginModuleGraphFeature::ModuleSources) {
return Ok(());
}
Expand Down
Loading