RN v61 upgrade by chrisbobbe · Pull Request #4151 · zulip/zulip-mobile

chrisbobbe · 2020-06-11T22:54:40Z

~~Awaiting #4150.~~ And, it's merged! Thanks, @gnprice !

chrisbobbe · 2020-06-11T23:19:30Z

Hmm, actually, there's a part I haven't investigated yet—the various changes to project.pbxproj shown in the upgrade helper. I'll do that now.

[...]

Hmm, so there weren't actually any changes to the project.pbxproj in the template app. The following command (in the react-native repo) gives no results:

git lsp v0.60.6..v0.61.5 -- template/ios/HelloWorld.xcodeproj/project.pbxproj

I'm guessing the changes showing up in the upgrade helper are NFC and incidental, and caused by some changes in the environment in which react-native init was run, between the versions, to make the branches of the rn-diff-purge repo. Maybe the Xcode version? It looks like most or all of the changes are in the way things are ordered, or things are given different IDs.

chrisbobbe · 2020-07-07T21:21:12Z

edit: One way of doing this is at e956f99 from my current revision of #4183 (not merged yet).

Bookmarking this, as something we might (?) have to think about, for mocking native modules now that Haste isn't being used: https://altany.github.io/react-native/0.61/jest/mocking/upgrade/2020/01/25/mocking-react-native-0.61-modules-with-jest.html.

It links to facebook/react-native#26579 (comment).

chrisbobbe · 2020-07-08T23:40:45Z

edit: One way of doing this is at e956f99 from my current revision of #4183 (not merged yet).

OK, I've cherry-picked e956f99 and made some changes.

Also, I resolved some conflicts; this is ready for a review. 🙂

gnprice · 2020-07-11T00:22:14Z

Thanks @chrisbobbe ! Chat discussion starting here. Looks good, with some comments in that thread:

the changes to Jest mocking (details there)
probably worth including the equivalent of facebook/react-native@9127fb5
a couple of items to mention in your list of changes we're omitting, at Upgrade to RN v0.61 #3781 (comment)

gnprice · 2020-07-11T01:38:45Z

+// modules being available after the bridge initializes.
+//
+// The 'react-native' we import here is already mocked to a great
+// extent by `node_modules/react-native-jest/setup.js`, thanks to our


Suggested change

// extent by `node_modules/react-native-jest/setup.js`, thanks to our

// extent by `node_modules/react-native/jest/setup.js`, thanks to our

chrisbobbe · 2020-07-11T02:11:28Z

Thanks for the review! Just pushed these changes to this branch; also propagated them to my branch rn-61-followup-1, for #4152.

With something called Haste, we were allowed to just pass "Linking" to `jest.mock`, and it would automagically be known that we want something called "Linking" from React Native. With RN v0.61, Haste is no longer used, and that way of mocking breaks. One possible response is to spell out the entire path to "Linking" within `react-native`: jest.mock('react-native/Libraries/Linking/Linking') But that's brittle: that path may change with new React Native versions, and it'll be unpleasant to have to adapt. The recommended solution [1] is to mock the `react-native` module ourselves, on top of the mocking that React Native's Jest setup does for us. And to put our "Linking" mock there. So, do. The *exact* recommendation is something that uses `Object.setPrototypeOf`. We don't do that. Instead, Greg found an earlier revision of the comment where that recommendation appears, and we go from there. This way, we avoid an awkward problem with react-native-vector-icons. That library re-exports `react-native` in its `lib/react-native.js`, and imports that when they want properties from the `react-native` module. Errors ensue; it appears that their strategy cuts off access to properties we'd intended to make available by using ReactNative as a prototype. So, don't mess around with prototypes. [1] facebook/react-native#26579 (comment)

Part of the RN v0.60 -> v0.61 upgrade [1]. Corresponds to facebook/react-native@9127fb51f. [1]: https://react-native-community.github.io/upgrade-helper/?from=0.60.6&to=0.61.5

Part of the RN v0.60 -> v0.61 upgrade [1]. Corresponds to facebook/react-native@ba8f88d1a. Before the upgrade commit, we add the (temporarily unnecessary) new name. After the upgrade, we'll remove the (then-unnecessary) old name. [1]: https://react-native-community.github.io/upgrade-helper/?from=0.60.6&to=0.61.5

Using the RN Upgrade Helper, a web app showing the diff from the release/0.60.6 and the release/0.61.5 branches of the `react-native-community/rn-diff-purge` repo, at https://react-native-community.github.io/upgrade-helper/?from=0.60.6&to=0.61.5. In this commit: - Upgrade `react-native`, `react`, and `flow-bin` following the template - Change our Podfile to reflect new/changed iOS dependencies in RN, following the template - Make changes to adapt to multiple upgrades of RN's Hermes dependency (details below) - Run `yarn yarn-deduplicate && yarn` as prompted by `tools/test deps` See (on the issue) a list of changes from the upgrade helper that we don't do in this series [1]. Hermes details: In facebook/react-native@c21e36db4, React Native started using v0.1.1 of Hermes [2], which includes a rename of the NPM package (facebook/hermes@c74842e) from 'hermesvm' to 'hermes-engine'. So, use the new path in the one place where its path occurs in our code, following the changes to the template in that commit. In facebook/react-native@06c64f5f1, React Native started using v0.2.1 of Hermes [3], which was came with the announcement, "The C++ runtime library is now packaged in a separate AAR to avoid `pickFirst` nondeterminisms". Follow the changes to the template in that commit, where several `pickFirst` lines are removed. [1]: zulip#3781 (comment) [2]: https://github.com/facebook/hermes/releases/tag/v0.1.1 [3]: https://github.com/facebook/hermes/releases/tag/v0.2.1 Fixes: zulip#3781

