diff options
| author | Audrey Eschright <audrey@npmjs.com> | 2018-11-29 14:05:52 -0800 |
|---|---|---|
| committer | Myles Borins <myles.borins@gmail.com> | 2018-12-25 15:15:54 -0500 |
| commit | 13ae5385ae010f0511927763fe28919ad44941f0 (patch) | |
| tree | c0befc029d844c8a8b69601bedb5fdfb615fa271 /deps/npm/html/doc/files | |
| parent | 77db1e70dd82245b7c263b6c48c41d398ad7ed61 (diff) | |
| download | android-node-v8-13ae5385ae010f0511927763fe28919ad44941f0.tar.gz android-node-v8-13ae5385ae010f0511927763fe28919ad44941f0.tar.bz2 android-node-v8-13ae5385ae010f0511927763fe28919ad44941f0.zip | |
deps: upgrade npm to 6.5.0
PR-URL: https://github.com/nodejs/node/pull/24734
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: Daijiro Wachi <daijiro.wachi@gmail.com>
Reviewed-By: Myles Borins <myles.borins@gmail.com>
Diffstat (limited to 'deps/npm/html/doc/files')
| -rw-r--r-- | deps/npm/html/doc/files/npm-folders.html | 12 | ||||
| -rw-r--r-- | deps/npm/html/doc/files/npm-global.html | 12 | ||||
| -rw-r--r-- | deps/npm/html/doc/files/npm-json.html | 2 | ||||
| -rw-r--r-- | deps/npm/html/doc/files/npm-package-locks.html | 17 | ||||
| -rw-r--r-- | deps/npm/html/doc/files/npm-shrinkwrap.json.html | 2 | ||||
| -rw-r--r-- | deps/npm/html/doc/files/npmrc.html | 2 | ||||
| -rw-r--r-- | deps/npm/html/doc/files/package-lock.json.html | 2 | ||||
| -rw-r--r-- | deps/npm/html/doc/files/package.json.html | 2 |
8 files changed, 27 insertions, 24 deletions
diff --git a/deps/npm/html/doc/files/npm-folders.html b/deps/npm/html/doc/files/npm-folders.html index 95285eead0..39b4c88786 100644 --- a/deps/npm/html/doc/files/npm-folders.html +++ b/deps/npm/html/doc/files/npm-folders.html @@ -133,15 +133,15 @@ highest level possible, below the localized "target" folder.</p> | `-- asdf (2.3.4) `-- baz (1.2.3) <---[D] `-- node_modules - `-- quux (3.2.0) <---[E]</code></pre><p>Since foo depends directly on <a href="mailto:%60bar@1.2.3">`bar@1.2.3</a><code>and</code><a href="mailto:baz@1.2.3">baz@1.2.3</a><code>, those are -installed in foo's</code>node_modules` folder.</p> + `-- quux (3.2.0) <---[E]</code></pre><p>Since foo depends directly on <code>bar@1.2.3</code> and <code>baz@1.2.3</code>, those are +installed in foo's <code>node_modules</code> folder.</p> <p>Even though the latest copy of blerg is 1.3.7, foo has a specific dependency on version 1.2.5. So, that gets installed at [A]. Since the -parent installation of blerg satisfies bar's dependency on <a href="mailto:%60blerg@1.x">`blerg@1.x</a>`, +parent installation of blerg satisfies bar's dependency on <code>blerg@1.x</code>, it does not install another copy under [B].</p> <p>Bar [B] also has dependencies on baz and asdf, so those are installed in -bar's <code>node_modules</code> folder. Because it depends on <a href="mailto:%60baz@2.x">`baz@2.x</a><code>, it cannot -re-use the</code><a href="mailto:baz@1.2.3">baz@1.2.3</a><code>installed in the parent</code>node_modules` folder [D], +bar's <code>node_modules</code> folder. Because it depends on <code>baz@2.x</code>, it cannot +re-use the <code>baz@1.2.3</code> installed in the parent <code>node_modules</code> folder [D], and must install its own copy [C].</p> <p>Underneath bar, the <code>baz -> quux -> bar</code> dependency creates a cycle. However, because bar is already in quux's ancestry [B], it does not @@ -179,5 +179,5 @@ cannot be found elsewhere. See <code><a href="../files/package.json.html">packa <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6> </td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)"> </td></tr> <tr><td colspan=5 style="width:50px;height:10px;background:#fff"> </td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4> </td><td style="width:90px;height:10px;background:#fff" colspan=9> </td></tr> </table> -<p id="footer">npm-folders — npm@6.4.1</p> +<p id="footer">npm-folders — npm@6.5.0-next.0</p> diff --git a/deps/npm/html/doc/files/npm-global.html b/deps/npm/html/doc/files/npm-global.html index 95285eead0..39b4c88786 100644 --- a/deps/npm/html/doc/files/npm-global.html +++ b/deps/npm/html/doc/files/npm-global.html @@ -133,15 +133,15 @@ highest level possible, below the localized "target" folder.</p> | `-- asdf (2.3.4) `-- baz (1.2.3) <---[D] `-- node_modules - `-- quux (3.2.0) <---[E]</code></pre><p>Since foo depends directly on <a href="mailto:%60bar@1.2.3">`bar@1.2.3</a><code>and</code><a href="mailto:baz@1.2.3">baz@1.2.3</a><code>, those are -installed in foo's</code>node_modules` folder.</p> + `-- quux (3.2.0) <---[E]</code></pre><p>Since foo depends directly on <code>bar@1.2.3</code> and <code>baz@1.2.3</code>, those are +installed in foo's <code>node_modules</code> folder.</p> <p>Even though the latest copy of blerg is 1.3.7, foo has a specific dependency on version 1.2.5. So, that gets installed at [A]. Since the -parent installation of blerg satisfies bar's dependency on <a href="mailto:%60blerg@1.x">`blerg@1.x</a>`, +parent installation of blerg satisfies bar's dependency on <code>blerg@1.x</code>, it does not install another copy under [B].</p> <p>Bar [B] also has dependencies on baz and asdf, so those are installed in -bar's <code>node_modules</code> folder. Because it depends on <a href="mailto:%60baz@2.x">`baz@2.x</a><code>, it cannot -re-use the</code><a href="mailto:baz@1.2.3">baz@1.2.3</a><code>installed in the parent</code>node_modules` folder [D], +bar's <code>node_modules</code> folder. Because it depends on <code>baz@2.x</code>, it cannot +re-use the <code>baz@1.2.3</code> installed in the parent <code>node_modules</code> folder [D], and must install its own copy [C].</p> <p>Underneath bar, the <code>baz -> quux -> bar</code> dependency creates a cycle. However, because bar is already in quux's ancestry [B], it does not @@ -179,5 +179,5 @@ cannot be found elsewhere. See <code><a href="../files/package.json.html">packa <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6> </td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)"> </td></tr> <tr><td colspan=5 style="width:50px;height:10px;background:#fff"> </td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4> </td><td style="width:90px;height:10px;background:#fff" colspan=9> </td></tr> </table> -<p id="footer">npm-folders — npm@6.4.1</p> +<p id="footer">npm-folders — npm@6.5.0-next.0</p> diff --git a/deps/npm/html/doc/files/npm-json.html b/deps/npm/html/doc/files/npm-json.html index 5d9a0f79b6..119efcc09a 100644 --- a/deps/npm/html/doc/files/npm-json.html +++ b/deps/npm/html/doc/files/npm-json.html @@ -574,5 +574,5 @@ ignored.</p> <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6> </td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)"> </td></tr> <tr><td colspan=5 style="width:50px;height:10px;background:#fff"> </td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4> </td><td style="width:90px;height:10px;background:#fff" colspan=9> </td></tr> </table> -<p id="footer">package.json — npm@6.4.1</p> +<p id="footer">package.json — npm@6.5.0-next.0</p> diff --git a/deps/npm/html/doc/files/npm-package-locks.html b/deps/npm/html/doc/files/npm-package-locks.html index 425d274eb7..ed9a767026 100644 --- a/deps/npm/html/doc/files/npm-package-locks.html +++ b/deps/npm/html/doc/files/npm-package-locks.html @@ -120,17 +120,20 @@ 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:%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 +merge conflicts in source control systems. As of <code>npm@5.7.0</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 -the dependencies from both branches in a reasonable tree. If</code>--package-lock-only<code>is provided, it will do this without also modifying your -local</code>node_modules/`.</p> +the dependencies from both branches in a reasonable tree. If +<code>--package-lock-only</code> is provided, it will do this without also modifying your +local <code>node_modules/</code>.</p> <p>To make this process seamless on git, consider installing <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-%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> +pre-<code>npm@5.7.0</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</code> 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> @@ -151,4 +154,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> </td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)"> </td></tr> <tr><td colspan=5 style="width:50px;height:10px;background:#fff"> </td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4> </td><td style="width:90px;height:10px;background:#fff" colspan=9> </td></tr> </table> -<p id="footer">npm-package-locks — npm@6.4.1</p> +<p id="footer">npm-package-locks — npm@6.5.0-next.0</p> diff --git a/deps/npm/html/doc/files/npm-shrinkwrap.json.html b/deps/npm/html/doc/files/npm-shrinkwrap.json.html index 0d01fdf56b..0bfe9e3f72 100644 --- a/deps/npm/html/doc/files/npm-shrinkwrap.json.html +++ b/deps/npm/html/doc/files/npm-shrinkwrap.json.html @@ -42,4 +42,4 @@ to the manual page for <a href="../files/package-lock.json.html">package-lock.js <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6> </td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)"> </td></tr> <tr><td colspan=5 style="width:50px;height:10px;background:#fff"> </td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4> </td><td style="width:90px;height:10px;background:#fff" colspan=9> </td></tr> </table> -<p id="footer">npm-shrinkwrap.json — npm@6.4.1</p> +<p id="footer">npm-shrinkwrap.json — npm@6.5.0-next.0</p> diff --git a/deps/npm/html/doc/files/npmrc.html b/deps/npm/html/doc/files/npmrc.html index eb83450634..a977661f58 100644 --- a/deps/npm/html/doc/files/npmrc.html +++ b/deps/npm/html/doc/files/npmrc.html @@ -82,5 +82,5 @@ manner.</p> <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6> </td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)"> </td></tr> <tr><td colspan=5 style="width:50px;height:10px;background:#fff"> </td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4> </td><td style="width:90px;height:10px;background:#fff" colspan=9> </td></tr> </table> -<p id="footer">npmrc — npm@6.4.1</p> +<p id="footer">npmrc — npm@6.5.0-next.0</p> diff --git a/deps/npm/html/doc/files/package-lock.json.html b/deps/npm/html/doc/files/package-lock.json.html index 5732969d25..7d243cde80 100644 --- a/deps/npm/html/doc/files/package-lock.json.html +++ b/deps/npm/html/doc/files/package-lock.json.html @@ -130,4 +130,4 @@ should match via normal matching rules a dependency either in our <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6> </td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)"> </td></tr> <tr><td colspan=5 style="width:50px;height:10px;background:#fff"> </td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4> </td><td style="width:90px;height:10px;background:#fff" colspan=9> </td></tr> </table> -<p id="footer">package-lock.json — npm@6.4.1</p> +<p id="footer">package-lock.json — npm@6.5.0-next.0</p> diff --git a/deps/npm/html/doc/files/package.json.html b/deps/npm/html/doc/files/package.json.html index 5d9a0f79b6..119efcc09a 100644 --- a/deps/npm/html/doc/files/package.json.html +++ b/deps/npm/html/doc/files/package.json.html @@ -574,5 +574,5 @@ ignored.</p> <tr><td style="width:60px;height:10px;background:rgb(237,127,127)" colspan=6> </td><td colspan=10 style="width:10px;height:10px;background:rgb(237,127,127)"> </td></tr> <tr><td colspan=5 style="width:50px;height:10px;background:#fff"> </td><td style="width:40px;height:10px;background:rgb(237,127,127)" colspan=4> </td><td style="width:90px;height:10px;background:#fff" colspan=9> </td></tr> </table> -<p id="footer">package.json — npm@6.4.1</p> +<p id="footer">package.json — npm@6.5.0-next.0</p> |