-
-
Notifications
You must be signed in to change notification settings - Fork 5.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
Upgrade to lodash 4 #3315
Upgrade to lodash 4 #3315
Conversation
|
||
export default function (dest?: Object, src?: Object): ?Object { | ||
if (!dest || !src) return; | ||
|
||
return merge(dest, src, function (a, b) { | ||
return mergeWith(dest, src, function (a, b) { | ||
if (b && Array.isArray(a)) { | ||
let newArray = b.slice(0); |
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.
The rest of this could also be replaced with _.union
It seems like there's some caching issues with the CI. I thought it might be an issue with npm v2, but I just ran the tests locally with node 3 and npm 2, and it works fine. Can the cache be cleaned somehow for this PR? |
All of the tests pass on travis when running cleanly on my branch: https://travis-ci.org/forivall/babel kcheck / eslint depends on lodash 3, and it seems to be cached in some deduplicated state. When it is restored from the cache, it doesn't specifically contain lodash, since it expecs it in the parent. But when bootstrap |
roughly reproducable via |
Hi @hzoo and @loganfsmyth. I'd love to see this Lodash bump get merged -- without it, projects that depend on Babel and lodash@4 can't dedupe a second version, so lodash@3 gets installed dozens of times for a typical Babel config. Would it be helpful for me to rebase this PR against master? Are there any other blockers that I can help clear up? |
Current coverage is 87.81%@@ master #3315 diff @@
==========================================
Files 194 194
Lines 10119 10119
Methods 1535 1535
Messages 0 0
Branches 2245 2245
==========================================
Hits 8886 8886
Misses 1233 1233
Partials 0 0
|
Not a big deal for node 4, etc, then. @loganfsmyth |
Thanks so much! |
Briefly discussed on slack.
One of the test fixtures was also caught by my grep/sed'ing, just to note. (I did double- & triple-check everything after the sed & grep, ran tests, etc.) I'll also check the coverage results to make sure all the changes were covered.