Integrate of 3/22 Nightly Build by NickGerleman · Pull Request #5028 · microsoft/react-native-windows

NickGerleman · 2020-05-27T21:19:00Z

Start integration of the first available nightly build before 0.63. This build has some interesting stuff like C++ version stamping, PlatformColor, import fixes.

Fixes #3990

Microsoft Reviewers: Open in CodeFlow

Fixes microsoft#4857 Teach the tooling about the pattern and make sure we can validate against `0.0.0-56cf99a96` (the earliest nightly build). We cannot do a lazy fetch against a shortned commit hash, so we need to get a bit "creative" here. We make a couple other improvements here: 1. Change fetch depth to 1 to pull in less history. This reduces the scratch repo size from 174MB to 34MB when fetching just 0.62.2 (which is already much less than the 500MB for cloning entire remote) 2. Don't add remotes to the scratch git repo and instead fetch using the URL. We've seen transient errors where `simplegit` thinks we don't yet have a repo set up and adds a duplicate remote. This should hopefully fix that.

Matching Android behavior of null if not a prerelease

…ndows into nightly-integration

…/react-native-windows into nightly-integration

elicwhite · 2020-06-12T17:42:25Z


 'use strict';
 import ReactNativeViewViewConfigAndroid from './ReactNativeViewViewConfigAndroid';
-import {Platform} from 'react-native'; // from facebook:master d204541


What did these comments mean?

In 0.61 we needed to pull in some changes made to later builds around processing transforms for IIRC non iOS platforms? Added a comment to the change for where the diff was from.

elicwhite · 2020-06-12T17:59:24Z


-  _setNativePropsOnRef: ?({refreshing: boolean, ...}) => void;
+  _nativeRef: ?React.ElementRef<
+    | typeof PullToRefreshViewNativeComponent


Does Windows implement this one? Or do you need to add another one for Windows to this file?

We implement PullToRefreshViewNativeComponent.

elicwhite · 2020-06-12T18:00:35Z

+
+import AndroidCheckBoxNativeComponent, {
+  Commands as AndroidCheckBoxCommands,
+} from './AndroidCheckBoxNativeComponent';


Does the Windows component have the Android name?

Yes we have the android name. -- That way we can mark in our tooling that the .windows.js should just be a copy of the .android.js version. This reduces merge cost in the future.

We'd probably try to push a change upstream to make rename CheckBox.android.js -> CheckBox.js, and change the native component name to be more platform agnostic but since its deprecated I'm not sure its worth the effort.

elicwhite · 2020-06-12T18:03:02Z

 <PROJECT_ROOT>/Libraries/Components/Picker/RCTPickerNativeComponent.js
 <PROJECT_ROOT>/Libraries/Components/RefreshControl/RefreshControl.js
 <PROJECT_ROOT>/Libraries/Components/SafeAreaView/SafeAreaView.js
-<PROJECT_ROOT>/Libraries/Components/ScrollView/ScrollView.js


Do things being removed from this file mean you no longer have override files for them?

If you want the "source of truth" for platform overrides you can also look at the "overrides.json"!files scattered around the repo. The stuff in the flowconfig is just where we replace something that's shared JS.

