deps: upgrade npm to 6.1.0

PR-URL: https://github.com/nodejs/node/pull/20190
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Ruben Bridgewater <ruben@bridgewater.de>
Reviewed-By: Tiancheng "Timothy" Gu <timothygu99@gmail.com>
Reviewed-By: Benjamin Gruenbaum <benjamingr@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>

4 files changed, 32 insertions, 30 deletions

diff --git a/deps/npm/scripts/changelog.js b/deps/npm/scripts/changelog.js
index 07c8eef94a..ff6e43e385 100644
--- a/deps/npm/scripts/changelog.js
+++ b/deps/npm/scripts/changelog.js
@@ -29,7 +29,7 @@ function shortname (url) {
   }
 }
 
-function print_commit (c) {
+function printCommit (c) {
   console.log(`* [\`${c.shortid}\`](https://github.com/npm/npm/commit/${c.fullid})`)
   if (c.fixes) {
     let label = shortname(c.fixes)
@@ -51,10 +51,10 @@ function print_commit (c) {
     .replace(/^[-a-z]+: /, '')
     .replace(/^/mg, '  ')
     .replace(/\n$/, '')
-  // backtickify package@version
+    // backtickify package@version
     .replace(/^(\s*[^@\s]+@\d+[.]\d+[.]\d+)(\s*\S)/g, '$1:$2')
     .replace(/\b([^@\s]+@\d+[.]\d+[.]\d+)\b/g, '`$1`')
-  // linkify commitids
+    // linkify commitids
     .replace(/\b([a-f0-9]{7,8})\b/g, '[`$1`](https://github.com/npm/npm/commit/$1)')
     .replace(/\b#(\d+)\b/g, '[#$1](https://github.com/npm/npm/issues/$1)')
   console.log(msg)
@@ -71,9 +71,9 @@ function main () {
   let commit
   log.forEach(function (line) {
     let m
-    /*eslint no-cond-assign:0*/
+    /* eslint no-cond-assign:0 */
     if (/^---$/.test(line)) {
-      print_commit(commit)
+      printCommit(commit)
     } else if (m = line.match(/^([a-f0-9]{7,9}) ([a-f0-9]+) (?:[(]([^)]+)[)] )?(.*?) [(](.*?)[)]/)) {
       commit = {
         shortid: m[1],
diff --git a/deps/npm/scripts/index-build.js b/deps/npm/scripts/index-build.js
index 058bc74019..e782716d77 100755
--- a/deps/npm/scripts/index-build.js
+++ b/deps/npm/scripts/index-build.js
@@ -18,10 +18,10 @@ glob(root + '/{README.md,doc/*/*.md}', function (er, files) {
     return f
   }).sort(function (a, b) {
     return (a[0] === b[0])
-            ? (path.basename(a[1]) === 'npm.md' ? -1
-            : path.basename(b[1]) === 'npm.md' ? 1
-            : a[1] > b[1] ? 1 : -1)
-            : a[0] - b[0]
+      ? (path.basename(a[1]) === 'npm.md' ? -1
+        : path.basename(b[1]) === 'npm.md' ? 1
+          : a[1] > b[1] ? 1 : -1)
+      : a[0] - b[0]
   }))
 })
 
diff --git a/deps/npm/scripts/maketest b/deps/npm/scripts/maketest
index a71cadbc8c..118eb5fbc7 100755
--- a/deps/npm/scripts/maketest
+++ b/deps/npm/scripts/maketest
@@ -1,6 +1,6 @@
 #!/usr/bin/env node
 'use strict'
-var loadFromDir = require('tacks/load-from-dir.js')
+const loadFromDir = require('tacks/load-from-dir.js')
 
 process.exit(main(process.argv.slice(2)))
 
@@ -9,7 +9,7 @@ function main (argv) {
     console.error('Usage: maketest <fixturedir>')
     return 1
   }
-  var fixturedir = process.argv[2]
+  const fixturedir = process.argv[2]
 
   console.log(generateFromDir(fixturedir))
   return 0
@@ -20,27 +20,26 @@ function indent (ind, str) {
 }
 
 function generateFromDir (dir) {
-  var tacks = loadFromDir(dir)
+  const tacks = loadFromDir(dir)
   return `'use strict'
-var path = require('path')
-var test = require('tap').test
-var mr = require('npm-registry-mock')
-var Tacks = require('tacks')
-var File = Tacks.File
-var Symlink = Tacks.Symlink
-var Dir = Tacks.Dir
-var extend = Object.assign || require('util')._extend
-var common = require('../common-tap.js')
+const path = require('path')
+const test = require('tap').test
+const mr = require('npm-registry-mock')
+const Tacks = require('tacks')
+const File = Tacks.File
+const Symlink = Tacks.Symlink
+const Dir = Tacks.Dir
+const common = require('../common-tap.js')
 
-var basedir = path.join(__dirname, path.basename(__filename, '.js'))
-var testdir = path.join(basedir, 'testdir')
-var cachedir = path.join(basedir, 'cache')
-var globaldir = path.join(basedir, 'global')
-var tmpdir = path.join(basedir, 'tmp')
+const basedir = path.join(__dirname, path.basename(__filename, '.js'))
+const testdir = path.join(basedir, 'testdir')
+const cachedir = path.join(basedir, 'cache')
+const globaldir = path.join(basedir, 'global')
+const tmpdir = path.join(basedir, 'tmp')
 
-var conf = {
+const conf = {
   cwd: testdir,
-  env: extend(extend({}, process.env), {
+  env: Object.assign({}, process.env, {
     npm_config_cache: cachedir,
     npm_config_tmp: tmpdir,
     npm_config_prefix: globaldir,
@@ -49,8 +48,8 @@ var conf = {
   })
 }
 
-var server
-var fixture = new Tacks(Dir({
+let server
+const fixture = new Tacks(Dir({
   cache: Dir(),
   global: Dir(),
   tmp: Dir(),
diff --git a/deps/npm/scripts/release.sh b/deps/npm/scripts/release.sh
index 1a0c3b6875..705f21502a 100644
--- a/deps/npm/scripts/release.sh
+++ b/deps/npm/scripts/release.sh
@@ -12,6 +12,7 @@ node ./bin/npm-cli.js pack --loglevel error >/dev/null
 mv *.tgz release
 cd release
 tar xzf *.tgz
+cp -r ../test package/
 
 mkdir node_modules
 mv package node_modules/npm
@@ -32,5 +33,7 @@ mv "node_modules/$tarname" .
 rm -rf *.cmd
 rm -rf node_modules
 
+cd ..
+
 echo "release/$tarname"
 echo "release/$zipname"