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

[No QA] Upgrade RN to 0.70.4 (aka 0.70.1) #10860

Merged
merged 11 commits into from
Sep 23, 2022
Merged

[No QA] Upgrade RN to 0.70.4 (aka 0.70.1) #10860

merged 11 commits into from
Sep 23, 2022

Conversation

roryabraham
Copy link
Contributor

@roryabraham roryabraham commented Sep 7, 2022

How to review this PR

A lot of these changes might seem kind of random, but I was simply following the RN upgrade helper between our last version (0.69.3) and the new one (0.70.1): https://react-native-community.github.io/upgrade-helper/?from=0.69.3&to=0.70.1

Use that as a guide to review these changes.

Details

This PR update the React Native version to @expensify/react-native@0.70.2, which is based on React Native 0.70.1. Hopefully the next time we publish the fork, it will be with the same version from the upstream. My bad!

This upgrade should result in much better JSI performance, hopefully will fix the debug-build performance issues on the Android app. Overall many of the other upgrades from 0.70 are config or build-system related AFAICT.

As part of this, I had to update reanimated to a version that's compatible with RN 0.70.

Fixed Issues

(partial) #8503
(partial) #10345

Tests

Run the app. Make sure that the build succeeds and perform various regression tests of basic functionality to see that it works as expected.

  • Verify that no errors appear in the JS console

PR Review Checklist

