chore(cli): remove log option from being passed anywhere

Author: lukekarrys

lib/commands/access.js

@@ -3,7 +3,6 @@ const path = require('path')
 const libaccess = require('libnpmaccess')
 const readPackageJson = require('read-package-json-fast')
 
-const log = require('../utils/log-shim.js')
 const otplease = require('../utils/otplease.js')
 const getIdentity = require('../utils/get-identity.js')
 const BaseCommand = require('../base-command.js')
@@ -79,7 +78,6 @@ class Access extends BaseCommand {
 
     return this[cmd](args, {
       ...this.npm.flatOptions,
-      log,
     })
   }
 

lib/commands/adduser.js

@@ -31,7 +31,6 @@ class AddUser extends BaseCommand {
       creds,
       registry,
       scope,
-      log,
     })
 
     await this.updateConfig({

lib/commands/ci.js

@@ -36,11 +36,11 @@ class CI extends ArboristWorkspaceCmd {
     }
 
     const where = this.npm.prefix
+    const { silent } = this.npm.flatOptions
     const opts = {
       ...this.npm.flatOptions,
       packageLock: true, // npm ci should never skip lock files
       path: where,
-      log,
       save: false, // npm ci should never modify the lockfile or package.json
       workspaces: this.workspaceNames,
     }
@@ -101,7 +101,7 @@ class CI extends ArboristWorkspaceCmd {
           scriptShell,
           stdio: 'inherit',
           stdioString: true,
-          banner: log.level !== 'silent',
+          banner: !silent,
           event,
         })
       }

lib/commands/dedupe.js

@@ -1,7 +1,6 @@
 // dedupe duplicated packages, or find them in the tree
 const Arborist = require('@npmcli/arborist')
 const reifyFinish = require('../utils/reify-finish.js')
-const log = require('../utils/log-shim.js')
 
 const ArboristWorkspaceCmd = require('../arborist-cmd.js')
 
@@ -40,7 +39,6 @@ class Dedupe extends ArboristWorkspaceCmd {
     const where = this.npm.prefix
     const opts = {
       ...this.npm.flatOptions,
-      log,
       path: where,
       dryRun,
       save,

lib/commands/deprecate.js

@@ -1,5 +1,4 @@
 const fetch = require('npm-registry-fetch')
-const log = require('../utils/log-shim.js')
 const otplease = require('../utils/otplease.js')
 const npa = require('npm-package-arg')
 const semver = require('semver')
@@ -51,7 +50,6 @@ class Deprecate extends BaseCommand {
       ...this.npm.flatOptions,
       spec: p,
       query: { write: true },
-      log,
     })
 
     Object.keys(packument.versions)
@@ -66,7 +64,6 @@ class Deprecate extends BaseCommand {
       method: 'PUT',
       body: packument,
       ignoreBody: true,
-      log,
     }))
   }
 }

lib/commands/diff.js

@@ -61,7 +61,6 @@ class Diff extends BaseCommand {
       ...this.npm.flatOptions,
       diffFiles: args,
       where: this.top,
-      log,
     })
     return this.npm.output(res)
   }
@@ -194,7 +193,6 @@ class Diff extends BaseCommand {
         const packument = await pacote.packument(spec, {
           ...this.npm.flatOptions,
           preferOnline: true,
-          log,
         })
         bSpec = pickManifest(
           packument,

lib/commands/dist-tag.js

@@ -31,7 +31,6 @@ class DistTag extends BaseCommand {
   async exec ([cmdName, pkg, tag]) {
     const opts = {
       ...this.npm.flatOptions,
-      log,
     }
 
     if (['add', 'a', 'set', 's'].includes(cmdName)) {

lib/commands/doctor.js

@@ -125,7 +125,7 @@ class Doctor extends BaseCommand {
       stringLength: s => ansiTrim(s).length,
     }
 
-    const silent = log.levels[log.level] > log.levels.error
+    const { silent } = this.npm.flatOptions
     if (!silent) {
       this.npm.output(table(outTable, tableOpts))
       if (!allOk) {

lib/commands/exec.js

@@ -1,7 +1,6 @@
 const libexec = require('libnpmexec')
 const BaseCommand = require('../base-command.js')
 const getLocationMsg = require('../exec/get-workspace-location-msg.js')
-const log = require('../utils/log-shim')
 
 // it's like this:
 //
@@ -77,7 +76,6 @@ class Exec extends BaseCommand {
       call,
       localBin,
       locationMsg,
-      log,
       globalBin,
       output,
       packages,

lib/commands/fund.js

@@ -5,7 +5,6 @@ const pacote = require('pacote')
 const semver = require('semver')
 const npa = require('npm-package-arg')
 const { depth } = require('treeverse')
-const log = require('../utils/log-shim.js')
 const { readTree: getFundingInfo, normalizeFunding, isValidFunding } = require('libnpmfund')
 
 const completion = require('../utils/completion/installed-deep.js')
@@ -69,7 +68,6 @@ class Fund extends ArboristWorkspaceCmd {
     // TODO: add !workspacesEnabled option handling to libnpmfund
     const fundingInfo = getFundingInfo(tree, {
       ...this.flatOptions,
-      log,
       workspaces: this.workspaceNames,
     })