Skip to content

Commit dd77a8b

Browse files
inottnchenjiahan
andauthored
fix: reset the progress bar in the correct hook (#8429)
Co-authored-by: neverland <[email protected]>
1 parent 7187ba9 commit dd77a8b

File tree

1 file changed

+13
-13
lines changed
  • crates/rspack_plugin_progress/src

1 file changed

+13
-13
lines changed

crates/rspack_plugin_progress/src/lib.rs

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -282,6 +282,14 @@ async fn this_compilation(
282282
_compilation: &mut Compilation,
283283
_params: &mut CompilationParams,
284284
) -> Result<()> {
285+
if let ProgressPluginOptions::Default(options) = &self.options {
286+
let progress_bar = self.progress_bar.as_ref().unwrap_or_else(|| unreachable!());
287+
if !options.profile {
288+
progress_bar.reset();
289+
progress_bar.set_prefix(options.prefix.clone());
290+
}
291+
}
292+
285293
self.handler(
286294
0.08,
287295
"setup".to_string(),
@@ -306,14 +314,6 @@ async fn compilation(
306314

307315
#[plugin_hook(CompilerMake for ProgressPlugin)]
308316
async fn make(&self, _compilation: &mut Compilation) -> Result<()> {
309-
if let ProgressPluginOptions::Default(options) = &self.options {
310-
let progress_bar = self.progress_bar.as_ref().unwrap_or_else(|| unreachable!());
311-
if !options.profile {
312-
progress_bar.reset();
313-
progress_bar.set_prefix(options.prefix.clone());
314-
}
315-
}
316-
317317
self.handler(0.1, String::from("make"), vec![], None)?;
318318
self.modules_count.store(0, Relaxed);
319319
self.modules_done.store(0, Relaxed);
@@ -394,6 +394,11 @@ async fn finish_make(&self, _compilation: &mut Compilation) -> Result<()> {
394394
)
395395
}
396396

397+
#[plugin_hook(CompilationFinishModules for ProgressPlugin)]
398+
async fn finish_modules(&self, _compilation: &mut Compilation) -> Result<()> {
399+
self.sealing_hooks_report("finish modules", 0)
400+
}
401+
397402
#[plugin_hook(CompilationSeal for ProgressPlugin)]
398403
async fn seal(&self, _compilation: &mut Compilation) -> Result<()> {
399404
self.sealing_hooks_report("plugins", 1)
@@ -405,11 +410,6 @@ fn optimize_dependencies(&self, _compilation: &mut Compilation) -> Result<Option
405410
Ok(None)
406411
}
407412

408-
#[plugin_hook(CompilationFinishModules for ProgressPlugin)]
409-
async fn finish_modules(&self, _compilation: &mut Compilation) -> Result<()> {
410-
self.sealing_hooks_report("finish modules", 0)
411-
}
412-
413413
#[plugin_hook(CompilationOptimizeModules for ProgressPlugin)]
414414
async fn optimize_modules(&self, _compilation: &mut Compilation) -> Result<Option<bool>> {
415415
self.sealing_hooks_report("module optimization", 7)?;

0 commit comments

Comments
 (0)