Skip to content

Commit

Permalink
deps: proc-log@4.0.0
Browse files Browse the repository at this point in the history
  • Loading branch information
lukekarrys committed Apr 16, 2024
1 parent 9027266 commit 79f79c7
Show file tree
Hide file tree
Showing 107 changed files with 287 additions and 1,219 deletions.
2 changes: 1 addition & 1 deletion lib/arborist-cmd.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/base-command.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/cli-entry.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/adduser.js
Original file line number Diff line number Diff line change
@@ -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')

Expand Down
2 changes: 1 addition & 1 deletion lib/commands/audit.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/cache.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 */
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/ci.js
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/config.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/diff.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
2 changes: 1 addition & 1 deletion lib/commands/dist-tag.js
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/doctor.js
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/explore.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
2 changes: 1 addition & 1 deletion lib/commands/init.js
Original file line number Diff line number Diff line change
Expand Up @@ -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('/')
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/install.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/login.js
Original file line number Diff line number Diff line change
@@ -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')

Expand Down
2 changes: 1 addition & 1 deletion lib/commands/logout.js
Original file line number Diff line number Diff line change
@@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/owner.js
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/pack.js
Original file line number Diff line number Diff line change
@@ -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')

Expand Down
2 changes: 1 addition & 1 deletion lib/commands/ping.js
Original file line number Diff line number Diff line change
@@ -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')

Expand Down
2 changes: 1 addition & 1 deletion lib/commands/profile.js
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/publish.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/query.js
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/run-script.js
Original file line number Diff line number Diff line change
@@ -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')

Expand Down
2 changes: 1 addition & 1 deletion lib/commands/sbom.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
2 changes: 1 addition & 1 deletion lib/commands/search.js
Original file line number Diff line number Diff line change
@@ -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')

Expand Down
2 changes: 1 addition & 1 deletion lib/commands/shrinkwrap.js
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/star.js
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/stars.js
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/token.js
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/unpublish.js
Original file line number Diff line number Diff line change
Expand Up @@ -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. ' +
Expand Down
2 changes: 1 addition & 1 deletion lib/commands/update.js
Original file line number Diff line number Diff line change
@@ -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')

Expand Down
2 changes: 1 addition & 1 deletion lib/commands/view.js
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
11 changes: 2 additions & 9 deletions lib/npm.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/package-url-cmd.js
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
2 changes: 1 addition & 1 deletion lib/utils/audit-error.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/utils/auth.js
Original file line number Diff line number Diff line change
@@ -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')
Expand Down
8 changes: 2 additions & 6 deletions lib/utils/display.js
Original file line number Diff line number Diff line change
@@ -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')

Expand All @@ -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
}, {})
Expand Down Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion lib/utils/error-message.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')

Expand Down
2 changes: 1 addition & 1 deletion lib/utils/exit-handler.js
Original file line number Diff line number Diff line change
@@ -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')

Expand Down
2 changes: 1 addition & 1 deletion lib/utils/log-file.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion lib/utils/read-user-info.js
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/utils/reify-output.js
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
2 changes: 1 addition & 1 deletion lib/utils/tar.js
Original file line number Diff line number Diff line change
@@ -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', {
Expand Down
Loading

0 comments on commit 79f79c7

Please sign in to comment.