deps: upgrade npm to 6.2.0

PR-URL: https://github.com/nodejs/node/pull/21592
Reviewed-By: Rich Trott <rtrott@gmail.com>
Reviewed-By: Michaël Zasso <targos@protonmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>

1 files changed, 10 insertions, 17 deletions

diff --git a/deps/npm/html/doc/files/npm-package-locks.html b/deps/npm/html/doc/files/npm-package-locks.html
index fe9115c14a..50ac0d4db8 100644
--- a/deps/npm/html/doc/files/npm-package-locks.html
+++ b/deps/npm/html/doc/files/npm-package-locks.html
@@ -34,31 +34,26 @@ unable to do this. There are multiple reasons for this:</p>
   &quot;dependencies&quot;: {
     &quot;B&quot;: &quot;&lt;0.1.0&quot;
   }
-}
-</code></pre><p>package B:</p>
+}</code></pre><p>package B:</p>
 <pre><code>{
   &quot;name&quot;: &quot;B&quot;,
   &quot;version&quot;: &quot;0.0.1&quot;,
   &quot;dependencies&quot;: {
     &quot;C&quot;: &quot;&lt;0.1.0&quot;
   }
-}
-</code></pre><p>and package C:</p>
+}</code></pre><p>and package C:</p>
 <pre><code>{
   &quot;name&quot;: &quot;C&quot;,
   &quot;version&quot;: &quot;0.0.1&quot;
-}
-</code></pre><p>If these are the only versions of A, B, and C available in the
+}</code></pre><p>If these are the only versions of A, B, and C available in the
 registry, then a normal <code>npm install A</code> will install:</p>
 <pre><code>A@0.1.0
 `-- B@0.0.1
-    `-- C@0.0.1
-</code></pre><p>However, if <a href="mailto:B@0.0.2">B@0.0.2</a> is published, then a fresh <code>npm install A</code> will
+    `-- C@0.0.1</code></pre><p>However, if <a href="mailto:B@0.0.2">B@0.0.2</a> is published, then a fresh <code>npm install A</code> will
 install:</p>
 <pre><code>A@0.1.0
 `-- B@0.0.2
-    `-- C@0.0.1
-</code></pre><p>assuming the new version did not modify B&#39;s dependencies. Of course,
+    `-- C@0.0.1</code></pre><p>assuming the new version did not modify B&#39;s dependencies. Of course,
 the new version of B could include a new version of C and any number
 of new dependencies. If such changes are undesirable, the author of A
 could specify a dependency on <a href="mailto:B@0.0.1">B@0.0.1</a>. However, if A&#39;s author and B&#39;s
@@ -85,8 +80,7 @@ which will look something like this:</p>
       }
     }
   }
-}
-</code></pre><p>This file describes an <em>exact</em>, and more importantly <em>reproducible</em>
+}</code></pre><p>This file describes an <em>exact</em>, and more importantly <em>reproducible</em>
 <code>node_modules</code> tree. Once it&#39;s present, any future installation will base its
 work off this file, instead of recalculating dependency versions off
 p<a href="../files/ackage.json.html">ackage.json(5)</a>.</p>
@@ -109,8 +103,7 @@ executed afterwards. These scripts run for both <code>package-lock.json</code> a
 file:</p>
 <pre><code>&quot;scripts&quot;: {
   &quot;postshrinkwrap&quot;: &quot;json -I -e \&quot;this.myMetadata = $MY_APP_METADATA\&quot;&quot;
-}
-</code></pre><h3 id="using-locked-packages">Using locked packages</h3>
+}</code></pre><h3 id="using-locked-packages">Using locked packages</h3>
 <p>Using a locked package is no different than using any package without a package
 lock: any commands that update <code>node_modules</code> and/or <code>package.json</code>&#39;s
 dependencies will automatically sync the existing lockfile. This includes <code>npm
@@ -127,7 +120,7 @@ inform you of any changes npm has made to your <code>node_modules</code>, so you
 if any transitive dependencies were updated, hoisted, etc.</p>
 <h3 id="resolving-lockfile-conflicts">Resolving lockfile conflicts</h3>
 <p>Occasionally, two separate npm install will create package locks that cause
-merge conflicts in source control systems. As of <a href="mailto:`npm@5.7.0">`npm@5.7.0</a><code>, these conflicts
+merge conflicts in source control systems. As of <a href="mailto:%60npm@5.7.0">`npm@5.7.0</a><code>, these conflicts
 can be resolved by manually fixing any</code>package.json<code>conflicts, and then
 running</code>npm install [--package-lock-only]<code>again. npm will automatically
 resolve any conflicts for you and write a merged package lock that includes all
@@ -137,7 +130,7 @@ local</code>node_modules/`.</p>
 <a href="https://npm.im/npm-merge-driver"><code>npm-merge-driver</code></a>, which will teach git how
 to do this itself without any user interaction. In short: <code>$ npx
 npm-merge-driver install -g</code> will let you do this, and even works with
-<a href="mailto:pre-`npm@5.7.0">pre-`npm@5.7.0</a><code>versions of npm 5, albeit a bit more noisily. Note that if</code>package.json<code>itself conflicts, you will have to resolve that by hand and run</code>npm install` manually, even with the merge driver.</p>
+<a href="mailto:pre-%60npm@5.7.0">pre-`npm@5.7.0</a><code>versions of npm 5, albeit a bit more noisily. Note that if</code>package.json<code>itself conflicts, you will have to resolve that by hand and run</code>npm install` manually, even with the merge driver.</p>
 <h2 id="see-also">SEE ALSO</h2>
 <ul>
 <li><a href="https://medium.com/@sdboyer/so-you-want-to-write-a-package-manager-4ae9c17d9527">https://medium.com/@sdboyer/so-you-want-to-write-a-package-manager-4ae9c17d9527</a></li>
@@ -158,4 +151,4 @@ npm-merge-driver install -g</code> will let you do this, and even works with
 <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6>&nbsp;</td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)">&nbsp;</td></tr>
 <tr><td colspan=5 style="width:50px;height:10px;background:#fff">&nbsp;</td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4>&nbsp;</td><td style="width:90px;height:10px;background:#fff" colspan=9>&nbsp;</td></tr>
 </table>
-<p id="footer">npm-package-locks &mdash; npm@6.1.0</p>
+<p id="footer">npm-package-locks &mdash; npm@6.2.0</p>