Contributor (PR Author) Checklist

  • I linked the correct issue in the ### Fixed Issues section above
  • I wrote clear testing steps that cover the changes made in this PR
    • I added steps for local testing in the Tests section
    • I added steps for Staging and/or Production testing in the QA steps section
    • I added steps to cover failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I included screenshots or videos for tests on all platforms
  • I ran the tests on all platforms & verified they passed on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • MacOS / Desktop
  • I verified there are no console errors (if there's a console error not related to the PR, report it or open an issue for it to be fixed)
  • I followed proper code patterns (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick)
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product was added in all src/languages/* files
    • I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team on the original GH to get the correct copy.
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I followed the guidelines as stated in the Review Guidelines
  • I tested other components that can be impacted by my changes (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar are working as expected)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • Any functional components have the displayName property
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • I have checked off every checkbox in the PR author checklist, including those that don't apply to this PR.

PR Reviewer Checklist

The Contributor+ will copy/paste it into a new comment and complete it after the author checklist is completed

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I verified tests pass on all platforms & I tested again on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • MacOS / Desktop
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product was added in all src/languages/* files
    • I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team on the original GH to get the correct copy.
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • Any functional components have the displayName property
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

QA Steps

None, regression tests only.

  • Verify that no errors appear in the JS console

Screenshots

Web

Mobile Web

Desktop

iOS

image

Android

image

@roryabraham roryabraham changed the title Upgrade RN to 0.70.1 [WIP] Upgrade RN to 0.70.1 Sep 7, 2022
@roryabraham roryabraham changed the title [WIP] Upgrade RN to 0.70.1 [WIP] Upgrade RN to 0.70.2 (aka 0.70.1) Sep 22, 2022
@roryabraham roryabraham changed the title [WIP] Upgrade RN to 0.70.2 (aka 0.70.1) [WIP] Upgrade RN to 0.70.3 (aka 0.70.1) Sep 22, 2022
@roryabraham roryabraham self-assigned this Sep 22, 2022
@roryabraham

This comment was marked as outdated.

@roryabraham roryabraham changed the title [WIP] Upgrade RN to 0.70.3 (aka 0.70.1) [WIP][No QA] Upgrade RN to 0.70.3 (aka 0.70.1) Sep 23, 2022
@roryabraham roryabraham changed the title [WIP][No QA] Upgrade RN to 0.70.3 (aka 0.70.1) [No QA] Upgrade RN to 0.70.3 (aka 0.70.1) Sep 23, 2022
@roryabraham roryabraham marked this pull request as ready for review September 23, 2022 00:33
@roryabraham roryabraham requested a review from a team as a code owner September 23, 2022 00:33
@roryabraham
Copy link
Contributor Author

Took me a bit but this is ready for review!

@melvin-bot melvin-bot bot requested review from dangrous and removed request for a team September 23, 2022 00:34
Copy link
Contributor

@marcaaron marcaaron left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ - Web
✅ - Desktop
✅ - iOS
🟨 - Android dev builds - seem 1000x better
- Navigation is a bit slow / unusable on my account with a few hundred chats
- But I could not even test the app locally before so huge improvement overall
🟥 - Android release build didn't work for me and I ran into this weird error

Execution failed for task ':app:bundleReleaseJsAndAssets'.
> java.lang.Exception: Couldn't determine Hermesc location. Please set `project.ext.react.hermesCommand` to the path of the hermesc binary file. node_modules/react-native/sdks/hermesc/%OS-BIN%/hermesc

Tried to look at that path but didn't find hermesc in node_modules/react-native/sdks.

Comment on lines -163 to +164
// We configure the NDK build only if you decide to opt-in for the New Architecture.
// We configure the CMake build only if you decide to opt-in for the New Architecture.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It looks like we're switching from the ndk to Cmake? In which case, can we remove the other ndk config?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Well we're switching from ndk-build to CMake, but the Java NDK is still used ... that's what enables Java and C++ code to communicate with eachother

@@ -189,8 +182,8 @@ android {
if (isNewArchitectureEnabled()) {
// We configure the NDK build only if you decide to opt-in for the New Architecture.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We configure the CMake build

Copy link
Contributor

@Julesssss Julesssss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Web and Desktop worked for me 👍

iOS - I'm unable to build due to this error, even after pod deintegrate. Are you guys using a specific version of XCode?
Screenshot 2022-09-23 at 13 54 15

Android - I see the same issue as Marc, but interestingly it also occurs on main... Here's the RN issue, many people seem to be having the same problem

@roryabraham
Copy link
Contributor Author

iOS - I'm unable to build due to this error, even after pod deintegrate

@Julesssss Make sure you pull changes? It should be:

use_react_native!(
+    :path => config[:reactNativePath],
-    :path => config["reactNativePath"],
    ...

Copy link
Contributor

@Julesssss Julesssss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I found a workaround for the Android Release build issue. Simply generate a release build manually with Build > Generate Signed bundle / APK. Android release and debug builds are testing well 👍

Make sure you pull changes? It should be:

Ah, thanks. I had switched to main for testing and forgot I was on the wrong branch 🤦 I'm now seeing a different error. Trying a full pod deintegrate again...
Screenshot 2022-09-23 at 15 41 03

@roryabraham
Copy link
Contributor Author

I'm now seeing a different error

I saw that error and fixed it with pod update RCT-Folly --no-repo-update and committed the changes. Shouldn't have to do that again 🤔

@roryabraham
Copy link
Contributor Author

I found a workaround for the Android Release build issue

Hmmm ... I think node_modules/react-native/sdks/hermesc should contain some prebuilt hermes binaries, but that's not happening. I might need to either republish or create a workaround that downloads those binaries in a postinstall script.

@roryabraham
Copy link
Contributor Author

Going to republish once again ☹️

@roryabraham
Copy link
Contributor Author

roryabraham commented Sep 23, 2022

Updated and retested – this now appears to be working on Web, Desktop, iOS, Android (debug) AND Android (release) 👍🏼

Thanks @marcaaron for being super diligent and testing a release build too 👏🏼


FWIW, I did what I had done in the past and downloaded the pre-built Hermes binaries, force-committed them in the fork, and included them in the release. This is ideal because it means that nobody (not even our GitHub CI/CD) has to compile Hermes, which takes like an hour

@roryabraham roryabraham changed the title [No QA] Upgrade RN to 0.70.3 (aka 0.70.1) [No QA] Upgrade RN to 0.70.4 (aka 0.70.1) Sep 23, 2022
Copy link
Contributor

@marcaaron marcaaron left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM and works great !

@marcaaron
Copy link
Contributor

Are you guys using a specific version of XCode?

@Julesssss I'm on 13.4.1 atm. I did have to run some pod commands that were recommended to update the hermes build there

@marcaaron
Copy link
Contributor

  • I have verified the author checklist is complete (all boxes are checked off).
  • I verified the correct issue is linked in the ### Fixed Issues section above
  • I verified testing steps are clear and they cover the changes made in this PR
    • I verified the steps for local testing are in the Tests section
    • I verified the steps for Staging and/or Production testing are in the QA steps section
    • I verified the steps cover any possible failure scenarios (i.e. verify an input displays the correct error message if the entered data is not correct)
    • I turned off my network connection and tested it while offline to ensure it matches the expected behavior (i.e. verify the default avatar icon is displayed if app is offline)
  • I checked that screenshots or videos are included for tests on all platforms
  • I verified tests pass on all platforms & I tested again on:
    • iOS / native
    • Android / native
    • iOS / Safari
    • Android / Chrome
    • MacOS / Chrome
    • MacOS / Desktop
  • If there are any errors in the console that are unrelated to this PR, I either fixed them (preferred) or linked to where I reported them in Slack
  • I verified proper code patterns were followed (see Reviewing the code)
    • I verified that any callback methods that were added or modified are named for what the method does and never what callback they handle (i.e. toggleReport and not onIconClick).
    • I verified that comments were added to code that is not self explanatory
    • I verified that any new or modified comments were clear, correct English, and explained "why" the code was doing something instead of only explaining "what" the code was doing.
    • I verified any copy / text shown in the product was added in all src/languages/* files
    • I verified any copy / text that was added to the app is correct English and approved by marketing by tagging the marketing team on the original GH to get the correct copy.
    • I verified proper file naming conventions were followed for any new files or renamed files. All non-platform specific files are named after what they export and are not named "index.js". All platform-specific files are named for the platform the code supports as outlined in the README.
    • I verified the JSDocs style guidelines (in STYLE.md) were followed
  • If a new code pattern is added I verified it was agreed to be used by multiple Expensify engineers
  • I verified that this PR follows the guidelines as stated in the Review Guidelines
  • I verified other components that can be impacted by these changes have been tested, and I retested again (i.e. if the PR modifies a shared library or component like Avatar, I verified the components using Avatar have been tested & I retested again)
  • I verified all code is DRY (the PR doesn't include any logic written more than once, with the exception of tests)
  • I verified any variables that can be defined as constants (ie. in CONST.js or at the top of the file that uses the constant) are defined as such
  • If a new component is created I verified that:
    • A similar component doesn't exist in the codebase
    • All props are defined accurately and each prop has a /** comment above it */
    • Any functional components have the displayName property
    • The file is named correctly
    • The component has a clear name that is non-ambiguous and the purpose of the component can be inferred from the name alone
    • The only data being stored in the state is data necessary for rendering and nothing else
    • For Class Components, any internal methods passed to components event handlers are bound to this properly so there are no scoping issues (i.e. for onClick={this.submit} the method this.submit should be bound to this in the constructor)
    • Any internal methods bound to this are necessary to be bound (i.e. avoid this.submit = this.submit.bind(this); if this.submit is never passed to a component event handler like onClick)
    • All JSX used for rendering exists in the render method
    • The component has the minimum amount of code necessary for its purpose, and it is broken down into smaller components in order to separate concerns and functions
  • If a new CSS style is added I verified that:
    • A similar style doesn't already exist
    • The style can't be created with an existing StyleUtils function (i.e. StyleUtils.getBackgroundAndBorderStyle(themeColors.componentBG)
  • If the PR modifies a generic component, I tested and verified that those changes do not break usages of that component in the rest of the App (i.e. if a shared library or component like Avatar is modified, I verified that Avatar is working as expected in all cases)
  • If the PR modifies a component related to any of the existing Storybook stories, I tested and verified all stories for that component are still working as expected.
  • I have checked off every checkbox in the PR reviewer checklist, including those that don't apply to this PR.

@marcaaron
Copy link
Contributor

Gonna merge this so we can keep up the #urgency on WhatsApp Quality.

@marcaaron marcaaron merged commit 5898727 into main Sep 23, 2022
@marcaaron marcaaron deleted the Rory-UpgradeRN branch September 23, 2022 17:59
@OSBotify
Copy link
Contributor

✋ This PR was not deployed to staging yet because QA is ongoing. It will be automatically deployed to staging after the next production release.

@OSBotify
Copy link
Contributor

🚀 Deployed to staging by @marcaaron in version: 1.2.6-0 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

Copy link
Contributor

@Julesssss Julesssss left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@OSBotify
Copy link
Contributor

🚀 Deployed to production by @roryabraham in version: 1.2.6-0 🚀

platform result
🤖 android 🤖 success ✅
🖥 desktop 🖥 success ✅
🍎 iOS 🍎 success ✅
🕸 web 🕸 success ✅

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.

4 participants