deps: upgrade npm to 6.13.6

PR-URL: https://github.com/nodejs/node/pull/31304
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Jiawen Geng <technicalcute@gmail.com>
Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>

5 files changed, 67 insertions, 7 deletions

diff --git a/deps/npm/test/fixtures/config/userconfig-with-gc b/deps/npm/test/fixtures/config/userconfig-with-gc
index cf774bb883..866f78dab6 100644
--- a/deps/npm/test/fixtures/config/userconfig-with-gc
+++ b/deps/npm/test/fixtures/config/userconfig-with-gc
@@ -1,4 +1,4 @@
-globalconfig = /Users/isaacs/dev/npm/cli/test/fixtures/config/globalconfig
+globalconfig = /Users/ruyadorno/Documents/workspace/cli/test/fixtures/config/globalconfig
 email = i@izs.me
 env-thing = ${random_env_var}
 init.author.name = Isaac Z. Schlueter
diff --git a/deps/npm/test/tap/bin-overwriting.js b/deps/npm/test/tap/bin-overwriting.js
index 155d4abf52..faaa78745a 100644
--- a/deps/npm/test/tap/bin-overwriting.js
+++ b/deps/npm/test/tap/bin-overwriting.js
@@ -8,10 +8,11 @@ const path = require('path')
 const readBinCb = process.platform === 'win32' ? readCmdShim : readlink
 const readBin = bin => new Promise((resolve, reject) => {
   readBinCb(bin, (er, target) => {
-    if (er)
+    if (er) {
       reject(er)
-    else
-      resolve(path.resolve(pkg + '/global/bin', target))
+    } else {
+      resolve(path.resolve(path.dirname(bin), target))
+    }
   })
 })
 
diff --git a/deps/npm/test/tap/ci.js b/deps/npm/test/tap/ci.js
index 3f3e251d03..f635957805 100644
--- a/deps/npm/test/tap/ci.js
+++ b/deps/npm/test/tap/ci.js
@@ -12,6 +12,7 @@ const test = require('tap').test
 
 const Dir = Tacks.Dir
 const File = Tacks.File
+const cacheDir = common.cache
 const testDir = common.pkg
 
 const EXEC_OPTS = { cwd: testDir }
@@ -47,7 +48,7 @@ test('setup', () => {
   const fixture = new Tacks(Dir({
     'package.json': File(PKG)
   }))
-  return rimraf(testDir).then(() => {
+  return Promise.all([rimraf(cacheDir), rimraf(testDir)]).then(() => {
     fixture.create(testDir)
     return mr({port: common.port})
   })
@@ -306,7 +307,35 @@ test('errors if package-lock.json invalid', (t) => {
     )
 })
 
+test('correct cache location when using cache config', (t) => {
+  const fixture = new Tacks(Dir({
+    'package.json': File(PKG),
+    'package-lock.json': File(RAW_LOCKFILE)
+  }))
+  return Promise.all([rimraf(cacheDir), rimraf(testDir)])
+    .then(() => fixture.create(cacheDir))
+    .then(() => fixture.create(testDir))
+    .then(() => common.npm([
+      'ci',
+      `--cache=${cacheDir}`,
+      '--foo=asdf',
+      '--registry', common.registry,
+      '--loglevel', 'warn'
+    ], EXEC_OPTS))
+    .then((ret) => {
+      const code = ret[0]
+      const stderr = ret[2]
+      t.equal(code, 0, 'command completed without error')
+      t.equal(stderr.trim(), '', 'no output on stderr')
+      return fs.readdirAsync(path.join(cacheDir, '_cacache'))
+    })
+    .then((modules) => {
+      t.ok(modules, 'should create _cacache folder')
+      t.end()
+    })
+})
+
 test('cleanup', () => {
   SERVER.close()
-  return rimraf(testDir)
+  return Promise.all([rimraf(cacheDir), rimraf(testDir)])
 })
diff --git a/deps/npm/test/tap/version-allow-same-version.js b/deps/npm/test/tap/version-allow-same-version.js
index 41310e4eb2..14506aac7d 100644
--- a/deps/npm/test/tap/version-allow-same-version.js
+++ b/deps/npm/test/tap/version-allow-same-version.js
@@ -22,6 +22,21 @@ t.test('setup', t => {
 
 t.test('without --allow-same-version', t => {
   npm.config.set('allow-same-version', false)
+
+  const version = require('../../lib/version')
+
+  const commit1 = version.buildCommitArgs()
+  const commit2 = version.buildCommitArgs([ 'commit' ])
+  const commit3 = version.buildCommitArgs([ 'commit', '-m', 'some commit message' ])
+
+  t.same(commit1, [ 'commit' ])
+  t.same(commit2, [ 'commit' ])
+  t.same(commit3, [ 'commit', '-m', 'some commit message' ])
+
+  const tag = version.buildTagFlags()
+
+  t.same(tag, '-m')
+
   npm.commands.version(['0.0.1'], function (err) {
     t.isa(err, Error, 'got an error')
     t.like(err.message, /Version not changed/)
@@ -31,6 +46,21 @@ t.test('without --allow-same-version', t => {
 
 t.test('with --allow-same-version', t => {
   npm.config.set('allow-same-version', true)
+
+  const version = require('../../lib/version')
+
+  const commit1 = version.buildCommitArgs()
+  const commit2 = version.buildCommitArgs([ 'commit' ])
+  const commit3 = version.buildCommitArgs([ 'commit', '-m', 'some commit message' ])
+
+  t.same(commit1, [ 'commit', '--allow-empty' ])
+  t.same(commit2, [ 'commit', '--allow-empty' ])
+  t.same(commit3, [ 'commit', '--allow-empty', '-m', 'some commit message' ])
+
+  const tag = version.buildTagFlags()
+
+  t.same(tag, '-fm')
+
   npm.commands.version(['0.0.1'], function (err) {
     if (err) {
       throw err
diff --git a/deps/npm/test/tap/version-commit-hooks.js b/deps/npm/test/tap/version-commit-hooks.js
index 028767ab4e..36694d7eae 100644
--- a/deps/npm/test/tap/version-commit-hooks.js
+++ b/deps/npm/test/tap/version-commit-hooks.js
@@ -33,7 +33,7 @@ test('npm version <semver> with commit-hooks disabled', function (t) {
 
     t.same(args1, [ 'commit', '-n' ])
     t.same(args2, [ 'commit', '-n' ])
-    t.same(args3, [ 'commit', '-m', 'some commit message', '-n' ])
+    t.same(args3, [ 'commit', '-n', '-m', 'some commit message' ])
     t.end()
   })
 })