diff options
| author | Forrest L Norvell <ogd@aoaioxxysz.net> | 2015-01-08 14:37:26 -0800 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2015-01-08 23:49:03 +0100 |
| commit | e79ccee1685393e4ec73746bac93835cbcf3a809 (patch) | |
| tree | 304a1ddd59495b50a20d1b25c62da2a4519228db /deps/npm/html/doc/misc | |
| parent | 156cd82ef4d2ff4fa291407de562c3a7c2386dc7 (diff) | |
| download | node-new-e79ccee1685393e4ec73746bac93835cbcf3a809.tar.gz | |
npm: upgrade to v2.1.18
PR-URL: https://github.com/iojs/io.js/pull/266
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Diffstat (limited to 'deps/npm/html/doc/misc')
| -rw-r--r-- | deps/npm/html/doc/misc/npm-coding-style.html | 6 | ||||
| -rw-r--r-- | deps/npm/html/doc/misc/npm-config.html | 28 | ||||
| -rw-r--r-- | deps/npm/html/doc/misc/npm-developers.html | 10 | ||||
| -rw-r--r-- | deps/npm/html/doc/misc/npm-disputes.html | 8 | ||||
| -rw-r--r-- | deps/npm/html/doc/misc/npm-faq.html | 47 | ||||
| -rw-r--r-- | deps/npm/html/doc/misc/npm-index.html | 8 | ||||
| -rw-r--r-- | deps/npm/html/doc/misc/npm-registry.html | 4 | ||||
| -rw-r--r-- | deps/npm/html/doc/misc/npm-scope.html | 2 | ||||
| -rw-r--r-- | deps/npm/html/doc/misc/npm-scripts.html | 6 | ||||
| -rw-r--r-- | deps/npm/html/doc/misc/removing-npm.html | 2 | ||||
| -rw-r--r-- | deps/npm/html/doc/misc/semver.html | 26 |
11 files changed, 99 insertions, 48 deletions
diff --git a/deps/npm/html/doc/misc/npm-coding-style.html b/deps/npm/html/doc/misc/npm-coding-style.html index 30d3e07cfa..a5f04aff72 100644 --- a/deps/npm/html/doc/misc/npm-coding-style.html +++ b/deps/npm/html/doc/misc/npm-coding-style.html @@ -16,14 +16,14 @@ difference's sake, but rather a carefully crafted style that is designed to reduce visual clutter and make bugs more apparent.</p> <p>If you want to contribute to npm (which is very encouraged), you should make your code conform to npm's style.</p> -<p>Note: this concerns npm's code not the specific packages at npmjs.org</p> +<p>Note: this concerns npm's code not the specific packages that you can download from the npm registry.</p> <h2 id="line-length">Line Length</h2> <p>Keep lines shorter than 80 characters. It's better for lines to be too short than to be too long. Break up long lists, objects, and other statements onto multiple lines.</p> <h2 id="indentation">Indentation</h2> <p>Two-spaces. Tabs are better, but they look like hell in web browsers -(and on github), and node uses 2 spaces, so that's that.</p> +(and on GitHub), and node uses 2 spaces, so that's that.</p> <p>Configure your editor appropriately.</p> <h2 id="curly-braces">Curly braces</h2> <p>Curly braces belong on the same line as the thing that necessitates them.</p> @@ -147,5 +147,5 @@ set to anything."</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">npm-coding-style — npm@2.1.6</p> +<p id="footer">npm-coding-style — npm@2.1.18</p> diff --git a/deps/npm/html/doc/misc/npm-config.html b/deps/npm/html/doc/misc/npm-config.html index 249d5934c9..5f68b86786 100644 --- a/deps/npm/html/doc/misc/npm-config.html +++ b/deps/npm/html/doc/misc/npm-config.html @@ -118,13 +118,18 @@ ostensibly Unix systems.</p> <h3 id="ca">ca</h3> <ul> <li>Default: The npm CA certificate</li> -<li>Type: String or null</li> +<li>Type: String, Array or null</li> </ul> <p>The Certificate Authority signing certificate that is trusted for SSL -connections to the registry.</p> -<p>Set to <code>null</code> to only allow "known" registrars, or to a specific CA cert +connections to the registry. Values should be in PEM format with newlines +replaced by the string "\n". For example:</p> +<pre><code>ca="-----BEGIN CERTIFICATE-----\nXXXX\nXXXX\n-----END CERTIFICATE-----" +</code></pre><p>Set to <code>null</code> to only allow "known" registrars, or to a specific CA cert to trust only that specific signing authority.</p> -<p>See also the <code>strict-ssl</code> config.</p> +<p>Multiple CAs can be trusted by specifying an array of certificates:</p> +<pre><code>ca[]="..." +ca[]="..." +</code></pre><p>See also the <code>strict-ssl</code> config.</p> <h3 id="cafile">cafile</h3> <ul> <li>Default: <code>null</code></li> @@ -313,11 +318,12 @@ user.</p> <p>The string that starts all the debugging log output.</p> <h3 id="https-proxy">https-proxy</h3> <ul> -<li>Default: the <code>HTTPS_PROXY</code> or <code>https_proxy</code> or <code>HTTP_PROXY</code> or -<code>http_proxy</code> environment variables.</li> +<li>Default: null</li> <li>Type: url</li> </ul> -<p>A proxy to use for outgoing https requests.</p> +<p>A proxy to use for outgoing https requests. If the <code>HTTPS_PROXY</code> or +<code>https_proxy</code> or <code>HTTP_PROXY</code> or <code>http_proxy</code> environment variables are set, +proxy settings will be honored by the underlying <code>request</code> library.</p> <h3 id="ignore-scripts">ignore-scripts</h3> <ul> <li>Default: false</li> @@ -500,10 +506,12 @@ than npm -- particularly a very outdated tar implementation -- leave this as true.</p> <h3 id="proxy">proxy</h3> <ul> -<li>Default: <code>HTTP_PROXY</code> or <code>http_proxy</code> environment variable, or null</li> +<li>Default: null</li> <li>Type: url</li> </ul> -<p>A proxy to use for outgoing http requests.</p> +<p>A proxy to use for outgoing http requests. If the <code>HTTP_PROXY</code> or +<code>http_proxy</code> environment variables are set, proxy settings will be +honored by the underlying <code>request</code> library.</p> <h3 id="rebuild-bundle">rebuild-bundle</h3> <ul> <li>Default: true</li> @@ -759,5 +767,5 @@ exit successfully.</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">npm-config — npm@2.1.6</p> +<p id="footer">npm-config — npm@2.1.18</p> diff --git a/deps/npm/html/doc/misc/npm-developers.html b/deps/npm/html/doc/misc/npm-developers.html index b4190a1a2b..18d1020e15 100644 --- a/deps/npm/html/doc/misc/npm-developers.html +++ b/deps/npm/html/doc/misc/npm-developers.html @@ -94,6 +94,14 @@ no <code>.npmignore</code> file, but there <em>is</em> a <code>.gitignore</code> ignore the stuff matched by the <code>.gitignore</code> file. If you <em>want</em> to include something that is excluded by your <code>.gitignore</code> file, you can create an empty <code>.npmignore</code> file to override it.</p> +<p><code>.npmignore</code> files follow the <a href="http://git-scm.com/book/en/v2/Git-Basics-Recording-Changes-to-the-Repository#Ignoring-Files">same pattern rules</a> +as <code>.gitignore</code> files:</p> +<ul> +<li>Blank lines or lines starting with <code>#</code> are ignored.</li> +<li>Standard glob patterns work.</li> +<li>You can end patterns with a forward slash <code>/</code> to specify a directory.</li> +<li>You can negate a pattern by starting it with an exclamation point <code>!</code>.</li> +</ul> <p>By default, the following paths and files are ignored, so there's no need to add them to <code>.npmignore</code> explicitly:</p> <ul> @@ -181,5 +189,5 @@ from a fresh checkout.</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">npm-developers — npm@2.1.6</p> +<p id="footer">npm-developers — npm@2.1.18</p> diff --git a/deps/npm/html/doc/misc/npm-disputes.html b/deps/npm/html/doc/misc/npm-disputes.html index f59921e2e9..00a0e2a650 100644 --- a/deps/npm/html/doc/misc/npm-disputes.html +++ b/deps/npm/html/doc/misc/npm-disputes.html @@ -13,7 +13,7 @@ <h2 id="synopsis">SYNOPSIS</h2> <ol> <li>Get the author email with <code>npm owner ls <pkgname></code></li> -<li>Email the author, CC <a href="mailto:support@npmjs.com">support@npmjs.com</a></li> +<li>Email the author, CC <a href="mailto:support@npmjs.com">support@npmjs.com</a></li> <li>After a few weeks, if there's no resolution, we'll sort it out.</li> </ol> <p>Don't squat on package names. Publish code or move out of the way.</p> @@ -51,12 +51,12 @@ Joe's appropriate course of action in each case is the same.</p> owner (Bob).</li> <li>Joe emails Bob, explaining the situation <strong>as respectfully as possible</strong>, and what he would like to do with the module name. He -adds the npm support staff <a href="mailto:support@npmjs.com">support@npmjs.com</a> to the CC list of +adds the npm support staff <a href="mailto:support@npmjs.com">support@npmjs.com</a> to the CC list of the email. Mention in the email that Bob can run <code>npm owner add joe foo</code> to add Joe as an owner of the <code>foo</code> package.</li> <li>After a reasonable amount of time, if Bob has not responded, or if Bob and Joe can't come to any sort of resolution, email support -<a href="mailto:support@npmjs.com">support@npmjs.com</a> and we'll sort it out. ("Reasonable" is +<a href="mailto:support@npmjs.com">support@npmjs.com</a> and we'll sort it out. ("Reasonable" is usually at least 4 weeks, but extra time is allowed around common holidays.)</li> </ol> @@ -112,5 +112,5 @@ things into it.</li> <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-disputes — npm@2.1.6</p> +<p id="footer">npm-disputes — npm@2.1.18</p> diff --git a/deps/npm/html/doc/misc/npm-faq.html b/deps/npm/html/doc/misc/npm-faq.html index 08c8eafce2..6caf41929f 100644 --- a/deps/npm/html/doc/misc/npm-faq.html +++ b/deps/npm/html/doc/misc/npm-faq.html @@ -11,7 +11,7 @@ <h1><a href="../misc/npm-faq.html">npm-faq</a></h1> <p>Frequently Asked Questions</p> <h2 id="where-can-i-find-these-docs-in-html-">Where can I find these docs in HTML?</h2> -<p><a href="https://www.npmjs.org/doc/">https://www.npmjs.org/doc/</a>, or run:</p> +<p><a href="https://docs.npmjs.com/">https://docs.npmjs.com/</a>, or run:</p> <pre><code>npm config set viewer browser </code></pre><p>to open these documents in your default web browser rather than <code>man</code>.</p> <h2 id="it-didn-t-work-">It didn't work.</h2> @@ -62,7 +62,7 @@ in a shell script if you really wanted to.</p> <p>Usually, no. Allow npm to resolve dependencies for your packages.</p> <p>For packages you <strong>deploy</strong>, such as websites and apps, you should use npm shrinkwrap to lock down your full dependency tree:</p> -<p><a href="https://www.npmjs.org/doc/cli/npm-shrinkwrap.html">https://www.npmjs.org/doc/cli/npm-shrinkwrap.html</a></p> +<p><a href="https://docs.npmjs.com/cli/shrinkwrap">https://docs.npmjs.com/cli/shrinkwrap</a></p> <p>If you are paranoid about depending on the npm ecosystem, you should run a private npm mirror or a private cache.</p> <p>If you want 100% confidence in being able to reproduce the specific bytes @@ -108,7 +108,7 @@ version cannot be properly installed with the version that you have installed already. (Consider, if there is ever a bug in the <code>update</code> command.)</p> <p>In those cases, you can do this:</p> -<pre><code>curl https://www.npmjs.org/install.sh | sh +<pre><code>curl https://www.npmjs.com/install.sh | sh </code></pre><h2 id="what-is-a-package-">What is a <code>package</code>?</h2> <p>A package is:</p> <ul> @@ -230,28 +230,51 @@ that has a package.json in its root, or a git url. <h2 id="the-package-registry-website-what-is-that-exactly-">The package registry website. What is that exactly?</h2> <p>See <code><a href="../misc/npm-registry.html"><a href="../misc/npm-registry.html">npm-registry(7)</a></a></code>.</p> <h2 id="i-forgot-my-password-and-can-t-publish-how-do-i-reset-it-">I forgot my password, and can't publish. How do I reset it?</h2> -<p>Go to <a href="https://npmjs.org/forgot">https://npmjs.org/forgot</a>.</p> +<p>Go to <a href="https://npmjs.com/forgot">https://npmjs.com/forgot</a>.</p> <h2 id="i-get-econnrefused-a-lot-what-s-up-">I get ECONNREFUSED a lot. What's up?</h2> <p>Either the registry is down, or node's DNS isn't able to reach out.</p> <p>To check if the registry is down, open up <a href="https://registry.npmjs.org/">https://registry.npmjs.org/</a> in a web browser. This will also tell you if you are just unable to access the internet for some reason.</p> -<p>If the registry IS down, let us know by emailing <a href="mailto:support@npmjs.com">support@npmjs.com</a> +<p>If the registry IS down, let us know by emailing <a href="mailto:support@npmjs.com">support@npmjs.com</a> or posting an issue at <a href="https://github.com/npm/npm/issues">https://github.com/npm/npm/issues</a>. If it's down for the world (and not just on your local network) then we're probably already being pinged about it.</p> <p>You can also often get a faster response by visiting the #npm channel on Freenode IRC.</p> <h2 id="why-no-namespaces-">Why no namespaces?</h2> -<p>Please see this discussion: <a href="https://github.com/npm/npm/issues/798">https://github.com/npm/npm/issues/798</a></p> -<p>tl;dr - It doesn't actually make things better, and can make them worse.</p> -<p>If you want to namespace your own packages, you may: simply use the -<code>-</code> character to separate the names. npm is a mostly anarchic system. -There is not sufficient need to impose namespace rules on everyone.</p> +<p>npm has only one global namespace. If you want to namespace your own packages, +you may: simply use the <code>-</code> character to separate the names. npm is a mostly +anarchic system. There is not sufficient need to impose namespace rules on +everyone.</p> +<p>As of 2.0, npm supports scoped packages, which allow you to publish a group of +related modules without worrying about name collisions.</p> +<p>Every npm user owns the scope associated with their username. For example, the +user named <code>npm</code> owns the scope <code>@npm</code>. Scoped packages are published inside a +scope by naming them as if they were files under the scope directory, e.g., by +setting <code>name</code> in <code>package.json</code> to <code>@npm/npm</code>.</p> +<p>Scoped packages can coexist with public npm packages in a private npm registry. +At present (2014-11-04) scoped packages may NOT be published to the public npm +registry.</p> +<p>Unscoped packages can only depend on other unscoped packages. Scoped packages +can depend on packages from their own scope, a different scope, or the public +registry (unscoped).</p> +<p>For the current documentation of scoped packages, see +<a href="https://docs.npmjs.com/misc/scope">https://docs.npmjs.com/misc/scope</a></p> +<p>References:</p> +<ol> +<li><p>For the reasoning behind the "one global namespace", please see this +discussion: <a href="https://github.com/npm/npm/issues/798">https://github.com/npm/npm/issues/798</a> (TL;DR: It doesn't +actually make things better, and can make them worse.)</p> +</li> +<li><p>For the pre-implementation discussion of the scoped package feature, see +this discussion: <a href="https://github.com/npm/npm/issues/5239">https://github.com/npm/npm/issues/5239</a></p> +</li> +</ol> <h2 id="who-does-npm-">Who does npm?</h2> <p>npm was originally written by Isaac Z. Schlueter, and many others have contributed to it, some of them quite substantially.</p> -<p>The npm open source project, The npm Registry, and <a href="https://www.npmjs.org">the community +<p>The npm open source project, The npm Registry, and <a href="https://www.npmjs.com">the community website</a> are maintained and operated by the good folks at <a href="http://www.npmjs.com">npm, Inc.</a></p> <h2 id="i-have-a-question-or-request-not-addressed-here-where-should-i-put-it-">I have a question or request not addressed here. Where should I put it?</h2> @@ -284,5 +307,5 @@ good folks at <a href="http://www.npmjs.com">npm, Inc.</a></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">npm-faq — npm@2.1.6</p> +<p id="footer">npm-faq — npm@2.1.18</p> diff --git a/deps/npm/html/doc/misc/npm-index.html b/deps/npm/html/doc/misc/npm-index.html index 1ca7d75862..60a8845a77 100644 --- a/deps/npm/html/doc/misc/npm-index.html +++ b/deps/npm/html/doc/misc/npm-index.html @@ -11,7 +11,7 @@ <h1><a href="../misc/npm-index.html">npm-index</a></h1> <p>Index of all npm documentation</p> <h3 id="readme-1-"><a href="../../doc/README.html"><a href="../../doc/README.html">README</a></a></h3> -<p>node package manager</p> +<p>a JavaScript package manager</p> <h2 id="command-line-documentation">Command Line Documentation</h2> <p>Using npm on the command line</p> <h3 id="npm-1-"><a href="../cli/npm.html"><a href="../cli/npm.html">npm(1)</a></a></h3> @@ -71,7 +71,7 @@ <h3 id="npm-repo-1-"><a href="../cli/npm-repo.html"><a href="../cli/npm-repo.html">npm-repo(1)</a></a></h3> <p>Open package repository page in the browser</p> <h3 id="npm-restart-1-"><a href="../cli/npm-restart.html"><a href="../cli/npm-restart.html">npm-restart(1)</a></a></h3> -<p>Start a package</p> +<p>Restart a package</p> <h3 id="npm-rm-1-"><a href="../cli/npm-rm.html"><a href="../cli/npm-rm.html">npm-rm(1)</a></a></h3> <p>Remove a package</p> <h3 id="npm-root-1-"><a href="../cli/npm-root.html"><a href="../cli/npm-root.html">npm-root(1)</a></a></h3> @@ -157,7 +157,7 @@ <h3 id="npm-repo-3-"><a href="../api/npm-repo.html"><a href="../api/npm-repo.html">npm-repo(3)</a></a></h3> <p>Open package repository page in the browser</p> <h3 id="npm-restart-3-"><a href="../api/npm-restart.html"><a href="../api/npm-restart.html">npm-restart(3)</a></a></h3> -<p>Start a package</p> +<p>Restart a package</p> <h3 id="npm-root-3-"><a href="../api/npm-root.html"><a href="../api/npm-root.html">npm-root(3)</a></a></h3> <p>Display npm root</p> <h3 id="npm-run-script-3-"><a href="../api/npm-run-script.html"><a href="../api/npm-run-script.html">npm-run-script(3)</a></a></h3> @@ -230,5 +230,5 @@ <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-index — npm@2.1.6</p> +<p id="footer">npm-index — npm@2.1.18</p> diff --git a/deps/npm/html/doc/misc/npm-registry.html b/deps/npm/html/doc/misc/npm-registry.html index d746316f58..9c82de7168 100644 --- a/deps/npm/html/doc/misc/npm-registry.html +++ b/deps/npm/html/doc/misc/npm-registry.html @@ -49,7 +49,7 @@ otherwise.</p> <p>No, but it's way easier. Basically, yes, you do, or you have to effectively implement the entire CouchDB API anyway.</p> <h2 id="is-there-a-website-or-something-to-see-package-docs-and-such-">Is there a website or something to see package docs and such?</h2> -<p>Yes, head over to <a href="https://npmjs.org/">https://npmjs.org/</a></p> +<p>Yes, head over to <a href="https://npmjs.com/">https://npmjs.com/</a></p> <h2 id="see-also">SEE ALSO</h2> <ul> <li><a href="../cli/npm-config.html"><a href="../cli/npm-config.html">npm-config(1)</a></a></li> @@ -70,5 +70,5 @@ effectively implement the entire CouchDB API anyway.</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">npm-registry — npm@2.1.6</p> +<p id="footer">npm-registry — npm@2.1.18</p> diff --git a/deps/npm/html/doc/misc/npm-scope.html b/deps/npm/html/doc/misc/npm-scope.html index 9fed0bbf11..3b81cf00ce 100644 --- a/deps/npm/html/doc/misc/npm-scope.html +++ b/deps/npm/html/doc/misc/npm-scope.html @@ -78,5 +78,5 @@ that registry instead.</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">npm-scope — npm@2.1.6</p> +<p id="footer">npm-scope — npm@2.1.18</p> diff --git a/deps/npm/html/doc/misc/npm-scripts.html b/deps/npm/html/doc/misc/npm-scripts.html index b2a3dbd383..4f0d466efd 100644 --- a/deps/npm/html/doc/misc/npm-scripts.html +++ b/deps/npm/html/doc/misc/npm-scripts.html @@ -27,10 +27,6 @@ Run AFTER the package is installed.</li> Run BEFORE the package is uninstalled.</li> <li>postuninstall: Run AFTER the package is uninstalled.</li> -<li>preupdate: -Run BEFORE the package is updated with the update command.</li> -<li>update, postupdate: -Run AFTER the package is updated with the update command.</li> <li>pretest, test, posttest: Run by the <code>npm test</code> command.</li> <li>prestop, stop, poststop: @@ -220,5 +216,5 @@ the user will sudo the npm command in question.</li> <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-scripts — npm@2.1.6</p> +<p id="footer">npm-scripts — npm@2.1.18</p> diff --git a/deps/npm/html/doc/misc/removing-npm.html b/deps/npm/html/doc/misc/removing-npm.html index 3028625d1b..e8f05b097f 100644 --- a/deps/npm/html/doc/misc/removing-npm.html +++ b/deps/npm/html/doc/misc/removing-npm.html @@ -57,5 +57,5 @@ modules. To track those down, you can do the following:</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">removing-npm — npm@2.1.6</p> +<p id="footer">removing-npm — npm@2.1.18</p> diff --git a/deps/npm/html/doc/misc/semver.html b/deps/npm/html/doc/misc/semver.html index eeea8fbc40..3b1556041e 100644 --- a/deps/npm/html/doc/misc/semver.html +++ b/deps/npm/html/doc/misc/semver.html @@ -22,12 +22,12 @@ semver.lt('1.2.3', '9.8.7') // true </code></pre><p>As a command-line utility:</p> <pre><code>$ semver -h -Usage: semver <version> [<version> [...]] [-r <range> | -i <inc> | -d <dec>] +Usage: semver <version> [<version> [...]] [-r <range> | -i <inc> | --preid <identifier> | -l | -rv] Test if version(s) satisfy the supplied range(s), and sort them. Multiple versions or ranges may be supplied, unless increment -or decrement options are specified. In that case, only a single -version may be used, and it is incremented by the specified level +option is specified. In that case, only a single version may +be used, and it is incremented by the specified level Program exits successfully if any valid version satisfies all supplied ranges, and prints all satisfying versions. @@ -91,6 +91,20 @@ alpha/beta/rc versions. By including a prerelease tag in the range, the user is indicating that they are aware of the risk. However, it is still not appropriate to assume that they have opted into taking a similar risk on the <em>next</em> set of prerelease versions.</p> +<h4 id="prerelease-identifiers">Prerelease Identifiers</h4> +<p>The method <code>.inc</code> takes an additional <code>identifier</code> string argument that +will append the value of the string as a prerelease identifier:</p> +<pre><code class="lang-`javascript">> semver.inc('1.2.3', 'pre', 'beta') +'1.2.4-beta.0' +</code></pre> +<p>command-line example:</p> +<pre><code class="lang-shell">$ semver 1.2.3 -i prerelease --preid beta +1.2.4-beta.0 +</code></pre> +<p>Which then can be used to increment further:</p> +<pre><code class="lang-shell">$ semver 1.2.4-beta.0 -i prerelease +1.2.4-beta.1 +</code></pre> <h3 id="advanced-range-syntax">Advanced Range Syntax</h3> <p>Advanced range syntax desugars to primitive comparators in deterministic ways.</p> @@ -145,7 +159,6 @@ equal to <code>beta.2</code>. So, <code>1.2.3-beta.4</code> would be allowed, b <code>1.2.4-beta.2</code> would not, because it is a prerelease of a different <code>[major, minor, patch]</code> tuple.</li> </ul> -<p>Note: this is the same as the <code>~></code> operator in rubygems.</p> <h4 id="caret-ranges-1-2-3-0-2-5-0-0-4-">Caret Ranges <code>^1.2.3</code> <code>^0.2.5</code> <code>^0.0.4</code></h4> <p>Allows changes that do not modify the left-most non-zero digit in the <code>[major, minor, patch]</code> tuple. In other words, this allows patch and @@ -225,6 +238,9 @@ invalid comparison string is provided.</li> <code>v2</code> is greater. Sorts in ascending order if passed to <code>Array.sort()</code>.</li> <li><code>rcompare(v1, v2)</code>: The reverse of compare. Sorts an array of versions in descending order when passed to <code>Array.sort()</code>.</li> +<li><code>diff(v1, v2)</code>: Returns difference between two versions by the release type +(<code>major</code>, <code>premajor</code>, <code>minor</code>, <code>preminor</code>, <code>patch</code>, <code>prepatch</code>, or <code>prerelease</code>), +or null if the versions are the same.</li> </ul> <h3 id="ranges">Ranges</h3> <ul> @@ -263,5 +279,5 @@ range, use the <code>satisfies(version, range)</code> function.</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">semver — npm@2.1.6</p> +<p id="footer">semver — npm@2.1.18</p> |