Skip to content
This repository has been archived by the owner on Mar 12, 2020. It is now read-only.

React Native 0.57 - rebase and merge branch #1551

Merged
merged 2 commits into from
Mar 21, 2019
Merged

React Native 0.57 - rebase and merge branch #1551

merged 2 commits into from
Mar 21, 2019

Conversation

orta
Copy link
Contributor

@orta orta commented Mar 21, 2019

Already converted #1210 into a single commit, then will be re-basing that to master

@orta orta force-pushed the one_rn_57 branch 2 times, most recently from 94983b5 to 140b738 Compare March 21, 2019 15:10
@orta orta assigned alloy and orta Mar 21, 2019
@orta
Copy link
Contributor Author

orta commented Mar 21, 2019

OK, this is ready to go!

@alloy
Copy link
Contributor

alloy commented Mar 21, 2019

@l2succes I don’t want to hinder in any way work on the City Guide, in case any last minute changes need to get shipped. Perhaps we’re at the point where we do merge this to master and if last minute changes need to be made, those should just be applied to a branch off of the current release tag and re-applied to master?

@l2succes
Copy link
Contributor

👍Yes, I feel pretty comfortable merging the RN upgrade considering the current state of City Guide. If we need to push a hotfix as you said, we can do that off the current release tag.

orta added 2 commits March 21, 2019 16:03
Update native deps

React Native upgrade for rutime behavior

Fixes crash from division by zero.

Upgrades Danger.

Port Relay DevTools from Reaction

Patch relay-mock-network-layer to support persisted query resolution

Port over MockRelayRendererFixtures, renderWithLoadProgress tests

Update to Node 10 and update affected testing dependencies

Remove unused RAF dep

Add Changelog entry

Lift Context out of tests and into utils

Post-rebase lockfile updates

Updates Danger again, see #1212.

Resolve a version of fsevents that doesn't crash on node 10

Gets some of the tests to compile

Update the React Native version, and get types up to date

Update native deps

React Native upgrade for rutime behavior

Fixes crash from division by zero.

Upgrades Danger.

Port Relay DevTools from Reaction

Patch relay-mock-network-layer to support persisted query resolution

Port over MockRelayRendererFixtures, renderWithLoadProgress tests

Update to Node 10 and update affected testing dependencies

Remove unused RAF dep

Add Changelog entry

Lift Context out of tests and into utils

Post-rebase lockfile updates

Updates Danger again, see #1212.

Resolve a version of fsevents that doesn't crash on node 10

Gets some of the tests to compile

Dep updates

Dep updates

Try updating to RN 0.58

Downgrade rn to 57

Update snapshots

Fix react-tracking mock failing

Clean up comments

[babel] Strip Flow type annotations before any other transforms.

[test] Update snapshots with new default values.

[test] Fail on error/warn logs with helpful message.

[package] Pin exact RN/React/ReactDOM/Enzyme deps

[test] Ignore ReactDOM warnings that don’t apply to RN.

[test] Fix tests that were logging.

[test] A few more snapshot updates after dep updates.

[MockRelayRenderer] Properly name test

[test] Fix test that was bleeding failing async code into other tests

[styled-components] Remove usage of deprecated API.

[ci] Make fsevents optional

[tsc] Makes types green

Signed-off-by: Eloy Durán <eloy.de.enige@gmail.com>
…r something can render an empty string outside of a Text, which is a bug in RN 0.57

Signed-off-by: Eloy Durán <eloy.de.enige@gmail.com>
@alloy
Copy link
Contributor

alloy commented Mar 21, 2019

Perfect 👌

Merge on green, Peril buddy, and, while you’re at it, pop that 🍾

@l2succes
Copy link
Contributor

🙌🏾😭Can't believe it's finally happening 👏

@l2succes
Copy link
Contributor

continuous-integration/travis-ci/pr is ✅ already not sure why it still shows up yellow. Merging

@l2succes l2succes merged commit f0e1143 into master Mar 21, 2019
@alloy alloy deleted the one_rn_57 branch March 21, 2019 16:32
@alloy
Copy link
Contributor

alloy commented Mar 21, 2019

\o/

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

Successfully merging this pull request may close these issues.

3 participants