deps: upgrade npm to 7.7.5

PR-URL: #37919 Reviewed-By: Rich Trott <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Beth Griggs <[email protected]>
nodejs · Mar 30, 2021 · ec82feb · ec82feb
1 parent 1c04327
commit ec82feb
Show file tree

Hide file tree

Showing 16 changed files with 752 additions and 13 deletions.
diff --git a/deps/npm/.npmignore b/deps/npm/.npmignore
@@ -39,3 +39,7 @@ docs/template.html
 Session.vim
 .nyc_output
 /.editorconfig
+
+# don't ship smoke tests
+smoke-tests/
+tap-snapshots/smoke-tests-index.js-TAP.test.js
diff --git a/deps/npm/AUTHORS b/deps/npm/AUTHORS
@@ -767,3 +767,4 @@ Eric Chow <[email protected]>
 kbayrhammer <[email protected]>
 James Chen-Smith <[email protected]>
 Yash Singh <[email protected]>
+Danielle Church <[email protected]>
diff --git a/deps/npm/CHANGELOG.md b/deps/npm/CHANGELOG.md
@@ -1,3 +1,31 @@
+## v7.7.5 (2021-03-25)
+
+### BUG FIXES
+
+* [`95ba87622`](https://github.com/npm/cli/commit/95ba87622e00d68270eda9e071b19737718fca16)
+  [#2949](https://github.com/npm/cli/issues/2949)
+  fix handling manual indexes in `npm help`
+  ([@dmchurch](https://github.com/dmchurch))
+* [`59cf37962`](https://github.com/npm/cli/commit/59cf37962a2286e0f7d3bd37fa9c8bc3bac94218)
+  [#2958](https://github.com/npm/cli/issues/2958)
+  always set `npm.command` to canonical command name
+  ([@isaacs](https://github.com/isaacs))
+* [`1415b4bde`](https://github.com/npm/cli/commit/1415b4bdeeaabb6e0ba12b6b1b0cc56502bd64ab)
+  [#2964](https://github.com/npm/cli/issues/2964)
+  fix(config): properly translate user-agent
+  ([@wraithgar](https://github.com/wraithgar))
+* [`59271936d`](https://github.com/npm/cli/commit/59271936d90fbd6956a41967119f578c0ba63db9)
+  [#2965](https://github.com/npm/cli/issues/2965)
+  fix(config): tie save-exact/save-prefix together
+  ([@wraithgar](https://github.com/wraithgar))
+
+### TESTS
+
+* [`97b415287`](https://github.com/npm/cli/commit/97b41528739460b2e9e72e09000aded412418cb2)
+  [#2959](https://github.com/npm/cli/issues/2959)
+  add smoke tests
+  ([@ruyadorno](https://github.com/ruyadorno))
+
 ## v7.7.4 (2021-03-24)
 
 ### BUG FIXES

diff --git a/deps/npm/docs/output/commands/npm-ls.html b/deps/npm/docs/output/commands/npm-ls.html
@@ -159,7 +159,7 @@ <h3 id="description">Description</h3>
 the results to only the paths to the packages named.  Note that nested
 packages will <em>also</em> show the paths to the specified packages.  For
 example, running <code>npm ls promzard</code> in npm’s source tree will show:</p>
-<pre lang="bash"><code>[email protected].4 /path/to/npm
+<pre lang="bash"><code>[email protected].5 /path/to/npm
 └─┬ [email protected]
   └── [email protected]
 </code></pre>

diff --git a/deps/npm/docs/output/commands/npm.html b/deps/npm/docs/output/commands/npm.html
@@ -148,7 +148,7 @@ <h2 id="table-of-contents">Table of contents</h2>
 <pre lang="bash"><code>npm &lt;command&gt; [args]
 </code></pre>
 <h3 id="version">Version</h3>
-<p>7.7.4</p>
+<p>7.7.5</p>
 <h3 id="description">Description</h3>
 <p>npm is the package manager for the Node JavaScript platform.  It puts
 modules in place so that node can find them, and manages dependency

diff --git a/deps/npm/lib/help.js b/deps/npm/lib/help.js
@@ -9,7 +9,7 @@ const BaseCommand = require('./base-command.js')
 // Strips out the number from foo.7 or foo.7. or foo.7.tgz
 // We don't currently compress our man pages but if we ever did this would
 // seemlessly continue supporting it
-const manNumberRegex = /\.(\d+)(\..*)?$/
+const manNumberRegex = /\.(\d+)(\.[^/\\]*)?$/
 
 class Help extends BaseCommand {
   /* istanbul ignore next - see test/lib/load-all-commands.js */

diff --git a/deps/npm/lib/npm.js b/deps/npm/lib/npm.js
@@ -25,7 +25,7 @@ const proxyCmds = new Proxy({}, {
       // old way of doing things, until we can make breaking changes to the
       // npm.commands[x] api
       target[actual] = new Proxy(
-        (args, cb) => npm[_runCmd](cmd, impl, args, cb),
+        (args, cb) => npm[_runCmd](actual, impl, args, cb),
         {
           get: (target, attr, receiver) => {
             return Reflect.get(impl, attr, receiver)

diff --git a/deps/npm/lib/utils/config/definitions.js b/deps/npm/lib/utils/config/definitions.js
@@ -1526,7 +1526,10 @@ define('save-exact', {
     Dependencies saved to package.json will be configured with an exact
     version rather than using npm's default semver range operator.
   `,
-  flatten,
+  flatten (key, obj, flatOptions) {
+    // just call the save-prefix flattener, it reads from obj['save-exact']
+    definitions['save-prefix'].flatten('save-prefix', obj, flatOptions)
+  },
 })
 
 define('save-optional', {
@@ -1595,6 +1598,7 @@ define('save-prefix', {
   `,
   flatten (key, obj, flatOptions) {
     flatOptions.savePrefix = obj['save-exact'] ? '' : obj['save-prefix']
+    obj['save-prefix'] = flatOptions.savePrefix
   },
 })
 
@@ -1970,6 +1974,11 @@ define('user-agent', {
         .replace(/\{arch\}/gi, process.arch)
         .replace(/\{ci\}/gi, ciName ? `ci/${ciName}` : '')
         .trim()
+    // user-agent is a unique kind of config item that gets set from a template
+    // and ends up translated.  Because of this, the normal "should we set this
+    // to process.env also doesn't work
+    obj[key] = flatOptions.userAgent
+    process.env.npm_config_user_agent = flatOptions.userAgent
   },
 })
 

diff --git a/deps/npm/man/man1/npm-ls.1 b/deps/npm/man/man1/npm-ls.1
@@ -26,7 +26,7 @@ example, running \fBnpm ls promzard\fP in npm's source tree will show:
 .P
 .RS 2
 .nf
-npm@7\.7\.4 /path/to/npm
+npm@7\.7\.5 /path/to/npm
 └─┬ init\-package\-json@0\.0\.4
   └── promzard@0\.1\.5
 .fi

diff --git a/deps/npm/man/man1/npm.1 b/deps/npm/man/man1/npm.1
@@ -10,7 +10,7 @@ npm <command> [args]
 .RE
 .SS Version
 .P
-7\.7\.4
+7\.7\.5
 .SS Description
 .P
 npm is the package manager for the Node JavaScript platform\.  It puts

diff --git a/deps/npm/package.json b/deps/npm/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "7.7.4",
+  "version": "7.7.5",
   "name": "npm",
   "description": "a package manager for JavaScript",
   "keywords": [
@@ -207,7 +207,8 @@
     "lint": "npm run eslint -- test/lib test/bin \"lib/**/*.js\"",
     "lintfix": "npm run lint -- --fix",
     "prelint": "rimraf test/npm_cache*",
-    "resetdeps": "bash scripts/resetdeps.sh"
+    "resetdeps": "bash scripts/resetdeps.sh",
+    "smoke-tests": "tap smoke-tests/index.js"
   },
   "//": [
     "XXX temporarily only run unit tests while v7 beta is in progress",
-Original file line number
+Diff line change
@@ Expand Up / @@ -10,7 +10,7 @@ npm <command> [args] @@
     .RE
     .SS Version
     .P
-\.7\.4
+\.7\.5
     .SS Description
     .P
     npm is the package manager for the Node JavaScript platform\.  It puts
@@ Expand Down @@