deps: upgrade npm to 7.5.4

deps/npm/CHANGELOG.md

@@ -1,3 +1,71 @@
+## v7.5.4 (2021-02-12)
+
+### BUG FIXES
+
+* [`ef687f545`](https://github.com/npm/cli/commit/ef687f545b177d0496ce74faacf1bf738978355a)
+  [#2655](https://github.com/npm/cli/issues/2655)
+  fix(env): Do not clobber defined 'env' script
+  ([@isaacs](https://github.com/isaacs))
+* [`868954a72`](https://github.com/npm/cli/commit/868954a72c06ff2210b35e1e75571f4ec3357c43)
+  [#2654](https://github.com/npm/cli/issues/2654)
+  [fix] node v10.0 lacks `fs.promises`
+  ([@ljharb](https://github.com/ljharb))
+
+
+### DEPENDENCIES
+
+* [`14dd93853`](https://github.com/npm/cli/commit/14dd9385358b3815c2285526f7c2e53ed3c5e8da)
+  fix(package.json): resetdeps
+  ([@wraithgar](https://github.com/wraithgar))
+* [`39e4a6401`](https://github.com/npm/cli/commit/39e4a640130b85d62199a33cc2026b04390520ee)
+  `graceful-fs@4.2.6`
+* [`96dffab98`](https://github.com/npm/cli/commit/96dffab988048164516d8cf73c1fbf66781f86df)
+  `eslint-plugin-promise@4.3.1`
+* [`9a6e9d38a`](https://github.com/npm/cli/commit/9a6e9d38abccec793b6ac14871c2b639d62a6c41)
+  `@npmcli/run-script@1.8.3`
+    * fix fs.promises reference to run in node v10.0
+* [`584b746a2`](https://github.com/npm/cli/commit/584b746a2c8cdc697629298be27dd23d19de1231)
+  `@npmcli/git@2.0.5`
+* [`6305ebde4`](https://github.com/npm/cli/commit/6305ebde43796737014aedbe019db8cd81dcbbec)
+  `make-fetch-happen@8.0.14`
+* [`e99881117`](https://github.com/npm/cli/commit/e998811170ce5df00a725b2d683b4bff124c6792)
+  `libnpmversion@1.0.10`
+* [`554d91cdf`](https://github.com/npm/cli/commit/554d91cdf82e9c92c2ac3752ed91e7081c2271e5)
+  chore(package-lock): rebuild package-lock
+  ([@wraithgar](https://github.com/wraithgar))
+* [`37e8cc507`](https://github.com/npm/cli/commit/37e8cc507b2ce0b89f92e7e77b1d909d1bf5513f)
+  `@npmcli/arborist@2.2.2`
+    * [#2505](https://github.com/npm/cli/issues/2505) properly install
+      dependenciess of linked dependencies
+      ([@ruyadorno](https://github.com/ruyadorno))
+    * [#2504](https://github.com/npm/cli/issues/2504) Allow `--force` to
+      override conflicted optional peerDependencies
+      ([@isaacs](https://github.com/isaacs))
+    * Ensure correct flags on shrinkwrapped module deps
+      ([@isaacs](https://github.com/isaacs))
+    * Correct relative paths for global packages installed from tarball files
+      ([nlf](https://github.com/nlf))
+* [`7788ce47b`](https://github.com/npm/cli/commit/7788ce47bc264d9d951055da85f2b695eb8b3f15)
+  `@npmcli/map-workspaces@1.0.3`
+
+### TESTS
+
+* [`3a159d27e`](https://github.com/npm/cli/commit/3a159d27e976933098ec18fa9c3e474c85b5b332)
+  [#2681](https://github.com/npm/cli/issues/2681)
+  fix(tests): rewrite doctor tests
+  ([@ljharb](https://github.com/ljharb))
+* [`abcc96a20`](https://github.com/npm/cli/commit/abcc96a204ed581fc7cd603f47cdca0afe299530)
+  [#2682](https://github.com/npm/cli/issues/2682)
+  [tests] separate tests from linting and license validation
+  ([@ljharb](https://github.com/ljharb))
+
+### DOCUMENTATION
+
+* [`7e1e84181`](https://github.com/npm/cli/commit/7e1e84181ccaca8a8b499a21b1aa7d731a14d5b7)
+  [#2662](https://github.com/npm/cli/issues/2662)
+  fix(docs): fix angle brackets in npm diff docs
+  ([@ethomson](https://github.com/ethomson))
+
 ## v7.5.3 (2021-02-08)
 
 ### BUG FIXES

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

@@ -82,11 +82,11 @@ of files for packages published to the npm registry.
     When using a single package name (with no version or tag specifier) as an
     argument, `npm diff` will work in a similar way to
     [`npm-outdated`](npm-outdated) and reach for the registry to figure out
-    what current published version of the package named <pkg-name> will satisfy
-    its dependent declared semver-range. Once that specific version is known
-    `npm diff` will print diff patches comparing the current version of
-    <pkg-name> found in the local file system with that specific version
-    returned by the registry.
+    what current published version of the package named `<pkg-name>`
+    will satisfy its dependent declared semver-range. Once that specific
+    version is known `npm diff` will print diff patches comparing the
+    current version of `<pkg-name>` found in the local file system with
+    that specific version returned by the registry.
 
     Given a package named `abbrev` that is currently installed:
 
@@ -155,7 +155,7 @@ located within the folder `./lib/` and changed lines of code within the
 
 #### diff
 
-* Type: Array<String>
+* Type: Array
 * Default: null
 
 Defines npm package specifiers to compare using the `npm diff` command.

deps/npm/docs/output/commands/npm-diff.html

@@ -206,11 +206,11 @@ <h3 id="description">Description</h3>
 <p>When using a single package name (with no version or tag specifier) as an
 argument, <code>npm diff</code> will work in a similar way to
 <a href="npm-outdated"><code>npm-outdated</code></a> and reach for the registry to figure out
-what current published version of the package named <!-- raw HTML omitted --> will satisfy
-its dependent declared semver-range. Once that specific version is known
-<code>npm diff</code> will print diff patches comparing the current version of
-<!-- raw HTML omitted --> found in the local file system with that specific version
-returned by the registry.</p>
+what current published version of the package named <code>&lt;pkg-name&gt;</code>
+will satisfy its dependent declared semver-range. Once that specific
+version is known <code>npm diff</code> will print diff patches comparing the
+current version of <code>&lt;pkg-name&gt;</code> found in the local file system with
+that specific version returned by the registry.</p>
 <p>Given a package named <code>abbrev</code> that is currently installed:</p>
 <pre lang="bash"><code>npm diff --diff=abbrev
 </code></pre>
@@ -260,7 +260,7 @@ <h4 id="filtering-files">Filtering files</h4>
 <h3 id="configuration">Configuration</h3>
 <h4 id="diff">diff</h4>
 <ul>
-<li>Type: Array<!-- raw HTML omitted --></li>
+<li>Type: Array</li>
 <li>Default: null</li>
 </ul>
 <p>Defines npm package specifiers to compare using the <code>npm diff</code> command.</p>

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>npm@7.5.3 /path/to/npm
+<pre lang="bash"><code>npm@7.5.4 /path/to/npm
 └─┬ init-package-json@0.0.4
   └── promzard@0.1.5
 </code></pre>

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.5.3</p>
+<p>7.5.4</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

deps/npm/lib/run-script.js

@@ -41,7 +41,7 @@ const runScript = async (args) => {
 
   if (event === 'restart' && !scripts.restart)
     scripts.restart = 'npm stop --if-present && npm start'
-  else if (event === 'env')
+  else if (event === 'env' && !scripts.env)
     scripts.env = isWindowsShell ? 'SET' : 'env'
 
   pkg.scripts = scripts

deps/npm/lib/shrinkwrap.js

@@ -1,5 +1,7 @@
 const { resolve, basename } = require('path')
-const { promises: { unlink } } = require('fs')
+const util = require('util')
+const fs = require('fs')
+const { unlink } = fs.promises || util.promisify(fs.unlink)
 const Arborist = require('@npmcli/arborist')
 const log = require('npmlog')
 

deps/npm/lib/utils/reify-finish.js

@@ -1,7 +1,9 @@
 const reifyOutput = require('./reify-output.js')
 const npm = require('../npm.js')
 const ini = require('ini')
-const {writeFile} = require('fs').promises
+const util = require('util')
+const fs = require('fs')
+const { writeFile } = fs.promises || { writeFile: util.promisify(fs.writeFile) }
 const {resolve} = require('path')
 
 const reifyFinish = async arb => {

deps/npm/man/man1/npm-diff.1

@@ -78,11 +78,11 @@ of files for packages published to the npm registry\.
   When using a single package name (with no version or tag specifier) as an
   argument, \fBnpm diff\fP will work in a similar way to
   \fBnpm\-outdated\fP \fInpm\-outdated\fR and reach for the registry to figure out
-  what current published version of the package named <pkg\-name> will satisfy
-  its dependent declared semver\-range\. Once that specific version is known
-  \fBnpm diff\fP will print diff patches comparing the current version of
-  <pkg\-name> found in the local file system with that specific version
-  returned by the registry\.
+  what current published version of the package named \fB<pkg\-name>\fP
+  will satisfy its dependent declared semver\-range\. Once that specific
+  version is known \fBnpm diff\fP will print diff patches comparing the
+  current version of \fB<pkg\-name>\fP found in the local file system with
+  that specific version returned by the registry\.
   Given a package named \fBabbrev\fP that is currently installed:
 .P
 .RS 2
@@ -150,7 +150,7 @@ located within the folder \fB\|\./lib/\fP and changed lines of code within the
 .SS diff
 .RS 0
 .IP \(bu 2
-Type: Array<String>
+Type: Array
 .IP \(bu 2
 Default: null
 

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\.5\.3 /path/to/npm
+npm@7\.5\.4 /path/to/npm
 └─┬ init\-package\-json@0\.0\.4
   └── promzard@0\.1\.5
 .fi

deps/npm/man/man1/npm.1

@@ -10,7 +10,7 @@ npm <command> [args]
 .RE
 .SS Version
 .P
-7\.5\.3
+7\.5\.4
 .SS Description
 .P
 npm is the package manager for the Node JavaScript platform\.  It puts