Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/npm/cli.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'node_modules/@npmcli/config/lib/index.js')
-rw-r--r--node_modules/@npmcli/config/lib/index.js15
1 files changed, 7 insertions, 8 deletions
diff --git a/node_modules/@npmcli/config/lib/index.js b/node_modules/@npmcli/config/lib/index.js
index dc839a538..82e369938 100644
--- a/node_modules/@npmcli/config/lib/index.js
+++ b/node_modules/@npmcli/config/lib/index.js
@@ -5,6 +5,7 @@ const nopt = require('nopt')
const mkdirp = require('mkdirp-infer-owner')
const mapWorkspaces = require('@npmcli/map-workspaces')
const rpj = require('read-package-json-fast')
+const log = require('proc-log')
/* istanbul ignore next */
const myUid = process.getuid && process.getuid()
@@ -88,7 +89,6 @@ class Config {
// options just to override in tests, mostly
env = process.env,
argv = process.argv,
- log = require('./proc-log.js'),
platform = process.platform,
execPath = process.execPath,
cwd = process.cwd(),
@@ -114,7 +114,6 @@ class Config {
this.defaults = defaults
this.npmPath = npmPath
- this.log = log
this.argv = argv
this.env = env
this.execPath = execPath
@@ -436,7 +435,7 @@ class Config {
}
invalidHandler (k, val, type, source, where) {
- this.log.warn(
+ log.warn(
'invalid config',
k + '=' + JSON.stringify(val),
`set in ${source}`
@@ -469,7 +468,7 @@ class Config {
: mustBe.filter(m => m !== Array)
.map(n => typeof n === 'string' ? n : JSON.stringify(n))
.join(', ')
- this.log.warn('invalid config', msg, desc)
+ log.warn('invalid config', msg, desc)
}
[_loadObject] (obj, where, source, er = null) {
@@ -491,7 +490,7 @@ class Config {
if (er) {
conf.loadError = er
if (er.code !== 'ENOENT') {
- this.log.verbose('config', `error loading ${where} config`, er)
+ log.verbose('config', `error loading ${where} config`, er)
}
} else {
conf.raw = obj
@@ -510,7 +509,7 @@ class Config {
// XXX a future npm version will make this a warning.
// An even more future npm version will make this an error.
if (this.deprecated[key]) {
- this.log.verbose('config', key, this.deprecated[key])
+ log.verbose('config', key, this.deprecated[key])
}
}
@@ -607,14 +606,14 @@ class Config {
.catch(() => false)
if (hasNpmrc) {
- this.log.warn(`ignoring workspace config at ${this.localPrefix}/.npmrc`)
+ log.warn(`ignoring workspace config at ${this.localPrefix}/.npmrc`)
}
// set the workspace in the default layer, which allows it to be overridden easily
const { data } = this.data.get('default')
data.workspace = [this.localPrefix]
this.localPrefix = p
- this.log.info(`found workspace root at ${this.localPrefix}`)
+ log.info(`found workspace root at ${this.localPrefix}`)
// we found a root, so we return now
return
}