Skip to content
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

fix: props merge order && willUpdate. #967 #968

Merged
merged 1 commit into from
May 8, 2018
Merged

Conversation

theKashey
Copy link
Collaborator

Continuation of #967

@theKashey theKashey changed the title fix: props merge order. #967 fix: props merge order && willUpdate. #967 May 8, 2018
@timneutkens
Copy link

Verified that this solves the issue we were seeing. Thanks @theKashey 🙏

@codecov-io
Copy link

codecov-io commented May 8, 2018

Codecov Report

Merging #968 into master will decrease coverage by 0.15%.
The diff coverage is 100%.

Impacted file tree graph

@@            Coverage Diff             @@
##           master     #968      +/-   ##
==========================================
- Coverage   88.99%   88.84%   -0.16%     
==========================================
  Files          30       31       +1     
  Lines         727      744      +17     
  Branches      166      174       +8     
==========================================
+ Hits          647      661      +14     
- Misses         66       69       +3     
  Partials       14       14
Impacted Files Coverage Δ
src/reconciler/hotReplacementRender.js 89.93% <100%> (+0.12%) ⬆️
babel.js 66.66% <0%> (ø)
src/proxy/inject.js 77.27% <0%> (+1.34%) ⬆️

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update b22f37e...24b3a76. Read the comment docs.

@theKashey
Copy link
Collaborator Author

It's too late for me to merge and release. @neoziro, might be you could handle it?

@timneutkens
Copy link

Thank you very much @theKashey 👍🙌 Waiting on this to release Next.js 6.0.1 🙏

@gregberge
Copy link
Collaborator

@theKashey I am on it!

@gregberge gregberge merged commit 1f8adb9 into master May 8, 2018
@gregberge gregberge deleted the fix-merge-props branch May 8, 2018 20:39
@theKashey
Copy link
Collaborator Author

👍 👍 👍

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants