@npmcli/config 10.3.1 → 10.4.1

package/lib/definitions/definitions.js

@@ -398,14 +398,14 @@ const definitions = {
       \`\`\`
 
       It is _not_ the path to a certificate file, though you can set a registry-scoped
-      "cafile" path like "//other-registry.tld/:cafile=/path/to/cert.pem".
+      "certfile" path like "//other-registry.tld/:certfile=/path/to/cert.pem".
     `,
     deprecated: `
       \`key\` and \`cert\` are no longer used for most registry operations.
-      Use registry scoped \`keyfile\` and \`cafile\` instead.
+      Use registry scoped \`keyfile\` and \`certfile\` instead.
       Example:
       //other-registry.tld/:keyfile=/path/to/key.pem
-      //other-registry.tld/:cafile=/path/to/cert.crt
+      //other-registry.tld/:certfile=/path/to/cert.crt
     `,
     flatten,
   }),
@@ -1094,10 +1094,10 @@ const definitions = {
     `,
     deprecated: `
       \`key\` and \`cert\` are no longer used for most registry operations.
-      Use registry scoped \`keyfile\` and \`cafile\` instead.
+      Use registry scoped \`keyfile\` and \`certfile\` instead.
       Example:
       //other-registry.tld/:keyfile=/path/to/key.pem
-      //other-registry.tld/:cafile=/path/to/cert.crt
+      //other-registry.tld/:certfile=/path/to/cert.crt
     `,
     flatten,
   }),

package/lib/env-replace.js

@@ -1,9 +1,11 @@
 // replace any ${ENV} values with the appropriate environ.
+// optional "?" modifier can be used like this: ${ENV?} so in case of the variable being not defined, it evaluates into empty string.
 
-const envExpr = /(?<!\\)(\\*)\$\{([^${}]+)\}/g
+const envExpr = /(?<!\\)(\\*)\$\{([^${}?]+)(\?)?\}/g
 
-module.exports = (f, env) => f.replace(envExpr, (orig, esc, name) => {
-  const val = env[name] !== undefined ? env[name] : `$\{${name}}`
+module.exports = (f, env) => f.replace(envExpr, (orig, esc, name, modifier) => {
+  const fallback = modifier === '?' ? '' : `$\{${name}}`
+  const val = env[name] !== undefined ? env[name] : fallback
 
   // consume the escape chars that are relevant.
   if (esc.length % 2) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@npmcli/config",
-  "version": "10.3.1",
+  "version": "10.4.1",
   "files": [
     "bin/",
     "lib/"
@@ -33,12 +33,12 @@
   "devDependencies": {
     "@npmcli/eslint-config": "^5.0.1",
     "@npmcli/mock-globals": "^1.0.0",
-    "@npmcli/template-oss": "4.24.4",
+    "@npmcli/template-oss": "4.25.1",
     "tap": "^16.3.8"
   },
   "dependencies": {
-    "@npmcli/map-workspaces": "^4.0.1",
-    "@npmcli/package-json": "^6.0.1",
+    "@npmcli/map-workspaces": "^5.0.0",
+    "@npmcli/package-json": "^7.0.0",
     "ci-info": "^4.0.0",
     "ini": "^5.0.0",
     "nopt": "^8.1.0",
@@ -51,7 +51,7 @@
   },
   "templateOSS": {
     "//@npmcli/template-oss": "This file is partially managed by @npmcli/template-oss. Edits may be overwritten.",
-    "version": "4.24.4",
+    "version": "4.25.1",
     "content": "../../scripts/template-oss/index.js"
   }
 }