Revert "Fix: Progress bar continue to update after footer (#4084)"

This reverts commit 280b6eb.

Author: Kaylie Kwon

__tests__/reporters/__snapshots__/console-reporter.js.snap

@@ -136,7 +136,7 @@ exports[`ProgressBar 1`] = `"░░ 0/2"`;
 
 exports[`ProgressBar 2`] = `"░░ 0/2█░ 1/2"`;
 
-exports[`ProgressBar 3`] = `"[2K[1G[1G░░ 0/2[1G█░ 1/2[1G██ 2/2"`;
+exports[`ProgressBar 3`] = `"[2K[1G[1G░░ 0/2[1G█░ 1/2[2K[1G[1G██ 2/2"`;
 
 exports[`Spinner 1`] = `"⠁ "`;
 

src/cli/index.js

@@ -170,6 +170,7 @@ export function main({
   const run = (): Promise<void> => {
     invariant(command, 'missing command');
     return command.run(config, reporter, commander, commander.args).then(exitCode => {
+      reporter.close();
       if (outputWrapper) {
         reporter.footer(false);
       }

src/reporters/console/console-reporter.js

@@ -42,7 +42,6 @@ export default class ConsoleReporter extends BaseReporter {
   }
 
   _lastCategorySize: number;
-  _progressBar: ?Progress;
 
   _prependEmoji(msg: string, emoji: ?string): string {
     if (this.emoji && emoji && this.isTTY) {
@@ -64,11 +63,6 @@ export default class ConsoleReporter extends BaseReporter {
     this.inspect(obj);
   }
 
-  close() {
-    this.stopProgress();
-    super.close();
-  }
-
   table(head: Array<string>, body: Array<Row>) {
     //
     head = head.map((field: string): string => this.format.underline(field));
@@ -142,8 +136,6 @@ export default class ConsoleReporter extends BaseReporter {
   }
 
   footer(showPeakMemory?: boolean) {
-    this.stopProgress();
-
     const totalTime = (this.getTotalTime() / 1000).toFixed(2);
     let msg = `Done in ${totalTime}s.`;
     if (showPeakMemory) {
@@ -395,14 +387,7 @@ export default class ConsoleReporter extends BaseReporter {
       };
     }
 
-    // Clear any potentiall old progress bars
-    this.stopProgress();
-
-    const bar = (this._progressBar = new Progress(count, this.stderr, (progress: Progress) => {
-      if (progress === this._progressBar) {
-        this._progressBar = null;
-      }
-    }));
+    const bar = new Progress(count, this.stderr);
 
     bar.render();
 
@@ -411,12 +396,6 @@ export default class ConsoleReporter extends BaseReporter {
     };
   }
 
-  stopProgress() {
-    if (this._progressBar) {
-      this._progressBar.stop();
-    }
-  }
-
   async prompt<T>(message: string, choices: Array<*>, options?: PromptOptions = {}): Promise<Array<T>> {
     if (!process.stdout.isTTY) {
       return Promise.reject(new Error("Can't answer a question unless a user TTY"));

src/reporters/console/progress-bar.js

@@ -4,13 +4,12 @@ import type {Stdout} from '../types.js';
 import {clearLine, toStartOfLine} from './util.js';
 
 export default class ProgressBar {
-  constructor(total: number, stdout: Stdout = process.stderr, callback: ?(progressBar: ProgressBar) => void) {
+  constructor(total: number, stdout: Stdout = process.stderr) {
     this.stdout = stdout;
     this.total = total;
     this.chars = ProgressBar.bars[0];
     this.delay = 60;
     this.curr = 0;
-    this._callback = callback;
     clearLine(stdout);
   }
 
@@ -21,44 +20,28 @@ export default class ProgressBar {
   chars: [string, string];
   delay: number;
   id: ?number;
-  _callback: ?(progressBar: ProgressBar) => void;
 
   static bars = [['█', '░']];
 
   tick() {
-    if (this.curr >= this.total) {
-      return;
-    }
-
     this.curr++;
 
     // schedule render
     if (!this.id) {
       this.id = setTimeout((): void => this.render(), this.delay);
     }
-  }
 
-  cancelTick() {
-    if (this.id) {
+    // progress complete
+    if (this.curr >= this.total) {
       clearTimeout(this.id);
-      this.id = null;
-    }
-  }
-
-  stop() {
-    // "stop" by setting current to end so `tick` becomes noop
-    this.curr = this.total;
-
-    this.cancelTick();
-    clearLine(this.stdout);
-    if (this._callback) {
-      this._callback(this);
+      clearLine(this.stdout);
     }
   }
 
   render() {
     // clear throttle
-    this.cancelTick();
+    clearTimeout(this.id);
+    this.id = null;
 
     let ratio = this.curr / this.total;
     ratio = Math.min(Math.max(ratio, 0), 1);