Part of the RN v0.60 -> v0.61 upgrade [1]. Corresponds to facebook/react-native@ba8f88d1a. Before the upgrade commit, we added the (then-unnecessary) new name. Now that the upgrade is done, we remove the (now-unnecessary) old name. [1]: https://react-native-community.github.io/upgrade-helper/?from=0.60.6&to=0.61.5

Part of the RN v0.60 -> v0.61 changes to the template app [1], corresponding to facebook/react-native@bf8d91868 and a correction in facebook/react-native@732ded7f7. This must happen at or after the main upgrade commit because the former declares that it depends on facebook/react-native#25100, which landed in facebook/react-native@69d1ed731 and was released in v0.61.0. [1]: https://react-native-community.github.io/upgrade-helper/?from=0.60.6&to=0.61.5

gnprice · 2020-07-13T19:30:02Z

Merged! 🎉 Thanks for pushing this through.

chrisbobbe · 2020-07-13T19:36:22Z

Thanks, @gnprice! I'll address the conflicts over at #4152, that followup will fix an existing issue by upgrading Unimodules!

chrisbobbe added upstream: RN Issues related to an issue in React Native blocked on other work To come back to after another related PR, or some other task. labels Jun 11, 2020

chrisbobbe mentioned this pull request Jun 11, 2020

RN v0.61 upgrade followup. #4152

Merged

chrisbobbe requested a review from gnprice June 11, 2020 22:55

chrisbobbe marked this pull request as draft June 11, 2020 23:52

chrisbobbe force-pushed the rn-61 branch from 8341978 to 2c89aba Compare June 12, 2020 21:39

chrisbobbe marked this pull request as ready for review June 15, 2020 22:43

chrisbobbe removed the blocked on other work To come back to after another related PR, or some other task. label Jun 15, 2020

chrisbobbe added the P1 high-priority label Jul 8, 2020

chrisbobbe force-pushed the rn-61 branch from 2c89aba to bf28be4 Compare July 8, 2020 23:36

chrisbobbe mentioned this pull request Jul 8, 2020

Use absolute URL for webview baseUrl on iOS. #4183

Merged

chrisbobbe force-pushed the rn-61 branch 2 times, most recently from c0dc963 to c323ea1 Compare July 9, 2020 17:34

gnprice reviewed Jul 11, 2020

View reviewed changes

chrisbobbe mentioned this pull request Jul 11, 2020

Upgrade to RN v0.61 #3781

Closed

chrisbobbe force-pushed the rn-61 branch 2 times, most recently from f3ff7a3 to eea6501 Compare July 11, 2020 02:04

chrisbobbe added 6 commits July 13, 2020 12:27

ZulipMobile: Annotate default export.

23bb82b

Part of the RN v0.60 -> v0.61 upgrade [1]. Corresponds to facebook/react-native@9127fb51f. [1]: https://react-native-community.github.io/upgrade-helper/?from=0.60.6&to=0.61.5

gnprice force-pushed the rn-61 branch from eea6501 to f7707e9 Compare July 13, 2020 19:29

gnprice merged commit f7707e9 into zulip:master Jul 13, 2020

chrisbobbe mentioned this pull request Jul 13, 2020

Convert all object types to exact, or explicitly-inexact #3452

Closed

chrisbobbe deleted the rn-61 branch November 6, 2020 03:19

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

RN v61 upgrade#4151

RN v61 upgrade#4151
gnprice merged 6 commits intozulip:masterfrom
chrisbobbe:rn-61

chrisbobbe commented Jun 11, 2020 •

edited

Loading

Uh oh!

chrisbobbe commented Jun 11, 2020 •

edited

Loading

Uh oh!

chrisbobbe commented Jul 7, 2020 •

edited

Loading

Uh oh!

chrisbobbe commented Jul 8, 2020

Uh oh!

gnprice commented Jul 11, 2020

Uh oh!

gnprice Jul 11, 2020

Uh oh!

chrisbobbe commented Jul 11, 2020

Uh oh!

gnprice commented Jul 13, 2020

Uh oh!

chrisbobbe commented Jul 13, 2020 •

edited

Loading

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

	// extent by `node_modules/react-native-jest/setup.js`, thanks to our
	// extent by `node_modules/react-native/jest/setup.js`, thanks to our

Uh oh!

Conversation

chrisbobbe commented Jun 11, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chrisbobbe commented Jun 11, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chrisbobbe commented Jul 7, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

chrisbobbe commented Jul 8, 2020

Uh oh!

gnprice commented Jul 11, 2020

Uh oh!

gnprice Jul 11, 2020

Choose a reason for hiding this comment

Uh oh!

chrisbobbe commented Jul 11, 2020

Uh oh!

gnprice commented Jul 13, 2020

Uh oh!

chrisbobbe commented Jul 13, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

chrisbobbe commented Jun 11, 2020 •

edited

Loading

chrisbobbe commented Jun 11, 2020 •

edited

Loading

chrisbobbe commented Jul 7, 2020 •

edited

Loading

chrisbobbe commented Jul 13, 2020 •

edited

Loading