output: Standardize how we write to stdout

This allows us to consistently make sure that the progress bar is hidden
before we try to write to stdout.

PR-URL: https://github.com/npm/npm/pull/13075
Credit: @iarna

1 files changed, 8 insertions, 7 deletions

diff --git a/lib/run-script.js b/lib/run-script.js
index f9c6872aa..05bc1fe98 100644
--- a/lib/run-script.js
+++ b/lib/run-script.js
@@ -7,6 +7,7 @@ var readJson = require('read-package-json')
 var log = require('npmlog')
 var chain = require('slide').chain
 var usage = require('./utils/usage')
+var output = require('./utils/output.js')
 
 runScript.usage = usage(
   'run-script',
@@ -91,13 +92,13 @@ function list (cb) {
     }
 
     if (npm.config.get('json')) {
-      console.log(JSON.stringify(d.scripts || {}, null, 2))
+      output(JSON.stringify(d.scripts || {}, null, 2))
       return cb(null, allScripts)
     }
 
     if (npm.config.get('parseable')) {
       allScripts.forEach(function (script) {
-        console.log(script + ':' + d.scripts[script])
+        output(script + ':' + d.scripts[script])
       })
       return cb(null, allScripts)
     }
@@ -105,18 +106,18 @@ function list (cb) {
     var s = '\n    '
     var prefix = '  '
     if (scripts.length) {
-      console.log('Lifecycle scripts included in %s:', d.name)
+      output('Lifecycle scripts included in %s:', d.name)
     }
     scripts.forEach(function (script) {
-      console.log(prefix + script + s + d.scripts[script])
+      output(prefix + script + s + d.scripts[script])
     })
     if (!scripts.length && runScripts.length) {
-      console.log('Scripts available in %s via `npm run-script`:', d.name)
+      output('Scripts available in %s via `npm run-script`:', d.name)
     } else if (runScripts.length) {
-      console.log('\navailable via `npm run-script`:')
+      output('\navailable via `npm run-script`:')
     }
     runScripts.forEach(function (script) {
-      console.log(prefix + script + s + d.scripts[script])
+      output(prefix + script + s + d.scripts[script])
     })
     return cb(null, allScripts)
   })