deps: upgrade npm to 6.14.5

PR-URL: #33239
Reviewed-By: Colin Ihrig <[email protected]>
Reviewed-By: Michaël Zasso <[email protected]>

Author: ruyadorno

deps/npm/.npmignore

@@ -24,5 +24,5 @@ html/*.png
 
 *.pyc
 
-
+Session.vim
 .nyc_output

deps/npm/.travis.yml

@@ -12,9 +12,6 @@ node_js:
 
 env: "DEPLOY_VERSION=testing"
 
-notifications:
-    slack: npm-inc:kRqQjto7YbINqHPb1X6nS3g8
-
 install:
   - "node . install"
 

deps/npm/AUTHORS

@@ -691,3 +691,7 @@ Vitaliy Markitanov <[email protected]>
 simon_s <[email protected]>
 John Kennedy <[email protected]>
 Bernard Kitchens <[email protected]>
+Jarda Snajdr <[email protected]>
+Naix Geng <[email protected]>
+Dylan Treisman <[email protected]>
+mum-never-proud <[email protected]>

deps/npm/CHANGELOG.md

@@ -63,7 +63,7 @@ function init (args, cb) {
       'This utility will walk you through creating a package.json file.',
       'It only covers the most common items, and tries to guess sensible defaults.',
       '',
-      'See `npm help json` for definitive documentation on these fields',
+      'See `npm help init` for definitive documentation on these fields',
       'and exactly what they do.',
       '',
       'Use `npm install <pkg>` afterwards to install a package and',

deps/npm/CONTRIBUTING.md

@@ -74,7 +74,10 @@ function doesChildVersionMatch (child, requested, requestor) {
     var childReq = child.package._requested
     if (childReq) {
       if (childReq.rawSpec === requested.rawSpec) return true
-      if (childReq.type === requested.type && childReq.saveSpec === requested.saveSpec) return true
+      if (childReq.type === requested.type) {
+        if (childReq.saveSpec === requested.saveSpec) return true
+        if (childReq.fetchSpec === requested.fetchSpec) return true
+      }
     }
     // If _requested didn't exist OR if it didn't match then we'll try using
     // _from. We pass it through npa to normalize the specifier.
@@ -200,6 +203,7 @@ function removeObsoleteDep (child, log) {
   })
 }
 
+exports.packageRelativePath = packageRelativePath
 function packageRelativePath (tree) {
   if (!tree) return ''
   var requested = tree.package._requested || {}
@@ -570,7 +574,7 @@ function addDependency (name, versionSpec, tree, log, done) {
   try {
     var req = childDependencySpecifier(tree, name, versionSpec)
     if (tree.swRequires && tree.swRequires[name]) {
-      var swReq = childDependencySpecifier(tree, name, tree.swRequires[name], tree.package._where)
+      var swReq = childDependencySpecifier(tree, name, tree.swRequires[name])
     }
   } catch (err) {
     return done(err)

deps/npm/docs/content/cli-commands/npm.md

@@ -1,12 +1,15 @@
 'use strict'
 const npa = require('npm-package-arg')
 const moduleName = require('../utils/module-name.js')
-
+const packageRelativePath = require('./deps').packageRelativePath
 module.exports = function (child, reqBy) {
   if (!child.requiredBy.length) return
   if (!reqBy) reqBy = child.requiredBy[0]
   const deps = reqBy.package.dependencies || {}
   const devDeps = reqBy.package.devDependencies || {}
+  const optDeps = reqBy.package.optionalDependencies || {}
   const name = moduleName(child)
-  return npa.resolve(name, deps[name] || devDeps[name], reqBy.realpath)
+  const spec = deps[name] || devDeps[name] || optDeps[name]
+  const where = packageRelativePath(reqBy)
+  return npa.resolve(name, spec, where)
 }

deps/npm/docs/content/using-npm/scripts.md

@@ -89,6 +89,20 @@ function tarballToVersion (name, tb) {
   return match[2] || match[1]
 }
 
+function relativizeLink (name, spec, topPath, requested) {
+  if (!spec.startsWith('file:')) {
+    return
+  }
+
+  let requestedPath = requested.fetchSpec
+  if (requested.type === 'file') {
+    requestedPath = path.dirname(requestedPath)
+  }
+
+  const relativized = path.relative(requestedPath, path.resolve(topPath, spec.slice(5)))
+  return 'file:' + relativized
+}
+
 function inflatableChild (onDiskChild, name, topPath, tree, sw, requested, opts) {
   validate('OSSOOOO|ZSSOOOO', arguments)
   const usesIntegrity = (
@@ -101,7 +115,14 @@ function inflatableChild (onDiskChild, name, topPath, tree, sw, requested, opts)
     sw.resolved = sw.version
     sw.version = regTarball
   }
-  if (sw.requires) Object.keys(sw.requires).map(_ => { sw.requires[_] = tarballToVersion(_, sw.requires[_]) || sw.requires[_] })
+  if (sw.requires) {
+    Object.keys(sw.requires).forEach(name => {
+      const spec = sw.requires[name]
+      sw.requires[name] = tarballToVersion(name, spec) ||
+        relativizeLink(name, spec, topPath, requested) ||
+        spec
+    })
+  }
   const modernLink = requested.type === 'directory' && !sw.from
   if (hasModernMeta(onDiskChild) && childIsEquivalent(sw, requested, onDiskChild)) {
     // The version on disk matches the shrinkwrap entry.

deps/npm/docs/public/cli-commands/npm-access/index.html

@@ -1,4 +1,4 @@
-.TH "NPM" "1" "March 2020" "" ""
+.TH "NPM" "1" "May 2020" "" ""
 .SH "NAME"
 \fBnpm\fR \- a JavaScript package manager
 .P

deps/npm/docs/public/cli-commands/npm-adduser/index.html

@@ -1,4 +1,4 @@
-.TH "NPM\-ACCESS" "1" "March 2020" "" ""
+.TH "NPM\-ACCESS" "1" "May 2020" "" ""
 .SH "NAME"
 \fBnpm-access\fR \- Set access level on published packages
 .SS Synopsis

deps/npm/docs/public/cli-commands/npm-audit/index.html

@@ -3,7 +3,7 @@
 section: cli\-commands
 title: npm\-adduser
 .SH description: Set access level on published packages
-.TH "NPM\-ADDUSER" "1" "March 2020" "" ""
+.TH "NPM\-ADDUSER" "1" "May 2020" "" ""
 .SH "NAME"
 \fBnpm-adduser\fR \- Add a registry user account
 .SS Synopsis

deps/npm/docs/public/cli-commands/npm-bin/index.html

@@ -1,4 +1,4 @@
-.TH "NPM\-AUDIT" "1" "March 2020" "" ""
+.TH "NPM\-AUDIT" "1" "May 2020" "" ""
 .SH "NAME"
 \fBnpm-audit\fR \- Run a security audit
 .SS Synopsis

deps/npm/docs/public/cli-commands/npm-bugs/index.html

@@ -1,4 +1,4 @@
-.TH "NPM\-BIN" "1" "March 2020" "" ""
+.TH "NPM\-BIN" "1" "May 2020" "" ""
 .SH "NAME"
 \fBnpm-bin\fR \- Display npm bin folder
 .SS Synopsis

deps/npm/docs/public/cli-commands/npm-build/index.html

@@ -1,4 +1,4 @@
-.TH "NPM\-BUGS" "1" "March 2020" "" ""
+.TH "NPM\-BUGS" "1" "May 2020" "" ""
 .SH "NAME"
 \fBnpm-bugs\fR \- Bugs for a package in a web browser maybe
 .SS Synopsis

deps/npm/docs/public/cli-commands/npm-bundle/index.html

@@ -1,4 +1,4 @@
-.TH "NPM\-BUILD" "1" "March 2020" "" ""
+.TH "NPM\-BUILD" "1" "May 2020" "" ""
 .SH "NAME"
 \fBnpm-build\fR \- Build a package
 .SS Synopsis

deps/npm/docs/public/cli-commands/npm-cache/index.html

@@ -1,4 +1,4 @@
-.TH "NPM\-BUNDLE" "1" "March 2020" "" ""
+.TH "NPM\-BUNDLE" "1" "May 2020" "" ""
 .SH "NAME"
 \fBnpm-bundle\fR \- REMOVED
 .SS Description

deps/npm/docs/public/cli-commands/npm-ci/index.html

@@ -1,4 +1,4 @@
-.TH "NPM\-CACHE" "1" "March 2020" "" ""
+.TH "NPM\-CACHE" "1" "May 2020" "" ""
 .SH "NAME"
 \fBnpm-cache\fR \- Manipulates packages cache
 .SS Synopsis

deps/npm/docs/public/cli-commands/npm-completion/index.html

@@ -1,4 +1,4 @@
-.TH "NPM\-CI" "1" "March 2020" "" ""
+.TH "NPM\-CI" "1" "May 2020" "" ""
 .SH "NAME"
 \fBnpm-ci\fR \- Install a project with a clean slate
 .SS Synopsis

deps/npm/docs/public/cli-commands/npm-config/index.html

@@ -1,4 +1,4 @@
-.TH "NPM\-COMPLETION" "1" "March 2020" "" ""
+.TH "NPM\-COMPLETION" "1" "May 2020" "" ""
 .SH "NAME"
 \fBnpm-completion\fR \- Tab Completion for npm
 .SS Synopsis

deps/npm/docs/public/cli-commands/npm-dedupe/index.html

@@ -1,4 +1,4 @@
-.TH "NPM\-CONFIG" "1" "March 2020" "" ""
+.TH "NPM\-CONFIG" "1" "May 2020" "" ""
 .SH "NAME"
 \fBnpm-config\fR \- Manage the npm configuration files
 .SS Synopsis

deps/npm/docs/public/cli-commands/npm-deprecate/index.html

@@ -1,4 +1,4 @@
-.TH "NPM\-DEDUPE" "1" "March 2020" "" ""
+.TH "NPM\-DEDUPE" "1" "May 2020" "" ""
 .SH "NAME"
 \fBnpm-dedupe\fR \- Reduce duplication
 .SS Synopsis

deps/npm/docs/public/cli-commands/npm-dist-tag/index.html

@@ -1,4 +1,4 @@
-.TH "NPM\-DEPRECATE" "1" "March 2020" "" ""
+.TH "NPM\-DEPRECATE" "1" "May 2020" "" ""
 .SH "NAME"
 \fBnpm-deprecate\fR \- Deprecate a version of a package
 .SS Synopsis

deps/npm/docs/public/cli-commands/npm-docs/index.html

@@ -3,7 +3,7 @@
 section: cli\-commands
 title: npm\-dist\-tag
 .SH description: Modify package distribution tags
-.TH "NPM\-DIST\-TAG" "1" "March 2020" "" ""
+.TH "NPM\-DIST\-TAG" "1" "May 2020" "" ""
 .SH "NAME"
 \fBnpm-dist-tag\fR \- Modify package distribution tags
 .SS Synopsis

deps/npm/docs/public/cli-commands/npm-doctor/index.html

@@ -1,4 +1,4 @@
-.TH "NPM\-DOCS" "1" "March 2020" "" ""
+.TH "NPM\-DOCS" "1" "May 2020" "" ""
 .SH "NAME"
 \fBnpm-docs\fR \- Docs for a package in a web browser maybe
 .SS Synopsis

deps/npm/docs/public/cli-commands/npm-edit/index.html

@@ -1,4 +1,4 @@
-.TH "NPM\-DOCTOR" "1" "March 2020" "" ""
+.TH "NPM\-DOCTOR" "1" "May 2020" "" ""
 .SH "NAME"
 \fBnpm-doctor\fR \- Check your environments
 .SS Synopsis

deps/npm/docs/public/cli-commands/npm-explore/index.html

@@ -1,4 +1,4 @@
-.TH "NPM\-EDIT" "1" "March 2020" "" ""
+.TH "NPM\-EDIT" "1" "May 2020" "" ""
 .SH "NAME"
 \fBnpm-edit\fR \- Edit an installed package
 .SS Synopsis

deps/npm/docs/public/cli-commands/npm-fund/index.html

@@ -3,7 +3,7 @@
 section: cli\-commands
 title: npm\-explore
 .SH description: Browse an installed package
-.TH "NPM\-EXPLORE" "1" "March 2020" "" ""
+.TH "NPM\-EXPLORE" "1" "May 2020" "" ""
 .SH "NAME"
 \fBnpm-explore\fR \- Browse an installed package
 .SS Synopsis

deps/npm/docs/public/cli-commands/npm-help-search/index.html

@@ -1,4 +1,4 @@
-.TH "NPM\-FUND" "1" "March 2020" "" ""
+.TH "NPM\-FUND" "1" "May 2020" "" ""
 .SH "NAME"
 \fBnpm-fund\fR \- Retrieve funding information
 .SS Synopsis

deps/npm/docs/public/cli-commands/npm-help/index.html

@@ -1,4 +1,4 @@
-.TH "NPM\-HELP\-SEARCH" "1" "March 2020" "" ""
+.TH "NPM\-HELP\-SEARCH" "1" "May 2020" "" ""
 .SH "NAME"
 \fBnpm-help-search\fR \- Search npm help documentation
 .SS Synopsis

deps/npm/docs/public/cli-commands/npm-hook/index.html

@@ -1,4 +1,4 @@
-.TH "NPM\-HELP" "1" "March 2020" "" ""
+.TH "NPM\-HELP" "1" "May 2020" "" ""
 .SH "NAME"
 \fBnpm-help\fR \- Get help on npm
 .SS Synopsis