-
Notifications
You must be signed in to change notification settings - Fork 29.6k
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.
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
deps: upgrade npm to 2.7.4 #1285
Conversation
Every npm version bump requires a few patches to be floated on node-gyp for io.js compatibility. These patches are found in 03d1992, 5de334c, and da730c7. This commit squashes them into a single commit. PR-URL: nodejs#990 Reviewed-By: Ben Noordhuis <[email protected]>
On Windows, when node or io.js attempts to dynamically load a compiled addon, the compiled addon tries to load node.exe or iojs.exe again - depending on which import library the module used when it was linked. This makes it impossible to rename node.exe or iojs.exe, because when that happens the module can't find its dependencies. With this patch, a delay-load hook is added to all modules that are compiled with node-gyp. The delay-load hook ensures that whenever a module tries to load imports from node.exe/iojs.exe, it'll just refer back to the process image, thus making it possible to rename the iojs/node binary. Bug: nodejs#751 Bug: nodejs#965 Upstream PR: nodejs/node-gyp#599 PR-URL: nodejs#1251 Reviewed-By: Rod Vagg <[email protected]>
The delay-load hook that was landed in 3d46fef to make compiled addons work on Windows regardless of the iojs.exe/node.exe filename causes issues with a small amount of compiled addons. Therefore this patch makes it an opt-in feature. An addon may set the 'win_delay_load_hook' option to 'true' in its binding.gyp to enable this feature. Example: ``` { 'targets': [ { 'target_name': 'ernie', 'win_delay_load_hook': 'true', ... ``` Refs: nodejs#1251 PR-URL: nodejs#1266 Reviewed-By: Ben Noordhuis <[email protected]>
@@ -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="mailto:i@izs.me">i@izs.me</a></p> | |||
<a href="mailto:i@izs.me">i@izs.me</a></p> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Just curious, why are the email links encoded like this, and why does it change each update? o.0
I always wonder why do you keep hardcoded version in all these .html files. |
Looked over the code. Can't wait for npm@3 to reduce some of those Also, yay no whitespace errors this time. :) I'm pretty sure @piscisaureus's commits can be rolled into one second floating patch.
LGTM otherwise. |
@YuriSolovyov the HTML documentation is primarily meant to be used by Windows users who don't have access to |
@Fishrock123 The email links are randomly encoded to mitigate spam, and date from a quaint time when people thought that was possible. |
Ah. Running the tests again now, hopefully github survives. |
Tests seem fine, LGTM pending a potential squash on @piscisaureus's commits, but that isn't of too much concern. |
I'd still like a thumbs up from @piscisaureus before merging. I'll probably combine his two commits, if he says that's OK. |
@othiym23 still, that would make diffs a lot less noisy and short |
I'll do that actually. |
Landed in iojs:73de135...iojs:ba93c58 |
@piscisaureus f166cde is missing its commit message and associated metadata. @chrisdickinson made the call that it wasn't worth changing because there are commits after it, but we should probably avoid that sort of thing in the future. |
This release is mostly bug fixes, including:
fe1bc38
#7672
[email protected]
:Fix client-side certificate handling by correcting property name.
(@atamon)
89ce829
#7630
[email protected]
: Part3 of ensuring that GitHub shorthand is handled consistently.
(@othiym23)
63313eb
#7630
[email protected]
: Part 2 of ensuring that GitHub shorthandis handled consistently. (@othiym23)
3ed41bf
#7630
[email protected]
: Part1 of ensuring that GitHub shorthand is handled consistently.
(@othiym23)
I've applied @cjihrig's
node-gyp
floating patch, as well as reapplying @piscisaureus's two patches for delayed loading of compiled modules. Are both of those commits necessary? Can they be combined into a single commit? I'm in the process of setting up a quilt to handle these floating patches (which I am still hopeful will only be needed for a little while), but the commit logs are going to start getting noisy if the list of commits that come along for the ride with each new version of npm continues to grow.R: @piscisaureus
R: @rvagg
R: @Fishrock123