deps: [email protected]

Author: lukekarrys

lib/arborist-cmd.js

@@ -1,4 +1,4 @@
-const log = require('proc-log')
+const { log } = require('proc-log')
 
 // This is the base for all commands whose execWorkspaces just gets
 // a list of workspace names and passes it on to new Arborist() to

lib/base-command.js

@@ -4,7 +4,7 @@ const { relative } = require('path')
 
 const { definitions } = require('@npmcli/config/lib/definitions')
 const { aliases: cmdAliases } = require('./utils/cmd-list')
-const log = require('proc-log')
+const { log } = require('proc-log')
 
 class BaseCommand {
   static workspaces = false

lib/cli-entry.js

@@ -18,7 +18,7 @@ module.exports = async (process, validateEngines) => {
   exitHandler.setNpm(npm)
 
   // only log node and npm paths in argv initially since argv can contain sensitive info. a cleaned version will be logged later
-  const log = require('proc-log')
+  const { log } = require('proc-log')
   log.verbose('cli', process.argv.slice(0, 2).join(' '))
   log.info('using', 'npm@%s', npm.version)
   log.info('using', 'node@%s', process.version)

lib/commands/adduser.js

@@ -1,4 +1,4 @@
-const log = require('proc-log')
+const { log } = require('proc-log')
 const { redactLog: replaceInfo } = require('@npmcli/redact')
 const auth = require('../utils/auth.js')
 

lib/commands/audit.js

@@ -8,7 +8,7 @@ const tufClient = require('@sigstore/tuf')
 
 const ArboristWorkspaceCmd = require('../arborist-cmd.js')
 const auditError = require('../utils/audit-error.js')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const reifyFinish = require('../utils/reify-finish.js')
 
 const sortAlphabetically = (a, b) => localeCompare(a.name, b.name)

lib/commands/cache.js

@@ -7,7 +7,7 @@ const BaseCommand = require('../base-command.js')
 const npa = require('npm-package-arg')
 const jsonParse = require('json-parse-even-better-errors')
 const localeCompare = require('@isaacs/string-locale-compare')('en')
-const log = require('proc-log')
+const { log } = require('proc-log')
 
 const searchCachePackage = async (path, parsed, cacheKeys) => {
   /* eslint-disable-next-line max-len */

lib/commands/ci.js

@@ -1,7 +1,7 @@
 const reifyFinish = require('../utils/reify-finish.js')
 const runScript = require('@npmcli/run-script')
 const fs = require('fs/promises')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const validateLockfile = require('../utils/validate-lockfile.js')
 
 const ArboristWorkspaceCmd = require('../arborist-cmd.js')

lib/commands/config.js

@@ -6,7 +6,7 @@ const ini = require('ini')
 const localeCompare = require('@isaacs/string-locale-compare')('en')
 const pkgJson = require('@npmcli/package-json')
 const { defaults, definitions } = require('@npmcli/config/lib/definitions')
-const log = require('proc-log')
+const { log } = require('proc-log')
 
 // These are the configs that we can nerf-dart. Not all of them currently even
 // *have* config definitions so we have to explicitly validate them here

lib/commands/diff.js

@@ -4,7 +4,7 @@ const libnpmdiff = require('libnpmdiff')
 const npa = require('npm-package-arg')
 const pacote = require('pacote')
 const pickManifest = require('npm-pick-manifest')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const pkgJson = require('@npmcli/package-json')
 const BaseCommand = require('../base-command.js')
 

lib/commands/dist-tag.js

@@ -1,7 +1,7 @@
 const npa = require('npm-package-arg')
 const regFetch = require('npm-registry-fetch')
 const semver = require('semver')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const otplease = require('../utils/otplease.js')
 const pkgJson = require('@npmcli/package-json')
 const BaseCommand = require('../base-command.js')

lib/commands/doctor.js

@@ -7,7 +7,7 @@ const pacote = require('pacote')
 const { resolve } = require('path')
 const semver = require('semver')
 const { promisify } = require('util')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const ping = require('../utils/ping.js')
 const { defaults } = require('@npmcli/config/lib/definitions')
 const lstat = promisify(fs.lstat)

lib/commands/explore.js

@@ -4,7 +4,7 @@
 const pkgJson = require('@npmcli/package-json')
 const runScript = require('@npmcli/run-script')
 const { join, relative } = require('path')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const completion = require('../utils/completion/installed-shallow.js')
 const BaseCommand = require('../base-command.js')
 

lib/commands/init.js

@@ -6,7 +6,7 @@ const npa = require('npm-package-arg')
 const libexec = require('libnpmexec')
 const mapWorkspaces = require('@npmcli/map-workspaces')
 const PackageJson = require('@npmcli/package-json')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const updateWorkspaces = require('../workspaces/update-workspaces.js')
 
 const posixPath = p => p.split('\\').join('/')

lib/commands/install.js

@@ -3,7 +3,7 @@ const fs = require('fs')
 const util = require('util')
 const readdir = util.promisify(fs.readdir)
 const reifyFinish = require('../utils/reify-finish.js')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const { resolve, join } = require('path')
 const runScript = require('@npmcli/run-script')
 const pacote = require('pacote')

lib/commands/login.js

@@ -1,4 +1,4 @@
-const log = require('proc-log')
+const { log } = require('proc-log')
 const { redactLog: replaceInfo } = require('@npmcli/redact')
 const auth = require('../utils/auth.js')
 

lib/commands/logout.js

@@ -1,6 +1,6 @@
 const npmFetch = require('npm-registry-fetch')
 const { getAuth } = npmFetch
-const log = require('proc-log')
+const { log } = require('proc-log')
 const BaseCommand = require('../base-command.js')
 
 class Logout extends BaseCommand {

lib/commands/owner.js

@@ -1,7 +1,7 @@
 const npa = require('npm-package-arg')
 const npmFetch = require('npm-registry-fetch')
 const pacote = require('pacote')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const otplease = require('../utils/otplease.js')
 const pkgJson = require('@npmcli/package-json')
 const BaseCommand = require('../base-command.js')

lib/commands/pack.js

@@ -1,7 +1,7 @@
 const pacote = require('pacote')
 const libpack = require('libnpmpack')
 const npa = require('npm-package-arg')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const { getContents, logTar } = require('../utils/tar.js')
 const BaseCommand = require('../base-command.js')
 

lib/commands/ping.js

@@ -1,5 +1,5 @@
 const { redact } = require('@npmcli/redact')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const pingUtil = require('../utils/ping.js')
 const BaseCommand = require('../base-command.js')
 

lib/commands/profile.js

@@ -1,6 +1,6 @@
 const inspect = require('util').inspect
 const { URL } = require('url')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const npmProfile = require('npm-profile')
 const qrcodeTerminal = require('qrcode-terminal')
 const Table = require('cli-table3')

lib/commands/publish.js

@@ -1,4 +1,4 @@
-const log = require('proc-log')
+const { log } = require('proc-log')
 const semver = require('semver')
 const pack = require('libnpmpack')
 const libpub = require('libnpmpublish').publish

lib/commands/query.js

@@ -2,7 +2,7 @@
 
 const { resolve } = require('path')
 const BaseCommand = require('../base-command.js')
-const log = require('proc-log')
+const { log } = require('proc-log')
 
 class QuerySelectorItem {
   constructor (node) {

lib/commands/run-script.js

@@ -1,7 +1,7 @@
 const runScript = require('@npmcli/run-script')
 const { isServerPackage } = runScript
 const pkgJson = require('@npmcli/package-json')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const didYouMean = require('../utils/did-you-mean.js')
 const { isWindowsShell } = require('../utils/is-windows.js')
 

lib/commands/sbom.js

@@ -2,7 +2,7 @@
 
 const localeCompare = require('@isaacs/string-locale-compare')('en')
 const BaseCommand = require('../base-command.js')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const { cyclonedxOutput } = require('../utils/sbom-cyclonedx.js')
 const { spdxOutput } = require('../utils/sbom-spdx.js')
 

lib/commands/search.js

@@ -1,7 +1,7 @@
 const { Minipass } = require('minipass')
 const Pipeline = require('minipass-pipeline')
 const libSearch = require('libnpmsearch')
-const log = require('proc-log')
+const { log } = require('proc-log')
 
 const formatSearchStream = require('../utils/format-search-stream.js')
 

lib/commands/shrinkwrap.js

@@ -1,6 +1,6 @@
 const { resolve, basename } = require('path')
 const { unlink } = require('fs').promises
-const log = require('proc-log')
+const { log } = require('proc-log')
 const BaseCommand = require('../base-command.js')
 class Shrinkwrap extends BaseCommand {
   static description = 'Lock down dependency versions for publication'

lib/commands/star.js

@@ -1,6 +1,6 @@
 const fetch = require('npm-registry-fetch')
 const npa = require('npm-package-arg')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const getIdentity = require('../utils/get-identity')
 
 const BaseCommand = require('../base-command.js')

lib/commands/stars.js

@@ -1,5 +1,5 @@
 const fetch = require('npm-registry-fetch')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const getIdentity = require('../utils/get-identity.js')
 
 const BaseCommand = require('../base-command.js')

lib/commands/token.js

@@ -1,5 +1,5 @@
 const Table = require('cli-table3')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const profile = require('npm-profile')
 
 const otplease = require('../utils/otplease.js')

lib/commands/unpublish.js

@@ -6,7 +6,7 @@ const pkgJson = require('@npmcli/package-json')
 
 const { flatten } = require('@npmcli/config/lib/definitions')
 const getIdentity = require('../utils/get-identity.js')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const otplease = require('../utils/otplease.js')
 
 const LAST_REMAINING_VERSION_ERROR = 'Refusing to delete the last version of the package. ' +

lib/commands/update.js

@@ -1,6 +1,6 @@
 const path = require('path')
 
-const log = require('proc-log')
+const { log } = require('proc-log')
 
 const reifyFinish = require('../utils/reify-finish.js')
 

lib/commands/view.js

@@ -1,7 +1,7 @@
 const columns = require('cli-columns')
 const fs = require('fs')
 const jsonParse = require('json-parse-even-better-errors')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const npa = require('npm-package-arg')
 const { resolve } = require('path')
 const formatBytes = require('../utils/format-bytes.js')

lib/npm.js

@@ -11,7 +11,7 @@ const usage = require('./utils/npm-usage.js')
 const LogFile = require('./utils/log-file.js')
 const Timers = require('./utils/timers.js')
 const Display = require('./utils/display.js')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const { redactLog: replaceInfo } = require('@npmcli/redact')
 const updateNotifier = require('./utils/update-notifier.js')
 const pkg = require('../package.json')
@@ -50,14 +50,7 @@ class Npm {
 
   #display = null
   #logFile = new LogFile()
-  #timers = new Timers({
-    start: 'npm',
-    listener: (name, ms) => {
-      const args = [name, `Completed in ${ms}ms`]
-      this.#logFile.log('timing', ...args)
-      this.#display.logTiming(...args)
-    },
-  })
+  #timers = new Timers({ start: 'npm' })
 
   // all these options are only used by tests in order to make testing more
   // closely resemble real world usage. for now, npm has no programmatic API so

lib/package-url-cmd.js

@@ -4,7 +4,7 @@ const pacote = require('pacote')
 const hostedGitInfo = require('hosted-git-info')
 
 const openUrl = require('./utils/open-url.js')
-const log = require('proc-log')
+const { log } = require('proc-log')
 
 const BaseCommand = require('./base-command.js')
 class PackageUrlCommand extends BaseCommand {

lib/utils/audit-error.js

@@ -1,4 +1,4 @@
-const log = require('proc-log')
+const { log } = require('proc-log')
 const { redactLog: replaceInfo } = require('@npmcli/redact')
 
 // print an error or just nothing if the audit report has an error

lib/utils/auth.js

@@ -1,5 +1,5 @@
 const profile = require('npm-profile')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const openUrlPrompt = require('../utils/open-url-prompt.js')
 const read = require('../utils/read-user-info.js')
 const otplease = require('../utils/otplease.js')

lib/utils/display.js

@@ -1,5 +1,5 @@
 const proggy = require('proggy')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const { explain } = require('./explain-eresolve.js')
 const { formatWithOptions, format } = require('./format')
 
@@ -17,7 +17,7 @@ const COLOR_PALETTE = ({ chalk: c }) => ({
   silly: c.inverse,
 })
 
-const LEVELS = ['timing', ...log.LEVELS].reduce((acc, key) => {
+const LEVELS = log.LEVELS.reduce((acc, key) => {
   acc[key] = key
   return acc
 }, {})
@@ -139,10 +139,6 @@ class Display {
     }
   }
 
-  logTiming (...args) {
-    this.#logHandler(LEVELS.timing, ...args)
-  }
-
   forceLog (level, ...args) {
     // This will show the log regardless of the current loglevel, except when silent
     this.#logHandler({ level, force: true }, ...args)

lib/utils/error-message.js

@@ -2,7 +2,7 @@ const { format } = require('util')
 const { resolve } = require('path')
 const { redactLog: replaceInfo } = require('@npmcli/redact')
 const { report } = require('./explain-eresolve.js')
-const log = require('proc-log')
+const { log } = require('proc-log')
 
 const messageText = msg => msg.map(line => line.slice(1).join(' ')).join('\n')
 

lib/utils/exit-handler.js

@@ -1,7 +1,7 @@
 const os = require('os')
 const fs = require('fs')
 
-const log = require('proc-log')
+const { log } = require('proc-log')
 const errorMessage = require('./error-message.js')
 const { redactLog: replaceInfo } = require('@npmcli/redact')
 

lib/utils/log-file.js

@@ -3,7 +3,7 @@ const { join, dirname, basename } = require('path')
 const { Minipass } = require('minipass')
 const fsMiniPass = require('fs-minipass')
 const fs = require('fs/promises')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const { formatWithOptions } = require('./format')
 
 const padZero = (n, length) => n.toString().padStart(length.toString().length, '0')

lib/utils/read-user-info.js

@@ -1,6 +1,6 @@
 const { read } = require('read')
 const userValidate = require('npm-user-validate')
-const log = require('proc-log')
+const { log } = require('proc-log')
 
 exports.otp = readOTP
 exports.password = readPassword

lib/utils/reify-output.js

@@ -9,7 +9,7 @@
 // found 37 vulnerabilities (5 low, 7 moderate, 25 high)
 //   run `npm audit fix` to fix them, or `npm audit` for details
 
-const log = require('proc-log')
+const { log } = require('proc-log')
 const { depth } = require('treeverse')
 const ms = require('ms')
 const npmAuditReport = require('npm-audit-report')

lib/utils/tar.js

@@ -1,6 +1,6 @@
 const tar = require('tar')
 const ssri = require('ssri')
-const log = require('proc-log')
+const { log } = require('proc-log')
 const formatBytes = require('./format-bytes.js')
 const columnify = require('columnify')
 const localeCompare = require('@isaacs/string-locale-compare')('en', {