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

Update React (and react-dom) to 15.4.0 and react-tap-event-plugin to 2.0.1 #155

Merged
merged 4 commits into from
Nov 30, 2016

Conversation

petetnt
Copy link
Contributor

@petetnt petetnt commented Nov 18, 2016

... to fix React 15.4.0 compatibility).

This PR builds on the previous PR #153 which was reverted in #154 due to NPM warnings about missing peer deps (which I missed because my peer deps matched the ones that prompted the update in the first place).

All tests pass, example works as it worked with the previous version.

Sorry about the hassle. cc @fzaninotto

--- Old message:

react-v15.4.0 broke react-tap-event-plugin@v1, which got updated to 2.0.1. just now at zilverline/react-tap-event-plugin#82. See the change set here: https://github.com/zilverline/react-tap-event-plugin/pull/82/files. It only changes the paths to react-dom.

Signed-off-by: petetnt pete.a.nykanen@gmail.com

@petetnt petetnt changed the title Update React (and react-dom) and react-tap-event-plugin to 2.0.1 Update React (and react-dom) to 15.4.0 and react-tap-event-plugin to 2.0.1 Nov 18, 2016
@petetnt petetnt closed this Nov 18, 2016
@petetnt
Copy link
Contributor Author

petetnt commented Nov 18, 2016

Argh, now the CI failed. Lemme see that one more time 😢

@petetnt petetnt reopened this Nov 18, 2016
@fzaninotto
Copy link
Member

I'll test locally and merge by hand if successful.

@fzaninotto
Copy link
Member

I found a version conflict in material UI:

  • React 0.15.4 is only compatible with Material UI v0.16.3, so we need to upgrade material ui, too (currently fixed to v0.16.1)
  • But Material UI v0.16.2 introduced a regression which breaks the layout in the <List> component.

So we can't merge this PR until mui/material-ui#5590 is solved.

petetnt and others added 3 commits November 30, 2016 11:15
... to fix React 15.4.0 compatibility).

[react-v15.4.0](https://facebook.github.io/react/blog/2016/11/16/react-v15.4.0.html) broke `react-tap-event-plugin@v1`, which got updated to 2.0.1. just now at zilverline/react-tap-event-plugin#82. See the change set here: https://github.com/zilverline/react-tap-event-plugin/pull/82/files. It only changes the paths to `react-dom`.

https://www.npmjs.com/package/react-tap-event-plugin

Update React too for correct peer deps

Signed-off-by: petetnt <pete.a.nykanen@gmail.com>
Signed-off-by: petetnt <pete.a.nykanen@gmail.com>
@fzaninotto fzaninotto merged commit 6667e09 into marmelab:master Nov 30, 2016
@petetnt
Copy link
Contributor Author

petetnt commented Nov 30, 2016

Thanks @fzaninotto 👍

@petetnt petetnt deleted the petetnt-update-deps branch November 30, 2016 10:32
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.

3 participants