deps: upgrade npm to 4.1.2 #11020

Closed
wants to merge 1 commit into
from

Projects

None yet

8 participants

@zkat
Member
zkat commented Jan 26, 2017 edited
Checklist
  • make -j4 test (UNIX), or vcbuild test (Windows) passes
  • tests and/or benchmarks are included
  • documentation is changed or added
  • commit message follows commit guidelines
Affected core subsystem(s)
  • deps
Description of Change
Additional notes

Heads-up that npm@next is currently a semver-minor bump to npm@4.2.0 which includes a significant improvement for search. We'll downstream it in two weeks but it might be worth pointing out that bump cause it's something folks might want in LTS (specially since it has to do with a side utility/service rather than installation and the like). Cheers!

Changelogs

r: @Fishrock123
r: @jasnell
r: @addaleax

@jasnell
Member
jasnell commented Jan 26, 2017

@zkat ... I appreciate this. It would be helpful if you would consider adding links to the relevant commits/PRs for each of the "description of change" bullet points. In particular I'd like to review the file URL changes a bit more in detail to understand more about what is happening there. I will try to give this a review by early next week

@Fishrock123
Member

@zkat oh no.

Our old friend is back... in a new form:

Applying: deps: upgrade npm to 4.1.2
error: deps/npm/node_modules/request/node_modules/form-data/README.md: already exists in working directory
Patch failed at 0001 deps: upgrade npm to 4.1.2
@Fishrock123
Member

@zkat In the mean time I'm going to merge #10781, can you rebase after and then we can try to fix that? :D

@Fishrock123
Member

Ok, 4.1.1 merged. I guess the best way forward here is to rename the file in a separate commit first and then do the rest including whatever changed within the file?

@zkat
Member
zkat commented Jan 26, 2017

@Fishrock123 I'm so angry. I'm so so angry. I hate git so much sometimes. I hate OSX's (and Windows') wobbly bullshit with case-insensitivity. I hate joy and happyness.... anyway yeah that sounds like a good plan. I'll try it again in a wee bit.

@jasnell Yeah, one sec and I'll look those up for you. Watch for an edit in a few minutes.

@zkat
Member
zkat commented Jan 26, 2017

@Fishrock123 I rebased and did --whitespace=fix again on mine and ran into no issues. You should definitely be able to merge through the GH UI now, but you may have to do some local maneuvering if you're still running into this shit locally. I'm sorry. I've tried. 😭

@zkat
Member
zkat commented Jan 26, 2017

@jasnell incidentally, the url.format patch: the only change made was literally just that we stopped using it in one tiny case where we really didn't have to, so that's all it took for it to stop affecting us. I don't think it'll need any further changes. This way is safer anyway. But the link is in the edit now. :)

@Fishrock123
Member

@zkat definitely still running into issues. :/

@zkat
Member
zkat commented Jan 26, 2017

@Fishrock123 one more try? Just pushed a new one.

@Fishrock123
Member

@zkat Nice, great work. Seems to land fine. Here's to hoping it doesn't also have lingering side effects.

Curious though, what did you do?

@zkat
Member
zkat commented Jan 26, 2017

@Fishrock123

git reset head~1
cd deps/npm/(...)/form-data
# need to do a two-step move because OSX will noop a plain case-only move
mv README.md rm.md
mv rm.md Readme.md
git add -A && git commit -m 'deps: upgrade npm to 4.1.2'

And then I just check the commit summary to make sure there's not a file addition for README.md.

@targos
Member
targos commented Jan 26, 2017

Changes from all commits 1,035 files +919 −21,259

That is cool!

@zkat
Member
zkat commented Jan 26, 2017

@targos not much to get excited about, imo. that's probably just from some part of the dependency tree being flattened because of recursive dependencies getting updated and thus allowing more deduping.

@targos
Member
targos commented Jan 26, 2017

Not much I agree, but the tarball should still be noticeably smaller

@zkat
Member
zkat commented Jan 26, 2017

@targos absolutely! you're right. And that's actually p. nice.

@Fishrock123 Fishrock123 self-assigned this Jan 26, 2017
@Fishrock123

Test pass, LGTM

@jasnell
Member
jasnell commented Jan 27, 2017

thank you @zkat!

@bricss bricss referenced this pull request Jan 29, 2017
Merged

v7.5.0 proposal #11062

@Fishrock123 Fishrock123 added a commit to Fishrock123/node that referenced this pull request Jan 30, 2017
@zkat @Fishrock123 zkat + Fishrock123 deps: upgrade npm to 4.1.2
PR-URL: nodejs#11020
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
afb7c1b
@Fishrock123
Member

Thanks, landed in afb7c1b!

@joaocgreis
Member

Was there a CI run on this PR? Anyone still has the link?

@joaocgreis joaocgreis referenced this pull request Jan 31, 2017
Closed

deps: fix npm files from upgrade to 4.1.2 #11085

2 of 2 tasks complete
@MylesBorins
Member

when this lands it will need to come with 35e749b

@evanlucas evanlucas added a commit that referenced this pull request Jan 31, 2017
@zkat @evanlucas zkat + evanlucas deps: upgrade npm to 4.1.2
PR-URL: #11020
Reviewed-By: Jeremiah Senkpiel <fishrock123@rocketmail.com>
9e60af8
@evanlucas evanlucas added a commit that referenced this pull request Jan 31, 2017
@evanlucas evanlucas 2017-01-31, Version 7.5.0 (Current)
Notable changes:

* crypto:
  * ability to select cert store at runtime (Adam Majer) #8334
  * Use system CAs instead of using bundled ones (Adam Majer) #8334
* deps:
  * upgrade npm to 4.1.2 (Kat Marchán) #11020
  * upgrade openssl sources to 1.0.2k (Shigeki Ohtsu) #11021
* doc: add basic documentation for WHATWG URL API (James M Snell) #10620
* process: add NODE_NO_WARNINGS environment variable (cjihrig) #10842
* url: allow use of URL with http.request and https.request (James M Snell) #10638

PR-URL: #11062
42b4cee
@evanlucas evanlucas added a commit that referenced this pull request Jan 31, 2017
@evanlucas evanlucas 2017-01-31, Version 7.5.0 (Current)
Notable changes:

* crypto:
  * ability to select cert store at runtime (Adam Majer) #8334
  * Use system CAs instead of using bundled ones (Adam Majer) #8334
* deps:
  * upgrade npm to 4.1.2 (Kat Marchán) #11020
  * upgrade openssl sources to 1.0.2k (Shigeki Ohtsu) #11021
* doc: add basic documentation for WHATWG URL API (James M Snell) #10620
* process: add NODE_NO_WARNINGS environment variable (cjihrig) #10842
* url: allow use of URL with http.request and https.request (James M Snell) #10638

PR-URL: #11062
a34f1d6
@evanlucas evanlucas added a commit that referenced this pull request Feb 1, 2017
@evanlucas evanlucas 2017-01-31, Version 7.5.0 (Current)
Notable changes:

* crypto:
  * ability to select cert store at runtime (Adam Majer) #8334
  * Use system CAs instead of using bundled ones (Adam Majer) #8334
* deps:
  * upgrade npm to 4.1.2 (Kat Marchán) #11020
  * upgrade openssl sources to 1.0.2k (Shigeki Ohtsu) #11021
* doc: add basic documentation for WHATWG URL API (James M Snell) #10620
* process: add NODE_NO_WARNINGS environment variable (cjihrig) #10842
* url: allow use of URL with http.request and https.request (James M Snell) #10638

PR-URL: #11062
a1c91ec
@joshgav joshgav referenced this pull request Feb 13, 2017
Closed

deps: Add node-inspect #10187

3 of 3 tasks complete
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment