Skip to content

deps: upgrade to npm 2.14.15 #4872

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
zkat wants to merge 3 commits into from
Closed

deps: upgrade to npm 2.14.15 #4872

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
23bbce7
deps: upgrade to npm 2.14.15
zkat Jan 26, 2016
a0b0d4f
test: make npm tests work on prerelease node versions
zkat Jan 26, 2016
1a1bff0
doc: Update small error in LICENSE for npm
zkat Jan 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
test: make npm tests work on prerelease node versions
  • Loading branch information
@zkat
zkat committed Jan 27, 2016
commit a0b0d4fb56cbd46aeaf63dfe4e6a92ae14153adb
6 changes: 3 additions & 3 deletions deps/npm/html/doc/cli/npm.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,15 +110,15 @@ <h2 id="contributions">CONTRIBUTIONS</h2>
the issues list or ask on the mailing list.</p>
<ul>
<li><a href="https://github.com/npm/npm/issues">https://github.com/npm/npm/issues</a></li>
<li><a href="&#x6d;&#97;&#x69;&#108;&#x74;&#x6f;&#58;&#x6e;&#x70;&#x6d;&#x2d;&#x40;&#103;&#111;&#x6f;&#x67;&#108;&#x65;&#103;&#x72;&#x6f;&#117;&#x70;&#x73;&#x2e;&#99;&#111;&#x6d;">&#x6e;&#x70;&#x6d;&#x2d;&#x40;&#103;&#111;&#x6f;&#x67;&#108;&#x65;&#103;&#x72;&#x6f;&#117;&#x70;&#x73;&#x2e;&#99;&#111;&#x6d;</a></li>
<li><a href="&#x6d;&#97;&#105;&#x6c;&#116;&#111;&#58;&#110;&#x70;&#x6d;&#45;&#64;&#x67;&#x6f;&#111;&#x67;&#x6c;&#101;&#x67;&#x72;&#x6f;&#x75;&#x70;&#115;&#x2e;&#x63;&#111;&#x6d;">&#110;&#x70;&#x6d;&#45;&#64;&#x67;&#x6f;&#111;&#x67;&#x6c;&#101;&#x67;&#x72;&#x6f;&#x75;&#x70;&#115;&#x2e;&#x63;&#111;&#x6d;</a></li>
</ul>
<h2 id="bugs">BUGS</h2>
<p>When you find issues, please report them:</p>
<ul>
<li>web:
<a href="https://github.com/npm/npm/issues">https://github.com/npm/npm/issues</a></li>
<li>email:
<a href="&#x6d;&#x61;&#105;&#x6c;&#x74;&#111;&#x3a;&#110;&#x70;&#109;&#45;&#64;&#103;&#111;&#x6f;&#103;&#108;&#101;&#x67;&#114;&#111;&#x75;&#112;&#115;&#x2e;&#99;&#111;&#109;">&#110;&#x70;&#109;&#45;&#64;&#103;&#111;&#x6f;&#103;&#108;&#101;&#x67;&#114;&#111;&#x75;&#112;&#115;&#x2e;&#99;&#111;&#109;</a></li>
<a href="&#109;&#97;&#105;&#108;&#116;&#111;&#x3a;&#x6e;&#112;&#109;&#45;&#64;&#103;&#111;&#x6f;&#x67;&#108;&#101;&#103;&#x72;&#x6f;&#117;&#x70;&#x73;&#x2e;&#x63;&#111;&#109;">&#x6e;&#112;&#109;&#45;&#64;&#103;&#111;&#x6f;&#x67;&#108;&#101;&#103;&#x72;&#x6f;&#117;&#x70;&#x73;&#x2e;&#x63;&#111;&#109;</a></li>
</ul>
<p>Be sure to include <em>all</em> of the output from the npm command that didn&#39;t work
as expected. The <code>npm-debug.log</code> file is also helpful to provide.</p>
Expand All @@ -128,7 +128,7 @@ <h2 id="author">AUTHOR</h2>
<p><a href="http://blog.izs.me/">Isaac Z. Schlueter</a> ::
<a href="https://github.com/isaacs/">isaacs</a> ::
<a href="http://twitter.com/izs">@izs</a> ::
<a href="&#x6d;&#x61;&#x69;&#108;&#x74;&#111;&#x3a;&#x69;&#64;&#105;&#x7a;&#115;&#x2e;&#109;&#101;">&#x69;&#64;&#105;&#x7a;&#115;&#x2e;&#109;&#101;</a></p>
<a href="&#109;&#x61;&#x69;&#108;&#116;&#x6f;&#x3a;&#x69;&#x40;&#105;&#122;&#x73;&#46;&#x6d;&#101;">&#x69;&#x40;&#105;&#122;&#x73;&#46;&#x6d;&#101;</a></p>
<h2 id="see-also">SEE ALSO</h2>
<ul>
<li><a href="../cli/npm-help.html">npm-help(1)</a></li>
Expand Down
6 changes: 3 additions & 3 deletions deps/npm/html/doc/misc/npm-disputes.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ <h1><a href="../misc/npm-disputes.html">npm-disputes</a></h1> <p>Handling Module
<h2 id="synopsis">SYNOPSIS</h2>
<ol>
<li>Get the author email with <code>npm owner ls &lt;pkgname&gt;</code></li>
<li>Email the author, CC <a href="&#109;&#97;&#x69;&#108;&#x74;&#111;&#58;&#x73;&#117;&#x70;&#x70;&#111;&#x72;&#x74;&#64;&#x6e;&#112;&#x6d;&#106;&#x73;&#x2e;&#99;&#x6f;&#x6d;">&#x73;&#117;&#x70;&#x70;&#111;&#x72;&#x74;&#64;&#x6e;&#112;&#x6d;&#106;&#x73;&#x2e;&#99;&#x6f;&#x6d;</a></li>
<li>Email the author, CC <a href="&#109;&#x61;&#x69;&#x6c;&#x74;&#x6f;&#58;&#115;&#x75;&#112;&#112;&#111;&#x72;&#116;&#64;&#x6e;&#x70;&#109;&#x6a;&#115;&#46;&#99;&#x6f;&#109;">&#115;&#x75;&#112;&#112;&#111;&#x72;&#116;&#64;&#x6e;&#x70;&#109;&#x6a;&#115;&#46;&#99;&#x6f;&#109;</a></li>
<li>After a few weeks, if there&#39;s no resolution, we&#39;ll sort it out.</li>
</ol>
<p>Don&#39;t squat on package names. Publish code or move out of the way.</p>
Expand Down Expand Up @@ -51,12 +51,12 @@ <h2 id="description">DESCRIPTION</h2>
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="&#109;&#x61;&#105;&#x6c;&#116;&#111;&#x3a;&#x73;&#x75;&#112;&#112;&#111;&#114;&#116;&#x40;&#x6e;&#112;&#109;&#x6a;&#115;&#46;&#x63;&#x6f;&#x6d;">&#x73;&#x75;&#112;&#112;&#111;&#114;&#116;&#x40;&#x6e;&#112;&#109;&#x6a;&#115;&#46;&#x63;&#x6f;&#x6d;</a> to the CC list of
adds the npm support staff <a href="&#109;&#97;&#x69;&#x6c;&#x74;&#x6f;&#58;&#x73;&#x75;&#x70;&#112;&#111;&#x72;&#116;&#64;&#110;&#112;&#x6d;&#x6a;&#x73;&#x2e;&#x63;&#x6f;&#109;">&#x73;&#x75;&#x70;&#112;&#111;&#x72;&#116;&#64;&#110;&#112;&#x6d;&#x6a;&#x73;&#x2e;&#x63;&#x6f;&#109;</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&#39;t come to any sort of resolution, email support
<a href="&#x6d;&#97;&#x69;&#x6c;&#x74;&#111;&#58;&#115;&#x75;&#112;&#x70;&#x6f;&#x72;&#x74;&#64;&#x6e;&#x70;&#109;&#x6a;&#115;&#x2e;&#x63;&#111;&#x6d;">&#115;&#x75;&#112;&#x70;&#x6f;&#x72;&#x74;&#64;&#x6e;&#x70;&#109;&#x6a;&#115;&#x2e;&#x63;&#111;&#x6d;</a> and we&#39;ll sort it out. (&quot;Reasonable&quot; is
<a href="&#109;&#97;&#105;&#x6c;&#x74;&#x6f;&#58;&#x73;&#117;&#x70;&#112;&#111;&#x72;&#116;&#64;&#x6e;&#112;&#109;&#106;&#x73;&#x2e;&#99;&#x6f;&#x6d;">&#x73;&#117;&#x70;&#112;&#111;&#x72;&#116;&#64;&#x6e;&#112;&#109;&#106;&#x73;&#x2e;&#99;&#x6f;&#x6d;</a> and we&#39;ll sort it out. (&quot;Reasonable&quot; is
usually at least 4 weeks, but extra time is allowed around common
holidays.)</li>
</ol>
Expand Down
2 changes: 2 additions & 0 deletions deps/npm/test/common-tap.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ process.env.npm_config_cache = exports.npm_config_cache = npm_config_cache
process.env.npm_config_userconfig = exports.npm_config_userconfig = path.join(__dirname, 'fixtures', 'config', 'userconfig')
process.env.npm_config_globalconfig = exports.npm_config_globalconfig = path.join(__dirname, 'fixtures', 'config', 'globalconfig')
process.env.random_env_var = 'foo'
// suppress warnings about using a prerelease version of node
process.env.npm_config_node_version = process.version.replace(/-.*$/, '')

var bin = exports.bin = require.resolve('../bin/npm-cli.js')
var chain = require('slide').chain
Expand Down