deps: upgrade npm to 7.0.0-rc.4

PR-URL: nodejs#35576
Reviewed-By: Antoine du Hamel <[email protected]>
Reviewed-By: Rich Trott <[email protected]>
Reviewed-By: Jiawen Geng <[email protected]>

deps/npm/CHANGELOG.md

@@ -1,3 +1,25 @@
+## v7.0.0-rc.4 (2020-10-09)
+
+* [`09b456f2d`](https://github.com/npm/cli/commit/09b456f2d776e2757956d2b9869febd1e01a1076)
+  `@npmcli/[email protected]`
+    * [#1919](https://github.com/npm/cli/pull/1919)
+      exposes `npm_config_user_agent` env variable
+      ([@nlf](https://github.com/nlf))
+* [`e859fba9e`](https://github.com/npm/cli/commit/e859fba9e7c267b0587b7d22da72e33f3e8f906b)
+  [#1936](https://github.com/npm/cli/pull/1936)
+  fix npx for non-interactive shells
+  ([@nlf](https://github.com/nlf))
+* [`9320b8e4f`](https://github.com/npm/cli/commit/9320b8e4f0e0338ea95e970ec9bbf0704def64b8)
+  [#1906](https://github.com/npm/cli/pull/1906)
+  restore old npx behavior of running existing bins first
+  ([@nlf](https://github.com/nlf))
+* [`7bd47ca2c`](https://github.com/npm/cli/commit/7bd47ca2c718df0a7d809f1992b7a87eece3f6dc)
+  `@npmcli/[email protected]`
+    * fixed handling of invalid package.json file
+* [`02737453b`](https://github.com/npm/cli/commit/02737453bc2363daeef8c4e4b7d239e2299029b2)
+  `[email protected]`
+    * do not calculate integrity values of http errors
+
 ## v7.0.0-rc.3 (2020-10-06)
 
 * [`d816c2efa`](https://github.com/npm/cli/commit/d816c2efae41930cbdf4fff8657e0adc450d1dd4)

deps/npm/lib/completion.js

@@ -43,6 +43,7 @@ const shorthandNames = Object.keys(shorthands)
 const allConfs = configNames.concat(shorthandNames)
 const isWindowsShell = require('./utils/is-windows-shell.js')
 const output = require('./utils/output.js')
+const fileExists = require('./utils/file-exists.js')
 
 const usageUtil = require('./utils/usage.js')
 const usage = usageUtil('completion', 'source <(npm completion)')
@@ -56,13 +57,10 @@ const completion = async (opts, cb) => {
     return cb()
   }
 
-  const fs = require('fs')
-  const stat = promisify(fs.stat)
-  const exists = f => stat(f).then(() => true).catch(() => false)
   const { resolve } = require('path')
   const [bashExists, zshExists] = await Promise.all([
-    exists(resolve(process.env.HOME, '.bashrc')),
-    exists(resolve(process.env.HOME, '.zshrc'))
+    fileExists(resolve(process.env.HOME, '.bashrc')),
+    fileExists(resolve(process.env.HOME, '.zshrc'))
   ])
   const out = []
   if (zshExists) {

deps/npm/lib/exec.js

@@ -59,6 +59,8 @@ const crypto = require('crypto')
 const pacote = require('pacote')
 const npa = require('npm-package-arg')
 const escapeArg = require('./utils/escape-arg.js')
+const fileExists = require('./utils/file-exists.js')
+const PATH = require('./utils/path.js')
 
 const cmd = (args, cb) => exec(args).then(() => cb()).catch(cb)
 
@@ -69,8 +71,38 @@ const exec = async args => {
     throw usage
   }
 
+  const pathArr = [...PATH]
+
   const needPackageCommandSwap = args.length && !packages.length
+  // if there's an argument and no package has been explicitly asked for
+  // check the local and global bin paths for a binary named the same as
+  // the argument and run it if it exists, otherwise fall through to
+  // the behavior of treating the single argument as a package name
   if (needPackageCommandSwap) {
+    let binExists = false
+    if (await fileExists(`${npm.localBin}/${args[0]}`)) {
+      pathArr.unshift(npm.localBin)
+      binExists = true
+    } else if (await fileExists(`${npm.globalBin}/${args[0]}`)) {
+      pathArr.unshift(npm.globalBin)
+      binExists = true
+    }
+
+    if (binExists) {
+      return await runScript({
+        cmd: [args[0], ...args.slice(1).map(escapeArg)].join(' ').trim(),
+        banner: false,
+        // we always run in cwd, not --prefix
+        path: process.cwd(),
+        stdioString: true,
+        event: 'npx',
+        env: {
+          PATH: pathArr.join(delimiter)
+        },
+        stdio: 'inherit'
+      })
+    }
+
     packages.push(args[0])
   }
 
@@ -111,7 +143,6 @@ const exec = async args => {
   // do we have all the packages in manifest list?
   const needInstall = manis.some(mani => manifestMissing(tree, mani))
 
-  const pathArr = [process.env.PATH]
   if (needInstall) {
     const installDir = cacheInstallDir(packages)
     await mkdirp(installDir)
@@ -126,19 +157,25 @@ const exec = async args => {
 
     // no need to install if already present
     if (add.length) {
+      const isTTY = process.stdin.isTTY && process.stdout.isTTY
       if (!npm.flatOptions.yes) {
         // set -n to always say no
         if (npm.flatOptions.yes === false) {
           throw 'canceled'
         }
-        const addList = add.map(a => `  ${a.replace(/@$/, '')}`)
-          .join('\n') + '\n'
-        const prompt = `Need to install the following packages:\n${
-          addList
-        }Ok to proceed? `
-        const confirm = await read({ prompt, default: 'y' })
-        if (confirm.trim().toLowerCase().charAt(0) !== 'y') {
-          throw 'canceled'
+
+        if (!isTTY) {
+          npm.log.warn('exec', `The following package${add.length === 1 ? ' was' : 's were'} not found and will be installed: ${add.map((pkg) => pkg.replace(/@$/, '')).join(', ')}`)
+        } else {
+          const addList = add.map(a => `  ${a.replace(/@$/, '')}`)
+            .join('\n') + '\n'
+          const prompt = `Need to install the following packages:\n${
+            addList
+          }Ok to proceed? `
+          const confirm = await read({ prompt, default: 'y' })
+          if (confirm.trim().toLowerCase().charAt(0) !== 'y') {
+            throw 'canceled'
+          }
         }
       }
       await arb.reify({ ...npm.flatOptions, add })

deps/npm/lib/npm.js

@@ -164,8 +164,6 @@ const npm = module.exports = new class extends EventEmitter {
     await this.config.load()
     this.argv = this.config.parsedArgv.remain
 
-    setUserAgent(this.config)
-
     this.color = setupLog(this.config, this)
     process.env.COLOR = this.color ? '1' : '0'
 
@@ -279,7 +277,6 @@ const startMetrics = require('./utils/metrics.js').start
 
 const which = promisify(require('which'))
 
-const setUserAgent = require('./utils/set-user-agent.js')
 const deref = require('./utils/deref-command.js')
 const setupLog = require('./utils/setup-log.js')
 const cleanUpLogFiles = require('./utils/cleanup-log-files.js')