@npmcli/config 3.0.0 → 4.0.1

package/README.md

@@ -78,9 +78,12 @@ const conf = new Config({
   platform: process.platform,
   // optional, defaults to process.cwd()
   cwd: process.cwd(),
-  // optional, defaults to emitting 'log' events on process object
-  // only silly, verbose, warn, and error are logged by this module
-  log: require('npmlog')
+})
+
+// emits log events on the process object
+// see `proc-log` for more info
+process.on('log', (level, ...args) => {
+  console.log(level, ...args)
 })
 
 // returns a promise that fails if config loading fails, and
@@ -124,8 +127,6 @@ Options:
   Windows.
 - `execPath` Optional, defaults to `process.execPath`.  Used to infer the
   `globalPrefix`.
-- `log` Optional, the object used to log debug messages, warnings, and
-  errors.  Defaults to emitting on the `process` object.
 - `env` Optional, defaults to `process.env`.  Source of the environment
   variables for configuration.
 - `argv` Optional, defaults to `process.argv`.  Source of the CLI options
@@ -161,7 +162,6 @@ Fields:
 - `argv` The `argv` param
 - `execPath` The `execPath` param
 - `platform` The `platform` param
-- `log` The `log` param
 - `defaults` The `defaults` param
 - `shorthands` The `shorthands` param
 - `types` The `types` param

package/lib/env-replace.js

@@ -1,6 +1,6 @@
 // replace any ${ENV} values with the appropriate environ.
 
-const envExpr = /(\\*)\$\{([^}]+)\}/g
+const envExpr = /(?<!\\)(\\*)\$\{([^${}]+)\}/g
 
 module.exports = (f, env) => f.replace(envExpr, (orig, esc, name) => {
   const val = env[name] !== undefined ? env[name] : `$\{${name}}`

package/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])
     }
   }
 
@@ -567,6 +566,7 @@ class Config {
     }
 
     const cliWorkspaces = this[_get]('workspaces', 'cli')
+    const isGlobal = this[_get]('global') || this[_get]('location') === 'global'
 
     for (const p of walkUp(this.cwd)) {
       const hasNodeModules = await stat(resolve(p, 'node_modules'))
@@ -580,8 +580,8 @@ class Config {
       if (!this.localPrefix && (hasNodeModules || hasPackageJson)) {
         this.localPrefix = p
 
-        // if workspaces are disabled, return now
-        if (cliWorkspaces === false) {
+        // if workspaces are disabled, or we're in global mode, return now
+        if (cliWorkspaces === false || isGlobal) {
           return
         }
 
@@ -607,14 +607,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
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/config",
-  "version": "3.0.0",
+  "version": "4.0.1",
   "files": [
     "bin",
     "lib"
@@ -30,22 +30,23 @@
     "coverage-map": "map.js"
   },
   "devDependencies": {
-    "@npmcli/template-oss": "^2.5.1",
-    "tap": "^15.0.4"
+    "@npmcli/template-oss": "^2.8.1",
+    "tap": "^15.1.6"
   },
   "dependencies": {
-    "@npmcli/map-workspaces": "^2.0.0",
+    "@npmcli/map-workspaces": "^2.0.1",
     "ini": "^2.0.0",
     "mkdirp-infer-owner": "^2.0.0",
     "nopt": "^5.0.0",
+    "proc-log": "^2.0.0",
     "read-package-json-fast": "^2.0.3",
-    "semver": "^7.3.4",
+    "semver": "^7.3.5",
     "walk-up-path": "^1.0.0"
   },
   "engines": {
     "node": "^12.13.0 || ^14.15.0 || >=16"
   },
   "templateOSS": {
-    "version": "2.6.0"
+    "version": "2.8.1"
   }
 }

package/lib/proc-log.js

@@ -1,4 +0,0 @@
-const log = (level) => (...args) => process.emit('log', level, ...args)
-for (const level of ['silly', 'verbose', 'warn', 'error']) {
-  exports[level] = log(level)
-}