Skip to content
This repository was archived by the owner on Aug 27, 2018. It is now read-only.

Merge the react16 branch back into master.#203

Merged
kwight merged 7 commits intomasterfrom
react16
Dec 8, 2017
Merged

Merge the react16 branch back into master.#203
kwight merged 7 commits intomasterfrom
react16

Conversation

@kwight
Copy link
Contributor

@kwight kwight commented Dec 6, 2017

Now that both Calypso and this repo are running on React 16, it would be best to merge the temporary React 16-based branch back into master. Note that this brings together React 16 (now 16.2) with the esnext changes originally introduced in #174 .

samouri and others added 6 commits November 1, 2017 17:15
* apply prop-types codemod

* upgrade react to 16 and also add prop-types package

* update react-redux

* apply class codemod

* bump minor version, and also include create-react-class

* pkg bump to 2.0.0
@kwight kwight requested review from gwwar and ockham December 6, 2017 01:35
@ockham
Copy link
Contributor

ockham commented Dec 6, 2017

Can we merge this without the esnext change? I'm afraid that's still not quite ready on the Calypso side. I don't think we should block notifications-panel's React 16 upgrade by that though...

@gwwar
Copy link
Contributor

gwwar commented Dec 6, 2017

Thanks for the heads up @ockham

@kwight
Copy link
Contributor Author

kwight commented Dec 6, 2017

Sure, removed the esnext changes from #174 in a981725.

@kwight kwight merged commit ab7bb60 into master Dec 8, 2017
@kwight kwight deleted the react16 branch December 8, 2017 19:24
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants