Integrate RN nightly 2/20 build #7282
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rectified95
force-pushed
the
integrate_2_20
branch
from
6cb4e56 to
35a1e06
Compare
acoates-ms
reviewed
Mar 8, 2021
vnext/stubs/glog/logging.h
Outdated
|
|
||
| typedef int LogSeverity; | ||
| inline void FlushLogFiles(LogSeverity min_severity) { | ||
| LOG(""); |
Contributor
There was a problem hiding this comment.
You can probably just no-op here. Rather than including the LOG call.
Contributor
Author
There was a problem hiding this comment.
@acoates-ms Is this line below ok?
#define google GlogStub
I didn't know how else to do it..
acoates-ms
reviewed
Mar 8, 2021
vnext/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/mapbuffer/MapBuffer.cpp
Show resolved
Hide resolved
asklar
reviewed
Mar 8, 2021
vnext/ReactCommon/TEMP_UntilReactCommonUpdate/react/renderer/mapbuffer/MapBuffer.cpp
Show resolved
Hide resolved
rectified95
force-pushed
the
integrate_2_20
branch
from
35a1e06 to
aa19881
Compare
NickGerleman
reviewed
Mar 8, 2021
Comment on lines
+855
to
+856
| // discovered when upgrading react-hooks | ||
| // eslint-disable-next-line react-hooks/exhaustive-deps |
Contributor
There was a problem hiding this comment.
This should also let us remove the selective dependency resolution for react eslint rules in the root "package.json"
NickGerleman
approved these changes
Mar 8, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Commits:
facebook/react-native@16efb8d...1fe5cac
facebook/react-native@022936b breaks our build with an unsafe cast - submitted PR in core to fix it: facebook/react-native#31106
In the meantime, I had to fork MapBuffer.cpp to make the change for RNW.
facebook/react-native@1fe5cac uses a logging function from the Google
gloglibrary - we currently stub out all the macros used from that library - needed to do something similar for a function call the make - it doesn't look very clean, please let me know how to improve the crudedefineI used inlogging.h.Microsoft Reviewers: Open in CodeFlow