fix: honor options.stream everywhere

unjs · Mar 31, 2018 · 34733b7 · 34733b7
1 parent 4af75bc
commit 34733b7
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 6 deletions.
diff --git a/src/index.js b/src/index.js
@@ -11,7 +11,7 @@ import {
   parseRequst,
   formatRequest,
   renderBar,
-  printStats,
+  formatStats,
   colorize,
 } from './utils';
 
@@ -41,7 +41,9 @@ export default class WebpackBarPlugin extends webpack.ProgressPlugin {
 
     this._render = _.throttle(this.render, 25);
 
-    this.logUpdate = this.options.logUpdate || logUpdate;
+    this.logUpdate =
+      this.options.logUpdate ||
+      (this.options.stream === process.stderr ? logUpdate.stderr : logUpdate);
 
     if (!this.state) {
       sharedState[this.options.name] = {
@@ -59,7 +61,8 @@ export default class WebpackBarPlugin extends webpack.ProgressPlugin {
   done() {
     if (this.options.profile) {
       const stats = this.state.profile.getStats();
-      printStats(stats);
+      const statsStr = formatStats(stats);
+      this.options.stream.write(`\n${statsStr}\n`);
     }
 
     if (typeof this.options.done === 'function') {

diff --git a/src/utils.js b/src/utils.js
@@ -79,11 +79,13 @@ export const formatRequest = (request) => {
   return format(`${loaders}${NEXT}${request.file}`);
 };
 
-export const printStats = (allStats) => {
+export const formatStats = (allStats) => {
+  const lines = [];
+
   Object.keys(allStats).forEach((category) => {
     const stats = allStats[category];
 
-    process.stderr.write(`\nStats by ${chalk.bold(_.startCase(category))}\n`);
+    lines.push(`Stats by ${chalk.bold(_.startCase(category))}`);
 
     let totalRequests = 0;
     const totalTime = [0, 0];
@@ -121,6 +123,8 @@ export const printStats = (allStats) => {
 
     data.push(['Total', totalRequests, prettyTime(totalTime), '', '']);
 
-    process.stderr.write(`\n${table(data)}\n`);
+    lines.push(table(data));
   });
+
+  return lines.join('\n\n');
 };