Skip to content

Latest commit

 

History

History
56 lines (43 loc) · 1.89 KB

Wanderlog.md

File metadata and controls

56 lines (43 loc) · 1.89 KB
Raw

Wanderlog-specific readme

This is our fork of React Native, to integrate various bugfixes that require re-building all the native components.

How tos

1. Integrate upstream patch into our fork

Let's say we're on React Native 0.62.2, and encounter a React Native issue that has been fixed in 0.64. We have two options:

  1. Upgrade to 0.64, or
  2. Backport the patch

Upgrading a version often takes half a day, so if it's a small patch, it's often easier to just release.

  1. Checkout your version branch (0.62.2-wanderlog)
  2. Download the patch by:
  3. Apply the patch 
    cd react-native
git apply 1234.patch
git commit -m 'Same message as upstream, preferably'
  4. Adding a line to WanderlogPatches.md about where we got the patch from and the commit that references it, and then commit that.

2. Make a fix ourselves

See https://gitlab.com/travelchime/itineraries/-/blob/master/mobile/PATCHING_REACT_NATIVE.md

3. Publishing a new version and using it in our app

See https://gitlab.com/travelchime/itineraries/-/blob/master/mobile/PATCHING_REACT_NATIVE.md

4. Rebasing on main

  • Check WanderlogPatches.md:
    • Run: 
      git checkout main
git pull
git remote add upstream git@github.com:facebook/react-native.git
git fetch upstream main
git rebase -i upstream/main
    • For patches that have Pull Requests that have now been merged into upstream, you can omit/DROP them
    • Otherwise, try to resolve any merge conflicts
  • Clean up WanderlogPatches.md by removing any patches/commits that you omitted/DROPped
  • Commit any changes to WanderlogPatches.md you made