elicwhite · 2020-06-12T18:08:28Z

 if (global.RN$Bridgeless) {
-  ImageViewNativeComponent = codegenNativeComponent<NativeProps>(
-    'RCTImage', // [Win32] Rename RCTImageView to RCTImage
-  );
+  ReactNativeViewConfigRegistry.register('RCTImage', () => {
+    // [Win32] Rename RCTImageView to RCTImage
+    return ImageViewViewConfig;
+  });
+  ImageViewNativeComponent = 'RCTImage'; // [Win32] Rename RCTImageView to RCTImage
 } else {


These checks shouldn't matter much for you right now, this is for Venice, the post-fabric project.

elicwhite · 2020-06-12T18:09:08Z

+  ImageViewNativeComponent = 'RCTImage'; // [Win32] Rename RCTImageView to RCTImage
 } else {
  ImageViewNativeComponent = requireNativeComponent<NativeProps>(
    'RCTImage', // [Win32] Rename RCTImageView to RCTImage


Hmm. in the source I see RCTImageView: https://github.com/facebook/react-native/blob/master/Libraries/Image/ImageViewNativeComponent.js#L51

Should these comments say "Rename RCTImage to RCTImageView"?

Depends if its documenting what the win32 diff is compared to master, or if its documenting a change we need to make in native. In this case it looks like its trying to document the diff.

Yeah, I've been commenting what the change is instead of as a TODO.

NickGerleman · 2020-06-13T05:30:26Z

ACoates changed the ImageViewNativeCompoonent name in devmain to support old + new so we should be able to remove JS forking entirely this PR.

NickGerleman · 2020-06-13T05:33:53Z

Also need to remove the last of the NativeStatusBarManager patches, since we aren't supporting anything anymore where a require-time dependency of the NM would break anything and don't need NativeOrDynamicColor tweaks any more.

NickGerleman · 2020-06-25T19:42:55Z

@acoates-ms I have a few more quick fixes to do, and some followups, but I think we should be able to merge today. Would rather get master on nightly sooner than later to avoid some of the assumptions that have been coming up around it.

ghost · 2020-06-26T23:52:58Z

Hello @NickGerleman!

Because this pull request has the AutoMerge label, I will be glad to assist with helping to merge this pull request once all check-in policies pass.

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (`@msftbot`) and give me an instruction to get started! Learn more here.

elicwhite · 2020-06-27T01:55:07Z

elicwhite

So when do you plan on starting to integrate another nightly build? 😀

Should be a much smaller diff hopefully 🤞

elicwhite · 2020-06-27T01:58:25Z

+      // onChange event to JS when JS itself is updating the value of the checkbox
+      shadow->UnregisterChangedEvents();
+      viewToUpdate.as<xaml::Controls::CheckBox>().IsChecked(value);
+      shadow->RegisterChangedEvents();


Should there be a return in this if statement to keep the next IsChecked call from running again?

elicwhite · 2020-06-27T02:05:20Z

+export const PlatformColor = (...names: Array<string>): ColorValue => {
+  // We dont support fallback colors right now, so no point in sending more than the first color across the bridge
+  return {windowsbrush: names[0]};
+};


Isn't this neat how WIndows can define a custom behavior for this function that works throughout the stack? It seems like this is something that would benefit from some documentation in core for other platforms to know how to do it. Who would be the right person to ask to help with that?

elicwhite · 2020-06-27T02:07:20Z

@@ -0,0 +1,21 @@
+/**


Why do you need this file? It looks like it is unchanged? Should it be inherited from core? Or is it being here, without a platform extension, doing exactly that?

This one was removed from OSS, then added back later, but after this build. We need it in conjunction with the Appearance changes around avoiding sync module calls to allow web debugging.

NickGerleman · 2020-06-27T02:29:27Z

So when do you plan on starting to integrate another nightly build? 😀

Should be a much smaller diff hopefully

This build gets us two weeks away from the base of 63. At that point where we reach the base of 0.63 we will need to wait for other payload we would want for RNW 0.63. In the meantime my plan is to spend some time working on automatic integration tooling and use those two weeks to experiment with it.

Current discussion has pointed towards branching 0.63 to preview in mid-August, where we can resume integration after. This takes us from about three months behind FB master back to 4.5 months, which isn't ideal. @acoates-ms and I were talking about wanting to do this a bit earlier, but there's also some pretty critical changes we'd like to get into the next RNW, so there's a tradeoff. Need to discuss this more with @chrisglein next week when he's back from vacation.

NickGerleman and others added 13 commits May 27, 2020 09:44

Change files

c2450cd

Reduce unneeded fetches

688cdd5

Begin integration of 3/22 Nightly Build

63abd19

Change files

084ea64

New Specs

1317b41

Do auto upgrades (limited success here)

5d51479

Begin Manual Merging + NativeOrDynamicColor Deletion

4220391

More merges

aa3843c

native fixes

5e9936d

Get RNTester booting

08af31a

Merge remote-tracking branch 'upstream/master' into nightly-integration

3216c7c

RNTester mostly works now

dc76ea7

NickGerleman commented Jun 10, 2020

View reviewed changes

Comment thread vnext/src/overrides.json Outdated

acoates-ms and others added 7 commits June 10, 2020 13:51

Fix redbox when clicking on text

8b7a3b0

Add Prerelease Segment to PlatformConstants

05c2182

Matching Android behavior of null if not a prerelease

Merge branch 'master' of https://github.com/microsoft/react-native-wi…

42ef75c

…ndows into nightly-integration

Win32 Fixes

daf0917

Fix PlatformColor

c15281e

Merge branch 'nightly-integration' of https://github.com/NickGerleman…

627a9a7

…/react-native-windows into nightly-integration

lint fix

02efbaa

acoates-ms mentioned this pull request Jun 12, 2020

Remove NativeOrDynamicColor Related Patches When PlatformColor is Available #3990

Closed

make vnext flow clean

124dbf7

elicwhite reviewed Jun 12, 2020

View reviewed changes

NickGerleman changed the title ~~[WIP] Begin integration of 3/22 Nightly Build~~ Integrate of 3/22 Nightly Build Jun 25, 2020

NickGerleman marked this pull request as ready for review June 25, 2020 19:41

NickGerleman requested a review from a team as a code owner June 25, 2020 19:41

NickGerleman and others added 18 commits June 25, 2020 13:03

Fix Peer Dependencies

b120770

The Generator Should Only Install the RN Peer Dep if It Isn't Satisfied

723c25c

We probably want a fixed peer dep

b4d5ca4

Keep react-native-dom in sync for react-native-win32

080b7ba

Dedupe Lockfile

bee6557

Testing (Does normal Yarn have different lockfile behavior?)

f77dc8e

Go back to midgard-yarn but make sure to pass --frozen-lockfile

fa24a56

Fix name

38f0eda

Expose the native win32 gradient color type as a strongly typed method.

e3b5aa8

Register new overrides

ce8ff42

Bring Back Style Validation Fix to Fix Flatlist Examples

3f40c32

Implement ExceptionsManager.reportException

ae0182a

Merge remote-tracking branch 'upstream/master' into nightly-integration

895accb

yarn api

37cdd4a

Fix win32 flow-check

e01ae48

Merge remote-tracking branch 'upstream/master' into nightly-integration

dafd8cd

Merge remote-tracking branch 'upstream/master' into nightly-integration

1a7e032

realign package versions

546f054

acoates-ms approved these changes Jun 26, 2020

View reviewed changes

NickGerleman added the AutoMerge Causes a PR to be automatically merged once all requirements are passed (label drives bot activity) label Jun 26, 2020

ghost merged commit 0727ffc into microsoft:master Jun 26, 2020

elicwhite reviewed Jun 27, 2020

View reviewed changes

NickGerleman mentioned this pull request Sep 1, 2020

Image onLoad Event Structure Using React Native 0.64 Type in RNW 0.63 #5896

Closed

This pull request was closed.

Conversation

NickGerleman commented May 27, 2020 • edited by acoates-ms Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Microsoft Reviewers: Open in CodeFlow

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

NickGerleman commented Jun 13, 2020

Uh oh!

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

Uh oh!

Uh oh!

NickGerleman commented Jun 25, 2020

Uh oh!

ghost commented Jun 26, 2020

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (@msftbot) and give me an instruction to get started! Learn more here.

Uh oh!

elicwhite commented Jun 27, 2020

Uh oh!

elicwhite left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

NickGerleman commented Jun 27, 2020

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

NickGerleman commented May 27, 2020 •

edited by acoates-ms

Loading

NickGerleman Jun 12, 2020 •

edited

Loading

NickGerleman commented Jun 13, 2020 •

edited

Loading

p.s. you can customize the way I help with merging this pull request, such as holding this pull request until a specific person approves. Simply @mention me (`@msftbot`) and give me an instruction to get started! Learn more here.